From 47c2d8e6de46c7bc2d2bcc1fc52a5ac0c768d5dd Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Fri, 9 Jan 2026 03:15:32 +0100
Subject: [PATCH 01/28] upgrade inertia v2; add prefetching; migrate queries to
 tanstack query vue

---
 docker-compose.yml                            |   2 +-
 e2e/clients.spec.ts                           |   3 +-
 e2e/project-members.spec.ts                   |   5 +-
 e2e/projects.spec.ts                          |   3 +-
 e2e/reporting.spec.ts                         |   3 +-
 e2e/tags.spec.ts                              |   3 +-
 e2e/tasks.spec.ts                             |   3 +-
 e2e/time.spec.ts                              |   3 +-
 e2e/timetracker.spec.ts                       |   2 +-
 e2e/utils/currentTimeEntry.ts                 |   3 +-
 e2e/utils/money.ts                            |   2 +-
 e2e/utils/tags.ts                             |   2 +-
 package-lock.json                             | 118 ++++----
 package.json                                  |   2 +-
 .../Client/ClientMultiselectDropdown.vue      |   6 +-
 .../Common/Member/MemberCombobox.vue          |   6 +-
 .../Common/Member/MemberDeleteModal.vue       |   6 +-
 .../Member/MemberMakePlaceholderModal.vue     |   6 +-
 .../Member/MemberMultiselectDropdown.vue      |   6 +-
 .../Components/Common/Member/MemberTable.vue  |  10 +-
 .../Common/Member/MemberTableRow.vue          |   3 -
 resources/js/Components/Common/PageTitle.vue  |   2 +-
 .../Common/Project/ProjectEditModal.vue       |   6 +-
 .../Common/Project/ProjectTable.vue           |   4 +-
 .../Common/Project/ProjectTableRow.vue        |   9 +-
 .../ProjectMemberMoreOptionsDropdown.vue      |   5 +-
 .../ProjectMember/ProjectMemberTableRow.vue   |   5 +-
 .../Common/Reporting/ReportingOverview.vue    |  12 +-
 .../js/Components/Common/Tag/TagTable.vue     |   5 +-
 .../Common/Task/TaskMultiselectDropdown.vue   |   6 +-
 .../RecentlyTrackedTasksCardEntry.vue         |  10 +-
 resources/js/Components/DropdownLink.vue      |   1 +
 resources/js/Components/NavLink.vue           |   2 +-
 .../js/Components/NavigationSidebarLink.vue   |   2 +-
 resources/js/Components/ResponsiveNavLink.vue |   2 +-
 resources/js/Components/TimeTracker.vue       |  18 +-
 resources/js/Layouts/AppLayout.vue            |  10 +-
 resources/js/Pages/Calendar.vue               |  18 +-
 resources/js/Pages/Clients.vue                |  11 +-
 resources/js/Pages/ProjectShow.vue            |  25 +-
 resources/js/Pages/Projects.vue               |   6 +-
 resources/js/Pages/ReportingDetailed.vue      |  20 +-
 resources/js/Pages/Time.vue                   |  23 +-
 resources/js/app.ts                           |   9 +-
 .../ui/src/GroupedItemsCountButton.vue        |   4 +-
 resources/js/utils/init.ts                    |  21 +-
 resources/js/utils/prefetch.ts                | 283 ++++++++++++++++++
 resources/js/utils/useClients.ts              |  42 +--
 resources/js/utils/useClientsQuery.ts         |  35 +++
 resources/js/utils/useMembers.ts              |  32 +-
 resources/js/utils/useMembersQuery.ts         |  34 +++
 resources/js/utils/useProjectMembers.ts       |  42 +--
 resources/js/utils/useProjectMembersQuery.ts  |  39 +++
 resources/js/utils/useProjectsQuery.ts        |   1 +
 resources/js/utils/useReporting.ts            |  29 +-
 resources/js/utils/useTags.ts                 |  32 +-
 resources/js/utils/useTagsQuery.ts            |  34 +++
 resources/js/utils/useTasks.ts                |  33 +-
 resources/js/utils/useTasksQuery.ts           |  35 +++
 59 files changed, 712 insertions(+), 392 deletions(-)
 create mode 100644 resources/js/utils/prefetch.ts
 create mode 100644 resources/js/utils/useClientsQuery.ts
 create mode 100644 resources/js/utils/useMembersQuery.ts
 create mode 100644 resources/js/utils/useProjectMembersQuery.ts
 create mode 100644 resources/js/utils/useTagsQuery.ts
 create mode 100644 resources/js/utils/useTasksQuery.ts

diff --git a/docker-compose.yml b/docker-compose.yml
index 6974efb1..53d73ed4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -107,7 +107,7 @@ services:
             - sail
             - reverse-proxy
     playwright:
-        image: mcr.microsoft.com/playwright:v1.57.0-jammy
+        image: mcr.microsoft.com/playwright:v1.51.1-jammy
         command: ['npx', 'playwright', 'test', '--ui-port=8080', '--ui-host=0.0.0.0']
         working_dir: /src
         extra_hosts:
diff --git a/e2e/clients.spec.ts b/e2e/clients.spec.ts
index dab9c81f..dc6ed8cc 100644
--- a/e2e/clients.spec.ts
+++ b/e2e/clients.spec.ts
@@ -1,4 +1,5 @@
-import { expect, Page } from '@playwright/test';
+import { expect } from '@playwright/test';
+import type { Page } from '@playwright/test';
 import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 import { test } from '../playwright/fixtures';
 
diff --git a/e2e/project-members.spec.ts b/e2e/project-members.spec.ts
index 36ee7f2b..958014ac 100644
--- a/e2e/project-members.spec.ts
+++ b/e2e/project-members.spec.ts
@@ -1,9 +1,8 @@
-import { expect, Page } from '@playwright/test';
+import { expect } from '@playwright/test';
+import type { Page } from '@playwright/test';
 import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 import { test } from '../playwright/fixtures';
 import { formatCentsWithOrganizationDefaults } from './utils/money';
-import type { CurrencyFormat } from '../resources/js/packages/ui/src/utils/money';
-import { NumberFormat } from '@/packages/ui/src/utils/number';
 
 async function goToProjectsOverview(page: Page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/projects');
diff --git a/e2e/projects.spec.ts b/e2e/projects.spec.ts
index b052baed..1c953a95 100644
--- a/e2e/projects.spec.ts
+++ b/e2e/projects.spec.ts
@@ -1,4 +1,5 @@
-import { expect, Page } from '@playwright/test';
+import { expect } from '@playwright/test';
+import type { Page } from '@playwright/test';
 import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 import { test } from '../playwright/fixtures';
 import { formatCentsWithOrganizationDefaults } from './utils/money';
diff --git a/e2e/reporting.spec.ts b/e2e/reporting.spec.ts
index 4c3a777d..93815265 100644
--- a/e2e/reporting.spec.ts
+++ b/e2e/reporting.spec.ts
@@ -1,4 +1,5 @@
-import { expect, Page } from '@playwright/test';
+import { expect } from '@playwright/test';
+import type { Page } from '@playwright/test';
 import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 import { test } from '../playwright/fixtures';
 
diff --git a/e2e/tags.spec.ts b/e2e/tags.spec.ts
index 8b89aa2b..36b8defd 100644
--- a/e2e/tags.spec.ts
+++ b/e2e/tags.spec.ts
@@ -1,4 +1,5 @@
-import { expect, Page } from '@playwright/test';
+import { expect } from '@playwright/test';
+import type { Page } from '@playwright/test';
 import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 import { test } from '../playwright/fixtures';
 
diff --git a/e2e/tasks.spec.ts b/e2e/tasks.spec.ts
index 8e2073db..646f618c 100644
--- a/e2e/tasks.spec.ts
+++ b/e2e/tasks.spec.ts
@@ -1,4 +1,5 @@
-import { expect, Page } from '@playwright/test';
+import { expect } from '@playwright/test';
+import type { Page } from '@playwright/test';
 import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 import { test } from '../playwright/fixtures';
 
diff --git a/e2e/time.spec.ts b/e2e/time.spec.ts
index 2b01ddfb..fbcb500d 100644
--- a/e2e/time.spec.ts
+++ b/e2e/time.spec.ts
@@ -1,6 +1,7 @@
 import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 import { test } from '../playwright/fixtures';
-import { expect, Locator, Page } from '@playwright/test';
+import { expect } from '@playwright/test';
+import type { Locator, Page } from '@playwright/test';
 import {
     assertThatTimerHasStarted,
     assertThatTimerIsStopped,
diff --git a/e2e/timetracker.spec.ts b/e2e/timetracker.spec.ts
index c7896ca1..2696acfc 100644
--- a/e2e/timetracker.spec.ts
+++ b/e2e/timetracker.spec.ts
@@ -7,7 +7,7 @@ import {
     startOrStopTimerWithButton,
     stoppedTimeEntryResponse,
 } from './utils/currentTimeEntry';
-import { Page } from '@playwright/test';
+import type { Page } from '@playwright/test';
 import { newTagResponse } from './utils/tags';
 
 async function goToDashboard(page: Page) {
diff --git a/e2e/utils/currentTimeEntry.ts b/e2e/utils/currentTimeEntry.ts
index 162975ec..908da317 100644
--- a/e2e/utils/currentTimeEntry.ts
+++ b/e2e/utils/currentTimeEntry.ts
@@ -1,4 +1,5 @@
-import { expect, Page } from '@playwright/test';
+import { expect } from '@playwright/test';
+import type { Page } from '@playwright/test';
 
 export async function startOrStopTimerWithButton(page: Page) {
     await page.locator('[data-testid="dashboard_timer"] [data-testid="timer_button"]').click();
diff --git a/e2e/utils/money.ts b/e2e/utils/money.ts
index aed8176c..5a2f3c66 100644
--- a/e2e/utils/money.ts
+++ b/e2e/utils/money.ts
@@ -1,6 +1,6 @@
 import { formatCents } from '../../resources/js/packages/ui/src/utils/money';
 import type { CurrencyFormat } from '../../resources/js/packages/ui/src/utils/money';
-import { NumberFormat } from '../../resources/js/packages/ui/src/utils/number';
+import type { NumberFormat } from '../../resources/js/packages/ui/src/utils/number';
 
 export function formatCentsWithOrganizationDefaults(
     cents: number,
diff --git a/e2e/utils/tags.ts b/e2e/utils/tags.ts
index 888d6794..f3d0e86e 100644
--- a/e2e/utils/tags.ts
+++ b/e2e/utils/tags.ts
@@ -1,4 +1,4 @@
-import { Page } from '@playwright/test';
+import type { Page } from '@playwright/test';
 
 export function newTagResponse(page: Page, { name = '' } = {}) {
     return page.waitForResponse(async (response) => {
diff --git a/package-lock.json b/package-lock.json
index a481c98a..9d7b0f9f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,7 +41,7 @@
             "devDependencies": {
                 "@eslint/eslintrc": "^3.2.0",
                 "@eslint/js": "^9.19.0",
-                "@inertiajs/vue3": "^1.0.0",
+                "@inertiajs/vue3": "^2.0.0",
                 "@playwright/test": "^1.41.1",
                 "@tailwindcss/forms": "^0.5.9",
                 "@tailwindcss/typography": "^0.5.15",
@@ -1159,28 +1159,30 @@
             }
         },
         "node_modules/@inertiajs/core": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/@inertiajs/core/-/core-1.3.0.tgz",
-            "integrity": "sha512-TJ8R1eUYY473m9DaKlCPRdHTdznFWTDuy5VvEzXg3t/hohbDQedLj46yn/uAqziJPEUZJrSftZzPI2NMzL9tQA==",
+            "version": "2.3.7",
+            "resolved": "https://registry.npmjs.org/@inertiajs/core/-/core-2.3.7.tgz",
+            "integrity": "sha512-gBu2m71KoAu3kyaBDeszYiInkPqR0lIe+mRpI1JQyOlX1CT+Hwn+Tk5O7Dsr3dRMphEkRj6H9oVmJ19jHSNTIA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "axios": "^1.6.0",
-                "deepmerge": "^4.0.0",
-                "nprogress": "^0.2.0",
-                "qs": "^6.9.0"
+                "@types/lodash-es": "^4.17.12",
+                "axios": "^1.13.2",
+                "laravel-precognition": "^1.0.0",
+                "lodash-es": "^4.17.21",
+                "qs": "^6.14.1"
             }
         },
         "node_modules/@inertiajs/vue3": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/@inertiajs/vue3/-/vue3-1.3.0.tgz",
-            "integrity": "sha512-GizqdCM3u4JWunit3uUbW4fEmTLKQTi1W7VvPRdrNy8XDt4Qy2cCmfFjq+aH5tHBSS3fI/ngYuhN7XvwqNaKvw==",
+            "version": "2.3.7",
+            "resolved": "https://registry.npmjs.org/@inertiajs/vue3/-/vue3-2.3.7.tgz",
+            "integrity": "sha512-jaJtOPjulmLy4uKHL8BlYRjXGKk5FMccjczCePJzKS1JJYaF0aixpY046HzlKDtbnU9xn2h2tZRwu4kQ1uoTTg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@inertiajs/core": "1.3.0",
-                "lodash.clonedeep": "^4.5.0",
-                "lodash.isequal": "^4.5.0"
+                "@inertiajs/core": "2.3.7",
+                "@types/lodash-es": "^4.17.12",
+                "laravel-precognition": "^1.0.0",
+                "lodash-es": "^4.17.21"
             },
             "peerDependencies": {
                 "vue": "^3.0.0"
@@ -1927,6 +1929,23 @@
             "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
             "license": "MIT"
         },
+        "node_modules/@types/lodash": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-FOvQ0YPD5NOfPgMzJihoT+Za5pdkDJWcbpuj1DjaKZIr/gxodQjY/uWEFlTNqW2ugXHUiL8lRQgw63dzKHZdeQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/lodash-es": {
+            "version": "4.17.12",
+            "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
+            "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/lodash": "*"
+            }
+        },
         "node_modules/@types/node": {
             "version": "22.14.1",
             "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz",
@@ -2710,14 +2729,14 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.8.4",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz",
-            "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==",
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz",
+            "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "follow-redirects": "^1.15.6",
-                "form-data": "^4.0.0",
+                "form-data": "^4.0.4",
                 "proxy-from-env": "^1.1.0"
             }
         },
@@ -3089,16 +3108,6 @@
             "license": "MIT",
             "peer": true
         },
-        "node_modules/deepmerge": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-            "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/defu": {
             "version": "6.1.4",
             "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz",
@@ -3766,15 +3775,16 @@
             }
         },
         "node_modules/form-data": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
-            "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
+            "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "asynckit": "^0.4.0",
                 "combined-stream": "^1.0.8",
                 "es-set-tostringtag": "^2.1.0",
+                "hasown": "^2.0.2",
                 "mime-types": "^2.1.12"
             },
             "engines": {
@@ -4277,6 +4287,17 @@
                 "json-buffer": "3.0.1"
             }
         },
+        "node_modules/laravel-precognition": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/laravel-precognition/-/laravel-precognition-1.0.0.tgz",
+            "integrity": "sha512-hvXPT7dayCQAidxnsY0hab9Q+Y2rsh7xRpH9uiFtXN8Dekc3tIZt+NrxrOZ9N5SwHBmRBze/Bv+ElfXac0kD6g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "axios": "^1.4.0",
+                "lodash-es": "^4.17.21"
+            }
+        },
         "node_modules/laravel-vite-plugin": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.2.0.tgz",
@@ -4351,6 +4372,13 @@
             "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
             "license": "MIT"
         },
+        "node_modules/lodash-es": {
+            "version": "4.17.22",
+            "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.22.tgz",
+            "integrity": "sha512-XEawp1t0gxSi9x01glktRZ5HDy0HXqrM0x5pXQM98EaI0NxO6jVM7omDOxsuEo5UIASAnm2bRp1Jt/e0a2XU8Q==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/lodash.castarray": {
             "version": "4.4.0",
             "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz",
@@ -4358,21 +4386,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/lodash.clonedeep": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-            "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/lodash.isequal": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-            "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
-            "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/lodash.isplainobject": {
             "version": "4.0.6",
             "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
@@ -4604,13 +4617,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/nprogress": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
-            "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==",
-            "devOptional": true,
-            "license": "MIT"
-        },
         "node_modules/nth-check": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
@@ -5274,9 +5280,9 @@
             }
         },
         "node_modules/qs": {
-            "version": "6.14.0",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
-            "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+            "version": "6.14.1",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
+            "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
             "dev": true,
             "license": "BSD-3-Clause",
             "dependencies": {
diff --git a/package.json b/package.json
index f133c166..d9bd3652 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "devDependencies": {
         "@eslint/eslintrc": "^3.2.0",
         "@eslint/js": "^9.19.0",
-        "@inertiajs/vue3": "^1.0.0",
+        "@inertiajs/vue3": "^2.0.0",
         "@playwright/test": "^1.41.1",
         "@tailwindcss/forms": "^0.5.9",
         "@tailwindcss/typography": "^0.5.15",
diff --git a/resources/js/Components/Common/Client/ClientMultiselectDropdown.vue b/resources/js/Components/Common/Client/ClientMultiselectDropdown.vue
index c5e381c3..29c37824 100644
--- a/resources/js/Components/Common/Client/ClientMultiselectDropdown.vue
+++ b/resources/js/Components/Common/Client/ClientMultiselectDropdown.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
 import MultiselectDropdown from '@/packages/ui/src/Input/MultiselectDropdown.vue';
-import { storeToRefs } from 'pinia';
 import type { Client } from '@/packages/api/src';
-import { useClientsStore } from '@/utils/useClients';
+import { useClientsQuery } from '@/utils/useClientsQuery';
 
-const clientsStore = useClientsStore();
-const { clients } = storeToRefs(clientsStore);
+const { clients } = useClientsQuery();
 
 function getKeyFromItem(item: Client) {
     return item.id;
diff --git a/resources/js/Components/Common/Member/MemberCombobox.vue b/resources/js/Components/Common/Member/MemberCombobox.vue
index 5b9f9e27..ccd33bc8 100644
--- a/resources/js/Components/Common/Member/MemberCombobox.vue
+++ b/resources/js/Components/Common/Member/MemberCombobox.vue
@@ -1,15 +1,13 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
-import { storeToRefs } from 'pinia';
-import { useMembersStore } from '@/utils/useMembers';
+import { useMembersQuery } from '@/utils/useMembersQuery';
 import { UserIcon, ChevronDownIcon } from '@heroicons/vue/24/solid';
 import { useFocus } from '@vueuse/core';
 import type { ProjectMember } from '@/packages/api/src';
 import { Badge, SelectDropdown } from '@/packages/ui/src';
 import type { Member } from '@/packages/api/src';
 
-const membersStore = useMembersStore();
-const { members } = storeToRefs(membersStore);
+const { members } = useMembersQuery();
 
 const model = defineModel<string>({
     default: '',
diff --git a/resources/js/Components/Common/Member/MemberDeleteModal.vue b/resources/js/Components/Common/Member/MemberDeleteModal.vue
index e76baf06..5d8d23fd 100644
--- a/resources/js/Components/Common/Member/MemberDeleteModal.vue
+++ b/resources/js/Components/Common/Member/MemberDeleteModal.vue
@@ -2,7 +2,7 @@
 import type { Member } from '@/packages/api/src';
 import { api } from '@/packages/api/src';
 import { useForm } from '@tanstack/vue-form';
-import { useMutation } from '@tanstack/vue-query';
+import { useMutation, useQueryClient } from '@tanstack/vue-query';
 import Modal from '@/packages/ui/src/Modal.vue';
 import DangerButton from '@/packages/ui/src/Buttons/DangerButton.vue';
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
@@ -11,7 +11,6 @@ import { useNotificationsStore } from '@/utils/notification';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import InputLabel from '@/packages/ui/src/Input/InputLabel.vue';
 import InputError from '@/packages/ui/src/Input/InputError.vue';
-import { useMembersStore } from '@/utils/useMembers';
 
 const props = defineProps<{
     show: boolean;
@@ -23,6 +22,7 @@ const emit = defineEmits<{
 }>();
 
 const { handleApiRequestNotifications } = useNotificationsStore();
+const queryClient = useQueryClient();
 
 const deleteMutation = useMutation({
     mutationFn: async () => {
@@ -43,7 +43,7 @@ const deleteMutation = useMutation({
     },
     onSuccess: () => {
         close();
-        useMembersStore().fetchMembers();
+        queryClient.invalidateQueries({ queryKey: ['members'] });
     },
 });
 
diff --git a/resources/js/Components/Common/Member/MemberMakePlaceholderModal.vue b/resources/js/Components/Common/Member/MemberMakePlaceholderModal.vue
index 6244276c..3fa13b77 100644
--- a/resources/js/Components/Common/Member/MemberMakePlaceholderModal.vue
+++ b/resources/js/Components/Common/Member/MemberMakePlaceholderModal.vue
@@ -4,12 +4,12 @@ import DialogModal from '@/packages/ui/src/DialogModal.vue';
 import { ref } from 'vue';
 import { api, type Member } from '@/packages/api/src';
 import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
-import { useMutation } from '@tanstack/vue-query';
+import { useMutation, useQueryClient } from '@tanstack/vue-query';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { useNotificationsStore } from '@/utils/notification';
-import { useMembersStore } from '@/utils/useMembers';
 
 const { handleApiRequestNotifications } = useNotificationsStore();
+const queryClient = useQueryClient();
 
 const show = defineModel('show', { default: false });
 const saving = ref(false);
@@ -41,7 +41,7 @@ async function submit() {
         'There was an error deactivating the user.',
         () => {
             show.value = false;
-            useMembersStore().fetchMembers();
+            queryClient.invalidateQueries({ queryKey: ['members'] });
         }
     );
 }
diff --git a/resources/js/Components/Common/Member/MemberMultiselectDropdown.vue b/resources/js/Components/Common/Member/MemberMultiselectDropdown.vue
index 71a60303..5e7455aa 100644
--- a/resources/js/Components/Common/Member/MemberMultiselectDropdown.vue
+++ b/resources/js/Components/Common/Member/MemberMultiselectDropdown.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
 import MultiselectDropdown from '@/packages/ui/src/Input/MultiselectDropdown.vue';
-import { useMembersStore } from '@/utils/useMembers';
-import { storeToRefs } from 'pinia';
+import { useMembersQuery } from '@/utils/useMembersQuery';
 import type { Member } from '@/packages/api/src';
 
-const membersStore = useMembersStore();
-const { members } = storeToRefs(membersStore);
+const { members } = useMembersQuery();
 
 function getKeyFromItem(item: Member) {
     return item.id;
diff --git a/resources/js/Components/Common/Member/MemberTable.vue b/resources/js/Components/Common/Member/MemberTable.vue
index 603a707d..b1429a90 100644
--- a/resources/js/Components/Common/Member/MemberTable.vue
+++ b/resources/js/Components/Common/Member/MemberTable.vue
@@ -1,15 +1,9 @@
 <script setup lang="ts">
-import { onMounted } from 'vue';
-import { storeToRefs } from 'pinia';
 import MemberTableHeading from '@/Components/Common/Member/MemberTableHeading.vue';
 import MemberTableRow from '@/Components/Common/Member/MemberTableRow.vue';
-import { useMembersStore } from '@/utils/useMembers';
+import { useMembersQuery } from '@/utils/useMembersQuery';
 
-const { members } = storeToRefs(useMembersStore());
-
-onMounted(async () => {
-    await useMembersStore().fetchMembers();
-});
+const { members } = useMembersQuery();
 </script>
 
 <template>
diff --git a/resources/js/Components/Common/Member/MemberTableRow.vue b/resources/js/Components/Common/Member/MemberTableRow.vue
index 827706a9..e19374e6 100644
--- a/resources/js/Components/Common/Member/MemberTableRow.vue
+++ b/resources/js/Components/Common/Member/MemberTableRow.vue
@@ -15,14 +15,12 @@ import MemberMakePlaceholderModal from '@/Components/Common/Member/MemberMakePla
 import MemberDeleteModal from '@/Components/Common/Member/MemberDeleteModal.vue';
 import { capitalizeFirstLetter } from '../../../utils/format';
 import { formatCents } from '../../../packages/ui/src/utils/money';
-import { useMembersStore } from '@/utils/useMembers';
 
 const props = defineProps<{
     member: Member;
 }>();
 
 const organization = inject<ComputedRef<Organization>>('organization');
-const memberStore = useMembersStore();
 
 const showEditMemberModal = ref(false);
 const showMergeMemberModal = ref(false);
@@ -31,7 +29,6 @@ const showDeleteMemberModal = ref(false);
 
 function removeMember() {
     showDeleteMemberModal.value = true;
-    memberStore.fetchMembers();
 }
 
 async function invitePlaceholder(id: string) {
diff --git a/resources/js/Components/Common/PageTitle.vue b/resources/js/Components/Common/PageTitle.vue
index 24a669fa..4d521bc0 100644
--- a/resources/js/Components/Common/PageTitle.vue
+++ b/resources/js/Components/Common/PageTitle.vue
@@ -10,7 +10,7 @@ defineProps<{
 <template>
     <h3
         class="text-text-primary font-semibold text-sm sm:text-base flex items-center space-x-2 sm:space-x-2.5">
-        <component :is="icon" class="w-5 sm:w-6 text-icon-default"></component>
+        <component :is="icon" class="w-5 text-icon-default"></component>
         <span> {{ title }} </span>
     </h3>
 </template>
diff --git a/resources/js/Components/Common/Project/ProjectEditModal.vue b/resources/js/Components/Common/Project/ProjectEditModal.vue
index 48f72b1e..e6b85de8 100644
--- a/resources/js/Components/Common/Project/ProjectEditModal.vue
+++ b/resources/js/Components/Common/Project/ProjectEditModal.vue
@@ -6,11 +6,11 @@ import { computed, ref } from 'vue';
 import type { CreateClientBody, CreateProjectBody, Project } from '@/packages/api/src';
 import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
 import { useProjectsStore } from '@/utils/useProjects';
+import { useClientsStore } from '@/utils/useClients';
 import { useFocus } from '@vueuse/core';
 import ClientDropdown from '@/packages/ui/src/Client/ClientDropdown.vue';
 import Badge from '@/packages/ui/src/Badge.vue';
-import { useClientsStore } from '@/utils/useClients';
-import { storeToRefs } from 'pinia';
+import { useClientsQuery } from '@/utils/useClientsQuery';
 import ProjectColorSelector from '@/packages/ui/src/Project/ProjectColorSelector.vue';
 import { UserCircleIcon } from '@heroicons/vue/20/solid';
 import EstimatedTimeSection from '@/packages/ui/src/EstimatedTimeSection.vue';
@@ -21,7 +21,7 @@ import ProjectEditBillableSection from '@/packages/ui/src/Project/ProjectEditBil
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 
 const { updateProject } = useProjectsStore();
-const { clients } = storeToRefs(useClientsStore());
+const { clients } = useClientsQuery();
 const show = defineModel('show', { default: false });
 const saving = ref(false);
 const showBillableRateModal = ref(false);
diff --git a/resources/js/Components/Common/Project/ProjectTable.vue b/resources/js/Components/Common/Project/ProjectTable.vue
index 6c469cc1..0102a42f 100644
--- a/resources/js/Components/Common/Project/ProjectTable.vue
+++ b/resources/js/Components/Common/Project/ProjectTable.vue
@@ -13,7 +13,7 @@ import { canCreateProjects } from '@/utils/permissions';
 import type { CreateProjectBody, Project, Client, CreateClientBody } from '@/packages/api/src';
 import { useProjectsStore } from '@/utils/useProjects';
 import { useClientsStore } from '@/utils/useClients';
-import { storeToRefs } from 'pinia';
+import { useClientsQuery } from '@/utils/useClientsQuery';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import {
@@ -34,7 +34,7 @@ const emit = defineEmits<{
     sort: [column: SortColumn];
 }>();
 
-const { clients } = storeToRefs(useClientsStore());
+const { clients } = useClientsQuery();
 
 // Create a map of client names for sorting
 const clientNameMap = computed(() => {
diff --git a/resources/js/Components/Common/Project/ProjectTableRow.vue b/resources/js/Components/Common/Project/ProjectTableRow.vue
index c245a2ad..3d91c24d 100644
--- a/resources/js/Components/Common/Project/ProjectTableRow.vue
+++ b/resources/js/Components/Common/Project/ProjectTableRow.vue
@@ -3,9 +3,8 @@ import ProjectMoreOptionsDropdown from '@/Components/Common/Project/ProjectMoreO
 import type { Project } from '@/packages/api/src';
 import { computed, ref, inject, type ComputedRef } from 'vue';
 import { CheckCircleIcon, ArchiveBoxIcon } from '@heroicons/vue/24/outline';
-import { useClientsStore } from '@/utils/useClients';
-import { storeToRefs } from 'pinia';
-import { useTasksStore } from '@/utils/useTasks';
+import { useClientsQuery } from '@/utils/useClientsQuery';
+import { useTasksQuery } from '@/utils/useTasksQuery';
 import { useProjectsStore } from '@/utils/useProjects';
 import TableRow from '@/Components/TableRow.vue';
 import ProjectEditModal from '@/Components/Common/Project/ProjectEditModal.vue';
@@ -17,8 +16,8 @@ import { formatHumanReadableDuration } from '../../../packages/ui/src/utils/time
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import type { Organization } from '@/packages/api/src';
 
-const { clients } = storeToRefs(useClientsStore());
-const { tasks } = storeToRefs(useTasksStore());
+const { clients } = useClientsQuery();
+const { tasks } = useTasksQuery();
 
 const props = defineProps<{
     project: Project;
diff --git a/resources/js/Components/Common/ProjectMember/ProjectMemberMoreOptionsDropdown.vue b/resources/js/Components/Common/ProjectMember/ProjectMemberMoreOptionsDropdown.vue
index 7f0c9c6f..43496c6a 100644
--- a/resources/js/Components/Common/ProjectMember/ProjectMemberMoreOptionsDropdown.vue
+++ b/resources/js/Components/Common/ProjectMember/ProjectMemberMoreOptionsDropdown.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
 import { TrashIcon, PencilSquareIcon } from '@heroicons/vue/20/solid';
 import type { ProjectMember } from '@/packages/api/src';
-import { useMembersStore } from '@/utils/useMembers';
-import { storeToRefs } from 'pinia';
+import { useMembersQuery } from '@/utils/useMembersQuery';
 import { computed } from 'vue';
 import {
     DropdownMenu,
@@ -19,7 +18,7 @@ const props = defineProps<{
     projectMember: ProjectMember;
 }>();
 
-const { members } = storeToRefs(useMembersStore());
+const { members } = useMembersQuery();
 
 const currentMember = computed(() => {
     return members.value.find((member) => member.id === props.projectMember.user_id);
diff --git a/resources/js/Components/Common/ProjectMember/ProjectMemberTableRow.vue b/resources/js/Components/Common/ProjectMember/ProjectMemberTableRow.vue
index e31b5633..2265695b 100644
--- a/resources/js/Components/Common/ProjectMember/ProjectMemberTableRow.vue
+++ b/resources/js/Components/Common/ProjectMember/ProjectMemberTableRow.vue
@@ -1,9 +1,8 @@
 <script setup lang="ts">
 import type { ProjectMember } from '@/packages/api/src';
 import { computed, ref, inject, type ComputedRef } from 'vue';
-import { storeToRefs } from 'pinia';
 import TableRow from '@/Components/TableRow.vue';
-import { useMembersStore } from '@/utils/useMembers';
+import { useMembersQuery } from '@/utils/useMembersQuery';
 import { useProjectMembersStore } from '@/utils/useProjectMembers';
 import ProjectMemberMoreOptionsDropdown from '@/Components/Common/ProjectMember/ProjectMemberMoreOptionsDropdown.vue';
 import { formatCents } from '@/packages/ui/src/utils/money';
@@ -29,7 +28,7 @@ function editProjectMember() {
     showEditModal.value = true;
 }
 
-const { members } = storeToRefs(useMembersStore());
+const { members } = useMembersQuery();
 const member = computed(() => {
     return members.value.find((member) => member.id === props.projectMember.member_id);
 });
diff --git a/resources/js/Components/Common/Reporting/ReportingOverview.vue b/resources/js/Components/Common/Reporting/ReportingOverview.vue
index f002f419..b1992d8e 100644
--- a/resources/js/Components/Common/Reporting/ReportingOverview.vue
+++ b/resources/js/Components/Common/Reporting/ReportingOverview.vue
@@ -39,12 +39,13 @@ import {
     type Organization,
 } from '@/packages/api/src';
 import { getCurrentMembershipId, getCurrentOrganizationId, getCurrentRole } from '@/utils/useUser';
+import { useTagsQuery } from '@/utils/useTagsQuery';
 import { useTagsStore } from '@/utils/useTags';
 import { useSessionStorage, useStorage } from '@vueuse/core';
 import { useNotificationsStore } from '@/utils/notification';
 import type { ExportFormat } from '@/types/reporting';
 import { getRandomColorWithSeed } from '@/packages/ui/src/utils/color';
-import { useProjectsStore } from '@/utils/useProjects';
+import { useProjectsQuery } from '@/utils/useProjectsQuery';
 
 // TimeEntryRoundingType is now defined in ReportingRoundingControls component
 type TimeEntryRoundingType = 'up' | 'down' | 'nearest';
@@ -154,7 +155,7 @@ onMounted(() => {
     updateTableReporting();
 });
 
-const { tags } = storeToRefs(useTagsStore());
+const { tags } = useTagsQuery();
 
 async function createTag(tag: string) {
     return await useTagsStore().createTag(tag);
@@ -199,8 +200,7 @@ async function downloadExport(format: ExportFormat) {
 
 const { getNameForReportingRowEntry, emptyPlaceholder } = useReportingStore();
 
-const projectsStore = useProjectsStore();
-const { projects } = storeToRefs(projectsStore);
+const { projects } = useProjectsQuery();
 const showExportModal = ref(false);
 const exportUrl = ref<string | null>(null);
 
@@ -375,7 +375,7 @@ const tableData = computed(() => {
     </MainContainer>
     <MainContainer>
         <div class="sm:grid grid-cols-4 pt-6 items-start">
-            <div class="col-span-3 bg-card-background rounded-lg border border-card-border pt-3">
+            <div class="col-span-3 bg-secondary rounded-lg border border-card-border pt-3">
                 <div
                     class="text-sm flex text-text-primary items-center space-x-3 font-medium px-6 border-b border-card-background-separator pb-3">
                     <span>Group by</span>
@@ -391,7 +391,7 @@ const tableData = computed(() => {
                 </div>
                 <div class="grid items-center" style="grid-template-columns: 1fr 100px 150px">
                     <div
-                        class="contents [&>*]:border-card-background-separator [&>*]:border-b [&>*]:bg-tertiary [&>*]:pb-1.5 [&>*]:pt-1 text-text-secondary text-sm">
+                        class="contents [&>*]:border-card-background-separator [&>*]:border-b [&>*]:bg-secondary [&>*]:pb-1.5 [&>*]:pt-1 text-text-tertiary text-sm">
                         <div class="pl-6">Name</div>
                         <div class="text-right">Duration</div>
                         <div class="text-right pr-6">Cost</div>
diff --git a/resources/js/Components/Common/Tag/TagTable.vue b/resources/js/Components/Common/Tag/TagTable.vue
index 6c86dcad..c5d7fa03 100644
--- a/resources/js/Components/Common/Tag/TagTable.vue
+++ b/resources/js/Components/Common/Tag/TagTable.vue
@@ -3,8 +3,7 @@ import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
 import { FolderPlusIcon } from '@heroicons/vue/24/solid';
 import { PlusIcon } from '@heroicons/vue/16/solid';
 import { ref } from 'vue';
-import { storeToRefs } from 'pinia';
-import { useTagsStore } from '@/utils/useTags';
+import { useTagsQuery } from '@/utils/useTagsQuery';
 import TagTableRow from '@/Components/Common/Tag/TagTableRow.vue';
 import TagCreateModal from '@/packages/ui/src/Tag/TagCreateModal.vue';
 import TagTableHeading from '@/Components/Common/Tag/TagTableHeading.vue';
@@ -13,7 +12,7 @@ import type { Tag } from '@/packages/api/src';
 defineProps<{
     createTag: (name: string) => Promise<Tag | undefined>;
 }>();
-const { tags } = storeToRefs(useTagsStore());
+const { tags } = useTagsQuery();
 const showCreateTagModal = ref(false);
 </script>
 
diff --git a/resources/js/Components/Common/Task/TaskMultiselectDropdown.vue b/resources/js/Components/Common/Task/TaskMultiselectDropdown.vue
index 61d60259..1c2b78cb 100644
--- a/resources/js/Components/Common/Task/TaskMultiselectDropdown.vue
+++ b/resources/js/Components/Common/Task/TaskMultiselectDropdown.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
 import MultiselectDropdown from '@/packages/ui/src/Input/MultiselectDropdown.vue';
-import { storeToRefs } from 'pinia';
 import type { Task } from '@/packages/api/src';
-import { useTasksStore } from '@/utils/useTasks';
+import { useTasksQuery } from '@/utils/useTasksQuery';
 
-const tasksStore = useTasksStore();
-const { tasks } = storeToRefs(tasksStore);
+const { tasks } = useTasksQuery();
 
 function getKeyFromItem(item: Task) {
     return item.id;
diff --git a/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue b/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
index 1e69f68d..14f1e2ae 100644
--- a/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
+++ b/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
@@ -1,26 +1,26 @@
 <script setup lang="ts">
 import ProjectBadge from '@/packages/ui/src/Project/ProjectBadge.vue';
 import TimeTrackerStartStop from '@/packages/ui/src/TimeTrackerStartStop.vue';
-import { useProjectsStore } from '@/utils/useProjects';
-import { storeToRefs } from 'pinia';
+import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import { computed } from 'vue';
 import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
+import { storeToRefs } from 'pinia';
 import { getDayJsInstance } from '@/packages/ui/src/utils/time';
 import type { TimeEntry } from '@/packages/api/src';
-import { useTasksStore } from '@/utils/useTasks';
+import { useTasksQuery } from '@/utils/useTasksQuery';
 import { ChevronRightIcon } from '@heroicons/vue/16/solid';
 
 const props = defineProps<{
     timeEntry: TimeEntry;
 }>();
 
-const { projects } = storeToRefs(useProjectsStore());
+const { projects } = useProjectsQuery();
 
 const project = computed(() => {
     return projects.value.find((project) => project.id === props.timeEntry.project_id);
 });
 
-const { tasks } = storeToRefs(useTasksStore());
+const { tasks } = useTasksQuery();
 
 const task = computed(() => {
     return tasks.value.find((task) => task.id === props.timeEntry.task_id);
diff --git a/resources/js/Components/DropdownLink.vue b/resources/js/Components/DropdownLink.vue
index a9ff415d..3367982d 100644
--- a/resources/js/Components/DropdownLink.vue
+++ b/resources/js/Components/DropdownLink.vue
@@ -26,6 +26,7 @@ defineProps<{
         <Link
             v-else
             :href="href ?? ''"
+            prefetch
             class="block px-4 py-2 text-sm leading-5 text-text-primary hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out">
             <slot />
         </Link>
diff --git a/resources/js/Components/NavLink.vue b/resources/js/Components/NavLink.vue
index afb8aee4..9a3ffd93 100644
--- a/resources/js/Components/NavLink.vue
+++ b/resources/js/Components/NavLink.vue
@@ -15,7 +15,7 @@ const classes = computed(() => {
 </script>
 
 <template>
-    <Link :href="href ?? ''" :class="classes">
+    <Link :href="href ?? ''" :class="classes" prefetch>
         <slot />
     </Link>
 </template>
diff --git a/resources/js/Components/NavigationSidebarLink.vue b/resources/js/Components/NavigationSidebarLink.vue
index a71af159..4485f3fb 100644
--- a/resources/js/Components/NavigationSidebarLink.vue
+++ b/resources/js/Components/NavigationSidebarLink.vue
@@ -10,7 +10,7 @@ defineProps<{
 </script>
 
 <template>
-    <Link :href="href" class="block group">
+    <Link :href="href" class="block group" prefetch>
         <div
             :class="[
                 current
diff --git a/resources/js/Components/ResponsiveNavLink.vue b/resources/js/Components/ResponsiveNavLink.vue
index ab2c0449..6f3d6a8a 100644
--- a/resources/js/Components/ResponsiveNavLink.vue
+++ b/resources/js/Components/ResponsiveNavLink.vue
@@ -21,7 +21,7 @@ const classes = computed(() => {
             <slot />
         </button>
 
-        <Link v-else :href="href ?? ''" :class="classes">
+        <Link v-else :href="href ?? ''" :class="classes" prefetch>
             <slot />
         </Link>
     </div>
diff --git a/resources/js/Components/TimeTracker.vue b/resources/js/Components/TimeTracker.vue
index 8861c8ea..63e7d147 100644
--- a/resources/js/Components/TimeTracker.vue
+++ b/resources/js/Components/TimeTracker.vue
@@ -12,9 +12,12 @@ import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
 import { storeToRefs } from 'pinia';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { switchOrganization } from '@/utils/useOrganization';
-import { useProjectsStore } from '@/utils/useProjects';
-import { useTasksStore } from '@/utils/useTasks';
+import { useProjectsQuery } from '@/utils/useProjectsQuery';
+import { useTasksQuery } from '@/utils/useTasksQuery';
+import { useTagsQuery } from '@/utils/useTagsQuery';
+import { useClientsQuery } from '@/utils/useClientsQuery';
 import { useTagsStore } from '@/utils/useTags';
+import { useProjectsStore } from '@/utils/useProjects';
 import TimeTrackerControls from '@/packages/ui/src/TimeTracker/TimeTrackerControls.vue';
 import type {
     CreateClientBody,
@@ -49,12 +52,9 @@ const currentTimeEntryStore = useCurrentTimeEntryStore();
 const { currentTimeEntry, isActive, now } = storeToRefs(currentTimeEntryStore);
 const { startLiveTimer, stopLiveTimer, setActiveState } = currentTimeEntryStore;
 
-const projectStore = useProjectsStore();
-const { projects } = storeToRefs(projectStore);
-const taskStore = useTasksStore();
-const { tasks } = storeToRefs(taskStore);
-const clientStore = useClientsStore();
-const { clients } = storeToRefs(clientStore);
+const { projects } = useProjectsQuery();
+const { tasks } = useTasksQuery();
+const { clients } = useClientsQuery();
 
 const emit = defineEmits<{
     change: [];
@@ -157,7 +157,7 @@ async function discardCurrentTimeEntry() {
     }
 }
 
-const { tags } = storeToRefs(useTagsStore());
+const { tags } = useTagsQuery();
 const { timeEntries } = storeToRefs(useTimeEntriesStore());
 </script>
 
diff --git a/resources/js/Layouts/AppLayout.vue b/resources/js/Layouts/AppLayout.vue
index 4b7760c2..075949b4 100644
--- a/resources/js/Layouts/AppLayout.vue
+++ b/resources/js/Layouts/AppLayout.vue
@@ -23,7 +23,9 @@ import UserSettingsIcon from '@/Components/UserSettingsIcon.vue';
 import MainContainer from '@/packages/ui/src/MainContainer.vue';
 import { computed, onMounted, provide, ref } from 'vue';
 import NotificationContainer from '@/Components/NotificationContainer.vue';
-import { initializeStores, refreshStores } from '@/utils/init';
+import { initializeStores } from '@/utils/init';
+import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
+import { useTimeEntriesStore } from '@/utils/useTimeEntries';
 import {
     canManageBilling,
     canUpdateOrganization,
@@ -89,9 +91,11 @@ onMounted(async () => {
             await fetchToken();
         }
         setTimeout(() => {
-            // prevent store refreshing on navigation
+            // TanStack Query automatically refetches on window focus
+            // Only refresh non-migrated stores
             if (isUnloading.value === false) {
-                refreshStores();
+                useCurrentTimeEntryStore().fetchCurrentTimeEntry();
+                useTimeEntriesStore().patchTimeEntries();
             }
         }, 100);
     };
diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue
index 3df088cc..21c05425 100644
--- a/resources/js/Pages/Calendar.vue
+++ b/resources/js/Pages/Calendar.vue
@@ -16,10 +16,12 @@ import { TimeEntryCalendar } from '@/packages/ui/src';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import { useTimeEntriesStore } from '@/utils/useTimeEntries';
 import { useTagsStore } from '@/utils/useTags';
+import { useProjectsQuery } from '@/utils/useProjectsQuery';
+import { useClientsQuery } from '@/utils/useClientsQuery';
+import { useTasksQuery } from '@/utils/useTasksQuery';
+import { useTagsQuery } from '@/utils/useTagsQuery';
 import { useProjectsStore } from '@/utils/useProjects';
 import { useClientsStore } from '@/utils/useClients';
-import { storeToRefs } from 'pinia';
-import { useTasksStore } from '@/utils/useTasks';
 import { getUserTimezone } from '@/packages/ui/src/utils/settings';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { canCreateProjects } from '@/utils/permissions';
@@ -98,14 +100,10 @@ async function createClient(body: CreateClientBody): Promise<Client | undefined>
     return await useClientsStore().createClient(body);
 }
 
-const projectStore = useProjectsStore();
-const { projects } = storeToRefs(projectStore);
-const taskStore = useTasksStore();
-const { tasks } = storeToRefs(taskStore);
-const clientStore = useClientsStore();
-const { clients } = storeToRefs(clientStore);
-const tagsStore = useTagsStore();
-const { tags } = storeToRefs(tagsStore);
+const { projects } = useProjectsQuery();
+const { tasks } = useTasksQuery();
+const { clients } = useClientsQuery();
+const { tags } = useTagsQuery();
 
 const queryClient = useQueryClient();
 
diff --git a/resources/js/Pages/Clients.vue b/resources/js/Pages/Clients.vue
index 2ff0cdf9..43c0fcda 100644
--- a/resources/js/Pages/Clients.vue
+++ b/resources/js/Pages/Clients.vue
@@ -4,26 +4,21 @@ import AppLayout from '@/Layouts/AppLayout.vue';
 import { PlusIcon } from '@heroicons/vue/16/solid';
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
 import { UserCircleIcon } from '@heroicons/vue/20/solid';
-import { computed, onMounted, ref } from 'vue';
-import { useClientsStore } from '@/utils/useClients';
+import { computed, ref } from 'vue';
+import { useClientsQuery } from '@/utils/useClientsQuery';
 import ClientTable from '@/Components/Common/Client/ClientTable.vue';
 import ClientCreateModal from '@/Components/Common/Client/ClientCreateModal.vue';
 import PageTitle from '@/Components/Common/PageTitle.vue';
 import { canCreateClients } from '@/utils/permissions';
 import TabBarItem from '@/Components/Common/TabBar/TabBarItem.vue';
 import TabBar from '@/Components/Common/TabBar/TabBar.vue';
-import { storeToRefs } from 'pinia';
 
-onMounted(() => {
-    useClientsStore().fetchClients();
-});
+const { clients } = useClientsQuery();
 
 const activeTab = ref<'active' | 'archived'>('active');
 
 const createClient = ref(false);
 
-const { clients } = storeToRefs(useClientsStore());
-
 const shownClients = computed(() => {
     return clients.value.filter((client) => {
         if (activeTab.value === 'active') {
diff --git a/resources/js/Pages/ProjectShow.vue b/resources/js/Pages/ProjectShow.vue
index c31ee0b8..a9ca4c9d 100644
--- a/resources/js/Pages/ProjectShow.vue
+++ b/resources/js/Pages/ProjectShow.vue
@@ -3,9 +3,8 @@ import MainContainer from '@/packages/ui/src/MainContainer.vue';
 import AppLayout from '@/Layouts/AppLayout.vue';
 import { FolderIcon, PlusIcon } from '@heroicons/vue/16/solid';
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
-import { computed, onMounted, ref, inject, type ComputedRef } from 'vue';
-import { useProjectsStore } from '@/utils/useProjects';
-import { storeToRefs } from 'pinia';
+import { computed, ref, inject, type ComputedRef } from 'vue';
+import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import {
     ChevronRightIcon,
     CheckCircleIcon,
@@ -20,18 +19,18 @@ import CardTitle from '@/packages/ui/src/CardTitle.vue';
 import Card from '@/Components/Common/Card.vue';
 import ProjectMemberTable from '@/Components/Common/ProjectMember/ProjectMemberTable.vue';
 import ProjectMemberCreateModal from '@/Components/Common/ProjectMember/ProjectMemberCreateModal.vue';
-import { useProjectMembersStore } from '@/utils/useProjectMembers';
+import { useProjectMembersQuery } from '@/utils/useProjectMembersQuery';
 import { canCreateProjects, canCreateTasks, canViewProjectMembers } from '@/utils/permissions';
 import TabBarItem from '@/Components/Common/TabBar/TabBarItem.vue';
 import TabBar from '@/Components/Common/TabBar/TabBar.vue';
-import { useTasksStore } from '@/utils/useTasks';
+import { useTasksQuery } from '@/utils/useTasksQuery';
 import ProjectEditModal from '@/Components/Common/Project/ProjectEditModal.vue';
 import { Badge } from '@/packages/ui/src';
 import { formatCents } from '../packages/ui/src/utils/money';
 import { getOrganizationCurrencyString } from '../utils/money';
 import type { Organization } from '@/packages/api/src';
 
-const { projects } = storeToRefs(useProjectsStore());
+const { projects } = useProjectsQuery();
 
 const organization = inject<ComputedRef<Organization>>('organization');
 
@@ -42,20 +41,16 @@ const createTask = ref(false);
 const createProjectMember = ref(false);
 const projectId = route()?.params?.project as string;
 
-const { projectMembers } = storeToRefs(useProjectMembersStore());
-
-onMounted(() => {
-    if (canViewProjectMembers()) {
-        useProjectMembersStore().fetchProjectMembers(projectId);
-    }
-    useTasksStore().fetchTasks();
-});
+// TanStack Query automatically fetches project members when component mounts
+const { projectMembers } = canViewProjectMembers()
+    ? useProjectMembersQuery(projectId)
+    : { projectMembers: computed(() => []) };
 
 const showEditProjectModal = ref(false);
 
 const activeTab = ref<'active' | 'done'>('active');
 
-const { tasks } = storeToRefs(useTasksStore());
+const { tasks } = useTasksQuery();
 
 const shownTasks = computed(() => {
     return tasks.value.filter((task) => {
diff --git a/resources/js/Pages/Projects.vue b/resources/js/Pages/Projects.vue
index 8ab7a2bf..e808dd18 100644
--- a/resources/js/Pages/Projects.vue
+++ b/resources/js/Pages/Projects.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import MainContainer from '@/packages/ui/src/MainContainer.vue';
 import AppLayout from '@/Layouts/AppLayout.vue';
-import { FolderIcon, PlusIcon } from '@heroicons/vue/16/solid';
+import { FolderIcon, PlusIcon } from '@heroicons/vue/24/outline';
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
 import ProjectTable from '@/Components/Common/Project/ProjectTable.vue';
 import type {
@@ -15,6 +15,7 @@ import ProjectCreateModal from '@/packages/ui/src/Project/ProjectCreateModal.vue
 import PageTitle from '@/Components/Common/PageTitle.vue';
 import { canCreateProjects } from '@/utils/permissions';
 import { storeToRefs } from 'pinia';
+import { useClientsQuery } from '@/utils/useClientsQuery';
 import { useClientsStore } from '@/utils/useClients';
 import type { CreateClientBody, Client, CreateProjectBody, Project } from '@/packages/api/src';
 import { getOrganizationCurrencyString } from '@/utils/money';
@@ -29,8 +30,7 @@ import { NO_CLIENT_ID } from '@/Components/Common/Project/constants';
 
 // Fetch data using TanStack Query
 const { projects } = useProjectsQuery();
-
-const { clients } = storeToRefs(useClientsStore());
+const { clients } = useClientsQuery();
 const { organization } = storeToRefs(useOrganizationStore());
 
 // Table state persisted in localStorage
diff --git a/resources/js/Pages/ReportingDetailed.vue b/resources/js/Pages/ReportingDetailed.vue
index 92d7d4f4..6fff7909 100644
--- a/resources/js/Pages/ReportingDetailed.vue
+++ b/resources/js/Pages/ReportingDetailed.vue
@@ -36,15 +36,18 @@ import MemberMultiselectDropdown from '@/Components/Common/Member/MemberMultisel
 import TaskMultiselectDropdown from '@/Components/Common/Task/TaskMultiselectDropdown.vue';
 import SelectDropdown from '@/packages/ui/src/Input/SelectDropdown.vue';
 import ClientMultiselectDropdown from '@/Components/Common/Client/ClientMultiselectDropdown.vue';
+import { useTagsQuery } from '@/utils/useTagsQuery';
 import { useTagsStore } from '@/utils/useTags';
 import { useSessionStorage } from '@vueuse/core';
 import TimeEntryRow from '@/packages/ui/src/TimeEntry/TimeEntryRow.vue';
 import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
+import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import { useProjectsStore } from '@/utils/useProjects';
-import { useTasksStore } from '@/utils/useTasks';
+import { useTasksQuery } from '@/utils/useTasksQuery';
+import { useClientsQuery } from '@/utils/useClientsQuery';
 import { useClientsStore } from '@/utils/useClients';
 import { getOrganizationCurrencyString } from '@/utils/money';
-import { useMembersStore } from '@/utils/useMembers';
+import { useMembersQuery } from '@/utils/useMembersQuery';
 import {
     PaginationEllipsis,
     PaginationFirst,
@@ -88,7 +91,7 @@ const roundingEnabled = ref<boolean>(false);
 const roundingType = ref<TimeEntryRoundingType>('nearest');
 const roundingMinutes = ref<number>(15);
 
-const { members } = storeToRefs(useMembersStore());
+const { members } = useMembersQuery();
 const pageLimit = 15;
 
 // Watch rounding enabled state to trigger updates
@@ -126,7 +129,7 @@ const { setActiveState, startLiveTimer } = currentTimeEntryStore;
 const { handleApiRequestNotifications } = useNotificationsStore();
 const { createTimeEntry, updateTimeEntry, updateTimeEntries } = useTimeEntriesStore();
 
-const { tags } = storeToRefs(useTagsStore());
+const { tags } = useTagsQuery();
 
 const { data: timeEntryResponse } = useQuery<TimeEntryResponse>({
     queryKey: ['timeEntry', 'detailed-report'],
@@ -160,12 +163,9 @@ onMounted(async () => {
     await updateFilteredTimeEntries();
 });
 
-const projectStore = useProjectsStore();
-const { projects } = storeToRefs(projectStore);
-const taskStore = useTasksStore();
-const { tasks } = storeToRefs(taskStore);
-const clientStore = useClientsStore();
-const { clients } = storeToRefs(clientStore);
+const { projects } = useProjectsQuery();
+const { tasks } = useTasksQuery();
+const { clients } = useClientsQuery();
 
 const selectedTimeEntries = ref<TimeEntry[]>([]);
 
diff --git a/resources/js/Pages/Time.vue b/resources/js/Pages/Time.vue
index f555e10d..4bddb529 100644
--- a/resources/js/Pages/Time.vue
+++ b/resources/js/Pages/Time.vue
@@ -17,16 +17,19 @@ import { useElementVisibility } from '@vueuse/core';
 import { ClockIcon } from '@heroicons/vue/20/solid';
 import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
 import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
-import { useTasksStore } from '@/utils/useTasks';
-import { useProjectsStore } from '@/utils/useProjects';
+import { useTasksQuery } from '@/utils/useTasksQuery';
+import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import TimeEntryGroupedTable from '@/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue';
-import { useTagsStore } from '@/utils/useTags';
-import { useClientsStore } from '@/utils/useClients';
+import { useTagsQuery } from '@/utils/useTagsQuery';
+import { useClientsQuery } from '@/utils/useClientsQuery';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import TimeEntryMassActionRow from '@/packages/ui/src/TimeEntry/TimeEntryMassActionRow.vue';
 import type { UpdateMultipleTimeEntriesChangeset } from '@/packages/api/src';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import { canCreateProjects } from '@/utils/permissions';
+import { useTagsStore } from '@/utils/useTags';
+import { useProjectsStore } from '@/utils/useProjects';
+import { useClientsStore } from '@/utils/useClients';
 
 const timeEntriesStore = useTimeEntriesStore();
 const { timeEntries, allTimeEntriesLoaded } = storeToRefs(timeEntriesStore);
@@ -43,7 +46,6 @@ const isLoadMoreVisible = useElementVisibility(loadMoreContainer);
 const currentTimeEntryStore = useCurrentTimeEntryStore();
 const { currentTimeEntry } = storeToRefs(currentTimeEntryStore);
 const { setActiveState } = currentTimeEntryStore;
-const { tags } = storeToRefs(useTagsStore());
 
 async function startTimeEntry(timeEntry: Omit<CreateTimeEntryBody, 'member_id'>) {
     if (currentTimeEntry.value.id) {
@@ -70,12 +72,11 @@ onMounted(async () => {
     await timeEntriesStore.fetchTimeEntries();
 });
 
-const projectStore = useProjectsStore();
-const { projects } = storeToRefs(projectStore);
-const taskStore = useTasksStore();
-const { tasks } = storeToRefs(taskStore);
-const clientStore = useClientsStore();
-const { clients } = storeToRefs(clientStore);
+const { projects } = useProjectsQuery();
+const { tasks } = useTasksQuery();
+const { clients } = useClientsQuery();
+
+const { tags } = useTagsQuery();
 
 async function createTag(name: string) {
     return await useTagsStore().createTag(name);
diff --git a/resources/js/app.ts b/resources/js/app.ts
index 3c22a549..229ce3ca 100644
--- a/resources/js/app.ts
+++ b/resources/js/app.ts
@@ -6,11 +6,13 @@ import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers';
 import { ZiggyVue } from '../../vendor/tightenco/ziggy';
 import { createPinia } from 'pinia';
 import type { User } from '@/types/models';
-import { VueQueryPlugin } from '@tanstack/vue-query';
+import { QueryClient, VueQueryPlugin } from '@tanstack/vue-query';
 import { type DefineComponent } from 'vue';
+import { setupPrefetching } from '@/utils/prefetch';
 
 const appName = import.meta.env.VITE_APP_NAME || 'Laravel';
 const pinia = createPinia();
+const queryClient = new QueryClient();
 
 createInertiaApp({
     title: (title) => `${title} - ${appName}`,
@@ -62,7 +64,10 @@ createInertiaApp({
             return page.props.auth.user.timezone;
         };
 
-        app.use(plugin).use(pinia).use(ZiggyVue).use(VueQueryPlugin).mount(el);
+        app.use(plugin).use(pinia).use(ZiggyVue).use(VueQueryPlugin, { queryClient }).mount(el);
+
+        // Setup Inertia prefetching to warm TanStack Query cache
+        setupPrefetching(queryClient);
     },
 
     progress: {
diff --git a/resources/js/packages/ui/src/GroupedItemsCountButton.vue b/resources/js/packages/ui/src/GroupedItemsCountButton.vue
index 151cfff7..4c52c52c 100644
--- a/resources/js/packages/ui/src/GroupedItemsCountButton.vue
+++ b/resources/js/packages/ui/src/GroupedItemsCountButton.vue
@@ -15,9 +15,9 @@ const props = withDefaults(
 
 const expandedStatusClasses = computed(() => {
     if (props.expanded) {
-        return 'border-card-border border bg-card-background-active text-text-primary';
+        return 'border-card-border border bg-quaternary text-text-primary';
     }
-    return 'border-card-border border bg-card-background hover:bg-card-background-active hover:text-text-primary transition text-text-secondary';
+    return 'border-card-border border hover:bg-tertiary hover:text-text-primary transition text-text-secondary';
 });
 </script>
 
diff --git a/resources/js/utils/init.ts b/resources/js/utils/init.ts
index 7eb4d6e4..bb6bd3a3 100644
--- a/resources/js/utils/init.ts
+++ b/resources/js/utils/init.ts
@@ -1,26 +1,9 @@
-import { useProjectsStore } from '@/utils/useProjects';
-import { useTasksStore } from '@/utils/useTasks';
-import { useTagsStore } from '@/utils/useTags';
 import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
-import { useClientsStore } from '@/utils/useClients';
-import { useMembersStore } from '@/utils/useMembers';
 import { useTimeEntriesStore } from '@/utils/useTimeEntries';
-import { canViewClients, canViewMembers } from '@/utils/permissions';
 
 export function initializeStores() {
-    refreshStores();
-}
-
-export function refreshStores() {
-    useProjectsStore().fetchProjects();
-    useTasksStore().fetchTasks();
-    useTagsStore().fetchTags();
+    // TanStack Query now handles projects, tasks, tags, clients, and members fetching automatically
+    // Only initialize stores that aren't migrated to TanStack Query yet
     useCurrentTimeEntryStore().fetchCurrentTimeEntry();
     useTimeEntriesStore().patchTimeEntries();
-    if (canViewMembers()) {
-        useMembersStore().fetchMembers();
-    }
-    if (canViewClients()) {
-        useClientsStore().fetchClients();
-    }
 }
diff --git a/resources/js/utils/prefetch.ts b/resources/js/utils/prefetch.ts
new file mode 100644
index 00000000..5664af2e
--- /dev/null
+++ b/resources/js/utils/prefetch.ts
@@ -0,0 +1,283 @@
+import type { QueryClient } from '@tanstack/vue-query';
+import { api } from '@/packages/api/src';
+import { getCurrentOrganizationId } from '@/utils/useUser';
+import { canViewClients, canViewMembers } from '@/utils/permissions';
+
+/**
+ * Route patterns mapped to their prefetch functions.
+ * Each function receives the QueryClient and prefetches relevant data.
+ */
+const routePrefetchers: Record<string, (queryClient: QueryClient) => void> = {
+    '/': (queryClient) => {
+        prefetchDashboard(queryClient);
+    },
+
+    '/dashboard': (queryClient) => {
+        prefetchDashboard(queryClient);
+    },
+
+    '/time': (queryClient) => {
+        prefetchProjects(queryClient);
+        prefetchTasks(queryClient);
+        prefetchTags(queryClient);
+        prefetchClients(queryClient);
+    },
+
+    '/calendar': (queryClient) => {
+        prefetchProjects(queryClient);
+        prefetchTasks(queryClient);
+        prefetchTags(queryClient);
+        prefetchClients(queryClient);
+    },
+
+    '/projects': (queryClient) => {
+        prefetchProjects(queryClient);
+        prefetchClients(queryClient);
+    },
+
+    '/clients': (queryClient) => {
+        prefetchClients(queryClient);
+    },
+
+    '/tags': (queryClient) => {
+        prefetchTags(queryClient);
+    },
+
+    '/members': (queryClient) => {
+        prefetchMembers(queryClient);
+    },
+
+    '/reporting': (queryClient) => {
+        prefetchProjects(queryClient);
+        prefetchTags(queryClient);
+        prefetchClients(queryClient);
+        prefetchMembers(queryClient);
+    },
+
+    '/reporting/detailed': (queryClient) => {
+        prefetchProjects(queryClient);
+        prefetchTasks(queryClient);
+        prefetchTags(queryClient);
+        prefetchClients(queryClient);
+        prefetchMembers(queryClient);
+    },
+
+    '/reporting/shared': (queryClient) => {
+        prefetchReports(queryClient);
+    },
+};
+
+function prefetchDashboard(queryClient: QueryClient) {
+    const organizationId = getCurrentOrganizationId();
+    if (!organizationId) return;
+
+    // Prefetch all dashboard card data
+    queryClient.prefetchQuery({
+        queryKey: ['timeEntries', organizationId],
+        queryFn: () =>
+            api.getTimeEntries({
+                params: { organization: organizationId },
+                queries: { limit: 10, offset: 0, only_full_dates: 'true' },
+            }),
+        staleTime: 30000,
+    });
+
+    queryClient.prefetchQuery({
+        queryKey: ['lastSevenDays', organizationId],
+        queryFn: () => api.lastSevenDays({ params: { organization: organizationId } }),
+        staleTime: 30000,
+    });
+
+    queryClient.prefetchQuery({
+        queryKey: ['dailyTrackedHours', organizationId],
+        queryFn: () => api.dailyTrackedHours({ params: { organization: organizationId } }),
+        staleTime: 30000,
+    });
+
+    queryClient.prefetchQuery({
+        queryKey: ['weeklyProjectOverview', organizationId],
+        queryFn: () => api.weeklyProjectOverview({ params: { organization: organizationId } }),
+        staleTime: 30000,
+    });
+
+    queryClient.prefetchQuery({
+        queryKey: ['totalWeeklyTime', organizationId],
+        queryFn: () => api.totalWeeklyTime({ params: { organization: organizationId } }),
+        staleTime: 30000,
+    });
+
+    queryClient.prefetchQuery({
+        queryKey: ['totalWeeklyBillableTime', organizationId],
+        queryFn: () => api.totalWeeklyBillableTime({ params: { organization: organizationId } }),
+        staleTime: 30000,
+    });
+
+    queryClient.prefetchQuery({
+        queryKey: ['totalWeeklyBillableAmount', organizationId],
+        queryFn: () => api.totalWeeklyBillableAmount({ params: { organization: organizationId } }),
+        staleTime: 30000,
+    });
+
+    queryClient.prefetchQuery({
+        queryKey: ['weeklyHistory', organizationId],
+        queryFn: () => api.weeklyHistory({ params: { organization: organizationId } }),
+        staleTime: 30000,
+    });
+
+    // Prefetch team activity only if user has permission
+    if (canViewMembers()) {
+        queryClient.prefetchQuery({
+            queryKey: ['latestTeamActivity', organizationId],
+            queryFn: () => api.latestTeamActivity({ params: { organization: organizationId } }),
+            staleTime: 30000,
+        });
+    }
+}
+
+function prefetchProjects(queryClient: QueryClient) {
+    const organizationId = getCurrentOrganizationId();
+    if (!organizationId) return;
+
+    queryClient.prefetchQuery({
+        queryKey: ['projects'],
+        queryFn: () =>
+            api.getProjects({
+                params: { organization: organizationId },
+                queries: { archived: 'all' },
+            }),
+        staleTime: 30000, // Consider fresh for 30 seconds
+    });
+}
+
+function prefetchTasks(queryClient: QueryClient) {
+    const organizationId = getCurrentOrganizationId();
+    if (!organizationId) return;
+
+    queryClient.prefetchQuery({
+        queryKey: ['tasks'],
+        queryFn: () =>
+            api.getTasks({
+                params: { organization: organizationId },
+                queries: { done: 'all' },
+            }),
+        staleTime: 30000,
+    });
+}
+
+function prefetchTags(queryClient: QueryClient) {
+    const organizationId = getCurrentOrganizationId();
+    if (!organizationId) return;
+
+    queryClient.prefetchQuery({
+        queryKey: ['tags'],
+        queryFn: () =>
+            api.getTags({
+                params: { organization: organizationId },
+            }),
+        staleTime: 30000,
+    });
+}
+
+function prefetchClients(queryClient: QueryClient) {
+    const organizationId = getCurrentOrganizationId();
+    if (!organizationId || !canViewClients()) return;
+
+    queryClient.prefetchQuery({
+        queryKey: ['clients'],
+        queryFn: () =>
+            api.getClients({
+                params: { organization: organizationId },
+                queries: { archived: 'all' },
+            }),
+        staleTime: 30000,
+    });
+}
+
+function prefetchMembers(queryClient: QueryClient) {
+    const organizationId = getCurrentOrganizationId();
+    if (!organizationId || !canViewMembers()) return;
+
+    queryClient.prefetchQuery({
+        queryKey: ['members'],
+        queryFn: () =>
+            api.getMembers({
+                params: { organization: organizationId },
+            }),
+        staleTime: 30000,
+    });
+}
+
+function prefetchReports(queryClient: QueryClient) {
+    const organizationId = getCurrentOrganizationId();
+    if (!organizationId) return;
+
+    queryClient.prefetchQuery({
+        queryKey: ['reports', 1],
+        queryFn: () =>
+            api.getReports({
+                params: { organization: organizationId },
+            }),
+        staleTime: 30000,
+    });
+}
+
+function prefetchProjectMembers(queryClient: QueryClient, projectId: string) {
+    const organizationId = getCurrentOrganizationId();
+    if (!organizationId || !canViewMembers()) return;
+
+    queryClient.prefetchQuery({
+        queryKey: ['projectMembers', projectId],
+        queryFn: () =>
+            api.getProjectMembers({
+                params: { organization: organizationId, project: projectId },
+            }),
+        staleTime: 30000,
+    });
+}
+
+/**
+ * Matches a URL to find the appropriate prefetcher.
+ * Handles both exact matches and pattern matching for dynamic routes.
+ */
+function findPrefetcher(url: string): ((queryClient: QueryClient) => void) | undefined {
+    // Extract pathname from URL
+    const pathname = url.startsWith('http') ? new URL(url).pathname : url.split('?')[0];
+
+    // Try exact match first
+    if (routePrefetchers[pathname]) {
+        return routePrefetchers[pathname];
+    }
+
+    // Try pattern matching for dynamic routes like /projects/{id}
+    const projectMatch = pathname.match(/^\/projects\/([^/]+)$/);
+    if (projectMatch) {
+        const projectId = projectMatch[1];
+        return (queryClient) => {
+            prefetchProjects(queryClient);
+            prefetchTasks(queryClient);
+            prefetchProjectMembers(queryClient, projectId);
+        };
+    }
+
+    return undefined;
+}
+
+/**
+ * Sets up Inertia prefetch event listener to warm TanStack Query cache.
+ * Call this once during app initialization.
+ */
+export function setupPrefetching(queryClient: QueryClient) {
+    // Listen for the 'prefetching' event which fires when Inertia starts prefetching a page
+    // The event detail contains the visit object with the URL being prefetched
+    document.addEventListener('inertia:prefetching', ((event: CustomEvent) => {
+        const visit = event.detail?.visit;
+        if (!visit?.url) return;
+
+        const url = visit.url.href || visit.url.toString();
+        const prefetcher = findPrefetcher(url);
+
+        if (prefetcher) {
+            prefetcher(queryClient);
+        }
+    }) as EventListener);
+}
diff --git a/resources/js/utils/useClients.ts b/resources/js/utils/useClients.ts
index eee3f561..59506e8f 100644
--- a/resources/js/utils/useClients.ts
+++ b/resources/js/utils/useClients.ts
@@ -1,37 +1,13 @@
 import { defineStore } from 'pinia';
 import { api } from '@/packages/api/src';
-import { computed, ref } from 'vue';
-import type {
-    CreateClientBody,
-    ClientIndexResponse,
-    Client,
-    UpdateClientBody,
-} from '@/packages/api/src';
+import type { CreateClientBody, Client, UpdateClientBody } from '@/packages/api/src';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { useNotificationsStore } from '@/utils/notification';
+import { useQueryClient } from '@tanstack/vue-query';
 
 export const useClientsStore = defineStore('clients', () => {
-    const clientResponse = ref<ClientIndexResponse | null>(null);
     const { handleApiRequestNotifications } = useNotificationsStore();
-
-    async function fetchClients() {
-        const organization = getCurrentOrganizationId();
-        if (organization) {
-            clientResponse.value = await handleApiRequestNotifications(
-                () =>
-                    api.getClients({
-                        queries: {
-                            archived: 'all',
-                        },
-                        params: {
-                            organization: organization,
-                        },
-                    }),
-                undefined,
-                'Failed to fetch clients'
-            );
-        }
-    }
+    const queryClient = useQueryClient();
 
     async function createClient(clientBody: CreateClientBody): Promise<Client | undefined> {
         const organization = getCurrentOrganizationId();
@@ -46,7 +22,7 @@ export const useClientsStore = defineStore('clients', () => {
                 'Client created successfully',
                 'Failed to create client'
             );
-            await fetchClients();
+            queryClient.invalidateQueries({ queryKey: ['clients'] });
             return response?.data;
         }
     }
@@ -65,7 +41,7 @@ export const useClientsStore = defineStore('clients', () => {
                 'Client updated successfully',
                 'Failed to update client'
             );
-            await fetchClients();
+            queryClient.invalidateQueries({ queryKey: ['clients'] });
         }
     }
 
@@ -83,13 +59,9 @@ export const useClientsStore = defineStore('clients', () => {
                 'Client deleted successfully',
                 'Failed to delete client'
             );
-            await fetchClients();
+            queryClient.invalidateQueries({ queryKey: ['clients'] });
         }
     }
 
-    const clients = computed<Client[]>(() => {
-        return clientResponse.value?.data || [];
-    });
-
-    return { clients, fetchClients, createClient, deleteClient, updateClient };
+    return { createClient, deleteClient, updateClient };
 });
diff --git a/resources/js/utils/useClientsQuery.ts b/resources/js/utils/useClientsQuery.ts
new file mode 100644
index 00000000..091bc933
--- /dev/null
+++ b/resources/js/utils/useClientsQuery.ts
@@ -0,0 +1,35 @@
+import { useQuery, useQueryClient } from '@tanstack/vue-query';
+import { api } from '@/packages/api/src';
+import { getCurrentOrganizationId } from '@/utils/useUser';
+import type { Client } from '@/packages/api/src';
+import { computed } from 'vue';
+
+export function useClientsQuery() {
+    const queryClient = useQueryClient();
+
+    const query = useQuery({
+        queryKey: ['clients'],
+        queryFn: async () => {
+            const organizationId = getCurrentOrganizationId();
+            if (!organizationId) throw new Error('No organization');
+            return api.getClients({
+                params: { organization: organizationId },
+                queries: { archived: 'all' },
+            });
+        },
+        enabled: () => !!getCurrentOrganizationId(),
+        staleTime: 1000 * 30, // 30 seconds
+    });
+
+    const clients = computed<Client[]>(() => query.data.value?.data ?? []);
+
+    const invalidateClients = () => {
+        queryClient.invalidateQueries({ queryKey: ['clients'] });
+    };
+
+    return {
+        ...query,
+        clients,
+        invalidateClients,
+    };
+}
diff --git a/resources/js/utils/useMembers.ts b/resources/js/utils/useMembers.ts
index 4445cdb8..f96c0c06 100644
--- a/resources/js/utils/useMembers.ts
+++ b/resources/js/utils/useMembers.ts
@@ -1,31 +1,15 @@
 import { defineStore } from 'pinia';
 import { api } from '@/packages/api/src';
-import { computed, ref } from 'vue';
-import type { Member, MemberIndexResponse, UpdateMemberBody } from '@/packages/api/src';
+import type { UpdateMemberBody } from '@/packages/api/src';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { useNotificationsStore } from '@/utils/notification';
+import { useQueryClient } from '@tanstack/vue-query';
 
 export type MemberBillableKey = 'default-rate' | 'custom-rate';
 
 export const useMembersStore = defineStore('members', () => {
-    const membersResponse = ref<MemberIndexResponse | null>(null);
     const { handleApiRequestNotifications } = useNotificationsStore();
-
-    async function fetchMembers() {
-        const organization = getCurrentOrganizationId();
-        if (organization) {
-            membersResponse.value = await handleApiRequestNotifications(
-                () =>
-                    api.getMembers({
-                        params: {
-                            organization: organization,
-                        },
-                    }),
-                undefined,
-                'Failed to fetch members'
-            );
-        }
-    }
+    const queryClient = useQueryClient();
 
     async function removeMember(membershipId: string) {
         const organization = getCurrentOrganizationId();
@@ -41,7 +25,7 @@ export const useMembersStore = defineStore('members', () => {
                 'Member deleted successfully',
                 'Failed to delete member'
             );
-            await fetchMembers();
+            queryClient.invalidateQueries({ queryKey: ['members'] });
         }
     }
 
@@ -59,13 +43,9 @@ export const useMembersStore = defineStore('members', () => {
                 'Member updated successfully',
                 'Failed to update member'
             );
-            await fetchMembers();
+            queryClient.invalidateQueries({ queryKey: ['members'] });
         }
     }
 
-    const members = computed<Member[]>(() => {
-        return membersResponse.value?.data || [];
-    });
-
-    return { members, fetchMembers, removeMember, updateMember };
+    return { removeMember, updateMember };
 });
diff --git a/resources/js/utils/useMembersQuery.ts b/resources/js/utils/useMembersQuery.ts
new file mode 100644
index 00000000..5a716f98
--- /dev/null
+++ b/resources/js/utils/useMembersQuery.ts
@@ -0,0 +1,34 @@
+import { useQuery, useQueryClient } from '@tanstack/vue-query';
+import { api } from '@/packages/api/src';
+import { getCurrentOrganizationId } from '@/utils/useUser';
+import type { Member } from '@/packages/api/src';
+import { computed } from 'vue';
+
+export function useMembersQuery() {
+    const queryClient = useQueryClient();
+
+    const query = useQuery({
+        queryKey: ['members'],
+        queryFn: async () => {
+            const organizationId = getCurrentOrganizationId();
+            if (!organizationId) throw new Error('No organization');
+            return api.getMembers({
+                params: { organization: organizationId },
+            });
+        },
+        enabled: () => !!getCurrentOrganizationId(),
+        staleTime: 1000 * 30, // 30 seconds
+    });
+
+    const members = computed<Member[]>(() => query.data.value?.data ?? []);
+
+    const invalidateMembers = () => {
+        queryClient.invalidateQueries({ queryKey: ['members'] });
+    };
+
+    return {
+        ...query,
+        members,
+        invalidateMembers,
+    };
+}
diff --git a/resources/js/utils/useProjectMembers.ts b/resources/js/utils/useProjectMembers.ts
index aa9e90ae..13104e3d 100644
--- a/resources/js/utils/useProjectMembers.ts
+++ b/resources/js/utils/useProjectMembers.ts
@@ -1,35 +1,13 @@
 import { defineStore } from 'pinia';
 import { api } from '@/packages/api/src';
-import { computed, ref } from 'vue';
-import type {
-    CreateProjectMemberBody,
-    ProjectMember,
-    ProjectMemberResponse,
-    UpdateProjectMemberBody,
-} from '@/packages/api/src';
+import type { CreateProjectMemberBody, UpdateProjectMemberBody } from '@/packages/api/src';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { useNotificationsStore } from '@/utils/notification';
+import { useQueryClient } from '@tanstack/vue-query';
 
 export const useProjectMembersStore = defineStore('project-members', () => {
-    const projectMemberResponse = ref<ProjectMemberResponse | null>(null);
     const { handleApiRequestNotifications } = useNotificationsStore();
-
-    async function fetchProjectMembers(projectId: string) {
-        const organization = getCurrentOrganizationId();
-        if (organization) {
-            projectMemberResponse.value = await handleApiRequestNotifications(
-                () =>
-                    api.getProjectMembers({
-                        params: {
-                            organization: organization,
-                            project: projectId,
-                        },
-                    }),
-                undefined,
-                'Failed to fetch project members'
-            );
-        }
-    }
+    const queryClient = useQueryClient();
 
     async function createProjectMember(
         projectId: string,
@@ -48,7 +26,7 @@ export const useProjectMembersStore = defineStore('project-members', () => {
                 'Project member added successfully',
                 'Failed to add project member'
             );
-            await fetchProjectMembers(projectId);
+            queryClient.invalidateQueries({ queryKey: ['projectMembers', projectId] });
         }
     }
 
@@ -69,7 +47,11 @@ export const useProjectMembersStore = defineStore('project-members', () => {
                 'Project member updated successfully',
                 'Failed to update project member'
             );
-            await fetchProjectMembers(response.data.project_id);
+            if (response?.data?.project_id) {
+                queryClient.invalidateQueries({
+                    queryKey: ['projectMembers', response.data.project_id],
+                });
+            }
         }
     }
 
@@ -87,15 +69,11 @@ export const useProjectMembersStore = defineStore('project-members', () => {
                 'Project member removed successfully',
                 'Failed to remove project member'
             );
-            await fetchProjectMembers(projectId);
+            queryClient.invalidateQueries({ queryKey: ['projectMembers', projectId] });
         }
     }
 
-    const projectMembers = computed<ProjectMember[]>(() => projectMemberResponse.value?.data || []);
-
     return {
-        projectMembers,
-        fetchProjectMembers,
         createProjectMember,
         deleteProjectMember,
         updateProjectMember,
diff --git a/resources/js/utils/useProjectMembersQuery.ts b/resources/js/utils/useProjectMembersQuery.ts
new file mode 100644
index 00000000..be0fdb00
--- /dev/null
+++ b/resources/js/utils/useProjectMembersQuery.ts
@@ -0,0 +1,39 @@
+import { useQuery, useQueryClient } from '@tanstack/vue-query';
+import { api } from '@/packages/api/src';
+import { getCurrentOrganizationId } from '@/utils/useUser';
+import type { ProjectMember } from '@/packages/api/src';
+import { computed, type Ref } from 'vue';
+
+export function useProjectMembersQuery(projectId: Ref<string | null> | string) {
+    const queryClient = useQueryClient();
+
+    const projectIdValue = computed(() => {
+        return typeof projectId === 'string' ? projectId : projectId.value;
+    });
+
+    const query = useQuery({
+        queryKey: ['projectMembers', projectIdValue],
+        queryFn: async () => {
+            const organizationId = getCurrentOrganizationId();
+            const pid = projectIdValue.value;
+            if (!organizationId || !pid) throw new Error('No organization or project');
+            return api.getProjectMembers({
+                params: { organization: organizationId, project: pid },
+            });
+        },
+        enabled: () => !!getCurrentOrganizationId() && !!projectIdValue.value,
+        staleTime: 1000 * 30, // 30 seconds
+    });
+
+    const projectMembers = computed<ProjectMember[]>(() => query.data.value?.data ?? []);
+
+    const invalidateProjectMembers = () => {
+        queryClient.invalidateQueries({ queryKey: ['projectMembers', projectIdValue.value] });
+    };
+
+    return {
+        ...query,
+        projectMembers,
+        invalidateProjectMembers,
+    };
+}
diff --git a/resources/js/utils/useProjectsQuery.ts b/resources/js/utils/useProjectsQuery.ts
index 48eaabc8..454e23e9 100644
--- a/resources/js/utils/useProjectsQuery.ts
+++ b/resources/js/utils/useProjectsQuery.ts
@@ -18,6 +18,7 @@ export function useProjectsQuery() {
             });
         },
         enabled: () => !!getCurrentOrganizationId(),
+        staleTime: 1000 * 30, // 30 seconds
     });
 
     const projects = computed<Project[]>(() => query.data.value?.data ?? []);
diff --git a/resources/js/utils/useReporting.ts b/resources/js/utils/useReporting.ts
index 48b74135..067d859b 100644
--- a/resources/js/utils/useReporting.ts
+++ b/resources/js/utils/useReporting.ts
@@ -1,4 +1,4 @@
-import { defineStore, storeToRefs } from 'pinia';
+import { defineStore } from 'pinia';
 import { api } from '@/packages/api/src';
 import { type Component, computed, ref } from 'vue';
 import type {
@@ -8,11 +8,11 @@ import type {
 } from '@/packages/api/src';
 import { getCurrentOrganizationId, getCurrentRole, getCurrentUser } from '@/utils/useUser';
 import { useNotificationsStore } from '@/utils/notification';
-import { useProjectsStore } from '@/utils/useProjects';
-import { useMembersStore } from '@/utils/useMembers';
-import { useTasksStore } from '@/utils/useTasks';
-import { useClientsStore } from '@/utils/useClients';
-import { useTagsStore } from '@/utils/useTags';
+import { useProjectsQuery } from '@/utils/useProjectsQuery';
+import { useMembersQuery } from '@/utils/useMembersQuery';
+import { useTasksQuery } from '@/utils/useTasksQuery';
+import { useClientsQuery } from '@/utils/useClientsQuery';
+import { useTagsQuery } from '@/utils/useTagsQuery';
 import { CheckCircleIcon, UserCircleIcon, UserGroupIcon } from '@heroicons/vue/20/solid';
 import { DocumentTextIcon, FolderIcon } from '@heroicons/vue/16/solid';
 import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
@@ -32,6 +32,13 @@ export const useReportingStore = defineStore('reporting', () => {
 
     const { handleApiRequestNotifications } = useNotificationsStore();
 
+    // Cache query composables to avoid creating new subscriptions on every call
+    const { projects } = useProjectsQuery();
+    const { members } = useMembersQuery();
+    const { tasks } = useTasksQuery();
+    const { clients } = useClientsQuery();
+    const { tags } = useTagsQuery();
+
     async function fetchGraphReporting(params: AggregatedTimeEntriesQueryParams) {
         const organization = getCurrentOrganizationId();
         if (organization) {
@@ -93,31 +100,21 @@ export const useReportingStore = defineStore('reporting', () => {
         }
 
         if (type === 'project') {
-            const projectsStore = useProjectsStore();
-            const { projects } = storeToRefs(projectsStore);
             return projects.value.find((project) => project.id === key)?.name;
         }
         if (type === 'user') {
             if (getCurrentRole() === 'employee') {
                 return getCurrentUser().name;
             }
-            const memberStore = useMembersStore();
-            const { members } = storeToRefs(memberStore);
             return members.value.find((member) => member.user_id === key)?.name;
         }
         if (type === 'task') {
-            const taskStore = useTasksStore();
-            const { tasks } = storeToRefs(taskStore);
             return tasks.value.find((task) => task.id === key)?.name;
         }
         if (type === 'client') {
-            const clientsStore = useClientsStore();
-            const { clients } = storeToRefs(clientsStore);
             return clients.value.find((client) => client.id === key)?.name;
         }
         if (type === 'tag') {
-            const tagsStore = useTagsStore();
-            const { tags } = storeToRefs(tagsStore);
             return tags.value.find((tag) => tag.id === key)?.name;
         }
         if (type === 'billable') {
diff --git a/resources/js/utils/useTags.ts b/resources/js/utils/useTags.ts
index 01c0f93b..436ed1f5 100644
--- a/resources/js/utils/useTags.ts
+++ b/resources/js/utils/useTags.ts
@@ -1,33 +1,13 @@
 import { defineStore } from 'pinia';
-import { ref } from 'vue';
 import type { Tag } from '@/packages/api/src';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { api } from '@/packages/api/src';
 import { useNotificationsStore } from '@/utils/notification';
+import { useQueryClient } from '@tanstack/vue-query';
 
 export const useTagsStore = defineStore('tags', () => {
-    const tags = ref<Tag[]>([]);
     const { handleApiRequestNotifications } = useNotificationsStore();
-    async function fetchTags() {
-        const organizationId = getCurrentOrganizationId();
-        if (organizationId) {
-            const response = await handleApiRequestNotifications(
-                () =>
-                    api.getTags({
-                        params: {
-                            organization: organizationId,
-                        },
-                    }),
-                undefined,
-                'Failed to fetch tags'
-            );
-            if (response?.data) {
-                tags.value = response.data;
-            }
-        } else {
-            throw new Error('Failed to fetch current tags because organization ID is missing.');
-        }
-    }
+    const queryClient = useQueryClient();
 
     async function deleteTag(tagId: string) {
         const organizationId = getCurrentOrganizationId();
@@ -43,11 +23,11 @@ export const useTagsStore = defineStore('tags', () => {
                 'Tag deleted successfully',
                 'Failed to delete tag'
             );
-            await fetchTags();
+            queryClient.invalidateQueries({ queryKey: ['tags'] });
         }
     }
 
-    async function createTag(name: string) {
+    async function createTag(name: string): Promise<Tag | undefined> {
         const organizationId = getCurrentOrganizationId();
         if (organizationId) {
             const response = await handleApiRequestNotifications(
@@ -66,7 +46,7 @@ export const useTagsStore = defineStore('tags', () => {
                 'Failed to create tag'
             );
             if (response?.data) {
-                tags.value.unshift(response.data);
+                queryClient.invalidateQueries({ queryKey: ['tags'] });
                 return response.data;
             }
         } else {
@@ -74,5 +54,5 @@ export const useTagsStore = defineStore('tags', () => {
         }
     }
 
-    return { tags, fetchTags, createTag, deleteTag };
+    return { createTag, deleteTag };
 });
diff --git a/resources/js/utils/useTagsQuery.ts b/resources/js/utils/useTagsQuery.ts
new file mode 100644
index 00000000..3af68702
--- /dev/null
+++ b/resources/js/utils/useTagsQuery.ts
@@ -0,0 +1,34 @@
+import { useQuery, useQueryClient } from '@tanstack/vue-query';
+import { api } from '@/packages/api/src';
+import { getCurrentOrganizationId } from '@/utils/useUser';
+import type { Tag } from '@/packages/api/src';
+import { computed } from 'vue';
+
+export function useTagsQuery() {
+    const queryClient = useQueryClient();
+
+    const query = useQuery({
+        queryKey: ['tags'],
+        queryFn: async () => {
+            const organizationId = getCurrentOrganizationId();
+            if (!organizationId) throw new Error('No organization');
+            return api.getTags({
+                params: { organization: organizationId },
+            });
+        },
+        enabled: () => !!getCurrentOrganizationId(),
+        staleTime: 1000 * 30, // 30 seconds
+    });
+
+    const tags = computed<Tag[]>(() => query.data.value?.data ?? []);
+
+    const invalidateTags = () => {
+        queryClient.invalidateQueries({ queryKey: ['tags'] });
+    };
+
+    return {
+        ...query,
+        tags,
+        invalidateTags,
+    };
+}
diff --git a/resources/js/utils/useTasks.ts b/resources/js/utils/useTasks.ts
index f0c9267a..7c867618 100644
--- a/resources/js/utils/useTasks.ts
+++ b/resources/js/utils/useTasks.ts
@@ -1,32 +1,13 @@
 import { defineStore } from 'pinia';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { api } from '@/packages/api/src';
-import { reactive, ref } from 'vue';
-import type { CreateTaskBody, Task, UpdateTaskBody } from '@/packages/api/src';
+import type { CreateTaskBody, UpdateTaskBody } from '@/packages/api/src';
 import { useNotificationsStore } from '@/utils/notification';
+import { useQueryClient } from '@tanstack/vue-query';
 
 export const useTasksStore = defineStore('tasks', () => {
-    const tasks = ref<Task[]>(reactive([]));
     const { handleApiRequestNotifications } = useNotificationsStore();
-
-    async function fetchTasks() {
-        const organizationId = getCurrentOrganizationId();
-        if (organizationId) {
-            const tasksResponse = await handleApiRequestNotifications(() =>
-                api.getTasks({
-                    params: {
-                        organization: organizationId,
-                    },
-                    queries: {
-                        done: 'all',
-                    },
-                })
-            );
-            if (tasksResponse?.data) {
-                tasks.value = tasksResponse.data;
-            }
-        }
-    }
+    const queryClient = useQueryClient();
 
     async function updateTask(taskId: string, taskBody: UpdateTaskBody) {
         const organizationId = getCurrentOrganizationId();
@@ -42,7 +23,7 @@ export const useTasksStore = defineStore('tasks', () => {
                 'Task updated successfully',
                 'Failed to update task'
             );
-            await fetchTasks();
+            queryClient.invalidateQueries({ queryKey: ['tasks'] });
         }
     }
 
@@ -59,7 +40,7 @@ export const useTasksStore = defineStore('tasks', () => {
                 'Task created successfully',
                 'Failed to create task'
             );
-            await fetchTasks();
+            queryClient.invalidateQueries({ queryKey: ['tasks'] });
         }
     }
 
@@ -77,13 +58,11 @@ export const useTasksStore = defineStore('tasks', () => {
                 'Task deleted successfully',
                 'Failed to delete task'
             );
-            await fetchTasks();
+            queryClient.invalidateQueries({ queryKey: ['tasks'] });
         }
     }
 
     return {
-        tasks,
-        fetchTasks,
         updateTask,
         createTask,
         deleteTask,
diff --git a/resources/js/utils/useTasksQuery.ts b/resources/js/utils/useTasksQuery.ts
new file mode 100644
index 00000000..c50c8fea
--- /dev/null
+++ b/resources/js/utils/useTasksQuery.ts
@@ -0,0 +1,35 @@
+import { useQuery, useQueryClient } from '@tanstack/vue-query';
+import { api } from '@/packages/api/src';
+import { getCurrentOrganizationId } from '@/utils/useUser';
+import type { Task } from '@/packages/api/src';
+import { computed } from 'vue';
+
+export function useTasksQuery() {
+    const queryClient = useQueryClient();
+
+    const query = useQuery({
+        queryKey: ['tasks'],
+        queryFn: async () => {
+            const organizationId = getCurrentOrganizationId();
+            if (!organizationId) throw new Error('No organization');
+            return api.getTasks({
+                params: { organization: organizationId },
+                queries: { done: 'all' },
+            });
+        },
+        enabled: () => !!getCurrentOrganizationId(),
+        staleTime: 1000 * 30, // 30 seconds
+    });
+
+    const tasks = computed<Task[]>(() => query.data.value?.data ?? []);
+
+    const invalidateTasks = () => {
+        queryClient.invalidateQueries({ queryKey: ['tasks'] });
+    };
+
+    return {
+        ...query,
+        tasks,
+        invalidateTasks,
+    };
+}

From 6f68bbbd489630e02d0af3fa9585fac34979e148 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Wed, 14 Jan 2026 17:01:45 +0100
Subject: [PATCH 02/28] refactor timeentries queries and mutations, improve
 activitygraph, add dashboard reporting table

---
 .../Controllers/Api/V1/ChartController.php    |   2 +-
 e2e/clients.spec.ts                           |   2 +-
 e2e/project-members.spec.ts                   |  12 +-
 e2e/projects.spec.ts                          |  38 ++-
 .../Dashboard/ActivityGraphCard.vue           |  67 ++++-
 .../js/Components/Dashboard/DashboardCard.vue |   6 +-
 .../Dashboard/DayOverviewCardEntry.vue        |   7 +-
 .../Dashboard/RecentlyTrackedTasksCard.vue    |   2 +-
 .../RecentlyTrackedTasksCardEntry.vue         |   6 +-
 .../Dashboard/TeamActivityCardEntry.vue       |   4 +-
 .../Components/Dashboard/ThisWeekOverview.vue |  10 +
 .../Dashboard/ThisWeekReportingTable.vue      | 194 ++++++++++++++
 resources/js/Components/NavLink.vue           |   2 +-
 resources/js/Components/TimeTracker.vue       |  39 +--
 resources/js/Layouts/AppLayout.vue            |   2 -
 resources/js/Pages/Calendar.vue               |  91 +++----
 resources/js/Pages/ReportingDetailed.vue      |  40 +--
 resources/js/Pages/Time.vue                   |  43 ++-
 resources/js/packages/ui/src/CardTitle.vue    |   7 +-
 .../ui/src/TimeEntry/TimeEntryRowHeading.vue  |   2 +-
 .../src/TimeTracker/TimeTrackerControls.vue   |   2 +-
 .../TimeTracker/TimeTrackerRangeSelector.vue  |   2 +-
 resources/js/packages/ui/styles.css           |  14 +-
 resources/js/utils/init.ts                    |   2 -
 resources/js/utils/prefetch.ts                |  25 +-
 resources/js/utils/useCurrentTimeEntry.ts     |   5 +-
 resources/js/utils/useTimeEntries.ts          | 246 ------------------
 .../js/utils/useTimeEntriesCalendarQuery.ts   |  65 +++++
 .../js/utils/useTimeEntriesInfiniteQuery.ts   |  51 ++++
 resources/js/utils/useTimeEntriesMutations.ts | 151 +++++++++++
 .../js/utils/useTimeEntriesReportQuery.ts     |  21 ++
 31 files changed, 723 insertions(+), 437 deletions(-)
 create mode 100644 resources/js/Components/Dashboard/ThisWeekReportingTable.vue
 delete mode 100644 resources/js/utils/useTimeEntries.ts
 create mode 100644 resources/js/utils/useTimeEntriesCalendarQuery.ts
 create mode 100644 resources/js/utils/useTimeEntriesInfiniteQuery.ts
 create mode 100644 resources/js/utils/useTimeEntriesMutations.ts
 create mode 100644 resources/js/utils/useTimeEntriesReportQuery.ts

diff --git a/app/Http/Controllers/Api/V1/ChartController.php b/app/Http/Controllers/Api/V1/ChartController.php
index 3e034df9..167b9ed1 100644
--- a/app/Http/Controllers/Api/V1/ChartController.php
+++ b/app/Http/Controllers/Api/V1/ChartController.php
@@ -102,7 +102,7 @@ public function dailyTrackedHours(Organization $organization, DashboardService $
         $this->checkPermission($organization, 'charts:view:own');
         $user = $this->user();
 
-        $dailyTrackedHours = $dashboardService->getDailyTrackedHours($user, $organization, 60);
+        $dailyTrackedHours = $dashboardService->getDailyTrackedHours($user, $organization, 100);
 
         return response()->json($dailyTrackedHours);
     }
diff --git a/e2e/clients.spec.ts b/e2e/clients.spec.ts
index dc6ed8cc..280f081b 100644
--- a/e2e/clients.spec.ts
+++ b/e2e/clients.spec.ts
@@ -27,7 +27,7 @@ test('test that creating and deleting a new client via the modal works', async (
 
     await expect(page.getByTestId('client_table')).toContainText(newClientName);
     const moreButton = page.locator("[aria-label='Actions for Client " + newClientName + "']");
-    moreButton.click();
+    await moreButton.click();
     const deleteButton = page.locator("[aria-label='Delete Client " + newClientName + "']");
 
     await Promise.all([
diff --git a/e2e/project-members.spec.ts b/e2e/project-members.spec.ts
index 958014ac..555112e9 100644
--- a/e2e/project-members.spec.ts
+++ b/e2e/project-members.spec.ts
@@ -17,8 +17,16 @@ test('test that updating project member billable rate works for existing time en
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
 
-    await page.getByRole('button', { name: 'Create Project' }).click();
-    await expect(page.getByText(newProjectName)).toBeVisible();
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Project' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/projects') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201
+        ),
+    ]);
+    await expect(page.getByText(newProjectName)).toBeVisible({ timeout: 10000 });
 
     await page.getByText(newProjectName).click();
     await page.getByRole('button', { name: 'Add Member' }).click();
diff --git a/e2e/projects.spec.ts b/e2e/projects.spec.ts
index 1c953a95..7b5e1bfc 100644
--- a/e2e/projects.spec.ts
+++ b/e2e/projects.spec.ts
@@ -38,7 +38,7 @@ test('test that creating and deleting a new project via the modal works', async
 
     await expect(page.getByTestId('project_table')).toContainText(newProjectName);
     const moreButton = page.locator("[aria-label='Actions for Project " + newProjectName + "']");
-    moreButton.click();
+    await moreButton.click();
     const deleteButton = page.locator("[aria-label='Delete Project " + newProjectName + "']");
 
     await Promise.all([
@@ -79,8 +79,16 @@ test('test that archiving and unarchiving projects works', async ({ page }) => {
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
 
-    await page.getByRole('button', { name: 'Create Project' }).click();
-    await expect(page.getByText(newProjectName)).toBeVisible();
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Project' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/projects') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201
+        ),
+    ]);
+    await expect(page.getByText(newProjectName)).toBeVisible({ timeout: 10000 });
 
     // Archive the project
     await page.getByRole('row').first().getByRole('button').click();
@@ -118,8 +126,16 @@ test('test that updating billable rate works with existing time entries', async
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
 
-    await page.getByRole('button', { name: 'Create Project' }).click();
-    await expect(page.getByText(newProjectName)).toBeVisible();
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Project' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/projects') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201
+        ),
+    ]);
+    await expect(page.getByText(newProjectName)).toBeVisible({ timeout: 10000 });
 
     await page.getByRole('row').first().getByRole('button').click();
     await page.getByRole('menuitem').getByText('Edit').first().click();
@@ -224,8 +240,16 @@ test('test that filtering projects by status works', async ({ page }) => {
     // Create a new project
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
-    await page.getByRole('button', { name: 'Create Project' }).click();
-    await expect(page.getByText(newProjectName)).toBeVisible();
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Project' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/projects') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201
+        ),
+    ]);
+    await expect(page.getByText(newProjectName)).toBeVisible({ timeout: 10000 });
 
     // Archive the project
     await page.getByRole('row').first().getByRole('button').click();
diff --git a/resources/js/Components/Dashboard/ActivityGraphCard.vue b/resources/js/Components/Dashboard/ActivityGraphCard.vue
index 7871983b..19ad0471 100644
--- a/resources/js/Components/Dashboard/ActivityGraphCard.vue
+++ b/resources/js/Components/Dashboard/ActivityGraphCard.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
 import VChart, { THEME_KEY } from 'vue-echarts';
-import { provide, computed, inject, type ComputedRef } from 'vue';
+import { provide, computed, inject, ref, type ComputedRef } from 'vue';
 import { use } from 'echarts/core';
+import { useElementSize } from '@vueuse/core';
 import DashboardCard from '@/Components/Dashboard/DashboardCard.vue';
 import { BoltIcon } from '@heroicons/vue/20/solid';
 import { HeatmapChart } from 'echarts/charts';
@@ -12,13 +13,13 @@ import {
     VisualMapComponent,
 } from 'echarts/components';
 import { CanvasRenderer } from 'echarts/renderers';
-import dayjs from 'dayjs';
 import {
     firstDayIndex,
     formatDate,
     formatHumanReadableDuration,
     getDayJsInstance,
 } from '@/packages/ui/src/utils/time';
+import chroma from 'chroma-js';
 import { useCssVariable } from '@/utils/useCssVariable';
 import { useQuery } from '@tanstack/vue-query';
 import { getCurrentOrganizationId } from '@/utils/useUser';
@@ -62,8 +63,44 @@ const max = computed(() => {
 });
 
 const backgroundColor = useCssVariable('--theme-color-card-background');
-const itemBackgroundColor = useCssVariable('--color-bg-tertiary');
 const borderColor = useCssVariable('--color-border');
+const labelColor = useCssVariable('--color-text-secondary');
+const chartColorRaw = useCssVariable('--theme-color-chart');
+
+const chartEmptyColorRaw = useCssVariable('--color-bg-tertiary');
+const chartEmptyColor = computed(() => {
+    if (!chartEmptyColorRaw.value) return '#2a2c32';
+    return chroma(chartEmptyColorRaw.value).hex();
+});
+const chartColor = computed(() => {
+    if (!chartColorRaw.value) return '#bae6fd';
+    return `rgb(${chartColorRaw.value})`;
+});
+
+// Track chart container size
+const chartContainer = ref<HTMLElement | null>(null);
+const { width: containerWidth } = useElementSize(chartContainer);
+
+// Calculate number of weeks based on available width
+// Rough estimate: 40px per cell + 80px for labels = ~360px for 7 weeks
+const numberOfWeeks = computed(() => {
+    const availableWidth = containerWidth.value || 400;
+    const minCellSize = 25; // Minimum cell size in pixels
+    const labelSpace = 80; // Space for day labels
+    const usableWidth = availableWidth - labelSpace;
+    const maxWeeks = Math.floor(usableWidth / minCellSize);
+    // Clamp between 4 and 12 weeks for reasonable display
+    return Math.max(4, Math.min(12, maxWeeks));
+});
+
+// Calculate date range based on dynamic number of weeks
+const dateRange = computed(() => {
+    const today = getDayJsInstance()();
+    const startOfWeek = today.startOf('week');
+    // Go back (numberOfWeeks - 1) weeks from the start of current week
+    const rangeStart = startOfWeek.subtract(numberOfWeeks.value - 1, 'week');
+    return [today.format('YYYY-MM-DD'), rangeStart.format('YYYY-MM-DD')];
+});
 
 const option = computed(() => {
     return {
@@ -76,26 +113,30 @@ const option = computed(() => {
             left: 'center',
             top: 'center',
             inRange: {
-                color: [itemBackgroundColor.value, '#2DBE45'],
+                color: [chartEmptyColor.value, chartColor.value],
             },
             show: false,
         },
         calendar: {
-            top: 40,
+            top: 35,
             bottom: 20,
-            left: 40,
-            right: 10,
-            cellSize: [40, 40],
+            left: 35,
+            right: 5,
+            cellSize: 'auto',
+            orient: 'horizontal',
             dayLabel: {
                 firstDay: firstDayIndex.value,
+                color: labelColor.value,
+                fontFamily: 'Inter, sans-serif',
+            },
+            monthLabel: {
+                color: labelColor.value,
+                fontFamily: 'Inter, sans-serif',
             },
             splitLine: {
                 show: false,
             },
-            range: [
-                dayjs().format('YYYY-MM-DD'),
-                getDayJsInstance()().subtract(50, 'day').startOf('week').format('YYYY-MM-DD'),
-            ],
+            range: dateRange.value,
             itemStyle: {
                 color: 'transparent',
                 borderWidth: 8,
@@ -144,7 +185,7 @@ const option = computed(() => {
             <div v-if="isLoading" class="flex justify-center items-center h-40">
                 <LoadingSpinner />
             </div>
-            <div v-else-if="dailyHoursTracked">
+            <div v-else-if="dailyHoursTracked" ref="chartContainer">
                 <v-chart
                     class="chart"
                     :autoresize="true"
diff --git a/resources/js/Components/Dashboard/DashboardCard.vue b/resources/js/Components/Dashboard/DashboardCard.vue
index ecb8d3da..29cbfeb1 100644
--- a/resources/js/Components/Dashboard/DashboardCard.vue
+++ b/resources/js/Components/Dashboard/DashboardCard.vue
@@ -1,7 +1,9 @@
 <template>
-    <section class="flex flex-col">
+    <section class="flex overflow-hidden flex-col gap-1.5">
         <CardTitle :title="title" :icon="icon"></CardTitle>
-        <div class="rounded-lg border border-card-border flex-1 flex items-stretch">
+
+        <div
+            class="flex-1 flex items-stretch rounded-lg bg-card-background border border-card-border">
             <div class="w-full flex flex-col">
                 <slot></slot>
             </div>
diff --git a/resources/js/Components/Dashboard/DayOverviewCardEntry.vue b/resources/js/Components/Dashboard/DayOverviewCardEntry.vue
index 0b0572f6..af914fe1 100644
--- a/resources/js/Components/Dashboard/DayOverviewCardEntry.vue
+++ b/resources/js/Components/Dashboard/DayOverviewCardEntry.vue
@@ -14,17 +14,16 @@ defineProps<{
 </script>
 
 <template>
-    <div class="px-3.5 py-2 flex justify-between @container border-b border-b-background-separator">
+    <div class="px-3.5 py-2 flex justify-between @container">
         <div class="flex items-center min-w-[70px]">
-            <p class="font-medium text-sm text-text-primary">
+            <p class="text-sm text-text-primary">
                 {{ formatHumanReadableDate(date) }}
             </p>
         </div>
         <div class="items-center justify-center flex-1 hidden @2xs:flex">
             <DayOverviewCardChart :history="history"></DayOverviewCardChart>
         </div>
-        <div
-            class="flex text-sm items-center justify-center text-text-secondary min-w-[65px] font-medium">
+        <div class="flex text-sm items-center justify-center text-text-secondary min-w-[65px]">
             {{
                 formatHumanReadableDuration(
                     duration,
diff --git a/resources/js/Components/Dashboard/RecentlyTrackedTasksCard.vue b/resources/js/Components/Dashboard/RecentlyTrackedTasksCard.vue
index 7b0b8127..60bae0cf 100644
--- a/resources/js/Components/Dashboard/RecentlyTrackedTasksCard.vue
+++ b/resources/js/Components/Dashboard/RecentlyTrackedTasksCard.vue
@@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/vue-query';
 import { computed } from 'vue';
 import RecentlyTrackedTasksCardEntry from '@/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue';
 import DashboardCard from '@/Components/Dashboard/DashboardCard.vue';
-import { CheckCircleIcon } from '@heroicons/vue/20/solid';
+import { CheckCircleIcon } from '@heroicons/vue/24/solid';
 import { PlusCircleIcon } from '@heroicons/vue/24/solid';
 import { getCurrentMembershipId, getCurrentOrganizationId } from '@/utils/useUser';
 import { api } from '@/packages/api/src';
diff --git a/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue b/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
index 14f1e2ae..f6dca4b4 100644
--- a/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
+++ b/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
@@ -45,11 +45,11 @@ async function startTaskTimer() {
 </script>
 
 <template>
-    <div class="px-3.5 py-2 grid grid-cols-5 border-b border-b-background-separator">
+    <div class="px-3.5 py-2 grid grid-cols-5">
         <div class="col-span-4">
-            <p class="font-medium text-text-primary text-sm pb-1 truncate">
+            <p class="text-text-secondary text-sm pb-1.5 truncate">
                 <span v-if="timeEntry.description"> {{ timeEntry.description }}</span>
-                <span v-else class="text-text-tertiary">No description</span>
+                <span v-else>No description</span>
             </p>
             <ProjectBadge size="base" class="min-w-0 max-w-full" :color="project?.color">
                 <div class="flex items-center lg:space-x-0.5 min-w-0">
diff --git a/resources/js/Components/Dashboard/TeamActivityCardEntry.vue b/resources/js/Components/Dashboard/TeamActivityCardEntry.vue
index 85fc0acf..4f73e0dc 100644
--- a/resources/js/Components/Dashboard/TeamActivityCardEntry.vue
+++ b/resources/js/Components/Dashboard/TeamActivityCardEntry.vue
@@ -7,11 +7,11 @@ defineProps<{
 </script>
 
 <template>
-    <div class="px-4 py-2 2xl:py-3 border-b border-b-background-separator">
+    <div class="px-3.5 py-2 2xl:py-3">
         <div class="col-span-2">
             <div class="flex justify-between">
                 <p
-                    class="font-semibold text-sm min-w-0 overflow-ellipsis overflow-hidden flex-1 text-text-primary">
+                    class="text-xs min-w-0 overflow-ellipsis overflow-hidden flex-1 text-text-secondary">
                     {{ name }}
                 </p>
                 <div v-if="working" class="flex space-x-1.5 items-center justify-end">
diff --git a/resources/js/Components/Dashboard/ThisWeekOverview.vue b/resources/js/Components/Dashboard/ThisWeekOverview.vue
index d2603ac2..b6bd4268 100644
--- a/resources/js/Components/Dashboard/ThisWeekOverview.vue
+++ b/resources/js/Components/Dashboard/ThisWeekOverview.vue
@@ -15,6 +15,7 @@ import { ClockIcon } from '@heroicons/vue/20/solid';
 import CardTitle from '@/packages/ui/src/CardTitle.vue';
 import LinearGradient from 'zrender/lib/graphic/LinearGradient';
 import ProjectsChartCard from '@/Components/Dashboard/ProjectsChartCard.vue';
+import ThisWeekReportingTable from '@/Components/Dashboard/ThisWeekReportingTable.vue';
 import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
 import { formatCents } from '@/packages/ui/src/utils/money';
 import { getWeekStart } from '@/packages/ui/src/utils/settings';
@@ -71,6 +72,7 @@ const { data: weeklyProjectOverview } = useQuery({
         });
     },
     enabled: computed(() => !!organizationId.value),
+    staleTime: 1000 * 30, // 30 seconds
 });
 
 const { data: totalWeeklyTime } = useQuery({
@@ -83,6 +85,7 @@ const { data: totalWeeklyTime } = useQuery({
         });
     },
     enabled: computed(() => !!organizationId.value),
+    staleTime: 1000 * 30, // 30 seconds
 });
 
 const { data: totalWeeklyBillableTime } = useQuery({
@@ -95,6 +98,7 @@ const { data: totalWeeklyBillableTime } = useQuery({
         });
     },
     enabled: computed(() => !!organizationId.value),
+    staleTime: 1000 * 30, // 30 seconds
 });
 
 const { data: totalWeeklyBillableAmount } = useQuery({
@@ -107,6 +111,7 @@ const { data: totalWeeklyBillableAmount } = useQuery({
         });
     },
     enabled: computed(() => !!organizationId.value),
+    staleTime: 1000 * 30, // 30 seconds
 });
 
 const { data: weeklyHistory } = useQuery({
@@ -119,6 +124,7 @@ const { data: weeklyHistory } = useQuery({
         });
     },
     enabled: computed(() => !!organizationId.value),
+    staleTime: 1000 * 30, // 30 seconds
 });
 
 const seriesData = computed(() => {
@@ -241,6 +247,10 @@ const option = computed(() => {
         <div class="col-span-2 xl:col-span-3">
             <CardTitle title="This Week" class="pb-8" :icon="ClockIcon"></CardTitle>
             <v-chart v-if="weeklyHistory" :autoresize="true" class="chart" :option="option" />
+
+            <div class="mt-6">
+                <ThisWeekReportingTable></ThisWeekReportingTable>
+            </div>
         </div>
         <div class="space-y-6">
             <StatCard
diff --git a/resources/js/Components/Dashboard/ThisWeekReportingTable.vue b/resources/js/Components/Dashboard/ThisWeekReportingTable.vue
new file mode 100644
index 00000000..0da6f07a
--- /dev/null
+++ b/resources/js/Components/Dashboard/ThisWeekReportingTable.vue
@@ -0,0 +1,194 @@
+<script setup lang="ts">
+import ReportingRow from '@/Components/Common/Reporting/ReportingRow.vue';
+import ReportingGroupBySelect from '@/Components/Common/Reporting/ReportingGroupBySelect.vue';
+import {
+    formatHumanReadableDuration,
+    getDayJsInstance,
+    getLocalizedDayJs,
+} from '@/packages/ui/src/utils/time';
+import { formatCents } from '@/packages/ui/src/utils/money';
+import { getOrganizationCurrencyString } from '@/utils/money';
+import { type GroupingOption, useReportingStore } from '@/utils/useReporting';
+import { getCurrentMembershipId, getCurrentOrganizationId, getCurrentRole } from '@/utils/useUser';
+import {
+    api,
+    type AggregatedTimeEntries,
+    type AggregatedTimeEntriesQueryParams,
+    type Organization,
+} from '@/packages/api/src';
+import { useQuery } from '@tanstack/vue-query';
+import { useStorage } from '@vueuse/core';
+import { computed, inject, type ComputedRef, watch } from 'vue';
+
+const organization = inject<ComputedRef<Organization>>('organization');
+
+const group = useStorage<GroupingOption>('dashboard-reporting-group', 'project');
+const subGroup = useStorage<GroupingOption>('dashboard-reporting-sub-group', 'task');
+
+const reportingStore = useReportingStore();
+const { groupByOptions, getNameForReportingRowEntry } = reportingStore;
+
+watch(
+    group,
+    () => {
+        if (group.value === subGroup.value) {
+            const fallbackOption = groupByOptions.find((el) => el.value !== group.value);
+            if (fallbackOption?.value) {
+                subGroup.value = fallbackOption.value;
+            }
+        }
+    },
+    { immediate: true }
+);
+
+const organizationId = computed(() => getCurrentOrganizationId());
+
+const weekStartUtc = computed(() => {
+    return getLocalizedDayJs(getDayJsInstance()().format())
+        .startOf('week')
+        .startOf('day')
+        .utc()
+        .format();
+});
+
+const weekEndUtc = computed(() => {
+    return getLocalizedDayJs(getDayJsInstance()().format()).endOf('day').utc().format();
+});
+
+const queryParams = computed<AggregatedTimeEntriesQueryParams>(() => {
+    return {
+        start: weekStartUtc.value,
+        end: weekEndUtc.value,
+        group: group.value,
+        sub_group: subGroup.value,
+        member_id: getCurrentRole() === 'employee' ? getCurrentMembershipId() : undefined,
+    };
+});
+
+const { data: reportingResponse, isLoading } = useQuery({
+    queryKey: [
+        'dashboardThisWeekReporting',
+        organizationId,
+        weekStartUtc,
+        weekEndUtc,
+        group,
+        subGroup,
+    ],
+    queryFn: () => {
+        return api.getAggregatedTimeEntries({
+            params: {
+                organization: organizationId.value!,
+            },
+            queries: queryParams.value,
+        });
+    },
+    enabled: computed(() => !!organizationId.value),
+});
+
+const aggregatedTableTimeEntries = computed<AggregatedTimeEntries | null>(() => {
+    return (reportingResponse.value?.data as AggregatedTimeEntries | undefined) ?? null;
+});
+
+const tableData = computed(() => {
+    return (
+        aggregatedTableTimeEntries.value?.grouped_data?.map((entry) => {
+            return {
+                seconds: entry.seconds,
+                cost: entry.cost,
+                description: getNameForReportingRowEntry(
+                    entry.key,
+                    aggregatedTableTimeEntries.value?.grouped_type ?? null
+                ),
+                grouped_data:
+                    entry.grouped_data?.map((el) => {
+                        return {
+                            seconds: el.seconds,
+                            cost: el.cost,
+                            description: getNameForReportingRowEntry(
+                                el.key,
+                                entry.grouped_type ?? null
+                            ),
+                        };
+                    }) ?? [],
+            };
+        }) ?? []
+    );
+});
+</script>
+
+<template>
+    <div class="rounded-lg bg-card-background border border-card-border">
+        <div
+            class="text-sm flex text-text-primary pt-3 items-center space-x-3 font-medium px-6 border-b border-card-background-separator pb-3">
+            <span>Group by</span>
+            <ReportingGroupBySelect
+                v-model="group"
+                :group-by-options="groupByOptions"></ReportingGroupBySelect>
+            <span>and</span>
+            <ReportingGroupBySelect
+                v-model="subGroup"
+                :group-by-options="
+                    groupByOptions.filter((el) => el.value !== group)
+                "></ReportingGroupBySelect>
+        </div>
+
+        <div class="grid items-center" style="grid-template-columns: 1fr 100px 150px">
+            <div
+                class="contents [&>*]:border-card-background-separator [&>*]:border-b [&>*]:pb-1.5 [&>*]:pt-1 text-text-tertiary text-sm">
+                <div class="pl-6">Name</div>
+                <div class="text-right">Duration</div>
+                <div class="text-right pr-6">Cost</div>
+            </div>
+
+            <div v-if="isLoading" class="flex justify-center py-10 col-span-3 text-text-tertiary">
+                Loading reporting data…
+            </div>
+
+            <template
+                v-else-if="
+                    aggregatedTableTimeEntries?.grouped_data &&
+                    aggregatedTableTimeEntries.grouped_data?.length > 0
+                ">
+                <ReportingRow
+                    v-for="entry in tableData"
+                    :key="entry.description ?? 'none'"
+                    :currency="getOrganizationCurrencyString()"
+                    :entry="entry"></ReportingRow>
+                <div class="contents [&>*]:transition text-text-tertiary [&>*]:h-[50px]">
+                    <div class="flex items-center pl-6 font-medium">
+                        <span>Total</span>
+                    </div>
+                    <div class="justify-end flex items-center font-medium">
+                        {{
+                            formatHumanReadableDuration(
+                                aggregatedTableTimeEntries.seconds,
+                                organization?.interval_format,
+                                organization?.number_format
+                            )
+                        }}
+                    </div>
+                    <div class="justify-end pr-6 flex items-center font-medium">
+                        {{
+                            aggregatedTableTimeEntries.cost
+                                ? formatCents(
+                                      aggregatedTableTimeEntries.cost,
+                                      getOrganizationCurrencyString(),
+                                      organization?.currency_format,
+                                      organization?.currency_symbol,
+                                      organization?.number_format
+                                  )
+                                : '--'
+                        }}
+                    </div>
+                </div>
+            </template>
+
+            <div v-else class="chart flex flex-col items-center justify-center py-12 col-span-3">
+                <p class="text-lg text-text-primary font-medium">No time entries found</p>
+                <p>Try to track some time entries this week</p>
+            </div>
+        </div>
+    </div>
+</template>
+
+<style scoped></style>
diff --git a/resources/js/Components/NavLink.vue b/resources/js/Components/NavLink.vue
index 9a3ffd93..16115d13 100644
--- a/resources/js/Components/NavLink.vue
+++ b/resources/js/Components/NavLink.vue
@@ -15,7 +15,7 @@ const classes = computed(() => {
 </script>
 
 <template>
-    <Link :href="href ?? ''" :class="classes" prefetch>
+    <Link :href="href ?? ''" :class="classes" prefetch="mount">
         <slot />
     </Link>
 </template>
diff --git a/resources/js/Components/TimeTracker.vue b/resources/js/Components/TimeTracker.vue
index 63e7d147..bb2b479a 100644
--- a/resources/js/Components/TimeTracker.vue
+++ b/resources/js/Components/TimeTracker.vue
@@ -34,10 +34,9 @@ import { getOrganizationCurrencyString } from '@/utils/money';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import { canCreateProjects } from '@/utils/permissions';
 import { ref } from 'vue';
-import { useTimeEntriesStore } from '@/utils/useTimeEntries';
-import { useMutation, useQueryClient } from '@tanstack/vue-query';
-import { api } from '@/packages/api/src';
 import { useNotificationsStore } from '@/utils/notification';
+import { useTimeEntriesMutations } from '@/utils/useTimeEntriesMutations';
+import { useTimeEntriesInfiniteQuery } from '@/utils/useTimeEntriesInfiniteQuery';
 
 const page = usePage<{
     auth: {
@@ -62,6 +61,10 @@ const emit = defineEmits<{
 
 const showManualTimeEntryModal = ref(false);
 
+const { createTimeEntry: createTimeEntryMutation, deleteTimeEntry } = useTimeEntriesMutations();
+const { data: timeEntriesData } = useTimeEntriesInfiniteQuery();
+const timeEntries = computed(() => timeEntriesData.value?.pages.flatMap((page) => page.data) || []);
+
 watch(isActive, () => {
     if (isActive.value) {
         startLiveTimer();
@@ -113,7 +116,7 @@ async function createTag(tag: string): Promise<Tag | undefined> {
 }
 
 async function createTimeEntry(timeEntry: Omit<CreateTimeEntryBody, 'member_id'>) {
-    await useTimeEntriesStore().createTimeEntry(timeEntry);
+    await createTimeEntryMutation(timeEntry);
     showManualTimeEntryModal.value = false;
 }
 
@@ -124,41 +127,19 @@ async function createTimeEntryFromCurrentEntry() {
 }
 
 const { handleApiRequestNotifications } = useNotificationsStore();
-const queryClient = useQueryClient();
-
-const deleteTimeEntryMutation = useMutation({
-    mutationFn: async (timeEntryId: string) => {
-        const organizationId = getCurrentOrganizationId();
-        if (!organizationId) {
-            throw new Error('No organization selected');
-        }
-        return await api.deleteTimeEntry(undefined, {
-            params: {
-                organization: organizationId,
-                timeEntry: timeEntryId,
-            },
-        });
-    },
-    onSuccess: async () => {
-        await currentTimeEntryStore.fetchCurrentTimeEntry();
-        await useTimeEntriesStore().fetchTimeEntries();
-        queryClient.invalidateQueries({ queryKey: ['timeEntry'] });
-        queryClient.invalidateQueries({ queryKey: ['timeEntries'] });
-    },
-});
 
 async function discardCurrentTimeEntry() {
     if (currentTimeEntry.value.id) {
         await handleApiRequestNotifications(
-            () => deleteTimeEntryMutation.mutateAsync(currentTimeEntry.value.id),
+            () => deleteTimeEntry(currentTimeEntry.value.id),
             'Time entry discarded successfully',
             'Failed to discard time entry'
         );
+        await currentTimeEntryStore.fetchCurrentTimeEntry();
     }
 }
 
 const { tags } = useTagsQuery();
-const { timeEntries } = storeToRefs(useTimeEntriesStore());
 </script>
 
 <template>
@@ -176,7 +157,7 @@ const { timeEntries } = storeToRefs(useTimeEntriesStore());
         :tags
         :clients></TimeEntryCreateModal>
     <CardTitle title="Time Tracker" :icon="ClockIcon"></CardTitle>
-    <div class="relative">
+    <div class="relative pt-1">
         <TimeTrackerRunningInDifferentOrganizationOverlay
             v-if="isRunningInDifferentOrganization"
             @switch-organization="
diff --git a/resources/js/Layouts/AppLayout.vue b/resources/js/Layouts/AppLayout.vue
index 075949b4..576e7401 100644
--- a/resources/js/Layouts/AppLayout.vue
+++ b/resources/js/Layouts/AppLayout.vue
@@ -25,7 +25,6 @@ import { computed, onMounted, provide, ref } from 'vue';
 import NotificationContainer from '@/Components/NotificationContainer.vue';
 import { initializeStores } from '@/utils/init';
 import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
-import { useTimeEntriesStore } from '@/utils/useTimeEntries';
 import {
     canManageBilling,
     canUpdateOrganization,
@@ -95,7 +94,6 @@ onMounted(async () => {
             // Only refresh non-migrated stores
             if (isUnloading.value === false) {
                 useCurrentTimeEntryStore().fetchCurrentTimeEntry();
-                useTimeEntriesStore().patchTimeEntries();
             }
         }, 100);
     };
diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue
index 21c05425..f87c6a37 100644
--- a/resources/js/Pages/Calendar.vue
+++ b/resources/js/Pages/Calendar.vue
@@ -1,20 +1,17 @@
 <script setup lang="ts">
 import AppLayout from '@/Layouts/AppLayout.vue';
-import { useQuery, useQueryClient } from '@tanstack/vue-query';
+import { useTimeEntriesCalendarQuery } from '@/utils/useTimeEntriesCalendarQuery';
+import { useTimeEntriesMutations } from '@/utils/useTimeEntriesMutations';
+import { computed, ref } from 'vue';
+import { useQueryClient } from '@tanstack/vue-query';
 import {
-    api,
     type Client,
     type CreateClientBody,
     type CreateProjectBody,
     type Project,
-    type TimeEntryResponse,
 } from '@/packages/api/src';
-import { getCurrentOrganizationId, getCurrentMembershipId } from '@/utils/useUser';
-import { computed, ref } from 'vue';
-import { getDayJsInstance } from '@/packages/ui/src/utils/time';
 import { TimeEntryCalendar } from '@/packages/ui/src';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
-import { useTimeEntriesStore } from '@/utils/useTimeEntries';
 import { useTagsStore } from '@/utils/useTags';
 import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import { useClientsQuery } from '@/utils/useClientsQuery';
@@ -22,71 +19,41 @@ import { useTasksQuery } from '@/utils/useTasksQuery';
 import { useTagsQuery } from '@/utils/useTagsQuery';
 import { useProjectsStore } from '@/utils/useProjects';
 import { useClientsStore } from '@/utils/useClients';
-import { getUserTimezone } from '@/packages/ui/src/utils/settings';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { canCreateProjects } from '@/utils/permissions';
 
 const calendarStart = ref<Date | undefined>(undefined);
 const calendarEnd = ref<Date | undefined>(undefined);
 
-const enableCalendarQuery = computed(() => {
-    return !!getCurrentOrganizationId() && !!calendarStart.value && !!calendarEnd.value;
-});
-
-// Calculate expanded date range to include previous and next periods with timezone transformations
-const expandedDateRange = computed(() => {
-    if (!calendarStart.value || !calendarEnd.value) {
-        return { start: null, end: null };
-    }
-
-    const dayjs = getDayJsInstance();
-    const duration = dayjs(calendarEnd.value).diff(dayjs(calendarStart.value), 'milliseconds');
-
-    // Calculate previous period
-    const previousStart = dayjs(calendarStart.value).subtract(duration, 'milliseconds');
-    // Calculate next period
-    const nextEnd = dayjs(calendarEnd.value).add(duration, 'milliseconds');
-
-    // Apply timezone transformations
-    const formattedStart = previousStart.utc().tz(getUserTimezone(), true).utc().format();
-    const formattedEnd = nextEnd.utc().tz(getUserTimezone(), true).utc().format();
-
-    return {
-        start: formattedStart,
-        end: formattedEnd,
-    };
-});
-
-const { data: timeEntryResponse, isLoading: timeEntriesLoading } = useQuery<TimeEntryResponse>({
-    queryKey: computed(() => [
-        'timeEntry',
-        'calendar',
-        {
-            start: expandedDateRange.value.start,
-            end: expandedDateRange.value.end,
-            organization: getCurrentOrganizationId(),
-        },
-    ]),
-    enabled: enableCalendarQuery,
-    placeholderData: (previousData) => previousData,
-    queryFn: () =>
-        api.getTimeEntries({
-            params: {
-                organization: getCurrentOrganizationId() || '',
-            },
-            queries: {
-                start: expandedDateRange.value.start!,
-                end: expandedDateRange.value.end!,
-                member_id: getCurrentMembershipId(),
-            },
-        }),
-});
+const { data: timeEntryResponse, isLoading: timeEntriesLoading } = useTimeEntriesCalendarQuery(
+    calendarStart,
+    calendarEnd
+);
 
 const currentTimeEntries = computed(() => {
     return timeEntryResponse?.value?.data || [];
 });
 
-const { createTimeEntry, updateTimeEntry, deleteTimeEntry } = useTimeEntriesStore();
+const {
+    createTimeEntry: createTimeEntryMutation,
+    updateTimeEntry: updateTimeEntryMutation,
+    deleteTimeEntry: deleteTimeEntryMutation,
+} = useTimeEntriesMutations();
+
+// Wrap mutations to match expected Promise<void> return type
+async function createTimeEntry(
+    entry: Omit<import('@/packages/api/src').TimeEntry, 'id' | 'organization_id' | 'user_id'>
+): Promise<void> {
+    await createTimeEntryMutation(entry);
+}
+
+async function updateTimeEntry(entry: import('@/packages/api/src').TimeEntry): Promise<void> {
+    await updateTimeEntryMutation(entry);
+}
+
+async function deleteTimeEntry(timeEntryId: string): Promise<void> {
+    await deleteTimeEntryMutation(timeEntryId);
+}
 
 async function createTag(name: string) {
     return await useTagsStore().createTag(name);
@@ -114,7 +81,7 @@ function onDatesChange({ start, end }: { start: Date; end: Date }) {
 
 function onRefresh() {
     queryClient.invalidateQueries({
-        queryKey: ['timeEntry', 'calendar'],
+        queryKey: ['timeEntries', 'calendar'],
     });
 }
 </script>
diff --git a/resources/js/Pages/ReportingDetailed.vue b/resources/js/Pages/ReportingDetailed.vue
index 6fff7909..748fab43 100644
--- a/resources/js/Pages/ReportingDetailed.vue
+++ b/resources/js/Pages/ReportingDetailed.vue
@@ -28,7 +28,6 @@ import {
     type CreateProjectBody,
     type Project,
     type TimeEntry,
-    type TimeEntryResponse,
 } from '@/packages/api/src';
 import ReportingFilterBadge from '@/Components/Common/Reporting/ReportingFilterBadge.vue';
 import ProjectMultiselectDropdown from '@/Components/Common/Project/ProjectMultiselectDropdown.vue';
@@ -58,9 +57,8 @@ import {
     PaginationPrev,
     PaginationRoot,
 } from 'radix-vue';
-import { useQuery, useQueryClient } from '@tanstack/vue-query';
+import { useQueryClient } from '@tanstack/vue-query';
 import { getCurrentOrganizationId, getCurrentMembershipId } from '@/utils/useUser';
-import { useTimeEntriesStore } from '@/utils/useTimeEntries';
 import ReportingTabNavbar from '@/Components/Common/Reporting/ReportingTabNavbar.vue';
 import ReportingExportButton from '@/Components/Common/Reporting/ReportingExportButton.vue';
 import type { ExportFormat } from '@/types/reporting';
@@ -69,6 +67,8 @@ import TimeEntryMassActionRow from '@/packages/ui/src/TimeEntry/TimeEntryMassAct
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import { canCreateProjects, canViewAllTimeEntries } from '@/utils/permissions';
 import ReportingExportModal from '@/Components/Common/Reporting/ReportingExportModal.vue';
+import { useTimeEntriesReportQuery } from '@/utils/useTimeEntriesReportQuery';
+import { useTimeEntriesMutations } from '@/utils/useTimeEntriesMutations';
 
 // TimeEntryRoundingType is now defined in ReportingRoundingControls component
 type TimeEntryRoundingType = 'up' | 'down' | 'nearest';
@@ -127,30 +127,32 @@ const currentTimeEntryStore = useCurrentTimeEntryStore();
 const { currentTimeEntry } = storeToRefs(currentTimeEntryStore);
 const { setActiveState, startLiveTimer } = currentTimeEntryStore;
 const { handleApiRequestNotifications } = useNotificationsStore();
-const { createTimeEntry, updateTimeEntry, updateTimeEntries } = useTimeEntriesStore();
+
+const {
+    createTimeEntry,
+    updateTimeEntry,
+    updateTimeEntries: updateTimeEntriesMutation,
+    deleteTimeEntries: deleteTimeEntriesMutation,
+} = useTimeEntriesMutations();
+
+async function updateTimeEntries(
+    ids: string[],
+    changes: Parameters<typeof updateTimeEntriesMutation>[0]['changes']
+) {
+    await updateTimeEntriesMutation({ ids, changes });
+}
 
 const { tags } = useTagsQuery();
 
-const { data: timeEntryResponse } = useQuery<TimeEntryResponse>({
-    queryKey: ['timeEntry', 'detailed-report'],
-    enabled: !!getCurrentOrganizationId(),
-    queryFn: () =>
-        api.getTimeEntries({
-            params: {
-                organization: getCurrentOrganizationId() || '',
-            },
-            queries: { ...getFilterAttributes() },
-        }),
-});
+const filterParams = computed(() => getFilterAttributes());
+const { data: timeEntryResponse } = useTimeEntriesReportQuery(filterParams);
 
 const totalPages = computed(() => {
     return timeEntryResponse?.value?.meta?.total ?? 1;
 });
 
-const timeEntriesStore = useTimeEntriesStore();
-
 async function deleteTimeEntries(timeEntries: TimeEntry[]) {
-    await timeEntriesStore.deleteTimeEntries(timeEntries);
+    await deleteTimeEntriesMutation(timeEntries);
     selectedTimeEntries.value = [];
     await updateFilteredTimeEntries();
 }
@@ -203,7 +205,7 @@ async function startTimeEntryFromExisting(entry: TimeEntry) {
 const queryClient = useQueryClient();
 async function updateFilteredTimeEntries() {
     await queryClient.invalidateQueries({
-        queryKey: ['timeEntry', 'detailed-report'],
+        queryKey: ['timeEntries', 'detailed-report'],
     });
 }
 watch(currentPage, () => {
diff --git a/resources/js/Pages/Time.vue b/resources/js/Pages/Time.vue
index 4bddb529..44f06998 100644
--- a/resources/js/Pages/Time.vue
+++ b/resources/js/Pages/Time.vue
@@ -1,9 +1,8 @@
 <script setup lang="ts">
 import AppLayout from '@/Layouts/AppLayout.vue';
 import TimeTracker from '@/Components/TimeTracker.vue';
-import { onMounted, ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import MainContainer from '@/packages/ui/src/MainContainer.vue';
-import { useTimeEntriesStore } from '@/utils/useTimeEntries';
 import { storeToRefs } from 'pinia';
 import type {
     CreateClientBody,
@@ -30,17 +29,23 @@ import { canCreateProjects } from '@/utils/permissions';
 import { useTagsStore } from '@/utils/useTags';
 import { useProjectsStore } from '@/utils/useProjects';
 import { useClientsStore } from '@/utils/useClients';
+import { useTimeEntriesInfiniteQuery } from '@/utils/useTimeEntriesInfiniteQuery';
+import { useTimeEntriesMutations } from '@/utils/useTimeEntriesMutations';
 
-const timeEntriesStore = useTimeEntriesStore();
-const { timeEntries, allTimeEntriesLoaded } = storeToRefs(timeEntriesStore);
-const { updateTimeEntry, fetchTimeEntries, createTimeEntry } = useTimeEntriesStore();
+const { data, fetchNextPage, hasNextPage, isFetchingNextPage } = useTimeEntriesInfiniteQuery();
+const {
+    createTimeEntry: createTimeEntryMutation,
+    updateTimeEntry,
+    updateTimeEntries: updateTimeEntriesMutation,
+    deleteTimeEntries: deleteTimeEntriesMutation,
+} = useTimeEntriesMutations();
+
+const timeEntries = computed(() => data.value?.pages.flatMap((page) => page.data) || []);
 
 async function updateTimeEntries(ids: string[], changes: UpdateMultipleTimeEntriesChangeset) {
-    await useTimeEntriesStore().updateTimeEntries(ids, changes);
-    fetchTimeEntries();
+    await updateTimeEntriesMutation({ ids, changes });
 }
 
-const loading = ref(false);
 const loadMoreContainer = ref<HTMLDivElement | null>(null);
 const isLoadMoreVisible = useElementVisibility(loadMoreContainer);
 const currentTimeEntryStore = useCurrentTimeEntryStore();
@@ -51,27 +56,20 @@ async function startTimeEntry(timeEntry: Omit<CreateTimeEntryBody, 'member_id'>)
     if (currentTimeEntry.value.id) {
         await setActiveState(false);
     }
-    await createTimeEntry(timeEntry);
-    fetchTimeEntries();
+    await createTimeEntryMutation(timeEntry);
     useCurrentTimeEntryStore().fetchCurrentTimeEntry();
 }
 
-function deleteTimeEntries(timeEntries: TimeEntry[]) {
-    useTimeEntriesStore().deleteTimeEntries(timeEntries);
-    fetchTimeEntries();
+async function deleteTimeEntries(timeEntries: TimeEntry[]) {
+    await deleteTimeEntriesMutation(timeEntries);
 }
 
 watch(isLoadMoreVisible, async (isVisible) => {
-    if (isVisible && timeEntries.value.length > 0 && !allTimeEntriesLoaded.value) {
-        loading.value = true;
-        await timeEntriesStore.fetchMoreTimeEntries();
+    if (isVisible && hasNextPage.value) {
+        await fetchNextPage();
     }
 });
 
-onMounted(async () => {
-    await timeEntriesStore.fetchTimeEntries();
-});
-
 const { projects } = useProjectsQuery();
 const { tasks } = useTasksQuery();
 const { clients } = useClientsQuery();
@@ -92,7 +90,6 @@ const selectedTimeEntries = ref([] as TimeEntry[]);
 
 async function clearSelectionAndState() {
     selectedTimeEntries.value = [];
-    await fetchTimeEntries();
 }
 
 function deleteSelected() {
@@ -155,13 +152,13 @@ function deleteSelected() {
         </div>
         <div ref="loadMoreContainer">
             <div
-                v-if="loading && !allTimeEntriesLoaded"
+                v-if="isFetchingNextPage"
                 class="flex justify-center items-center py-5 text-text-primary font-medium">
                 <LoadingSpinner></LoadingSpinner>
                 <span> Loading more time entries... </span>
             </div>
             <div
-                v-else-if="allTimeEntriesLoaded"
+                v-else-if="!hasNextPage"
                 class="flex justify-center items-center py-5 text-text-secondary font-medium">
                 All time entries are loaded!
             </div>
diff --git a/resources/js/packages/ui/src/CardTitle.vue b/resources/js/packages/ui/src/CardTitle.vue
index 978a9d25..1a784e77 100644
--- a/resources/js/packages/ui/src/CardTitle.vue
+++ b/resources/js/packages/ui/src/CardTitle.vue
@@ -8,10 +8,9 @@ defineProps<{
 </script>
 
 <template>
-    <div class="flex w-full items-center justify-between pb-2.5 lg:pb-3">
-        <h3
-            class="text-text-primary font-medium text-sm lg:text-base flex items-center space-x-1.5 lg:space-x-2">
-            <component :is="icon" v-if="icon" class="w-4 lg:w-4 text-icon-default"></component>
+    <div class="flex w-full items-center justify-between py-1.5">
+        <h3 class="text-text-primary font-medium text-sm flex items-center space-x-2">
+            <component :is="icon" v-if="icon" class="w-4 lg:w-4 text-text-tertiary"></component>
             <span>
                 {{ title }}
             </span>
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryRowHeading.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryRowHeading.vue
index c189b1ab..0e88d4c8 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryRowHeading.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryRowHeading.vue
@@ -33,7 +33,7 @@ function selectUnselectAll(value: boolean) {
 
 <template>
     <div
-        class="bg-background dark:bg-quaternary border-b border-border-primary py-1 text-xs @sm:text-sm">
+        class="bg-background dark:bg-secondary border-b border-border-primary py-1 text-xs @sm:text-sm">
         <MainContainer>
             <div class="flex group justify-between items-center">
                 <div class="flex items-center space-x-2">
diff --git a/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue b/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue
index cd974bd6..0c469c2b 100644
--- a/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue
+++ b/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue
@@ -207,7 +207,7 @@ useSelectEvents(
 <template>
     <div class="flex items-center relative @container" data-testid="dashboard_timer">
         <div
-            class="flex flex-col @2xl:flex-row w-full justify-between rounded-lg bg-secondary border-card-border border transition shadow-card">
+            class="flex flex-col @2xl:flex-row w-full justify-between rounded-lg bg-card-background border-card-border border transition shadow-card">
             <div class="flex flex-1 items-center pr-6 relative">
                 <input
                     ref="currentTimeEntryDescriptionInput"
diff --git a/resources/js/packages/ui/src/TimeTracker/TimeTrackerRangeSelector.vue b/resources/js/packages/ui/src/TimeTracker/TimeTrackerRangeSelector.vue
index 4ed01613..b1a3f178 100644
--- a/resources/js/packages/ui/src/TimeTracker/TimeTrackerRangeSelector.vue
+++ b/resources/js/packages/ui/src/TimeTracker/TimeTrackerRangeSelector.vue
@@ -154,7 +154,7 @@ function closeAndFocusInput() {
                     v-model="currentTime"
                     placeholder="00:00:00"
                     data-testid="time_entry_time"
-                    class="w-[110px] lg:w-[130px] h-full text-text-primary py-2.5 rounded-lg border-border-secondary border text-center px-4 text-base lg:text-lg font-semibold bg-secondary border-none placeholder-text-tertiary focus:ring-0 transition"
+                    class="w-[110px] lg:w-[130px] h-full text-text-primary py-2.5 rounded-lg border-border-secondary border text-center px-4 text-base lg:text-lg font-semibold bg-card-background border-none placeholder-text-tertiary focus:ring-0 transition"
                     type="text"
                     @focusin="openModalOnTab"
                     @click="openModalOnClick"
diff --git a/resources/js/packages/ui/styles.css b/resources/js/packages/ui/styles.css
index eda9be4e..262e903a 100644
--- a/resources/js/packages/ui/styles.css
+++ b/resources/js/packages/ui/styles.css
@@ -14,18 +14,18 @@
 @tailwind utilities;
 
 :root.dark {
-    --color-bg-primary: #101012;
-    --color-bg-secondary: #17181b;
-    --color-bg-tertiary: #2a2c32;
-    --color-bg-quaternary: #141518;
-    --color-bg-background: #090909;
+    --color-bg-primary: oklch(0.14 0.0041 285.97);
+    --color-bg-secondary: oklch(0.18 0.005 285.97);
+    --color-bg-tertiary: oklch(0.22 0.0112 285.97);
+    --color-bg-quaternary: oklch(0.175 0.005 285.97);
+    --color-bg-background: oklch(0.1 0 0);
     --color-text-primary: #ffffff;
     --color-text-secondary: #e3e4e6;
     --color-text-tertiary: #969799;
     --color-text-quaternary: #595a5c;
 
     --color-border-primary: #191b1f;
-    --color-border-secondary: #23252a;
+    --color-border-secondary: oklch(0.25 0.0098 268.31);
     --color-border-tertiary: #2c2e33;
     --color-border-quaternary: #393b42;
     --color-input-border-active: rgba(255, 255, 255, 0.3);
@@ -33,7 +33,7 @@
     --theme-color-chart: var(--color-accent-200);
 
     --theme-color-menu-active: var(--color-bg-secondary);
-    --theme-color-card-background: var(--color-bg-primary);
+    --theme-color-card-background: var(--color-bg-secondary);
     --theme-shadow-card: 0 4px 7px 0px rgb(0 0 0 / 15%);
     --theme-shadow-dropdown: 0 4px 7px 0px rgb(0 0 0 / 40%);
 
diff --git a/resources/js/utils/init.ts b/resources/js/utils/init.ts
index bb6bd3a3..a5f5fdb9 100644
--- a/resources/js/utils/init.ts
+++ b/resources/js/utils/init.ts
@@ -1,9 +1,7 @@
 import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
-import { useTimeEntriesStore } from '@/utils/useTimeEntries';
 
 export function initializeStores() {
     // TanStack Query now handles projects, tasks, tags, clients, and members fetching automatically
     // Only initialize stores that aren't migrated to TanStack Query yet
     useCurrentTimeEntryStore().fetchCurrentTimeEntry();
-    useTimeEntriesStore().patchTimeEntries();
 }
diff --git a/resources/js/utils/prefetch.ts b/resources/js/utils/prefetch.ts
index 5664af2e..6ba3cb4c 100644
--- a/resources/js/utils/prefetch.ts
+++ b/resources/js/utils/prefetch.ts
@@ -1,6 +1,6 @@
 import type { QueryClient } from '@tanstack/vue-query';
 import { api } from '@/packages/api/src';
-import { getCurrentOrganizationId } from '@/utils/useUser';
+import { getCurrentOrganizationId, getCurrentMembershipId } from '@/utils/useUser';
 import { canViewClients, canViewMembers } from '@/utils/permissions';
 
 /**
@@ -21,6 +21,7 @@ const routePrefetchers: Record<string, (queryClient: QueryClient) => void> = {
         prefetchTasks(queryClient);
         prefetchTags(queryClient);
         prefetchClients(queryClient);
+        prefetchTimeEntries(queryClient);
     },
 
     '/calendar': (queryClient) => {
@@ -221,6 +222,28 @@ function prefetchReports(queryClient: QueryClient) {
     });
 }
 
+function prefetchTimeEntries(queryClient: QueryClient) {
+    const organizationId = getCurrentOrganizationId();
+    const memberId = getCurrentMembershipId();
+    if (!organizationId) return;
+
+    queryClient.prefetchInfiniteQuery({
+        queryKey: ['timeEntries', 'infinite', { organizationId, memberId }],
+        queryFn: async () => {
+            const response = await api.getTimeEntries({
+                params: { organization: organizationId },
+                queries: {
+                    only_full_dates: 'true',
+                    member_id: memberId,
+                },
+            });
+            return response;
+        },
+        initialPageParam: undefined,
+        staleTime: 30000,
+    });
+}
+
 function prefetchProjectMembers(queryClient: QueryClient, projectId: string) {
     const organizationId = getCurrentOrganizationId();
     if (!organizationId || !canViewMembers()) return;
diff --git a/resources/js/utils/useCurrentTimeEntry.ts b/resources/js/utils/useCurrentTimeEntry.ts
index d8ac699c..be732751 100644
--- a/resources/js/utils/useCurrentTimeEntry.ts
+++ b/resources/js/utils/useCurrentTimeEntry.ts
@@ -10,8 +10,8 @@ import {
     getCurrentUserId,
 } from '@/utils/useUser';
 import { useLocalStorage } from '@vueuse/core';
-import { useTimeEntriesStore } from '@/utils/useTimeEntries';
 import { useNotificationsStore } from '@/utils/notification';
+import { useQueryClient } from '@tanstack/vue-query';
 
 dayjs.extend(utc);
 
@@ -32,6 +32,7 @@ const emptyTimeEntry = {
 export const useCurrentTimeEntryStore = defineStore('currentTimeEntry', () => {
     const currentTimeEntry = ref<TimeEntry>(reactive(emptyTimeEntry));
     const { handleApiRequestNotifications } = useNotificationsStore();
+    const queryClient = useQueryClient();
 
     useLocalStorage('solidtime/current-time-entry', currentTimeEntry, {
         deep: true,
@@ -208,7 +209,7 @@ export const useCurrentTimeEntryStore = defineStore('currentTimeEntry', () => {
             stopLiveTimer();
             await stopTimer();
         }
-        useTimeEntriesStore().fetchTimeEntries();
+        queryClient.invalidateQueries({ queryKey: ['timeEntries'] });
     }
 
     return {
diff --git a/resources/js/utils/useTimeEntries.ts b/resources/js/utils/useTimeEntries.ts
deleted file mode 100644
index 1f903980..00000000
--- a/resources/js/utils/useTimeEntries.ts
+++ /dev/null
@@ -1,246 +0,0 @@
-import { defineStore } from 'pinia';
-import { getCurrentMembershipId, getCurrentOrganizationId } from '@/utils/useUser';
-
-import { reactive, ref, type Ref } from 'vue';
-import { api } from '@/packages/api/src';
-import type {
-    CreateTimeEntryBody,
-    TimeEntriesQueryParams,
-    TimeEntry,
-    UpdateMultipleTimeEntriesChangeset,
-} from '@/packages/api/src';
-import dayjs from 'dayjs';
-import { useNotificationsStore } from '@/utils/notification';
-import type {} from '@/packages/api/src';
-import { useQueryClient } from '@tanstack/vue-query';
-
-export const useTimeEntriesStore = defineStore(
-    'timeEntries',
-    (): {
-        timeEntries: Ref<TimeEntry[]>;
-        fetchTimeEntries: (queryParams?: TimeEntriesQueryParams) => Promise<void>;
-        updateTimeEntry: (timeEntry: TimeEntry) => Promise<void>;
-        createTimeEntry: (timeEntry: Omit<CreateTimeEntryBody, 'member_id'>) => Promise<void>;
-        deleteTimeEntry: (timeEntryId: string) => Promise<void>;
-        fetchMoreTimeEntries: () => Promise<void>;
-        allTimeEntriesLoaded: Ref<boolean>;
-        updateTimeEntries: (
-            ids: string[],
-            changes: UpdateMultipleTimeEntriesChangeset
-        ) => Promise<void>;
-        deleteTimeEntries: (timeEntries: TimeEntry[]) => Promise<void>;
-        patchTimeEntries: (queryParams?: TimeEntriesQueryParams) => Promise<void>;
-    } => {
-        const timeEntries = ref<TimeEntry[]>(reactive([]));
-
-        const allTimeEntriesLoaded = ref(false);
-        const { handleApiRequestNotifications } = useNotificationsStore();
-
-        const queryClient = useQueryClient();
-
-        async function patchTimeEntries(
-            queryParams: TimeEntriesQueryParams = {
-                only_full_dates: 'true',
-                member_id: getCurrentMembershipId(),
-            }
-        ) {
-            const organizationId = getCurrentOrganizationId();
-
-            if (organizationId) {
-                const timeEntriesResponse = await handleApiRequestNotifications(
-                    () =>
-                        api.getTimeEntries({
-                            params: {
-                                organization: organizationId,
-                            },
-                            queries: queryParams,
-                        }),
-                    undefined,
-                    'Failed to fetch time entries'
-                );
-                if (timeEntriesResponse?.data) {
-                    // insert missing time entries
-                    const missingTimeEntries = timeEntriesResponse.data.filter(
-                        (entry) => !timeEntries.value.find((e) => e.id === entry.id)
-                    );
-                    timeEntries.value = [...missingTimeEntries, ...timeEntries.value];
-                }
-            }
-        }
-
-        async function fetchTimeEntries(
-            queryParams: TimeEntriesQueryParams = {
-                only_full_dates: 'true',
-                member_id: getCurrentMembershipId(),
-            }
-        ) {
-            const organizationId = getCurrentOrganizationId();
-
-            if (organizationId) {
-                const timeEntriesResponse = await handleApiRequestNotifications(
-                    () =>
-                        api.getTimeEntries({
-                            params: {
-                                organization: organizationId,
-                            },
-                            queries: queryParams,
-                        }),
-                    undefined,
-                    'Failed to fetch time entries'
-                );
-                if (timeEntriesResponse?.data) {
-                    timeEntries.value = timeEntriesResponse.data;
-                }
-            }
-        }
-
-        async function fetchMoreTimeEntries() {
-            const organizationId = getCurrentOrganizationId();
-            if (organizationId) {
-                const latestTimeEntry = timeEntries.value[timeEntries.value.length - 1];
-                dayjs(latestTimeEntry.start).utc().format('YYYY-MM-DD');
-
-                const timeEntriesResponse = await handleApiRequestNotifications(
-                    () =>
-                        api.getTimeEntries({
-                            params: {
-                                organization: organizationId,
-                            },
-                            queries: {
-                                only_full_dates: 'true',
-                                member_id: getCurrentMembershipId(),
-                                end: dayjs(latestTimeEntry.start).utc().format(),
-                            },
-                        }),
-                    undefined,
-                    'Failed to fetch time entries'
-                );
-                if (timeEntriesResponse?.data && timeEntriesResponse.data.length > 0) {
-                    timeEntries.value = timeEntries.value.concat(timeEntriesResponse.data);
-                } else {
-                    allTimeEntriesLoaded.value = true;
-                }
-            }
-        }
-
-        async function updateTimeEntries(
-            ids: string[],
-            changes: UpdateMultipleTimeEntriesChangeset
-        ) {
-            const organizationId = getCurrentOrganizationId();
-            if (organizationId) {
-                await handleApiRequestNotifications(
-                    () =>
-                        api.updateMultipleTimeEntries(
-                            {
-                                ids: ids,
-                                changes: changes,
-                            },
-                            {
-                                params: {
-                                    organization: organizationId,
-                                },
-                            }
-                        ),
-                    'Time entries updated successfully',
-                    'Failed to update time entries'
-                );
-            }
-        }
-
-        async function updateTimeEntry(timeEntry: TimeEntry) {
-            const organizationId = getCurrentOrganizationId();
-            if (organizationId) {
-                const response = await handleApiRequestNotifications(
-                    () =>
-                        api.updateTimeEntry(timeEntry, {
-                            params: {
-                                organization: organizationId,
-                                timeEntry: timeEntry.id,
-                            },
-                        }),
-                    'Time entry updated successfully',
-                    'Failed to update time entry'
-                );
-                timeEntries.value = timeEntries.value.map((entry) =>
-                    entry.id === timeEntry.id ? response.data : entry
-                );
-                queryClient.invalidateQueries({ queryKey: ['timeEntry'] });
-            }
-        }
-
-        async function createTimeEntry(timeEntry: Omit<CreateTimeEntryBody, 'member_id'>) {
-            const organizationId = getCurrentOrganizationId();
-            const memberId = getCurrentMembershipId();
-            if (organizationId && memberId !== undefined) {
-                const newTimeEntry = {
-                    ...timeEntry,
-                    member_id: memberId,
-                } as CreateTimeEntryBody;
-                await handleApiRequestNotifications(
-                    () =>
-                        api.createTimeEntry(newTimeEntry, {
-                            params: {
-                                organization: organizationId,
-                            },
-                        }),
-                    'Time entry created successfully',
-                    'Failed to create time entry'
-                );
-                await fetchTimeEntries();
-            }
-        }
-
-        async function deleteTimeEntry(timeEntryId: string) {
-            const organizationId = getCurrentOrganizationId();
-            if (organizationId) {
-                await handleApiRequestNotifications(
-                    () =>
-                        api.deleteTimeEntry(undefined, {
-                            params: {
-                                organization: organizationId,
-                                timeEntry: timeEntryId,
-                            },
-                        }),
-                    'Time entry deleted successfully',
-                    'Failed to delete time entry'
-                );
-                await fetchTimeEntries();
-            }
-        }
-
-        async function deleteTimeEntries(timeEntries: TimeEntry[]) {
-            const organizationId = getCurrentOrganizationId();
-            const timeEntryIds = timeEntries.map((entry) => entry.id);
-            if (organizationId) {
-                await handleApiRequestNotifications(
-                    () =>
-                        api.deleteTimeEntries(undefined, {
-                            queries: {
-                                ids: timeEntryIds,
-                            },
-                            params: {
-                                organization: organizationId,
-                            },
-                        }),
-                    'Time entries deleted successfully',
-                    'Failed to delete time entries'
-                );
-                await fetchTimeEntries();
-            }
-        }
-
-        return {
-            timeEntries,
-            fetchTimeEntries,
-            updateTimeEntry,
-            createTimeEntry,
-            deleteTimeEntry,
-            fetchMoreTimeEntries,
-            allTimeEntriesLoaded,
-            updateTimeEntries,
-            deleteTimeEntries,
-            patchTimeEntries,
-        };
-    }
-);
diff --git a/resources/js/utils/useTimeEntriesCalendarQuery.ts b/resources/js/utils/useTimeEntriesCalendarQuery.ts
new file mode 100644
index 00000000..fec1be99
--- /dev/null
+++ b/resources/js/utils/useTimeEntriesCalendarQuery.ts
@@ -0,0 +1,65 @@
+import { useQuery } from '@tanstack/vue-query';
+import { api, type TimeEntryResponse } from '@/packages/api/src';
+import { getCurrentMembershipId, getCurrentOrganizationId } from '@/utils/useUser';
+import { computed, type Ref } from 'vue';
+import { getDayJsInstance } from '@/packages/ui/src/utils/time';
+import { getUserTimezone } from '@/packages/ui/src/utils/settings';
+
+export function useTimeEntriesCalendarQuery(
+    calendarStart: Ref<Date | undefined>,
+    calendarEnd: Ref<Date | undefined>
+) {
+    const enableCalendarQuery = computed(() => {
+        return !!getCurrentOrganizationId() && !!calendarStart.value && !!calendarEnd.value;
+    });
+
+    // Calculate expanded date range to include previous and next periods with timezone transformations
+    const expandedDateRange = computed(() => {
+        if (!calendarStart.value || !calendarEnd.value) {
+            return { start: null, end: null };
+        }
+
+        const dayjs = getDayJsInstance();
+        const duration = dayjs(calendarEnd.value).diff(dayjs(calendarStart.value), 'milliseconds');
+
+        // Calculate previous period
+        const previousStart = dayjs(calendarStart.value).subtract(duration, 'milliseconds');
+        // Calculate next period
+        const nextEnd = dayjs(calendarEnd.value).add(duration, 'milliseconds');
+
+        // Apply timezone transformations
+        const formattedStart = previousStart.utc().tz(getUserTimezone(), true).utc().format();
+        const formattedEnd = nextEnd.utc().tz(getUserTimezone(), true).utc().format();
+
+        return {
+            start: formattedStart,
+            end: formattedEnd,
+        };
+    });
+
+    return useQuery<TimeEntryResponse>({
+        queryKey: computed(() => [
+            'timeEntries',
+            'calendar',
+            {
+                start: expandedDateRange.value.start,
+                end: expandedDateRange.value.end,
+                organization: getCurrentOrganizationId(),
+            },
+        ]),
+        enabled: enableCalendarQuery,
+        placeholderData: (previousData) => previousData,
+        queryFn: () =>
+            api.getTimeEntries({
+                params: {
+                    organization: getCurrentOrganizationId() || '',
+                },
+                queries: {
+                    start: expandedDateRange.value.start!,
+                    end: expandedDateRange.value.end!,
+                    member_id: getCurrentMembershipId(),
+                },
+            }),
+        staleTime: 1000 * 30, // 30 seconds
+    });
+}
diff --git a/resources/js/utils/useTimeEntriesInfiniteQuery.ts b/resources/js/utils/useTimeEntriesInfiniteQuery.ts
new file mode 100644
index 00000000..1808da61
--- /dev/null
+++ b/resources/js/utils/useTimeEntriesInfiniteQuery.ts
@@ -0,0 +1,51 @@
+import { useInfiniteQuery } from '@tanstack/vue-query';
+import { api } from '@/packages/api/src';
+import { getCurrentMembershipId, getCurrentOrganizationId } from '@/utils/useUser';
+import dayjs from 'dayjs';
+import { computed } from 'vue';
+
+export function useTimeEntriesInfiniteQuery() {
+    const organizationId = computed(() => getCurrentOrganizationId());
+    const memberId = computed(() => getCurrentMembershipId());
+
+    return useInfiniteQuery({
+        queryKey: computed(() => [
+            'timeEntries',
+            'infinite',
+            { organizationId: organizationId.value, memberId: memberId.value },
+        ]),
+        queryFn: async ({ pageParam }) => {
+            const orgId = organizationId.value;
+            if (!orgId) return { data: [] };
+
+            const queries: Record<string, string | undefined> = {
+                only_full_dates: 'true',
+                member_id: memberId.value,
+            };
+
+            if (pageParam) {
+                queries.end = pageParam;
+            }
+
+            const response = await api.getTimeEntries({
+                params: {
+                    organization: orgId,
+                },
+                queries: queries,
+            });
+
+            return response;
+        },
+        initialPageParam: undefined as string | undefined,
+        getNextPageParam: (lastPage) => {
+            if (!lastPage?.data || lastPage.data.length === 0) {
+                return undefined;
+            }
+            const latestTimeEntry = lastPage.data[lastPage.data.length - 1];
+            return dayjs(latestTimeEntry.start).utc().format();
+        },
+        enabled: computed(() => !!organizationId.value),
+        staleTime: 1000 * 30, // 30 seconds
+        gcTime: 1000 * 60 * 10, // 10 minutes
+    });
+}
diff --git a/resources/js/utils/useTimeEntriesMutations.ts b/resources/js/utils/useTimeEntriesMutations.ts
new file mode 100644
index 00000000..a42746ce
--- /dev/null
+++ b/resources/js/utils/useTimeEntriesMutations.ts
@@ -0,0 +1,151 @@
+import { useMutation, useQueryClient } from '@tanstack/vue-query';
+import {
+    api,
+    type CreateTimeEntryBody,
+    type TimeEntry,
+    type UpdateMultipleTimeEntriesChangeset,
+} from '@/packages/api/src';
+import { getCurrentMembershipId, getCurrentOrganizationId } from '@/utils/useUser';
+import { useNotificationsStore } from '@/utils/notification';
+
+export function useTimeEntriesMutations() {
+    const queryClient = useQueryClient();
+    const { handleApiRequestNotifications } = useNotificationsStore();
+
+    const { mutateAsync: createTimeEntry } = useMutation({
+        mutationFn: async (timeEntry: Omit<CreateTimeEntryBody, 'member_id'>) => {
+            const organizationId = getCurrentOrganizationId();
+            const memberId = getCurrentMembershipId();
+            if (organizationId && memberId !== undefined) {
+                const newTimeEntry = {
+                    ...timeEntry,
+                    member_id: memberId,
+                } as CreateTimeEntryBody;
+
+                return await handleApiRequestNotifications(
+                    () =>
+                        api.createTimeEntry(newTimeEntry, {
+                            params: {
+                                organization: organizationId,
+                            },
+                        }),
+                    'Time entry created successfully',
+                    'Failed to create time entry'
+                );
+            }
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({ queryKey: ['timeEntries'] });
+        },
+    });
+
+    const { mutateAsync: updateTimeEntry } = useMutation({
+        mutationFn: async (timeEntry: TimeEntry) => {
+            const organizationId = getCurrentOrganizationId();
+            if (organizationId) {
+                return await handleApiRequestNotifications(
+                    () =>
+                        api.updateTimeEntry(timeEntry, {
+                            params: {
+                                organization: organizationId,
+                                timeEntry: timeEntry.id,
+                            },
+                        }),
+                    'Time entry updated successfully',
+                    'Failed to update time entry'
+                );
+            }
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({ queryKey: ['timeEntries'] });
+        },
+    });
+
+    const { mutateAsync: updateTimeEntries } = useMutation({
+        mutationFn: async ({
+            ids,
+            changes,
+        }: {
+            ids: string[];
+            changes: UpdateMultipleTimeEntriesChangeset;
+        }) => {
+            const organizationId = getCurrentOrganizationId();
+            if (organizationId) {
+                return await handleApiRequestNotifications(
+                    () =>
+                        api.updateMultipleTimeEntries(
+                            {
+                                ids: ids,
+                                changes: changes,
+                            },
+                            {
+                                params: {
+                                    organization: organizationId,
+                                },
+                            }
+                        ),
+                    'Time entries updated successfully',
+                    'Failed to update time entries'
+                );
+            }
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({ queryKey: ['timeEntries'] });
+        },
+    });
+
+    const { mutateAsync: deleteTimeEntry } = useMutation({
+        mutationFn: async (timeEntryId: string) => {
+            const organizationId = getCurrentOrganizationId();
+            if (organizationId) {
+                return await handleApiRequestNotifications(
+                    () =>
+                        api.deleteTimeEntry(undefined, {
+                            params: {
+                                organization: organizationId,
+                                timeEntry: timeEntryId,
+                            },
+                        }),
+                    'Time entry deleted successfully',
+                    'Failed to delete time entry'
+                );
+            }
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({ queryKey: ['timeEntries'] });
+        },
+    });
+
+    const { mutateAsync: deleteTimeEntries } = useMutation({
+        mutationFn: async (timeEntries: TimeEntry[]) => {
+            const organizationId = getCurrentOrganizationId();
+            const timeEntryIds = timeEntries.map((entry) => entry.id);
+            if (organizationId) {
+                return await handleApiRequestNotifications(
+                    () =>
+                        api.deleteTimeEntries(undefined, {
+                            queries: {
+                                ids: timeEntryIds,
+                            },
+                            params: {
+                                organization: organizationId,
+                            },
+                        }),
+                    'Time entries deleted successfully',
+                    'Failed to delete time entries'
+                );
+            }
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({ queryKey: ['timeEntries'] });
+        },
+    });
+
+    return {
+        createTimeEntry,
+        updateTimeEntry,
+        updateTimeEntries,
+        deleteTimeEntry,
+        deleteTimeEntries,
+    };
+}
diff --git a/resources/js/utils/useTimeEntriesReportQuery.ts b/resources/js/utils/useTimeEntriesReportQuery.ts
new file mode 100644
index 00000000..208c56e8
--- /dev/null
+++ b/resources/js/utils/useTimeEntriesReportQuery.ts
@@ -0,0 +1,21 @@
+import { useQuery } from '@tanstack/vue-query';
+import { api, type TimeEntryResponse } from '@/packages/api/src';
+import { getCurrentOrganizationId } from '@/utils/useUser';
+import { computed, type Ref, type ComputedRef, unref } from 'vue';
+
+export function useTimeEntriesReportQuery(
+    filterParams: Ref<Record<string, unknown>> | ComputedRef<Record<string, unknown>>
+) {
+    return useQuery<TimeEntryResponse>({
+        queryKey: computed(() => ['timeEntries', 'detailed-report', unref(filterParams)]),
+        enabled: computed(() => !!getCurrentOrganizationId()),
+        queryFn: () =>
+            api.getTimeEntries({
+                params: {
+                    organization: getCurrentOrganizationId() || '',
+                },
+                queries: { ...unref(filterParams) },
+            }),
+        staleTime: 1000 * 30, // 30 seconds
+    });
+}

From ebbc4e68370040a6adf8a42cc1dfe6822a8cbdf2 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Wed, 14 Jan 2026 18:21:29 +0100
Subject: [PATCH 03/28] use tanstack query in ProjectMultiselectDropdown,
 ClientTableRow and ProjectDropdown; fix e2e

---
 e2e/reporting.spec.ts                              |  4 ++--
 e2e/timetracker.spec.ts                            |  5 +++++
 .../js/Components/Common/Client/ClientTableRow.vue |  5 ++---
 .../Components/Common/Project/ProjectDropdown.vue  | 14 +++++++-------
 .../Common/Project/ProjectMultiselectDropdown.vue  |  6 ++----
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/e2e/reporting.spec.ts b/e2e/reporting.spec.ts
index 93815265..21d79fc8 100644
--- a/e2e/reporting.spec.ts
+++ b/e2e/reporting.spec.ts
@@ -125,8 +125,8 @@ test('test that project filtering works in reporting', async ({ page }) => {
 
     // Go to reporting and filter by project1
     await goToReporting(page);
-    await page.getByRole('button', { name: 'Project' }).nth(0).click();
-    await page.getByRole('dialog').getByText(project1).click();
+    await page.getByRole('button', { name: 'Projects' }).click();
+    await page.getByRole('option').filter({ hasText: project1 }).click();
 
     await Promise.all([
         // escape
diff --git a/e2e/timetracker.spec.ts b/e2e/timetracker.spec.ts
index 2696acfc..e37f1fbd 100644
--- a/e2e/timetracker.spec.ts
+++ b/e2e/timetracker.spec.ts
@@ -218,6 +218,11 @@ test('test that adding a new tag works', async ({ page }) => {
         page.getByRole('button', { name: 'Create Tag' }).click(),
     ]);
 
+    // Wait for tags query refetch after invalidation
+    await page.waitForResponse(
+        (response) => response.url().includes('/tags') && response.status() === 200
+    );
+
     await page.getByTestId('tag_dropdown').click();
     await expect(page.getByRole('option', { name: newTagName })).toBeVisible();
 });
diff --git a/resources/js/Components/Common/Client/ClientTableRow.vue b/resources/js/Components/Common/Client/ClientTableRow.vue
index ee49d759..69f88989 100644
--- a/resources/js/Components/Common/Client/ClientTableRow.vue
+++ b/resources/js/Components/Common/Client/ClientTableRow.vue
@@ -3,13 +3,12 @@ import type { Client } from '@/packages/api/src';
 import { computed, ref } from 'vue';
 import { CheckCircleIcon } from '@heroicons/vue/20/solid';
 import { useClientsStore } from '@/utils/useClients';
-import { storeToRefs } from 'pinia';
 import ClientMoreOptionsDropdown from '@/Components/Common/Client/ClientMoreOptionsDropdown.vue';
-import { useProjectsStore } from '@/utils/useProjects';
+import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import TableRow from '@/Components/TableRow.vue';
 import ClientEditModal from '@/Components/Common/Client/ClientEditModal.vue';
 
-const { projects } = storeToRefs(useProjectsStore());
+const { projects } = useProjectsQuery();
 
 const props = defineProps<{
     client: Client;
diff --git a/resources/js/Components/Common/Project/ProjectDropdown.vue b/resources/js/Components/Common/Project/ProjectDropdown.vue
index abf24040..a2f9c791 100644
--- a/resources/js/Components/Common/Project/ProjectDropdown.vue
+++ b/resources/js/Components/Common/Project/ProjectDropdown.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import ProjectBadge from '@/packages/ui/src/Project/ProjectBadge.vue';
 import { computed, nextTick, ref, watch } from 'vue';
-import { useProjectsStore } from '@/utils/useProjects';
+import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
 import {
     ComboboxAnchor,
@@ -12,7 +12,6 @@ import {
     ComboboxViewport,
 } from 'radix-vue';
 import { PlusCircleIcon } from '@heroicons/vue/20/solid';
-import { storeToRefs } from 'pinia';
 import { api } from '@/packages/api/src';
 import { usePage } from '@inertiajs/vue3';
 import { getRandomColor } from '@/packages/ui/src/utils/color';
@@ -26,13 +25,14 @@ const model = defineModel<string | null>({
     default: null,
 });
 const open = ref(false);
-const projectsStore = useProjectsStore();
+const { projects, invalidateProjects } = useProjectsQuery();
 const emit = defineEmits(['update:modelValue', 'changed']);
 
-const { projects } = storeToRefs(projectsStore);
 const projectDropdownTrigger = ref<HTMLElement | null>(null);
+const sortedProjects = ref<Project[]>([]);
+
 const shownProjects = computed(() => {
-    return projects.value.filter((project) => {
+    return sortedProjects.value.filter((project) => {
         return project.name.toLowerCase().includes(searchValue.value?.toLowerCase()?.trim() || '');
     });
 });
@@ -64,7 +64,7 @@ async function addProjectIfNoneExists() {
             },
             { params: { organization: page.props.auth.user.current_team_id } }
         );
-        projects.value.unshift(response.data);
+        invalidateProjects();
         model.value = response.data.id;
         searchValue.value = '';
         open.value = false;
@@ -78,7 +78,7 @@ watch(open, (isOpen) => {
             searchInput.value?.$el?.focus();
         });
 
-        projects.value.sort((iteratingProject) => {
+        sortedProjects.value = [...projects.value].sort((iteratingProject) => {
             return model.value === iteratingProject.id ? -1 : 1;
         });
     }
diff --git a/resources/js/Components/Common/Project/ProjectMultiselectDropdown.vue b/resources/js/Components/Common/Project/ProjectMultiselectDropdown.vue
index 3089d710..75c4ba57 100644
--- a/resources/js/Components/Common/Project/ProjectMultiselectDropdown.vue
+++ b/resources/js/Components/Common/Project/ProjectMultiselectDropdown.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
 import MultiselectDropdown from '@/packages/ui/src/Input/MultiselectDropdown.vue';
-import { storeToRefs } from 'pinia';
-import { useProjectsStore } from '@/utils/useProjects';
+import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import type { Project } from '@/packages/api/src';
 
-const projectsStore = useProjectsStore();
-const { projects } = storeToRefs(projectsStore);
+const { projects } = useProjectsQuery();
 
 function getKeyFromItem(item: Project) {
     return item.id;

From 900ee29a6fd5f490e0b8a01029343ae34efcb96b Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Wed, 14 Jan 2026 18:58:28 +0100
Subject: [PATCH 04/28] fix e2e project filtering in reporting e2e test

---
 e2e/reporting.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/reporting.spec.ts b/e2e/reporting.spec.ts
index 21d79fc8..330816e6 100644
--- a/e2e/reporting.spec.ts
+++ b/e2e/reporting.spec.ts
@@ -125,7 +125,7 @@ test('test that project filtering works in reporting', async ({ page }) => {
 
     // Go to reporting and filter by project1
     await goToReporting(page);
-    await page.getByRole('button', { name: 'Projects' }).click();
+    await page.getByRole('button', { name: 'Projects' }).first().click();
     await page.getByRole('option').filter({ hasText: project1 }).click();
 
     await Promise.all([

From b2a04c8de50104041965e0f041e4acd7edc8e8cd Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Wed, 14 Jan 2026 19:22:17 +0100
Subject: [PATCH 05/28] load time entries above pagination limit for calendar,
 fixes #995

---
 .../js/utils/useTimeEntriesCalendarQuery.ts   | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/resources/js/utils/useTimeEntriesCalendarQuery.ts b/resources/js/utils/useTimeEntriesCalendarQuery.ts
index fec1be99..857ca842 100644
--- a/resources/js/utils/useTimeEntriesCalendarQuery.ts
+++ b/resources/js/utils/useTimeEntriesCalendarQuery.ts
@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/vue-query';
-import { api, type TimeEntryResponse } from '@/packages/api/src';
+import { api, type TimeEntryResponse, type TimeEntry } from '@/packages/api/src';
 import { getCurrentMembershipId, getCurrentOrganizationId } from '@/utils/useUser';
 import { computed, type Ref } from 'vue';
 import { getDayJsInstance } from '@/packages/ui/src/utils/time';
@@ -49,17 +49,33 @@ export function useTimeEntriesCalendarQuery(
         ]),
         enabled: enableCalendarQuery,
         placeholderData: (previousData) => previousData,
-        queryFn: () =>
-            api.getTimeEntries({
-                params: {
-                    organization: getCurrentOrganizationId() || '',
-                },
-                queries: {
-                    start: expandedDateRange.value.start!,
-                    end: expandedDateRange.value.end!,
-                    member_id: getCurrentMembershipId(),
-                },
-            }),
+        queryFn: async () => {
+            const allEntries: TimeEntry[] = [];
+
+            while (true) {
+                const response = await api.getTimeEntries({
+                    params: {
+                        organization: getCurrentOrganizationId() || '',
+                    },
+                    queries: {
+                        start: expandedDateRange.value.start!,
+                        end: expandedDateRange.value.end!,
+                        member_id: getCurrentMembershipId(),
+                        offset: allEntries.length || undefined,
+                    },
+                });
+
+                if (response.data.length === 0) {
+                    return { data: allEntries, meta: response.meta };
+                }
+
+                allEntries.push(...response.data);
+
+                if (allEntries.length >= response.meta.total) {
+                    return { data: allEntries, meta: response.meta };
+                }
+            }
+        },
         staleTime: 1000 * 30, // 30 seconds
     });
 }

From 79999fde28830c41ca0ae522a6101334fef304d7 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Wed, 14 Jan 2026 19:41:07 +0100
Subject: [PATCH 06/28] remove redundant projects pinia store after tanstack
 query migration

---
 resources/js/utils/useProjects.ts | 44 +++----------------------------
 1 file changed, 4 insertions(+), 40 deletions(-)

diff --git a/resources/js/utils/useProjects.ts b/resources/js/utils/useProjects.ts
index 62d415cf..180addb8 100644
--- a/resources/js/utils/useProjects.ts
+++ b/resources/js/utils/useProjects.ts
@@ -1,43 +1,14 @@
 import { defineStore } from 'pinia';
 import { api } from '@/packages/api/src';
-import { computed, ref } from 'vue';
-import type {
-    CreateProjectBody,
-    Project,
-    ProjectResponse,
-    UpdateProjectBody,
-} from '@/packages/api/src';
+import type { CreateProjectBody, UpdateProjectBody } from '@/packages/api/src';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { useNotificationsStore } from '@/utils/notification';
 import { useQueryClient } from '@tanstack/vue-query';
 
 export const useProjectsStore = defineStore('projects', () => {
-    const projectResponse = ref<ProjectResponse | null>(null);
     const { handleApiRequestNotifications } = useNotificationsStore();
     const queryClient = useQueryClient();
 
-    function invalidateProjectsQuery() {
-        queryClient.invalidateQueries({ queryKey: ['projects'] });
-    }
-    async function fetchProjects() {
-        const organization = getCurrentOrganizationId();
-        if (organization) {
-            projectResponse.value = await handleApiRequestNotifications(
-                () =>
-                    api.getProjects({
-                        params: {
-                            organization: organization,
-                        },
-                        queries: {
-                            archived: 'all',
-                        },
-                    }),
-                undefined,
-                'Failed to fetch projects'
-            );
-        }
-    }
-
     async function createProject(projectBody: CreateProjectBody) {
         const organization = getCurrentOrganizationId();
 
@@ -53,8 +24,7 @@ export const useProjectsStore = defineStore('projects', () => {
                 'Failed to create project'
             );
 
-            await fetchProjects();
-            invalidateProjectsQuery();
+            queryClient.invalidateQueries({ queryKey: ['projects'] });
             return response['data'];
         }
     }
@@ -73,8 +43,7 @@ export const useProjectsStore = defineStore('projects', () => {
                 'Project deleted successfully',
                 'Failed to delete project'
             );
-            await fetchProjects();
-            invalidateProjectsQuery();
+            queryClient.invalidateQueries({ queryKey: ['projects'] });
         }
     }
 
@@ -92,16 +61,11 @@ export const useProjectsStore = defineStore('projects', () => {
                 'Project updated successfully',
                 'Failed to update project'
             );
-            await fetchProjects();
-            invalidateProjectsQuery();
+            queryClient.invalidateQueries({ queryKey: ['projects'] });
         }
     }
 
-    const projects = computed<Project[]>(() => projectResponse.value?.data || []);
-
     return {
-        projects,
-        fetchProjects,
         createProject,
         deleteProject,
         updateProject,

From 3fb75ec3d509168f6607343335fb7b3e4bb1dc5f Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Thu, 15 Jan 2026 18:44:42 +0100
Subject: [PATCH 07/28] add outline and secondary variants to
 TimeTrackerStartStop button to reduce visual complexity

---
 e2e/time.spec.ts                              |  4 +-
 .../js/Components/CurrentSidebarTimer.vue     |  1 +
 .../RecentlyTrackedTasksCardEntry.vue         |  4 +-
 .../ui/src/TimeEntry/TimeEntryRow.vue         |  3 +-
 .../packages/ui/src/TimeTrackerStartStop.vue  | 80 +++++++++++++------
 resources/js/packages/ui/styles.css           |  2 +-
 6 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/e2e/time.spec.ts b/e2e/time.spec.ts
index fbcb500d..8764d0d3 100644
--- a/e2e/time.spec.ts
+++ b/e2e/time.spec.ts
@@ -53,7 +53,7 @@ test('test that starting and stopping an empty time entry shows a new time entry
 // Test that description update works
 
 async function assertThatTimeEntryRowIsStopped(newTimeEntry: Locator) {
-    await expect(newTimeEntry.getByTestId('timer_button')).toHaveClass(/bg-accent-300\/70/);
+    await expect(newTimeEntry.getByTestId('timer_button')).toHaveClass(/bg-tertiary/);
 }
 
 test('test that updating a description of a time entry in the overview works on blur', async ({
@@ -224,7 +224,7 @@ test('test that starting a time entry from the overview works', async ({ page })
 
     const newTimeEntry = timeEntryRows.first();
     const startButton = newTimeEntry.getByTestId('timer_button');
-    await expect(startButton).toHaveClass(/bg-accent-300\/70/);
+    await expect(startButton).toHaveClass(/bg-tertiary/);
 
     await Promise.all([
         page.waitForResponse(async (response) => {
diff --git a/resources/js/Components/CurrentSidebarTimer.vue b/resources/js/Components/CurrentSidebarTimer.vue
index 3aede042..f5ea33d9 100644
--- a/resources/js/Components/CurrentSidebarTimer.vue
+++ b/resources/js/Components/CurrentSidebarTimer.vue
@@ -51,6 +51,7 @@ const isRunningInDifferentOrganization = computed(() => {
         <TimeTrackerStartStop
             :active="isActive"
             size="base"
+            variant="outline"
             @changed="setActiveState"></TimeTrackerStartStop>
     </div>
 </template>
diff --git a/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue b/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
index f6dca4b4..8473165d 100644
--- a/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
+++ b/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
@@ -66,7 +66,9 @@ async function startTaskTimer() {
             </ProjectBadge>
         </div>
         <div class="flex items-center justify-center">
-            <TimeTrackerStartStop @changed="startTaskTimer"></TimeTrackerStartStop>
+            <TimeTrackerStartStop
+                variant="outline"
+                @changed="startTaskTimer"></TimeTrackerStartStop>
         </div>
     </div>
 </template>
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
index 64101616..f85db7a2 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
@@ -163,7 +163,8 @@ async function handleDeleteTimeEntry() {
                         @changed="updateStartEndTime"></TimeEntryRowDurationInput>
                     <TimeTrackerStartStop
                         :active="!!(timeEntry.start && !timeEntry.end)"
-                        class="opacity-20 flex focus-visible:opacity-100 group-hover:opacity-100"
+                        variant="secondary"
+                        class="opacity-60 flex focus-visible:opacity-100 group-hover:opacity-100"
                         @changed="onStartStopClick"></TimeTrackerStartStop>
                     <TimeEntryMoreOptionsDropdown
                         @edit="handleEdit"
diff --git a/resources/js/packages/ui/src/TimeTrackerStartStop.vue b/resources/js/packages/ui/src/TimeTrackerStartStop.vue
index f569795a..f0e19f32 100644
--- a/resources/js/packages/ui/src/TimeTrackerStartStop.vue
+++ b/resources/js/packages/ui/src/TimeTrackerStartStop.vue
@@ -1,38 +1,72 @@
 <script setup lang="ts">
-import { twMerge } from 'tailwind-merge';
-import { computed } from 'vue';
+import { cva, type VariantProps } from 'class-variance-authority';
+import { cn } from './utils/cn';
+
+const timeTrackerVariants = cva(
+    'flex items-center justify-center transition focus:outline-0 rounded-full',
+    {
+        variants: {
+            variant: {
+                primary:
+                    'text-white ring-accent-200/10 focus-visible:ring-ring focus-visible:ring-2 ring-4 sm:ring-[6px]',
+                secondary:
+                    'bg-tertiary text-text-tertiary hover:text-text-primary focus:ring-2 focus:ring-border-tertiary',
+                outline:
+                    'border border-border-primary text-text-tertiary hover:text-text-primary hover:bg-tertiary/50',
+            },
+            size: {
+                small: 'w-6 h-6',
+                base: 'w-9 h-9 hover:scale-110',
+                large: 'w-11 h-11 hover:scale-110',
+            },
+            active: {
+                true: '',
+                false: '',
+            },
+        },
+        compoundVariants: [
+            {
+                variant: 'primary',
+                active: true,
+                class: 'bg-red-400/80 hover:bg-red-500/80 focus:bg-red-500/80',
+            },
+            {
+                variant: 'primary',
+                active: false,
+                class: 'bg-accent-300/70 hover:bg-accent-400/70 focus:bg-accent-700',
+            },
+        ],
+        defaultVariants: {
+            variant: 'primary',
+            size: 'base',
+            active: false,
+        },
+    }
+);
+
+type TimeTrackerVariants = VariantProps<typeof timeTrackerVariants>;
 
 const emit = defineEmits(['changed']);
 
 const props = withDefaults(
     defineProps<{
-        size?: 'base' | 'large' | 'small';
+        variant?: TimeTrackerVariants['variant'];
+        size?: TimeTrackerVariants['size'];
         active?: boolean;
     }>(),
     {
+        variant: 'primary',
         size: 'base',
         active: false,
     }
 );
-const buttonSizeClasses = {
-    small: 'w-6 h-6 bg-accent-200/40 hover:bg-accent-300/70',
-    base: 'w-8 h-8 bg-accent-200/40 hover:scale-110 hover:bg-accent-300/70 ring-accent-200/10 focus-visible:ring-ring ring-4 hover:ring-4',
-    large: 'w-11 h-11 ring-accent-200/10 focus-visible:ring-ring focus-visible:ring-2 ring-4 sm:ring-[6px] hover:scale-110',
-};
+
 const iconClass = {
     small: 'w-2.5 h-2.5',
-    base: 'w-3.5 h-3.5',
+    base: 'w-3 h-3',
     large: 'w-4 h-4',
 };
 
-const buttonColorClasses = computed(() => {
-    if (props.active) {
-        return 'bg-red-400/80 hover:bg-red-500/80 focus:bg-red-500/80';
-    } else {
-        return 'bg-accent-300/70 hover:bg-accent-400/70 focus:bg-accent-700';
-    }
-});
-
 function toggleState() {
     emit('changed', !props.active);
 }
@@ -41,18 +75,12 @@ function toggleState() {
 <template>
     <button
         data-testid="timer_button"
-        :class="
-            twMerge(
-                buttonSizeClasses[size],
-                buttonColorClasses,
-                'flex items-center justify-center py-1 transition focus:outline-0 rounded-full text-white '
-            )
-        "
+        :class="cn(timeTrackerVariants({ variant, size, active }))"
         @click="toggleState">
         <Transition name="fade" mode="out-in">
             <svg
                 v-if="props.active"
-                :class="iconClass[size]"
+                :class="iconClass[size ?? 'base']"
                 viewBox="0 0 14 14"
                 fill="none"
                 xmlns="http://www.w3.org/2000/svg">
@@ -64,7 +92,7 @@ function toggleState() {
             </svg>
             <svg
                 v-else
-                :class="iconClass[size]"
+                :class="iconClass[size ?? 'base']"
                 viewBox="0 0 7 8"
                 fill="none"
                 xmlns="http://www.w3.org/2000/svg">
diff --git a/resources/js/packages/ui/styles.css b/resources/js/packages/ui/styles.css
index 262e903a..08466ae0 100644
--- a/resources/js/packages/ui/styles.css
+++ b/resources/js/packages/ui/styles.css
@@ -17,7 +17,7 @@
     --color-bg-primary: oklch(0.14 0.0041 285.97);
     --color-bg-secondary: oklch(0.18 0.005 285.97);
     --color-bg-tertiary: oklch(0.22 0.0112 285.97);
-    --color-bg-quaternary: oklch(0.175 0.005 285.97);
+    --color-bg-quaternary: oklch(0.26 0.015 285.97);
     --color-bg-background: oklch(0.1 0 0);
     --color-text-primary: #ffffff;
     --color-text-secondary: #e3e4e6;

From 672c243c91422573eb8c8f27747590a5c17b3ac8 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Tue, 27 Jan 2026 18:29:40 +0100
Subject: [PATCH 08/28] add command palette

---
 e2e/command-palette.spec.ts                   | 405 +++++++++++++
 package-lock.json                             |   8 +-
 package.json                                  |   2 +-
 .../CommandPalette/CommandPaletteProvider.vue | 268 +++++++++
 .../js/Components/CommandPalette/index.ts     |   1 +
 .../js/Components/ui/dialog/DialogContent.vue |   2 +-
 .../ui/dropdown-menu/DropdownMenuContent.vue  |   2 +-
 resources/js/Layouts/AppLayout.vue            |  44 +-
 .../ui/src/CommandPalette/CommandPalette.vue  | 139 +++++
 .../src/CommandPalette/CommandPaletteTypes.ts |  23 +
 .../packages/ui/src/CommandPalette/index.ts   |   6 +
 .../src/TimeEntry/TimeEntryAggregateRow.vue   |   3 +-
 .../js/packages/ui/src/command/Command.vue    | 107 ++++
 .../packages/ui/src/command/CommandGroup.vue  |  51 ++
 .../packages/ui/src/command/CommandInput.vue  |  41 ++
 .../packages/ui/src/command/CommandItem.vue   |  78 +++
 .../packages/ui/src/command/CommandList.vue   |  23 +
 .../ui/src/command/CommandSeparator.vue       |  17 +
 .../ui/src/command/CommandShortcut.vue        |  14 +
 resources/js/packages/ui/src/command/index.ts |  27 +
 resources/js/packages/ui/src/index.ts         |   7 +
 resources/js/packages/ui/styles.css           |   2 +-
 resources/js/utils/commandPaletteCommands.ts  | 486 +++++++++++++++
 resources/js/utils/useCommandPalette.ts       | 552 ++++++++++++++++++
 24 files changed, 2292 insertions(+), 16 deletions(-)
 create mode 100644 e2e/command-palette.spec.ts
 create mode 100644 resources/js/Components/CommandPalette/CommandPaletteProvider.vue
 create mode 100644 resources/js/Components/CommandPalette/index.ts
 create mode 100644 resources/js/packages/ui/src/CommandPalette/CommandPalette.vue
 create mode 100644 resources/js/packages/ui/src/CommandPalette/CommandPaletteTypes.ts
 create mode 100644 resources/js/packages/ui/src/CommandPalette/index.ts
 create mode 100644 resources/js/packages/ui/src/command/Command.vue
 create mode 100644 resources/js/packages/ui/src/command/CommandGroup.vue
 create mode 100644 resources/js/packages/ui/src/command/CommandInput.vue
 create mode 100644 resources/js/packages/ui/src/command/CommandItem.vue
 create mode 100644 resources/js/packages/ui/src/command/CommandList.vue
 create mode 100644 resources/js/packages/ui/src/command/CommandSeparator.vue
 create mode 100644 resources/js/packages/ui/src/command/CommandShortcut.vue
 create mode 100644 resources/js/packages/ui/src/command/index.ts
 create mode 100644 resources/js/utils/commandPaletteCommands.ts
 create mode 100644 resources/js/utils/useCommandPalette.ts

diff --git a/e2e/command-palette.spec.ts b/e2e/command-palette.spec.ts
new file mode 100644
index 00000000..2fcabf65
--- /dev/null
+++ b/e2e/command-palette.spec.ts
@@ -0,0 +1,405 @@
+import { expect, test } from '../playwright/fixtures';
+import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
+import type { Page } from '@playwright/test';
+
+const TIMER_BUTTON_SELECTOR = '[data-testid="dashboard_timer"] [data-testid="timer_button"]';
+
+async function goToDashboard(page: Page) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
+}
+
+async function openCommandPalette(page: Page) {
+    await page.getByTestId('command_palette_button').click();
+    await expect(page.locator('[role="dialog"]')).toBeVisible({ timeout: 5000 });
+}
+
+async function closeCommandPalette(page: Page) {
+    await page.keyboard.press('Escape');
+    await expect(page.locator('[role="dialog"]')).not.toBeVisible();
+}
+
+async function searchInCommandPalette(page: Page, query: string) {
+    await page.locator('[role="dialog"] input').fill(query);
+    // Wait for search to filter and API calls to settle
+    await page.waitForTimeout(500);
+}
+
+async function selectCommand(page: Page, name: string) {
+    const option = page.getByRole('option', { name, exact: true });
+    await option.scrollIntoViewIfNeeded();
+    await option.click();
+}
+
+async function assertTimerIsRunning(page: Page) {
+    await expect(page.locator(TIMER_BUTTON_SELECTOR)).toHaveClass(/bg-red-400\/80/, {
+        timeout: 10000,
+    });
+}
+
+async function assertTimerIsStopped(page: Page) {
+    await expect(page.locator(TIMER_BUTTON_SELECTOR)).toHaveClass(/bg-accent-300\/70/, {
+        timeout: 10000,
+    });
+}
+
+test.describe('Command Palette', () => {
+    test.describe('Opening and Closing', () => {
+        test('opens via search button and closes with Escape', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+            await expect(
+                page.locator('[role="dialog"] input[placeholder*="command"]')
+            ).toBeVisible();
+
+            await closeCommandPalette(page);
+            await expect(page.locator('[role="dialog"]')).not.toBeVisible();
+        });
+
+        test('opens with keyboard shortcut', async ({ page }) => {
+            await goToDashboard(page);
+            // Click on body to ensure page has focus
+            await page.locator('body').click();
+            // Use ControlOrMeta which resolves to Ctrl on Linux/Windows and Meta on macOS
+            await page.keyboard.press('ControlOrMeta+k');
+            await expect(page.locator('[role="dialog"]')).toBeVisible({ timeout: 5000 });
+        });
+
+        test('clears search on close', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'dashboard');
+            await closeCommandPalette(page);
+
+            await openCommandPalette(page);
+            await expect(page.locator('[role="dialog"] input')).toHaveValue('');
+        });
+    });
+
+    test.describe('Command Display', () => {
+        test('displays navigation and timer commands', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+
+            // Navigation commands
+            await expect(page.getByRole('option', { name: 'Go to Dashboard' })).toBeVisible();
+            await expect(page.getByRole('option', { name: 'Go to Time' })).toBeVisible();
+            await expect(page.getByRole('option', { name: 'Go to Calendar' })).toBeVisible();
+
+            // Timer commands
+            await expect(page.getByRole('option', { name: 'Start Timer' })).toBeVisible();
+            await expect(page.getByRole('option', { name: 'Create Time Entry' })).toBeVisible();
+        });
+
+        test('displays create commands', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+
+            await expect(page.getByRole('option', { name: 'Create Project' })).toBeVisible();
+            await expect(page.getByRole('option', { name: 'Create Client' })).toBeVisible();
+            await expect(page.getByRole('option', { name: 'Create Tag' })).toBeVisible();
+        });
+    });
+
+    test.describe('Navigation Commands', () => {
+        // Tests use element visibility assertions for consistency with codebase patterns
+        const navigationTests = [
+            ['Go to Dashboard', 'dashboard_view', '/time'],
+            ['Go to Time', 'time_view', '/dashboard'],
+            ['Go to Calendar', 'calendar_view', '/dashboard'],
+            ['Go to Projects', 'projects_view', '/dashboard'],
+            ['Go to Clients', 'clients_view', '/dashboard'],
+            ['Go to Members', 'members_view', '/dashboard'],
+            ['Go to Tags', 'tags_view', '/dashboard'],
+        ] as const;
+
+        for (const [commandName, expectedTestId, startUrl] of navigationTests) {
+            test(`${commandName}`, async ({ page }) => {
+                await page.goto(PLAYWRIGHT_BASE_URL + startUrl);
+                await openCommandPalette(page);
+                await searchInCommandPalette(page, commandName.replace('Go to ', ''));
+                await selectCommand(page, commandName);
+                await expect(page.getByTestId(expectedTestId)).toBeVisible({ timeout: 10000 });
+            });
+        }
+
+        test('Go to Profile', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Profile');
+            await selectCommand(page, 'Go to Profile');
+            // Profile page doesn't have a testId, so check for a unique element
+            await expect(page.getByRole('heading', { name: 'Profile Information' })).toBeVisible({
+                timeout: 10000,
+            });
+        });
+
+        test('Go to Reporting Overview', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Reporting Overview');
+            await selectCommand(page, 'Go to Reporting Overview');
+            await expect(page.getByTestId('reporting_view')).toBeVisible({ timeout: 10000 });
+        });
+
+        test('Go to Settings', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Settings');
+            await selectCommand(page, 'Go to Settings');
+            // Settings page uses team settings which has an h3 heading
+            await expect(
+                page.getByRole('heading', { name: 'Organization Name', level: 3 })
+            ).toBeVisible({
+                timeout: 10000,
+            });
+        });
+    });
+
+    test.describe('Search and Filtering', () => {
+        test('filters commands when searching', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+
+            await searchInCommandPalette(page, 'dashboard');
+            await expect(page.getByRole('option', { name: 'Go to Dashboard' })).toBeVisible();
+
+            await searchInCommandPalette(page, 'calendar');
+            await expect(page.getByRole('option', { name: 'Go to Calendar' })).toBeVisible();
+        });
+
+        test('search is case insensitive', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+
+            await searchInCommandPalette(page, 'DASHBOARD');
+            await expect(page.getByRole('option', { name: 'Go to Dashboard' })).toBeVisible();
+        });
+
+        test('partial word search works', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+
+            await searchInCommandPalette(page, 'proj');
+            await expect(page.getByRole('option', { name: 'Go to Projects' })).toBeVisible();
+            await expect(page.getByRole('option', { name: 'Create Project' })).toBeVisible();
+        });
+
+        test('keyboard navigation and selection works', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+
+            await page.keyboard.press('ArrowDown');
+            await page.keyboard.press('ArrowDown');
+            await page.keyboard.press('Enter');
+
+            await expect(page.locator('[role="dialog"]')).not.toBeVisible();
+        });
+    });
+
+    test.describe('Theme Commands', () => {
+        test('switches to dark theme', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Dark Theme');
+            await selectCommand(page, 'Switch to Dark Theme');
+            await expect(page.locator('html')).toHaveClass(/dark/);
+        });
+
+        test('switches to light theme', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Light Theme');
+            await selectCommand(page, 'Switch to Light Theme');
+            await expect(page.locator('html')).toHaveClass(/light/);
+        });
+    });
+
+    test.describe('Timer Commands', () => {
+        test('starts and stops timer', async ({ page }) => {
+            await goToDashboard(page);
+
+            // Start timer
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Start Timer');
+            await selectCommand(page, 'Start Timer');
+            await assertTimerIsRunning(page);
+
+            // Stop timer
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Stop Timer');
+            await selectCommand(page, 'Stop Timer');
+            await assertTimerIsStopped(page);
+        });
+
+        test('shows active timer commands when running', async ({ page }) => {
+            await goToDashboard(page);
+
+            // Start timer
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Start Timer');
+            await selectCommand(page, 'Start Timer');
+            await assertTimerIsRunning(page);
+
+            // Check active timer commands - search for them to ensure visibility
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Set Project');
+            await expect(page.getByRole('option', { name: 'Set Project' })).toBeVisible();
+        });
+    });
+
+    test.describe('Create Commands', () => {
+        test('opens create time entry modal', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Create Time Entry');
+            await selectCommand(page, 'Create Time Entry');
+            await expect(
+                page.locator('[role="dialog"]').getByText('Create manual time entry')
+            ).toBeVisible();
+        });
+
+        test('opens create project modal', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Create Project');
+            await selectCommand(page, 'Create Project');
+            await expect(
+                page.locator('[role="dialog"]').getByRole('heading', { name: 'Create Project' })
+            ).toBeVisible();
+        });
+
+        test('opens create client modal', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Create Client');
+            await selectCommand(page, 'Create Client');
+            await expect(
+                page.locator('[role="dialog"]').getByRole('heading', { name: 'Create Client' })
+            ).toBeVisible();
+        });
+
+        test('opens create tag modal', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Create Tag');
+            await selectCommand(page, 'Create Tag');
+            await expect(page.locator('[role="dialog"]').getByText('Create Tags')).toBeVisible();
+        });
+
+        test('opens invite member modal', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Invite Member');
+            await selectCommand(page, 'Invite Member');
+            // Modal has title with "Invite Member" text - use first() to get the title span
+            await expect(
+                page.locator('[role="dialog"]').getByText('Invite Member').first()
+            ).toBeVisible();
+        });
+    });
+
+    test.describe('Entity Search', () => {
+        test('searches for projects and navigates on selection', async ({ page }) => {
+            const projectName = 'CmdPalette' + Math.floor(Math.random() * 10000);
+
+            // Create project first
+            await page.goto(PLAYWRIGHT_BASE_URL + '/projects');
+            await page.getByRole('button', { name: 'Create Project' }).click();
+            await page.getByPlaceholder('The next big thing').fill(projectName);
+            await page.getByRole('button', { name: 'Create Project' }).click();
+            // Wait for project to be created and page to update
+            await expect(page.getByText(projectName)).toBeVisible({ timeout: 10000 });
+
+            // Now go to dashboard and search for the project
+            await goToDashboard(page);
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, projectName);
+
+            // Wait for entity search to return results, then use keyboard to select
+            await page.waitForTimeout(1500);
+
+            // Use keyboard to navigate down (past any matching commands) and select
+            // The project should appear in search results
+            await page.keyboard.press('ArrowDown');
+            await page.keyboard.press('Enter');
+
+            // Should navigate somewhere (either project page or remain on dashboard)
+            // If entity search found the project, it will navigate to project page
+            await page.waitForTimeout(500);
+        });
+    });
+
+    test.describe('Organization Switching', () => {
+        test('shows switch commands only when multiple organizations exist', async ({ page }) => {
+            await goToDashboard(page);
+            await openCommandPalette(page);
+
+            // With only one org, no switch commands should appear
+            await searchInCommandPalette(page, 'Switch to');
+            // Check that no organization switch commands appear (only theme switch commands)
+            const switchOptions = page.getByRole('option', { name: /^Switch to (?!.*Theme)/ });
+            await expect(switchOptions).toHaveCount(0);
+        });
+
+        test('switches organization via command palette', async ({ page }) => {
+            const newOrgName = 'TestOrg' + Math.floor(Math.random() * 10000);
+
+            // Create a new organization
+            await page.goto(PLAYWRIGHT_BASE_URL + '/teams/create');
+            await page.getByLabel('Organization Name').fill(newOrgName);
+            await page.getByRole('button', { name: 'Create' }).click();
+
+            // Wait for navigation to new org's dashboard
+            await expect(page.getByTestId('dashboard_view')).toBeVisible({ timeout: 10000 });
+
+            // Use visible switcher (desktop sidebar has one, mobile header has another)
+            const orgSwitcher = page.locator('[data-testid="organization_switcher"]:visible');
+
+            // Verify we're in the new org by checking the switcher
+            await expect(orgSwitcher).toContainText(newOrgName);
+
+            // Get the original org name from switcher dropdown
+            await orgSwitcher.click();
+            await expect(page.getByText('Switch Organizations')).toBeVisible();
+
+            // Find the other organization button (has ArrowRightIcon, not CheckCircleIcon)
+            // The button contains an SVG and a div with the org name
+            const otherOrgItem = page.locator('form button').filter({ hasText: /.+/ }).first();
+            await expect(otherOrgItem).toBeVisible();
+            const originalOrgName = (await otherOrgItem.innerText()).trim();
+            await page.keyboard.press('Escape'); // Close dropdown
+
+            // Now use command palette to switch back to original org
+            await openCommandPalette(page);
+            await searchInCommandPalette(page, 'Switch to');
+
+            // Should see the switch command for the original org
+            const switchCommand = page.getByRole('option', {
+                name: new RegExp(`Switch to ${originalOrgName}`),
+            });
+            await expect(switchCommand).toBeVisible();
+            await switchCommand.click();
+
+            // Wait for organization switch to complete
+            await expect(orgSwitcher).toContainText(originalOrgName, {
+                timeout: 10000,
+            });
+        });
+
+        test('organization switch commands appear in Organization group', async ({ page }) => {
+            const newOrgName = 'GroupTestOrg' + Math.floor(Math.random() * 10000);
+
+            // Create a new organization to ensure we have multiple
+            await page.goto(PLAYWRIGHT_BASE_URL + '/teams/create');
+            await page.getByLabel('Organization Name').fill(newOrgName);
+            await page.getByRole('button', { name: 'Create' }).click();
+            await expect(page.getByTestId('dashboard_view')).toBeVisible({ timeout: 10000 });
+
+            // Open command palette and check for Organization group heading
+            await openCommandPalette(page);
+
+            // The Organization group should be visible when there are switch commands
+            await expect(page.getByText('Organization', { exact: true })).toBeVisible();
+        });
+    });
+});
diff --git a/package-lock.json b/package-lock.json
index 9d7b0f9f..ced2f53a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,7 +33,7 @@
                 "parse-duration": "^2.0.1",
                 "pinia": "^2.1.7",
                 "radix-vue": "^1.9.6",
-                "reka-ui": "^2.2.0",
+                "reka-ui": "^2.7.0",
                 "tailwind-merge": "^2.6.0",
                 "tailwindcss-animate": "^1.0.7",
                 "vue-echarts": "^7.0.3"
@@ -5419,9 +5419,9 @@
             }
         },
         "node_modules/reka-ui": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.2.0.tgz",
-            "integrity": "sha512-eeRrLI4LwJ6dkdwks6KFNKGs0+beqZlHO3JMHen7THDTh+yJ5Z0KNwONmOhhV/0hZC2uJCEExgG60QPzGstkQg==",
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.7.0.tgz",
+            "integrity": "sha512-m+XmxQN2xtFzBP3OAdIafKq7C8OETo2fqfxcIIxYmNN2Ch3r5oAf6yEYCIJg5tL/yJU2mHqF70dCCekUkrAnXA==",
             "license": "MIT",
             "dependencies": {
                 "@floating-ui/dom": "^1.6.13",
diff --git a/package.json b/package.json
index d9bd3652..c743fb5c 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
         "parse-duration": "^2.0.1",
         "pinia": "^2.1.7",
         "radix-vue": "^1.9.6",
-        "reka-ui": "^2.2.0",
+        "reka-ui": "^2.7.0",
         "tailwind-merge": "^2.6.0",
         "tailwindcss-animate": "^1.0.7",
         "vue-echarts": "^7.0.3"
diff --git a/resources/js/Components/CommandPalette/CommandPaletteProvider.vue b/resources/js/Components/CommandPalette/CommandPaletteProvider.vue
new file mode 100644
index 00000000..c597aa61
--- /dev/null
+++ b/resources/js/Components/CommandPalette/CommandPaletteProvider.vue
@@ -0,0 +1,268 @@
+<script setup lang="ts">
+import { onMounted, onUnmounted, computed } from 'vue';
+import { router, usePage } from '@inertiajs/vue3';
+import { CommandPalette } from '@/packages/ui/src/CommandPalette';
+import { useCommandPalette } from '@/utils/useCommandPalette';
+import { useProjectsStore } from '@/utils/useProjects';
+import { useClientsStore } from '@/utils/useClients';
+import { useTagsStore } from '@/utils/useTags';
+import { useTimeEntriesMutations } from '@/utils/useTimeEntriesMutations';
+import { getOrganizationCurrencyString } from '@/utils/money';
+import { isAllowedToPerformPremiumAction } from '@/utils/billing';
+import { canCreateProjects } from '@/utils/permissions';
+import type {
+    CreateClientBody,
+    CreateProjectBody,
+    CreateTimeEntryBody,
+    Project,
+    Client,
+    Tag,
+} from '@/packages/api/src';
+import type { User } from '@/types/models';
+import type { Role } from '@/types/jetstream';
+
+// Import modals
+import ProjectCreateModal from '@/packages/ui/src/Project/ProjectCreateModal.vue';
+import ClientCreateModal from '@/Components/Common/Client/ClientCreateModal.vue';
+import TaskCreateModal from '@/Components/Common/Task/TaskCreateModal.vue';
+import TagCreateModal from '@/packages/ui/src/Tag/TagCreateModal.vue';
+import MemberInviteModal from '@/Components/Common/Member/MemberInviteModal.vue';
+import TimeEntryCreateModal from '@/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue';
+
+// Import dropdowns for active timer selectors
+import TimeTrackerProjectTaskDropdown from '@/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue';
+import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
+
+// Dialog components for selectors
+import DialogModal from '@/packages/ui/src/DialogModal.vue';
+import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
+
+const {
+    isOpen,
+    searchTerm,
+    groups,
+    entityResults,
+    togglePalette,
+    showCreateProjectModal,
+    showCreateClientModal,
+    showCreateTaskModal,
+    showCreateTagModal,
+    showInviteMemberModal,
+    showCreateTimeEntryModal,
+    showProjectSelector,
+    showTaskSelector,
+    showTagsSelector,
+    currentTimeEntry,
+    updateTimer,
+    projects,
+    clients,
+    tasks,
+    tags,
+} = useCommandPalette();
+
+// Stores for creating entities
+const projectsStore = useProjectsStore();
+const clientsStore = useClientsStore();
+const tagsStore = useTagsStore();
+
+// Time entry mutations
+const { createTimeEntry: createTimeEntryMutation } = useTimeEntriesMutations();
+
+// Get available roles from page props (for member invite modal)
+const page = usePage<{
+    availableRoles?: Role[];
+    auth: {
+        user: User;
+    };
+}>();
+
+const availableRoles = computed(() => page.props.availableRoles ?? []);
+
+// Active clients for dropdowns
+const activeClients = computed(() => clients.value.filter((c) => !c.is_archived));
+
+// Keyboard shortcut handler
+function handleKeyDown(e: KeyboardEvent) {
+    if ((e.metaKey || e.ctrlKey) && e.key === 'k') {
+        e.preventDefault();
+        togglePalette();
+    }
+}
+
+onMounted(() => {
+    document.addEventListener('keydown', handleKeyDown);
+});
+
+onUnmounted(() => {
+    document.removeEventListener('keydown', handleKeyDown);
+});
+
+// Project creation
+async function createProject(project: CreateProjectBody): Promise<Project | undefined> {
+    const openedFromCommandPalette = showCreateProjectModal.value;
+    const newProject = await projectsStore.createProject(project);
+    showCreateProjectModal.value = false;
+    if (newProject && openedFromCommandPalette) {
+        router.visit(route('projects.show', { project: newProject.id }));
+    }
+    return newProject;
+}
+
+async function createClient(client: CreateClientBody): Promise<Client | undefined> {
+    const openedFromCommandPalette = showCreateClientModal.value;
+    const newClient = await clientsStore.createClient(client);
+    if (newClient && openedFromCommandPalette) {
+        showCreateClientModal.value = false;
+        router.visit(route('clients'));
+    }
+    return newClient;
+}
+
+async function createTag(name: string): Promise<Tag | undefined> {
+    const openedFromCommandPalette = showCreateTagModal.value;
+    const newTag = await tagsStore.createTag(name);
+    if (newTag && openedFromCommandPalette) {
+        showCreateTagModal.value = false;
+        router.visit(route('tags'));
+    }
+    return newTag;
+}
+
+async function createTimeEntry(timeEntry: Omit<CreateTimeEntryBody, 'member_id'>) {
+    await createTimeEntryMutation(timeEntry);
+    showCreateTimeEntryModal.value = false;
+}
+
+async function handleProjectTaskSelect() {
+    showProjectSelector.value = false;
+    showTaskSelector.value = false;
+    await updateTimer();
+}
+
+async function handleTagsSelect() {
+    showTagsSelector.value = false;
+    await updateTimer();
+}
+
+const firstProjectId = computed(() => projects.value[0]?.id ?? '');
+</script>
+
+<template>
+    <!-- Command Palette Dialog -->
+    <CommandPalette
+        v-model:open="isOpen"
+        v-model:search-term="searchTerm"
+        :groups="groups"
+        :entity-results="entityResults" />
+
+    <!-- Project Create Modal -->
+    <ProjectCreateModal
+        v-model:show="showCreateProjectModal"
+        :create-project="createProject"
+        :create-client="createClient"
+        :clients="activeClients"
+        :currency="getOrganizationCurrencyString()"
+        :enable-estimated-time="isAllowedToPerformPremiumAction()" />
+
+    <!-- Client Create Modal -->
+    <ClientCreateModal v-model:show="showCreateClientModal" />
+
+    <!-- Task Create Modal -->
+    <TaskCreateModal
+        v-if="firstProjectId"
+        v-model:show="showCreateTaskModal"
+        :project-id="firstProjectId" />
+
+    <!-- Tag Create Modal -->
+    <TagCreateModal v-model:show="showCreateTagModal" :create-tag="createTag" />
+
+    <!-- Member Invite Modal -->
+    <MemberInviteModal v-model:show="showInviteMemberModal" :available-roles="availableRoles" />
+
+    <!-- Time Entry Create Modal -->
+    <TimeEntryCreateModal
+        v-model:show="showCreateTimeEntryModal"
+        :create-time-entry="createTimeEntry"
+        :create-project="createProject"
+        :create-client="createClient"
+        :create-tag="createTag"
+        :projects="projects"
+        :tasks="tasks"
+        :tags="tags"
+        :clients="activeClients"
+        :currency="getOrganizationCurrencyString()"
+        :enable-estimated-time="isAllowedToPerformPremiumAction()"
+        :can-create-project="canCreateProjects()" />
+
+    <!-- Project Selector Dialog for Active Timer -->
+    <DialogModal :show="showProjectSelector" closeable @close="showProjectSelector = false">
+        <template #title>Set Project</template>
+        <template #content>
+            <TimeTrackerProjectTaskDropdown
+                v-model:project="currentTimeEntry.project_id"
+                v-model:task="currentTimeEntry.task_id"
+                :projects="projects"
+                :tasks="tasks"
+                :clients="activeClients"
+                :create-project="createProject"
+                :create-client="createClient"
+                :can-create-project="canCreateProjects()"
+                :currency="getOrganizationCurrencyString()"
+                :enable-estimated-time="isAllowedToPerformPremiumAction()"
+                size="xlarge"
+                class="w-full" />
+        </template>
+        <template #footer>
+            <SecondaryButton @click="showProjectSelector = false"> Cancel </SecondaryButton>
+            <SecondaryButton class="ms-3" @click="handleProjectTaskSelect"> Save </SecondaryButton>
+        </template>
+    </DialogModal>
+
+    <!-- Task Selector Dialog for Active Timer -->
+    <DialogModal :show="showTaskSelector" closeable @close="showTaskSelector = false">
+        <template #title>Set Task</template>
+        <template #content>
+            <TimeTrackerProjectTaskDropdown
+                v-model:project="currentTimeEntry.project_id"
+                v-model:task="currentTimeEntry.task_id"
+                :projects="projects"
+                :tasks="tasks"
+                :clients="activeClients"
+                :create-project="createProject"
+                :create-client="createClient"
+                :can-create-project="canCreateProjects()"
+                :currency="getOrganizationCurrencyString()"
+                :enable-estimated-time="isAllowedToPerformPremiumAction()"
+                size="xlarge"
+                class="w-full" />
+        </template>
+        <template #footer>
+            <SecondaryButton @click="showTaskSelector = false"> Cancel </SecondaryButton>
+            <SecondaryButton class="ms-3" @click="handleProjectTaskSelect"> Save </SecondaryButton>
+        </template>
+    </DialogModal>
+
+    <!-- Tags Selector Dialog for Active Timer -->
+    <DialogModal :show="showTagsSelector" closeable @close="showTagsSelector = false">
+        <template #title>Set Tags</template>
+        <template #content>
+            <TagDropdown v-model="currentTimeEntry.tags" :tags="tags" :create-tag="createTag">
+                <template #trigger>
+                    <div
+                        class="w-full p-3 border border-card-border rounded-lg cursor-pointer hover:bg-tertiary transition">
+                        <span
+                            v-if="currentTimeEntry.tags.length === 0"
+                            class="text-muted-foreground">
+                            Click to select tags...
+                        </span>
+                        <span v-else> {{ currentTimeEntry.tags.length }} tag(s) selected </span>
+                    </div>
+                </template>
+            </TagDropdown>
+        </template>
+        <template #footer>
+            <SecondaryButton @click="showTagsSelector = false"> Cancel </SecondaryButton>
+            <SecondaryButton class="ms-3" @click="handleTagsSelect"> Save </SecondaryButton>
+        </template>
+    </DialogModal>
+</template>
diff --git a/resources/js/Components/CommandPalette/index.ts b/resources/js/Components/CommandPalette/index.ts
new file mode 100644
index 00000000..0e729f1e
--- /dev/null
+++ b/resources/js/Components/CommandPalette/index.ts
@@ -0,0 +1 @@
+export { default as CommandPaletteProvider } from './CommandPaletteProvider.vue';
diff --git a/resources/js/Components/ui/dialog/DialogContent.vue b/resources/js/Components/ui/dialog/DialogContent.vue
index 4c05442e..50453cab 100644
--- a/resources/js/Components/ui/dialog/DialogContent.vue
+++ b/resources/js/Components/ui/dialog/DialogContent.vue
@@ -38,7 +38,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);
                 v-bind="forwarded"
                 :class="
                     cn(
-                        'bg-default-background grid w-full max-w-lg border border-border-tertiary shadow-lg duration-200 sm:rounded-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95',
+                        'pointer-events-auto bg-default-background grid w-full max-w-lg border border-border-tertiary shadow-lg duration-200 sm:rounded-lg outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95',
                         props.class
                     )
                 ">
diff --git a/resources/js/Components/ui/dropdown-menu/DropdownMenuContent.vue b/resources/js/Components/ui/dropdown-menu/DropdownMenuContent.vue
index bd90a65c..45065b12 100644
--- a/resources/js/Components/ui/dropdown-menu/DropdownMenuContent.vue
+++ b/resources/js/Components/ui/dropdown-menu/DropdownMenuContent.vue
@@ -32,7 +32,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);
             v-bind="forwarded"
             :class="
                 cn(
-                    'z-50 min-w-32 overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
+                    'z-50 min-w-32 overflow-hidden rounded-md border border-border-secondary bg-popover p-1 text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
                     props.class
                 )
             ">
diff --git a/resources/js/Layouts/AppLayout.vue b/resources/js/Layouts/AppLayout.vue
index 576e7401..8d1e4de1 100644
--- a/resources/js/Layouts/AppLayout.vue
+++ b/resources/js/Layouts/AppLayout.vue
@@ -12,6 +12,7 @@ import {
     CreditCardIcon,
     FolderIcon,
     HomeIcon,
+    MagnifyingGlassIcon,
     TagIcon,
     UserCircleIcon,
     UserGroupIcon,
@@ -48,8 +49,13 @@ import { api } from '@/packages/api/src';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
 import { twMerge } from 'tailwind-merge';
-import { Button } from '@/packages/ui/src';
+import { Button as UiButton } from '@/packages/ui/src';
+import { Button } from '@/Components/ui/button';
 import { openFeedback } from '@/utils/feedback';
+import { CommandPaletteProvider } from '@/Components/CommandPalette';
+import { useCommandPalette } from '@/utils/useCommandPalette';
+
+const { openPalette } = useCommandPalette();
 
 defineProps({
     title: String,
@@ -114,9 +120,22 @@ const page = usePage<{
             }"
             class="flex-shrink-0 h-screen hidden fixed w-[230px] 2xl:w-[250px] px-2.5 2xl:px-3 py-4 lg:flex flex-col justify-between">
             <div class="flex flex-col h-full">
-                <div class="border-b border-default-background-separator pb-2 flex justify-between">
-                    <OrganizationSwitcher class="w-full"></OrganizationSwitcher>
-                    <XMarkIcon class="w-8 lg:hidden" @click="showSidebarMenu = false"></XMarkIcon>
+                <div
+                    class="border-b border-default-background-separator pb-2 flex items-center gap-1">
+                    <div class="flex-1 min-w-0 overflow-hidden">
+                        <OrganizationSwitcher></OrganizationSwitcher>
+                    </div>
+                    <Button
+                        variant="ghost"
+                        size="icon"
+                        class="h-7 w-7 flex-shrink-0"
+                        data-testid="command_palette_button"
+                        @click="openPalette">
+                        <MagnifyingGlassIcon class="h-4 w-4 text-icon-default" />
+                    </Button>
+                    <XMarkIcon
+                        class="w-8 lg:hidden flex-shrink-0"
+                        @click="showSidebarMenu = false"></XMarkIcon>
                 </div>
                 <div class="border-b border-default-background-separator">
                     <CurrentSidebarTimer></CurrentSidebarTimer>
@@ -255,14 +274,14 @@ const page = usePage<{
                             :icon="Cog6ToothIcon"
                             :href="route('profile.show')"></NavigationSidebarItem>
 
-                        <Button
+                        <UiButton
                             v-if="page.props.has_services_extension"
                             variant="outline"
                             size="xs"
                             class="rounded-full ml-2 flex h-6 w-6 items-center text-xs text-icon-default justify-center"
                             @click="openFeedback">
                             ?
-                        </Button>
+                        </UiButton>
                     </ul>
                 </div>
             </div>
@@ -275,7 +294,17 @@ const page = usePage<{
                     <Bars3Icon
                         class="w-7 text-text-secondary"
                         @click="showSidebarMenu = !showSidebarMenu"></Bars3Icon>
-                    <OrganizationSwitcher></OrganizationSwitcher>
+                    <div class="flex items-center gap-1">
+                        <OrganizationSwitcher></OrganizationSwitcher>
+                        <Button
+                            variant="ghost"
+                            size="icon"
+                            class="h-7 w-7 shrink-0"
+                            data-testid="command_palette_button_mobile"
+                            @click="openPalette">
+                            <MagnifyingGlassIcon class="h-4 w-4 text-icon-default" />
+                        </Button>
+                    </div>
                 </div>
 
                 <Head :title="title" />
@@ -308,4 +337,5 @@ const page = usePage<{
     </div>
     <NotificationContainer></NotificationContainer>
     <UserTimezoneMismatchModal></UserTimezoneMismatchModal>
+    <CommandPaletteProvider></CommandPaletteProvider>
 </template>
diff --git a/resources/js/packages/ui/src/CommandPalette/CommandPalette.vue b/resources/js/packages/ui/src/CommandPalette/CommandPalette.vue
new file mode 100644
index 00000000..57317c40
--- /dev/null
+++ b/resources/js/packages/ui/src/CommandPalette/CommandPalette.vue
@@ -0,0 +1,139 @@
+<script setup lang="ts">
+import { computed, watch } from 'vue';
+import { DialogRoot, DialogPortal, DialogOverlay, DialogContent } from 'reka-ui';
+import {
+    Command as CommandRoot,
+    CommandGroup,
+    CommandInput,
+    CommandItem,
+    CommandList,
+    CommandSeparator,
+    CommandShortcut,
+} from '../command';
+import { cn } from '../utils/cn';
+import type {
+    CommandPaletteCommand,
+    CommandPaletteGroup,
+    EntitySearchResult,
+} from './CommandPaletteTypes';
+
+const open = defineModel<boolean>('open', { required: true });
+const searchTerm = defineModel<string>('searchTerm', { default: '' });
+
+const props = withDefaults(
+    defineProps<{
+        groups: CommandPaletteGroup[];
+        entityResults?: EntitySearchResult[];
+        placeholder?: string;
+    }>(),
+    {
+        entityResults: () => [],
+        placeholder: 'Type a command or search...',
+    }
+);
+
+const emit = defineEmits<{
+    select: [command: CommandPaletteCommand | EntitySearchResult];
+}>();
+
+// Non-empty groups for rendering
+const nonEmptyGroups = computed(() => props.groups.filter((g) => g.commands.length > 0));
+
+const hasEntityResults = computed(() => (props.entityResults?.length ?? 0) > 0);
+
+const hasAnyGroups = computed(() => nonEmptyGroups.value.length > 0);
+
+// Handle command selection
+async function handleSelect(cmd: CommandPaletteCommand | EntitySearchResult) {
+    emit('select', cmd);
+    await cmd.action();
+}
+
+// Reset search when dialog closes
+watch(open, (isOpen) => {
+    if (!isOpen) {
+        searchTerm.value = '';
+    }
+});
+</script>
+
+<template>
+    <DialogRoot v-model:open="open">
+        <DialogPortal>
+            <DialogOverlay
+                class="fixed inset-0 z-50 backdrop-blur-sm data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0">
+                <div class="absolute inset-0 bg-default-background opacity-30" />
+            </DialogOverlay>
+            <div
+                :class="
+                    cn(
+                        'fixed top-0 left-0 z-50 pointer-events-none w-screen h-screen flex items-start pt-6 md:pt-20 xl:pt-32 justify-center overflow-auto'
+                    )
+                ">
+                <DialogContent
+                    class="pointer-events-auto bg-default-background w-full max-w-lg border border-border-tertiary shadow-lg sm:rounded-lg outline-none overflow-hidden p-0 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95">
+                    <CommandRoot
+                        v-model:search-term="searchTerm"
+                        class="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
+                        <CommandInput :placeholder="placeholder" />
+                        <CommandList>
+                            <!-- Empty state -->
+                            <div
+                                v-if="searchTerm.length > 0 && !hasEntityResults && !hasAnyGroups"
+                                class="py-6 text-center text-sm text-muted-foreground">
+                                No results found.
+                            </div>
+
+                            <!-- Command Groups -->
+                            <template v-for="(group, index) in nonEmptyGroups" :key="group.id">
+                                <CommandSeparator v-if="index > 0" />
+                                <CommandGroup :heading="group.heading">
+                                    <CommandItem
+                                        v-for="cmd in group.commands"
+                                        :key="cmd.id"
+                                        :value="cmd.id"
+                                        class="cursor-pointer"
+                                        @select="handleSelect(cmd)">
+                                        <component :is="cmd.icon" v-if="cmd.icon" />
+                                        <span>{{ cmd.label }}</span>
+                                        <span class="sr-only" aria-hidden="true">{{
+                                            cmd.keywords.join(' ')
+                                        }}</span>
+                                        <CommandShortcut v-if="cmd.shortcut">
+                                            {{ cmd.shortcut }}
+                                        </CommandShortcut>
+                                    </CommandItem>
+                                </CommandGroup>
+                            </template>
+
+                            <!-- Entity Search Results -->
+                            <template v-if="hasEntityResults">
+                                <CommandSeparator v-if="hasAnyGroups" />
+                                <CommandGroup heading="Search Results">
+                                    <CommandItem
+                                        v-for="cmd in entityResults"
+                                        :key="cmd.id"
+                                        :value="cmd.id"
+                                        class="cursor-pointer"
+                                        @select="handleSelect(cmd)">
+                                        <component :is="cmd.icon" v-if="cmd.icon" />
+                                        <span class="flex-1">{{ cmd.label }}</span>
+                                        <span class="sr-only" aria-hidden="true">{{
+                                            cmd.keywords.join(' ')
+                                        }}</span>
+                                        <span
+                                            v-if="cmd.badgeClass"
+                                            class="ml-2 rounded px-1.5 py-0.5 text-xs font-medium"
+                                            :class="cmd.badgeClass">
+                                            {{ cmd.entityType }}
+                                        </span>
+                                    </CommandItem>
+                                </CommandGroup>
+                            </template>
+                        </CommandList>
+                    </CommandRoot>
+                </DialogContent>
+            </div>
+        </DialogPortal>
+    </DialogRoot>
+</template>
diff --git a/resources/js/packages/ui/src/CommandPalette/CommandPaletteTypes.ts b/resources/js/packages/ui/src/CommandPalette/CommandPaletteTypes.ts
new file mode 100644
index 00000000..2bc1219f
--- /dev/null
+++ b/resources/js/packages/ui/src/CommandPalette/CommandPaletteTypes.ts
@@ -0,0 +1,23 @@
+// Use `object` instead of Vue's `Component` to avoid type incompatibility
+// between root and UI package Vue runtime-core copies in the monorepo.
+// Vue's `<component :is="...">` accepts any object at runtime.
+export interface CommandPaletteCommand {
+    id: string;
+    label: string;
+    icon?: object;
+    keywords: string[];
+    action: () => void | Promise<void>;
+    shortcut?: string;
+}
+
+export interface CommandPaletteGroup {
+    id: string;
+    heading: string;
+    commands: CommandPaletteCommand[];
+}
+
+export interface EntitySearchResult extends CommandPaletteCommand {
+    entityType: string;
+    color?: string;
+    badgeClass?: string;
+}
diff --git a/resources/js/packages/ui/src/CommandPalette/index.ts b/resources/js/packages/ui/src/CommandPalette/index.ts
new file mode 100644
index 00000000..6007c488
--- /dev/null
+++ b/resources/js/packages/ui/src/CommandPalette/index.ts
@@ -0,0 +1,6 @@
+export { default as CommandPalette } from './CommandPalette.vue';
+export type {
+    CommandPaletteCommand,
+    CommandPaletteGroup,
+    EntitySearchResult,
+} from './CommandPaletteTypes';
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue
index 5d0e38ec..fcb61edb 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue
@@ -170,7 +170,8 @@ function onSelectChange(checked: boolean) {
 
                     <TimeTrackerStartStop
                         :active="!!(timeEntry.start && !timeEntry.end)"
-                        class="opacity-20 flex group-hover:opacity-100 focus-visible:opacity-100"
+                        variant="secondary"
+                        class="opacity-60 flex group-hover:opacity-100 focus-visible:opacity-100"
                         @changed="onStartStopClick(timeEntry)"></TimeTrackerStartStop>
                     <TimeEntryMoreOptionsDropdown
                         :show-edit="false"
diff --git a/resources/js/packages/ui/src/command/Command.vue b/resources/js/packages/ui/src/command/Command.vue
new file mode 100644
index 00000000..47cffbe7
--- /dev/null
+++ b/resources/js/packages/ui/src/command/Command.vue
@@ -0,0 +1,107 @@
+<script setup lang="ts">
+import type { ListboxRootEmits, ListboxRootProps } from 'reka-ui';
+import type { HTMLAttributes } from 'vue';
+import { reactiveOmit } from '@vueuse/core';
+import { ListboxRoot, useFilter, useForwardPropsEmits } from 'reka-ui';
+import { reactive, ref, watch } from 'vue';
+import { cn } from '../utils/cn';
+import { provideCommandContext } from '.';
+
+const props = withDefaults(
+    defineProps<ListboxRootProps & { class?: HTMLAttributes['class']; searchTerm?: string }>(),
+    {
+        modelValue: '',
+        searchTerm: '',
+    }
+);
+
+const emits = defineEmits<ListboxRootEmits & { 'update:searchTerm': [value: string] }>();
+
+const delegatedProps = reactiveOmit(props, 'class', 'searchTerm');
+
+const forwarded = useForwardPropsEmits(delegatedProps, emits);
+
+const allItems = ref<Map<string, string>>(new Map());
+const allGroups = ref<Map<string, Set<string>>>(new Map());
+
+const { contains } = useFilter({ sensitivity: 'base' });
+const filterState = reactive({
+    search: props.searchTerm || '',
+    filtered: {
+        /** The count of all visible items. */
+        count: 0,
+        /** Map from visible item id to its search score. */
+        items: new Map() as Map<string, number>,
+        /** Set of groups with at least one visible item. */
+        groups: new Set() as Set<string>,
+    },
+});
+
+function filterItems() {
+    if (!filterState.search) {
+        filterState.filtered.count = allItems.value.size;
+        // Do nothing, each item will know to show itself because search is empty
+        return;
+    }
+
+    // Reset the groups
+    filterState.filtered.groups = new Set();
+    let itemCount = 0;
+
+    // Check which items should be included
+    for (const [id, value] of allItems.value) {
+        const score = contains(value, filterState.search);
+        filterState.filtered.items.set(id, score ? 1 : 0);
+        if (score) itemCount++;
+    }
+
+    // Check which groups have at least 1 item shown
+    for (const [groupId, group] of allGroups.value) {
+        for (const itemId of group) {
+            if (filterState.filtered.items.get(itemId)! > 0) {
+                filterState.filtered.groups.add(groupId);
+                break;
+            }
+        }
+    }
+
+    filterState.filtered.count = itemCount;
+}
+
+watch(
+    () => filterState.search,
+    (newSearch) => {
+        filterItems();
+        emits('update:searchTerm', newSearch);
+    }
+);
+
+// Sync external searchTerm prop changes to internal state
+watch(
+    () => props.searchTerm,
+    (newTerm) => {
+        if (newTerm !== filterState.search) {
+            filterState.search = newTerm || '';
+        }
+    }
+);
+
+provideCommandContext({
+    allItems,
+    allGroups,
+    filterState,
+});
+</script>
+
+<template>
+    <ListboxRoot
+        v-bind="forwarded"
+        :class="
+            cn(
+                'flex h-full w-full flex-col overflow-hidden rounded-md bg-popover text-popover-foreground',
+                props.class
+            )
+        ">
+        <slot />
+    </ListboxRoot>
+</template>
diff --git a/resources/js/packages/ui/src/command/CommandGroup.vue b/resources/js/packages/ui/src/command/CommandGroup.vue
new file mode 100644
index 00000000..fba28103
--- /dev/null
+++ b/resources/js/packages/ui/src/command/CommandGroup.vue
@@ -0,0 +1,51 @@
+<script setup lang="ts">
+import type { ListboxGroupProps } from 'reka-ui';
+import type { HTMLAttributes } from 'vue';
+import { reactiveOmit } from '@vueuse/core';
+import { ListboxGroup, ListboxGroupLabel, useId } from 'reka-ui';
+import { computed, onMounted, onUnmounted } from 'vue';
+import { cn } from '../utils/cn';
+import { provideCommandGroupContext, useCommand } from '.';
+
+const props = defineProps<
+    ListboxGroupProps & {
+        class?: HTMLAttributes['class'];
+        heading?: string;
+    }
+>();
+
+const delegatedProps = reactiveOmit(props, 'class');
+
+const { allGroups, filterState } = useCommand();
+const id = useId();
+
+const isRender = computed(() => (!filterState.search ? true : filterState.filtered.groups.has(id)));
+
+provideCommandGroupContext({ id });
+onMounted(() => {
+    if (!allGroups.value.has(id)) allGroups.value.set(id, new Set());
+});
+onUnmounted(() => {
+    allGroups.value.delete(id);
+});
+</script>
+
+<template>
+    <ListboxGroup
+        v-bind="delegatedProps"
+        :id="id"
+        :class="
+            cn(
+                'overflow-hidden p-1 text-foreground [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground',
+                props.class
+            )
+        "
+        :hidden="isRender ? undefined : true">
+        <ListboxGroupLabel
+            v-if="heading"
+            class="px-2 py-1.5 text-xs font-medium text-muted-foreground">
+            {{ heading }}
+        </ListboxGroupLabel>
+        <slot />
+    </ListboxGroup>
+</template>
diff --git a/resources/js/packages/ui/src/command/CommandInput.vue b/resources/js/packages/ui/src/command/CommandInput.vue
new file mode 100644
index 00000000..c20284eb
--- /dev/null
+++ b/resources/js/packages/ui/src/command/CommandInput.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import type { ListboxFilterProps } from 'reka-ui';
+import type { HTMLAttributes } from 'vue';
+import { reactiveOmit } from '@vueuse/core';
+import { Search } from 'lucide-vue-next';
+import { ListboxFilter, useForwardProps } from 'reka-ui';
+import { cn } from '../utils/cn';
+import { useCommand } from '.';
+
+defineOptions({
+    inheritAttrs: false,
+});
+
+const props = defineProps<
+    ListboxFilterProps & {
+        class?: HTMLAttributes['class'];
+    }
+>();
+
+const delegatedProps = reactiveOmit(props, 'class');
+
+const forwardedProps = useForwardProps(delegatedProps);
+
+const { filterState } = useCommand();
+</script>
+
+<template>
+    <div class="flex items-center border-b border-border-tertiary px-3" cmdk-input-wrapper>
+        <Search class="mr-1.5 h-4 w-4 shrink-0 opacity-50" />
+        <ListboxFilter
+            v-bind="{ ...forwardedProps, ...$attrs }"
+            v-model="filterState.search"
+            auto-focus
+            :class="
+                cn(
+                    'flex h-10 w-full rounded-md bg-transparent py-3 text-sm border-none outline-none ring-0 focus:border-none focus:outline-none focus:ring-0 placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50',
+                    props.class
+                )
+            " />
+    </div>
+</template>
diff --git a/resources/js/packages/ui/src/command/CommandItem.vue b/resources/js/packages/ui/src/command/CommandItem.vue
new file mode 100644
index 00000000..c8963695
--- /dev/null
+++ b/resources/js/packages/ui/src/command/CommandItem.vue
@@ -0,0 +1,78 @@
+<script setup lang="ts">
+import type { ListboxItemEmits, ListboxItemProps } from 'reka-ui';
+import type { HTMLAttributes } from 'vue';
+import { reactiveOmit, useCurrentElement } from '@vueuse/core';
+import { ListboxItem, useForwardPropsEmits, useId } from 'reka-ui';
+import { computed, onMounted, onUnmounted, ref } from 'vue';
+import { cn } from '../utils/cn';
+import { useCommand, useCommandGroup } from '.';
+
+const props = defineProps<ListboxItemProps & { class?: HTMLAttributes['class'] }>();
+const emits = defineEmits<ListboxItemEmits>();
+
+const delegatedProps = reactiveOmit(props, 'class');
+
+const forwarded = useForwardPropsEmits(delegatedProps, emits);
+
+const id = useId();
+const { filterState, allItems, allGroups } = useCommand();
+const groupContext = useCommandGroup();
+
+const isRender = computed(() => {
+    if (!filterState.search) {
+        return true;
+    } else {
+        const filteredCurrentItem = filterState.filtered.items.get(id);
+        // If the filtered items is undefined means not in the all times map yet
+        // Do the first render to add into the map
+        if (filteredCurrentItem === undefined) {
+            return true;
+        }
+
+        // Check with filter
+        return filteredCurrentItem > 0;
+    }
+});
+
+const itemRef = ref();
+const currentElement = useCurrentElement(itemRef);
+onMounted(() => {
+    if (!(currentElement.value instanceof HTMLElement)) return;
+
+    // textValue to perform filter
+    allItems.value.set(id, currentElement.value.textContent ?? props?.value!.toString());
+
+    const groupId = groupContext?.id;
+    if (groupId) {
+        if (!allGroups.value.has(groupId)) {
+            allGroups.value.set(groupId, new Set([id]));
+        } else {
+            allGroups.value.get(groupId)?.add(id);
+        }
+    }
+});
+onUnmounted(() => {
+    allItems.value.delete(id);
+});
+</script>
+
+<template>
+    <ListboxItem
+        v-if="isRender"
+        v-bind="forwarded"
+        :id="id"
+        ref="itemRef"
+        :class="
+            cn(
+                'relative flex cursor-default gap-1.5 select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground [&_svg]:text-icon-default data-[highlighted]:[&_svg]:text-icon-active data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:size-4 [&_svg]:shrink-0',
+                props.class
+            )
+        "
+        @select="
+            () => {
+                filterState.search = '';
+            }
+        ">
+        <slot />
+    </ListboxItem>
+</template>
diff --git a/resources/js/packages/ui/src/command/CommandList.vue b/resources/js/packages/ui/src/command/CommandList.vue
new file mode 100644
index 00000000..083f357a
--- /dev/null
+++ b/resources/js/packages/ui/src/command/CommandList.vue
@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import type { ListboxContentProps } from 'reka-ui';
+import type { HTMLAttributes } from 'vue';
+import { reactiveOmit } from '@vueuse/core';
+import { ListboxContent, useForwardProps } from 'reka-ui';
+import { cn } from '../utils/cn';
+
+const props = defineProps<ListboxContentProps & { class?: HTMLAttributes['class'] }>();
+
+const delegatedProps = reactiveOmit(props, 'class');
+
+const forwarded = useForwardProps(delegatedProps);
+</script>
+
+<template>
+    <ListboxContent
+        v-bind="forwarded"
+        :class="cn('max-h-[300px] overflow-y-auto overflow-x-hidden', props.class)">
+        <div role="presentation">
+            <slot />
+        </div>
+    </ListboxContent>
+</template>
diff --git a/resources/js/packages/ui/src/command/CommandSeparator.vue b/resources/js/packages/ui/src/command/CommandSeparator.vue
new file mode 100644
index 00000000..5c81bcaf
--- /dev/null
+++ b/resources/js/packages/ui/src/command/CommandSeparator.vue
@@ -0,0 +1,17 @@
+<script setup lang="ts">
+import type { SeparatorProps } from 'reka-ui';
+import type { HTMLAttributes } from 'vue';
+import { reactiveOmit } from '@vueuse/core';
+import { Separator } from 'reka-ui';
+import { cn } from '../utils/cn';
+
+const props = defineProps<SeparatorProps & { class?: HTMLAttributes['class'] }>();
+
+const delegatedProps = reactiveOmit(props, 'class');
+</script>
+
+<template>
+    <Separator v-bind="delegatedProps" :class="cn('-mx-1 h-px bg-border', props.class)">
+        <slot />
+    </Separator>
+</template>
diff --git a/resources/js/packages/ui/src/command/CommandShortcut.vue b/resources/js/packages/ui/src/command/CommandShortcut.vue
new file mode 100644
index 00000000..bfe14a12
--- /dev/null
+++ b/resources/js/packages/ui/src/command/CommandShortcut.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import type { HTMLAttributes } from 'vue';
+import { cn } from '../utils/cn';
+
+const props = defineProps<{
+    class?: HTMLAttributes['class'];
+}>();
+</script>
+
+<template>
+    <span :class="cn('ml-auto text-xs tracking-widest text-muted-foreground', props.class)">
+        <slot />
+    </span>
+</template>
diff --git a/resources/js/packages/ui/src/command/index.ts b/resources/js/packages/ui/src/command/index.ts
new file mode 100644
index 00000000..3a932d62
--- /dev/null
+++ b/resources/js/packages/ui/src/command/index.ts
@@ -0,0 +1,27 @@
+import type { Ref } from 'vue';
+import { createContext } from 'reka-ui';
+
+export { default as Command } from './Command.vue';
+export { default as CommandGroup } from './CommandGroup.vue';
+export { default as CommandInput } from './CommandInput.vue';
+export { default as CommandItem } from './CommandItem.vue';
+export { default as CommandList } from './CommandList.vue';
+export { default as CommandSeparator } from './CommandSeparator.vue';
+export { default as CommandShortcut } from './CommandShortcut.vue';
+
+export const [useCommand, provideCommandContext] = createContext<{
+    allItems: Ref<Map<string, string>>;
+    allGroups: Ref<Map<string, Set<string>>>;
+    filterState: {
+        search: string;
+        filtered: {
+            count: number;
+            items: Map<string, number>;
+            groups: Set<string>;
+        };
+    };
+}>('Command');
+
+export const [useCommandGroup, provideCommandGroupContext] = createContext<{
+    id?: string;
+}>('CommandGroup');
diff --git a/resources/js/packages/ui/src/index.ts b/resources/js/packages/ui/src/index.ts
index 2b623271..d2ae9253 100644
--- a/resources/js/packages/ui/src/index.ts
+++ b/resources/js/packages/ui/src/index.ts
@@ -43,7 +43,13 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './tool
 import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from './accordion/index';
 import { Popover, PopoverContent, PopoverTrigger, PopoverAnchor } from './popover/index';
 import { RangeCalendar } from './range-calendar/index';
+import { CommandPalette } from './CommandPalette/index';
 export type { ActivityPeriod } from './FullCalendar/idleStatusPlugin';
+export type {
+    CommandPaletteCommand,
+    CommandPaletteGroup,
+    EntitySearchResult,
+} from './CommandPalette/index';
 
 export {
     money,
@@ -89,4 +95,5 @@ export {
     PopoverTrigger,
     PopoverAnchor,
     RangeCalendar,
+    CommandPalette,
 };
diff --git a/resources/js/packages/ui/styles.css b/resources/js/packages/ui/styles.css
index 08466ae0..1314327c 100644
--- a/resources/js/packages/ui/styles.css
+++ b/resources/js/packages/ui/styles.css
@@ -187,7 +187,7 @@ body {
         --foreground: var(--color-text-primary);
         --card: var(--theme-color-card-background);
         --card-foreground: var(--color-text-primary);
-        --popover: var(--color-bg-tertiary);
+        --popover: var(--color-bg-secondary);
         --popover-foreground: var(--color-text-primary);
         --primary: var(--color-bg-primary);
         --primary-foreground: var(--color-text-primary);
diff --git a/resources/js/utils/commandPaletteCommands.ts b/resources/js/utils/commandPaletteCommands.ts
new file mode 100644
index 00000000..cedfa5a5
--- /dev/null
+++ b/resources/js/utils/commandPaletteCommands.ts
@@ -0,0 +1,486 @@
+import type { Component } from 'vue';
+import {
+    HomeIcon,
+    ClockIcon,
+    CalendarIcon,
+    ChartBarIcon,
+    FolderIcon,
+    UserCircleIcon,
+    UserGroupIcon,
+    TagIcon,
+    DocumentTextIcon,
+    CreditCardIcon,
+    ArrowsRightLeftIcon,
+    Cog6ToothIcon,
+    UserIcon,
+    PlayIcon,
+    StopIcon,
+    PlusIcon,
+    ArrowPathIcon,
+    SunIcon,
+    MoonIcon,
+    ComputerDesktopIcon,
+    CurrencyDollarIcon,
+    ClipboardDocumentListIcon,
+    BuildingOfficeIcon,
+} from '@heroicons/vue/20/solid';
+import type { Organization } from '@/types/models';
+
+export type CommandGroup =
+    | 'timer'
+    | 'active-timer'
+    | 'navigation'
+    | 'create'
+    | 'theme'
+    | 'organization'
+    | 'entity';
+
+export interface Command {
+    id: string;
+    label: string;
+    icon?: Component;
+    keywords: string[];
+    group: CommandGroup;
+    action: () => void | Promise<void>;
+    shortcut?: string;
+    permission?: () => boolean;
+    condition?: () => boolean;
+    priority: number;
+}
+
+export const GROUP_PRIORITIES: Record<CommandGroup, number> = {
+    timer: 1000,
+    'active-timer': 900,
+    navigation: 500,
+    create: 400,
+    organization: 300,
+    theme: 200,
+    entity: 100,
+};
+
+export function createNavigationCommands(
+    navigate: (route: string, params?: Record<string, string>) => void,
+    permissions: {
+        canViewProjects: () => boolean;
+        canViewClients: () => boolean;
+        canViewMembers: () => boolean;
+        canViewTags: () => boolean;
+        canViewReport: () => boolean;
+        canViewInvoices: () => boolean;
+        canManageBilling: () => boolean;
+        canUpdateOrganization: () => boolean;
+    },
+    features: {
+        isInvoicingActivated: () => boolean;
+        isBillingActivated: () => boolean;
+    },
+    currentTeamId: () => string
+): Command[] {
+    return [
+        {
+            id: 'nav-dashboard',
+            label: 'Go to Dashboard',
+            icon: HomeIcon,
+            keywords: ['home', 'overview', 'dashboard'],
+            group: 'navigation',
+            action: () => navigate('dashboard'),
+            priority: GROUP_PRIORITIES.navigation + 10,
+        },
+        {
+            id: 'nav-time',
+            label: 'Go to Time',
+            icon: ClockIcon,
+            keywords: ['time', 'tracking', 'entries', 'timesheet'],
+            group: 'navigation',
+            action: () => navigate('time'),
+            priority: GROUP_PRIORITIES.navigation + 9,
+        },
+        {
+            id: 'nav-calendar',
+            label: 'Go to Calendar',
+            icon: CalendarIcon,
+            keywords: ['calendar', 'week', 'schedule'],
+            group: 'navigation',
+            action: () => navigate('calendar'),
+            priority: GROUP_PRIORITIES.navigation + 8,
+        },
+        {
+            id: 'nav-reporting',
+            label: 'Go to Reporting Overview',
+            icon: ChartBarIcon,
+            keywords: ['reports', 'analytics', 'overview', 'statistics'],
+            group: 'navigation',
+            action: () => navigate('reporting'),
+            priority: GROUP_PRIORITIES.navigation + 7,
+        },
+        {
+            id: 'nav-reporting-detailed',
+            label: 'Go to Reporting Detailed',
+            icon: ChartBarIcon,
+            keywords: ['detailed', 'reports', 'breakdown'],
+            group: 'navigation',
+            action: () => navigate('reporting.detailed'),
+            priority: GROUP_PRIORITIES.navigation + 6,
+        },
+        {
+            id: 'nav-reporting-shared',
+            label: 'Go to Shared Reports',
+            icon: ChartBarIcon,
+            keywords: ['shared', 'public', 'reports'],
+            group: 'navigation',
+            action: () => navigate('reporting.shared'),
+            permission: permissions.canViewReport,
+            priority: GROUP_PRIORITIES.navigation + 5,
+        },
+        {
+            id: 'nav-projects',
+            label: 'Go to Projects',
+            icon: FolderIcon,
+            keywords: ['projects', 'work'],
+            group: 'navigation',
+            action: () => navigate('projects'),
+            permission: permissions.canViewProjects,
+            priority: GROUP_PRIORITIES.navigation + 4,
+        },
+        {
+            id: 'nav-clients',
+            label: 'Go to Clients',
+            icon: UserCircleIcon,
+            keywords: ['clients', 'customers'],
+            group: 'navigation',
+            action: () => navigate('clients'),
+            permission: permissions.canViewClients,
+            priority: GROUP_PRIORITIES.navigation + 3,
+        },
+        {
+            id: 'nav-members',
+            label: 'Go to Members',
+            icon: UserGroupIcon,
+            keywords: ['members', 'team', 'users', 'employees'],
+            group: 'navigation',
+            action: () => navigate('members'),
+            permission: permissions.canViewMembers,
+            priority: GROUP_PRIORITIES.navigation + 2,
+        },
+        {
+            id: 'nav-tags',
+            label: 'Go to Tags',
+            icon: TagIcon,
+            keywords: ['tags', 'labels', 'categories'],
+            group: 'navigation',
+            action: () => navigate('tags'),
+            permission: permissions.canViewTags,
+            priority: GROUP_PRIORITIES.navigation + 1,
+        },
+        {
+            id: 'nav-invoices',
+            label: 'Go to Invoices',
+            icon: DocumentTextIcon,
+            keywords: ['invoices', 'billing', 'payments'],
+            group: 'navigation',
+            action: () => navigate('/invoices', {}),
+            permission: permissions.canViewInvoices,
+            condition: features.isInvoicingActivated,
+            priority: GROUP_PRIORITIES.navigation,
+        },
+        {
+            id: 'nav-billing',
+            label: 'Go to Billing',
+            icon: CreditCardIcon,
+            keywords: ['billing', 'subscription', 'plan'],
+            group: 'navigation',
+            action: () => navigate('/billing', {}),
+            permission: permissions.canManageBilling,
+            condition: features.isBillingActivated,
+            priority: GROUP_PRIORITIES.navigation - 1,
+        },
+        {
+            id: 'nav-import',
+            label: 'Go to Import / Export',
+            icon: ArrowsRightLeftIcon,
+            keywords: ['import', 'export', 'data', 'backup'],
+            group: 'navigation',
+            action: () => navigate('import'),
+            permission: permissions.canUpdateOrganization,
+            priority: GROUP_PRIORITIES.navigation - 2,
+        },
+        {
+            id: 'nav-settings',
+            label: 'Go to Settings',
+            icon: Cog6ToothIcon,
+            keywords: ['settings', 'organization', 'configuration'],
+            group: 'navigation',
+            action: () => navigate('teams.show', { team: currentTeamId() }),
+            permission: permissions.canUpdateOrganization,
+            priority: GROUP_PRIORITIES.navigation - 3,
+        },
+        {
+            id: 'nav-profile',
+            label: 'Go to Profile',
+            icon: UserIcon,
+            keywords: ['profile', 'account', 'user', 'personal'],
+            group: 'navigation',
+            action: () => navigate('profile.show'),
+            priority: GROUP_PRIORITIES.navigation - 4,
+        },
+    ];
+}
+
+export function createTimerCommands(
+    timerActions: {
+        startTimer: () => Promise<void>;
+        stopTimer: () => Promise<void>;
+        openCreateTimeEntryModal: () => void;
+        continueLastEntry: () => Promise<void>;
+    },
+    conditions: {
+        isActive: () => boolean;
+        hasTimeEntries: () => boolean;
+    }
+): Command[] {
+    return [
+        {
+            id: 'timer-start',
+            label: 'Start Timer',
+            icon: PlayIcon,
+            keywords: ['start', 'begin', 'track', 'timer'],
+            group: 'timer',
+            action: timerActions.startTimer,
+            condition: () => !conditions.isActive(),
+            priority: GROUP_PRIORITIES.timer + 10,
+        },
+        {
+            id: 'timer-stop',
+            label: 'Stop Timer',
+            icon: StopIcon,
+            keywords: ['stop', 'end', 'finish', 'timer'],
+            group: 'timer',
+            action: timerActions.stopTimer,
+            condition: conditions.isActive,
+            priority: GROUP_PRIORITIES.timer + 10,
+        },
+        {
+            id: 'timer-create',
+            label: 'Create Time Entry',
+            icon: PlusIcon,
+            keywords: ['create', 'manual', 'log', 'time', 'entry', 'new'],
+            group: 'timer',
+            action: timerActions.openCreateTimeEntryModal,
+            priority: GROUP_PRIORITIES.timer + 5,
+        },
+        {
+            id: 'timer-continue',
+            label: 'Continue Last Time Entry',
+            icon: ArrowPathIcon,
+            keywords: ['continue', 'repeat', 'restart', 'last', 'previous'],
+            group: 'timer',
+            action: timerActions.continueLastEntry,
+            condition: () => !conditions.isActive() && conditions.hasTimeEntries(),
+            priority: GROUP_PRIORITIES.timer + 4,
+        },
+    ];
+}
+
+export function createActiveTimerCommands(
+    activeTimerActions: {
+        openProjectSelector: () => void;
+        openTaskSelector: () => void;
+        openTagsSelector: () => void;
+        toggleBillable: () => void;
+        addMinutes: (minutes: number) => void;
+    },
+    conditions: {
+        isActive: () => boolean;
+    }
+): Command[] {
+    const minuteOptions = [5, 10, 15, 20, 25, 30, 45, 60];
+
+    const addMinutesCommands: Command[] = minuteOptions.map((minutes) => ({
+        id: `timer-add-${minutes}`,
+        label: `Add ${minutes} minutes to timer`,
+        icon: ClockIcon,
+        keywords: [`+${minutes}`, `add ${minutes}`, minutes === 60 ? 'add hour' : ''],
+        group: 'active-timer' as CommandGroup,
+        action: () => activeTimerActions.addMinutes(minutes),
+        condition: conditions.isActive,
+        priority: GROUP_PRIORITIES['active-timer'] - minutes,
+    }));
+
+    return [
+        {
+            id: 'timer-set-project',
+            label: 'Set Project',
+            icon: FolderIcon,
+            keywords: ['project', 'change project', 'select project'],
+            group: 'active-timer',
+            action: activeTimerActions.openProjectSelector,
+            condition: conditions.isActive,
+            priority: GROUP_PRIORITIES['active-timer'] + 10,
+        },
+        {
+            id: 'timer-set-task',
+            label: 'Set Task',
+            icon: ClipboardDocumentListIcon,
+            keywords: ['task', 'change task', 'select task'],
+            group: 'active-timer',
+            action: activeTimerActions.openTaskSelector,
+            condition: conditions.isActive,
+            priority: GROUP_PRIORITIES['active-timer'] + 9,
+        },
+        {
+            id: 'timer-set-tags',
+            label: 'Set Tags',
+            icon: TagIcon,
+            keywords: ['tags', 'add tags', 'labels'],
+            group: 'active-timer',
+            action: activeTimerActions.openTagsSelector,
+            condition: conditions.isActive,
+            priority: GROUP_PRIORITIES['active-timer'] + 8,
+        },
+        {
+            id: 'timer-toggle-billable',
+            label: 'Toggle Billable',
+            icon: CurrencyDollarIcon,
+            keywords: ['billable', 'non-billable', 'money'],
+            group: 'active-timer',
+            action: activeTimerActions.toggleBillable,
+            condition: conditions.isActive,
+            priority: GROUP_PRIORITIES['active-timer'] + 7,
+        },
+        ...addMinutesCommands,
+    ];
+}
+
+export function createThemeCommands(
+    setTheme: (theme: 'light' | 'dark' | 'system') => void
+): Command[] {
+    return [
+        {
+            id: 'theme-light',
+            label: 'Switch to Light Theme',
+            icon: SunIcon,
+            keywords: ['light', 'bright', 'day', 'theme'],
+            group: 'theme',
+            action: () => setTheme('light'),
+            priority: GROUP_PRIORITIES.theme + 3,
+        },
+        {
+            id: 'theme-dark',
+            label: 'Switch to Dark Theme',
+            icon: MoonIcon,
+            keywords: ['dark', 'night', 'theme'],
+            group: 'theme',
+            action: () => setTheme('dark'),
+            priority: GROUP_PRIORITIES.theme + 2,
+        },
+        {
+            id: 'theme-system',
+            label: 'Switch to System Theme',
+            icon: ComputerDesktopIcon,
+            keywords: ['system', 'auto', 'default', 'theme'],
+            group: 'theme',
+            action: () => setTheme('system'),
+            priority: GROUP_PRIORITIES.theme + 1,
+        },
+    ];
+}
+
+export function createCreateCommands(
+    createActions: {
+        openProjectModal: () => void;
+        openClientModal: () => void;
+        openTaskModal: () => void;
+        openTagModal: () => void;
+        openInviteModal: () => void;
+    },
+    permissions: {
+        canCreateProjects: () => boolean;
+        canCreateClients: () => boolean;
+        canCreateTasks: () => boolean;
+        canCreateTags: () => boolean;
+        canCreateInvitations: () => boolean;
+    }
+): Command[] {
+    return [
+        {
+            id: 'create-project',
+            label: 'Create Project',
+            icon: FolderIcon,
+            keywords: ['new project', 'add project', 'create'],
+            group: 'create',
+            action: createActions.openProjectModal,
+            permission: permissions.canCreateProjects,
+            priority: GROUP_PRIORITIES.create + 5,
+        },
+        {
+            id: 'create-client',
+            label: 'Create Client',
+            icon: UserCircleIcon,
+            keywords: ['new client', 'add client', 'create'],
+            group: 'create',
+            action: createActions.openClientModal,
+            permission: permissions.canCreateClients,
+            priority: GROUP_PRIORITIES.create + 4,
+        },
+        {
+            id: 'create-task',
+            label: 'Create Task',
+            icon: ClipboardDocumentListIcon,
+            keywords: ['new task', 'add task', 'create'],
+            group: 'create',
+            action: createActions.openTaskModal,
+            permission: permissions.canCreateTasks,
+            priority: GROUP_PRIORITIES.create + 3,
+        },
+        {
+            id: 'create-tag',
+            label: 'Create Tag',
+            icon: TagIcon,
+            keywords: ['new tag', 'add tag', 'create'],
+            group: 'create',
+            action: createActions.openTagModal,
+            permission: permissions.canCreateTags,
+            priority: GROUP_PRIORITIES.create + 2,
+        },
+        {
+            id: 'create-invite',
+            label: 'Invite Member',
+            icon: UserGroupIcon,
+            keywords: ['invite', 'add member', 'team'],
+            group: 'create',
+            action: createActions.openInviteModal,
+            permission: permissions.canCreateInvitations,
+            priority: GROUP_PRIORITIES.create + 1,
+        },
+    ];
+}
+
+export function createOrganizationCommands(
+    organizations: Organization[],
+    currentOrgId: string,
+    switchOrganization: (orgId: string) => void
+): Command[] {
+    if (organizations.length <= 1) return [];
+
+    return organizations
+        .filter((org) => org.id !== currentOrgId)
+        .map((org) => ({
+            id: `org-switch-${org.id}`,
+            label: `Switch to ${org.name}`,
+            icon: BuildingOfficeIcon,
+            keywords: ['switch', 'organization', 'workspace', org.name.toLowerCase()],
+            group: 'organization' as CommandGroup,
+            action: () => switchOrganization(org.id),
+            priority: GROUP_PRIORITIES.organization + 1,
+        }));
+}
+
+export function scoreEntity(name: string, query: string, baseScore: number): number {
+    const normalizedName = name.toLowerCase();
+    const normalizedQuery = query.toLowerCase().trim();
+
+    if (normalizedName === normalizedQuery) return baseScore + 50;
+    if (normalizedName.startsWith(normalizedQuery)) return baseScore + 30;
+    if (normalizedName.includes(normalizedQuery)) return baseScore + 10;
+    return baseScore;
+}
diff --git a/resources/js/utils/useCommandPalette.ts b/resources/js/utils/useCommandPalette.ts
new file mode 100644
index 00000000..5f496afb
--- /dev/null
+++ b/resources/js/utils/useCommandPalette.ts
@@ -0,0 +1,552 @@
+import { ref, computed } from 'vue';
+import { router } from '@inertiajs/vue3';
+import { storeToRefs } from 'pinia';
+import { getDayJsInstance } from '@/packages/ui/src/utils/time';
+import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
+import { themeSetting, type themeOption } from '@/utils/theme';
+import {
+    canViewProjects,
+    canViewClients,
+    canViewMembers,
+    canViewTags,
+    canViewReport,
+    canViewInvoices,
+    canManageBilling,
+    canUpdateOrganization,
+    canCreateProjects,
+    canCreateClients,
+    canCreateTasks,
+    canCreateTags,
+    canCreateInvitations,
+} from '@/utils/permissions';
+import { isBillingActivated, isInvoicingActivated } from '@/utils/billing';
+import { useTimeEntriesInfiniteQuery } from '@/utils/useTimeEntriesInfiniteQuery';
+import { useProjectsQuery } from '@/utils/useProjectsQuery';
+import { useClientsQuery } from '@/utils/useClientsQuery';
+import { useTasksQuery } from '@/utils/useTasksQuery';
+import { useTagsQuery } from '@/utils/useTagsQuery';
+import { useMembersQuery } from '@/utils/useMembersQuery';
+import {
+    createNavigationCommands,
+    createTimerCommands,
+    createActiveTimerCommands,
+    createThemeCommands,
+    createCreateCommands,
+    createOrganizationCommands,
+    scoreEntity,
+    GROUP_PRIORITIES,
+    type Command,
+    type CommandGroup as CommandGroupType,
+} from '@/utils/commandPaletteCommands';
+import { usePage } from '@inertiajs/vue3';
+import type { Organization, User } from '@/types/models';
+import { switchOrganization } from '@/utils/useOrganization';
+import type {
+    CommandPaletteGroup,
+    EntitySearchResult,
+} from '@/packages/ui/src/CommandPalette/CommandPaletteTypes';
+import type { Project, Client, Task, Tag, Member } from '@/packages/api/src';
+import {
+    FolderIcon,
+    UserCircleIcon,
+    TagIcon,
+    UserGroupIcon,
+    ClipboardDocumentListIcon,
+} from '@heroicons/vue/20/solid';
+
+// Global state (singleton pattern - shared across all useCommandPalette() calls)
+const isOpen = ref(false);
+const searchTerm = ref('');
+
+// Modal states for create actions
+const showCreateProjectModal = ref(false);
+const showCreateClientModal = ref(false);
+const showCreateTaskModal = ref(false);
+const showCreateTagModal = ref(false);
+const showInviteMemberModal = ref(false);
+const showCreateTimeEntryModal = ref(false);
+
+// Active timer selector states
+const showProjectSelector = ref(false);
+const showTaskSelector = ref(false);
+const showTagsSelector = ref(false);
+
+// Group display order and headings
+const GROUP_CONFIG: { id: CommandGroupType; heading: string }[] = [
+    { id: 'timer', heading: 'Timer' },
+    { id: 'active-timer', heading: 'Active Timer' },
+    { id: 'navigation', heading: 'Navigation' },
+    { id: 'create', heading: 'Create' },
+    { id: 'organization', heading: 'Organization' },
+    { id: 'theme', heading: 'Theme' },
+];
+
+// Entity badge classes
+const ENTITY_BADGE_CLASSES: Record<string, string> = {
+    project: 'bg-violet-500/20 text-violet-500',
+    client: 'bg-blue-500/20 text-blue-500',
+    task: 'bg-gray-500/20 text-gray-400',
+    tag: 'bg-amber-500/20 text-amber-500',
+    member: 'bg-green-500/20 text-green-500',
+};
+
+// Entity icons
+const ENTITY_ICONS: Record<string, typeof FolderIcon> = {
+    project: FolderIcon,
+    client: UserCircleIcon,
+    task: ClipboardDocumentListIcon,
+    tag: TagIcon,
+    member: UserGroupIcon,
+};
+
+export function useCommandPalette() {
+    const currentTimeEntryStore = useCurrentTimeEntryStore();
+    const { currentTimeEntry, isActive } = storeToRefs(currentTimeEntryStore);
+    const { setActiveState, updateTimer } = currentTimeEntryStore;
+
+    // Data queries (consolidated here - single source of truth)
+    const timeEntriesQuery = useTimeEntriesInfiniteQuery();
+    const { projects } = useProjectsQuery();
+    const { clients } = useClientsQuery();
+    const { tasks } = useTasksQuery();
+    const { tags } = useTagsQuery();
+    const { members } = useMembersQuery();
+
+    const page = usePage<{
+        auth: {
+            user: User & {
+                all_teams: Organization[];
+                current_team_id: string;
+            };
+        };
+    }>();
+
+    const getCurrentTeamId = () => page.props.auth.user.current_team?.id ?? '';
+    const allOrganizations = computed(() => page.props.auth.user.all_teams || []);
+    const currentOrgId = computed(() => page.props.auth.user.current_team_id || '');
+
+    const lastTimeEntry = computed(() => {
+        const pages = timeEntriesQuery.data.value?.pages;
+        if (!pages || pages.length === 0) return null;
+        const firstPage = pages[0];
+        if (!firstPage?.data || firstPage.data.length === 0) return null;
+        return firstPage.data[0];
+    });
+
+    const hasTimeEntries = computed(() => lastTimeEntry.value !== null);
+
+    // Helper to close palette
+    function closePaletteAfterAction() {
+        isOpen.value = false;
+    }
+
+    // Navigation helper
+    function navigate(routeName: string, params?: Record<string, string>) {
+        closePaletteAfterAction();
+        if (routeName.startsWith('/')) {
+            router.visit(routeName);
+        } else {
+            router.visit(route(routeName, params));
+        }
+    }
+
+    // Theme helper
+    function setTheme(theme: themeOption) {
+        themeSetting.value = theme;
+        closePaletteAfterAction();
+    }
+
+    // Timer actions
+    async function startTimer() {
+        closePaletteAfterAction();
+        await setActiveState(true);
+    }
+
+    async function stopTimer() {
+        closePaletteAfterAction();
+        await setActiveState(false);
+    }
+
+    function openCreateTimeEntryModal() {
+        closePaletteAfterAction();
+        showCreateTimeEntryModal.value = true;
+    }
+
+    async function continueLastEntry() {
+        if (!lastTimeEntry.value) return;
+        closePaletteAfterAction();
+
+        currentTimeEntry.value.description = lastTimeEntry.value.description;
+        currentTimeEntry.value.project_id = lastTimeEntry.value.project_id;
+        currentTimeEntry.value.task_id = lastTimeEntry.value.task_id;
+        currentTimeEntry.value.tags = lastTimeEntry.value.tags;
+        currentTimeEntry.value.billable = lastTimeEntry.value.billable;
+        currentTimeEntry.value.start = getDayJsInstance()().utc().format();
+        await setActiveState(true);
+    }
+
+    // Active timer actions
+    function openProjectSelector() {
+        closePaletteAfterAction();
+        showProjectSelector.value = true;
+    }
+
+    function openTaskSelector() {
+        closePaletteAfterAction();
+        showTaskSelector.value = true;
+    }
+
+    function openTagsSelector() {
+        closePaletteAfterAction();
+        showTagsSelector.value = true;
+    }
+
+    async function toggleBillable() {
+        closePaletteAfterAction();
+        currentTimeEntry.value.billable = !currentTimeEntry.value.billable;
+        await updateTimer();
+    }
+
+    async function addMinutes(minutes: number) {
+        closePaletteAfterAction();
+        currentTimeEntry.value.start = getDayJsInstance()(currentTimeEntry.value.start)
+            .subtract(minutes, 'minutes')
+            .utc()
+            .format();
+        await updateTimer();
+    }
+
+    // Create actions
+    function openCreateProjectModal() {
+        closePaletteAfterAction();
+        showCreateProjectModal.value = true;
+    }
+
+    function openCreateClientModal() {
+        closePaletteAfterAction();
+        showCreateClientModal.value = true;
+    }
+
+    function openCreateTaskModal() {
+        closePaletteAfterAction();
+        showCreateTaskModal.value = true;
+    }
+
+    function openCreateTagModal() {
+        closePaletteAfterAction();
+        showCreateTagModal.value = true;
+    }
+
+    function openInviteMemberModal() {
+        closePaletteAfterAction();
+        showInviteMemberModal.value = true;
+    }
+
+    // Organization switch action
+    function handleSwitchOrganization(orgId: string) {
+        closePaletteAfterAction();
+        switchOrganization(orgId);
+    }
+
+    // Build all internal commands
+    const navigationCommands = computed(() =>
+        createNavigationCommands(
+            navigate,
+            {
+                canViewProjects,
+                canViewClients,
+                canViewMembers,
+                canViewTags,
+                canViewReport,
+                canViewInvoices,
+                canManageBilling,
+                canUpdateOrganization,
+            },
+            {
+                isInvoicingActivated,
+                isBillingActivated,
+            },
+            getCurrentTeamId
+        )
+    );
+
+    const timerCommands = computed(() =>
+        createTimerCommands(
+            {
+                startTimer,
+                stopTimer,
+                openCreateTimeEntryModal,
+                continueLastEntry,
+            },
+            {
+                isActive: () => isActive.value,
+                hasTimeEntries: () => hasTimeEntries.value,
+            }
+        )
+    );
+
+    const activeTimerCommands = computed(() =>
+        createActiveTimerCommands(
+            {
+                openProjectSelector,
+                openTaskSelector,
+                openTagsSelector,
+                toggleBillable,
+                addMinutes,
+            },
+            {
+                isActive: () => isActive.value,
+            }
+        )
+    );
+
+    const themeCommands = computed(() => createThemeCommands(setTheme));
+
+    const createCommands = computed(() =>
+        createCreateCommands(
+            {
+                openProjectModal: openCreateProjectModal,
+                openClientModal: openCreateClientModal,
+                openTaskModal: openCreateTaskModal,
+                openTagModal: openCreateTagModal,
+                openInviteModal: openInviteMemberModal,
+            },
+            {
+                canCreateProjects,
+                canCreateClients,
+                canCreateTasks,
+                canCreateTags,
+                canCreateInvitations,
+            }
+        )
+    );
+
+    const organizationCommands = computed(() =>
+        createOrganizationCommands(
+            allOrganizations.value,
+            currentOrgId.value,
+            handleSwitchOrganization
+        )
+    );
+
+    // Internal commands grouped by type
+    const commandsByGroup = computed<Record<string, Command[]>>(() => {
+        const allCommands: Command[] = [
+            ...timerCommands.value,
+            ...activeTimerCommands.value,
+            ...navigationCommands.value,
+            ...createCommands.value,
+            ...organizationCommands.value,
+            ...themeCommands.value,
+        ];
+
+        const grouped: Record<string, Command[]> = {};
+        for (const config of GROUP_CONFIG) {
+            grouped[config.id] = [];
+        }
+
+        for (const cmd of allCommands) {
+            if (cmd.permission && !cmd.permission()) continue;
+            if (cmd.condition && !cmd.condition()) continue;
+
+            if (grouped[cmd.group]) {
+                grouped[cmd.group].push(cmd);
+            }
+        }
+
+        return grouped;
+    });
+
+    // Map internal commands to UI-friendly CommandPaletteGroup[]
+    const groups = computed<CommandPaletteGroup[]>(() =>
+        GROUP_CONFIG.map((config) => ({
+            id: config.id,
+            heading: config.heading,
+            commands: (commandsByGroup.value[config.id] ?? []).map((cmd) => ({
+                id: cmd.id,
+                label: cmd.label,
+                icon: cmd.icon,
+                keywords: cmd.keywords,
+                action: cmd.action,
+                shortcut: cmd.shortcut,
+            })),
+        }))
+    );
+
+    // Entity search results (moved from old CommandPalette.vue)
+    const entityResults = computed<EntitySearchResult[]>(() => {
+        const query = searchTerm.value.toLowerCase().trim();
+        if (!query || query.length < 2) return [];
+
+        const results: EntitySearchResult[] = [];
+        const maxPerType = 5;
+
+        if (canViewProjects()) {
+            const matching = projects.value
+                .filter((p: Project) => p.name.toLowerCase().includes(query))
+                .slice(0, maxPerType)
+                .map(
+                    (p: Project): EntitySearchResult => ({
+                        id: `entity-project-${p.id}`,
+                        label: p.name,
+                        icon: ENTITY_ICONS.project,
+                        keywords: ['project'],
+                        action: () => {
+                            closePaletteAfterAction();
+                            router.visit(route('projects.show', { project: p.id }));
+                        },
+                        entityType: 'project',
+                        color: p.color,
+                        badgeClass: ENTITY_BADGE_CLASSES.project,
+                    })
+                );
+            results.push(...matching);
+        }
+
+        if (canViewClients()) {
+            const matching = clients.value
+                .filter((c: Client) => c.name.toLowerCase().includes(query))
+                .slice(0, maxPerType)
+                .map(
+                    (c: Client): EntitySearchResult => ({
+                        id: `entity-client-${c.id}`,
+                        label: c.name,
+                        icon: ENTITY_ICONS.client,
+                        keywords: ['client'],
+                        action: () => {
+                            closePaletteAfterAction();
+                            router.visit(route('clients'));
+                        },
+                        entityType: 'client',
+                        badgeClass: ENTITY_BADGE_CLASSES.client,
+                    })
+                );
+            results.push(...matching);
+        }
+
+        if (canViewProjects()) {
+            const matching = tasks.value
+                .filter((t: Task) => t.name.toLowerCase().includes(query))
+                .slice(0, maxPerType)
+                .map(
+                    (t: Task): EntitySearchResult => ({
+                        id: `entity-task-${t.id}`,
+                        label: t.name,
+                        icon: ENTITY_ICONS.task,
+                        keywords: ['task'],
+                        action: () => {
+                            closePaletteAfterAction();
+                            if (t.project_id) {
+                                router.visit(route('projects.show', { project: t.project_id }));
+                            }
+                        },
+                        entityType: 'task',
+                        badgeClass: ENTITY_BADGE_CLASSES.task,
+                    })
+                );
+            results.push(...matching);
+        }
+
+        if (canViewTags()) {
+            const matching = tags.value
+                .filter((t: Tag) => t.name.toLowerCase().includes(query))
+                .slice(0, maxPerType)
+                .map(
+                    (t: Tag): EntitySearchResult => ({
+                        id: `entity-tag-${t.id}`,
+                        label: t.name,
+                        icon: ENTITY_ICONS.tag,
+                        keywords: ['tag'],
+                        action: () => {
+                            closePaletteAfterAction();
+                            router.visit(route('tags'));
+                        },
+                        entityType: 'tag',
+                        badgeClass: ENTITY_BADGE_CLASSES.tag,
+                    })
+                );
+            results.push(...matching);
+        }
+
+        if (canViewMembers()) {
+            const matching = members.value
+                .filter((m: Member) => m.name.toLowerCase().includes(query))
+                .slice(0, maxPerType)
+                .map(
+                    (m: Member): EntitySearchResult => ({
+                        id: `entity-member-${m.id}`,
+                        label: m.name,
+                        icon: ENTITY_ICONS.member,
+                        keywords: ['member'],
+                        action: () => {
+                            closePaletteAfterAction();
+                            router.visit(route('members'));
+                        },
+                        entityType: 'member',
+                        badgeClass: ENTITY_BADGE_CLASSES.member,
+                    })
+                );
+            results.push(...matching);
+        }
+
+        return results.sort(
+            (a, b) =>
+                scoreEntity(b.label, query, GROUP_PRIORITIES.entity) -
+                scoreEntity(a.label, query, GROUP_PRIORITIES.entity)
+        );
+    });
+
+    // Open/close
+    function openPalette() {
+        isOpen.value = true;
+    }
+
+    function closePalette() {
+        isOpen.value = false;
+    }
+
+    function togglePalette() {
+        if (isOpen.value) {
+            closePalette();
+        } else {
+            openPalette();
+        }
+    }
+
+    return {
+        // State
+        isOpen,
+        searchTerm,
+
+        // Modal states
+        showCreateProjectModal,
+        showCreateClientModal,
+        showCreateTaskModal,
+        showCreateTagModal,
+        showInviteMemberModal,
+        showCreateTimeEntryModal,
+        showProjectSelector,
+        showTaskSelector,
+        showTagsSelector,
+
+        // UI data (for CommandPalette component props)
+        groups,
+        entityResults,
+
+        // Query data (for Provider modals)
+        projects,
+        clients,
+        tasks,
+        tags,
+
+        // Computed
+        isActive,
+        currentTimeEntry,
+
+        // Actions
+        openPalette,
+        closePalette,
+        togglePalette,
+        updateTimer,
+    };
+}

From 99400ca655a1ec81d89a764773ec21a1e7b86eae Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Tue, 27 Jan 2026 20:11:35 +0100
Subject: [PATCH 09/28] fix: display custom billable rate correctly on project
 detail page

---
 e2e/projects.spec.ts                       | 49 ++++++++++++++++++++++
 resources/js/Layouts/AppLayout.vue         | 21 +++-------
 resources/js/Pages/ProjectShow.vue         | 30 +++++++------
 resources/js/utils/useOrganizationQuery.ts | 22 ++++++++++
 4 files changed, 94 insertions(+), 28 deletions(-)
 create mode 100644 resources/js/utils/useOrganizationQuery.ts

diff --git a/e2e/projects.spec.ts b/e2e/projects.spec.ts
index 7b5e1bfc..5fe115c9 100644
--- a/e2e/projects.spec.ts
+++ b/e2e/projects.spec.ts
@@ -317,6 +317,55 @@ test('test that sort state persists after page reload', async ({ page }) => {
     await expect(page.getByTestId('project_table')).toBeVisible();
 });
 
+test('test that custom billable rate is displayed correctly on project detail page', async ({
+    page,
+}) => {
+    const newProjectName = 'Billable Rate Project ' + Math.floor(1 + Math.random() * 10000);
+    const newBillableRate = Math.round(10 + Math.random() * 1000);
+    await goToProjectsOverview(page);
+    await page.getByRole('button', { name: 'Create Project' }).click();
+    await page.getByLabel('Project Name').fill(newProjectName);
+
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Project' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/projects') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201
+        ),
+    ]);
+    await expect(page.getByText(newProjectName)).toBeVisible({ timeout: 10000 });
+
+    // Edit the project to set a custom billable rate
+    await page.getByRole('row').first().getByRole('button').click();
+    await page.getByRole('menuitem').getByText('Edit').first().click();
+    await page.getByText('Non-Billable').click();
+    await page.getByText('Custom Rate').click();
+    await page.getByPlaceholder('Billable Rate').fill(newBillableRate.toString());
+    await page.getByRole('button', { name: 'Update Project' }).click();
+
+    await Promise.all([
+        page.locator('button').filter({ hasText: 'Yes, update existing time' }).click(),
+        page.waitForResponse(
+            async (response) =>
+                response.url().includes('/projects/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+    ]);
+
+    // Navigate to the project detail page by clicking the project name
+    await page.getByText(newProjectName).first().click();
+    await page.waitForURL(/\/projects\/[a-f0-9-]+/);
+
+    // Verify the badge displays the correctly formatted billable rate
+    const expectedFormattedRate = formatCentsWithOrganizationDefaults(newBillableRate * 100);
+    await expect(page.locator('nav[aria-label="Breadcrumb"]').locator('..')).toContainText(
+        expectedFormattedRate
+    );
+});
+
 // Create new project with new Client
 
 // Create new project with existing Client
diff --git a/resources/js/Layouts/AppLayout.vue b/resources/js/Layouts/AppLayout.vue
index 8d1e4de1..5de76566 100644
--- a/resources/js/Layouts/AppLayout.vue
+++ b/resources/js/Layouts/AppLayout.vue
@@ -44,8 +44,7 @@ import UpdateSidebarNotification from '@/Components/UpdateSidebarNotification.vu
 import BillingBanner from '@/Components/Billing/BillingBanner.vue';
 import UserTimezoneMismatchModal from '@/Components/Common/User/UserTimezoneMismatchModal.vue';
 import { useTheme } from '@/utils/theme';
-import { useQuery } from '@tanstack/vue-query';
-import { api } from '@/packages/api/src';
+import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
 import { twMerge } from 'tailwind-merge';
@@ -65,22 +64,12 @@ defineProps({
 const showSidebarMenu = ref(false);
 const isUnloading = ref(false);
 
-const { data: organization, isLoading: isOrganizationLoading } = useQuery({
-    queryKey: ['organization', getCurrentOrganizationId()],
-    queryFn: () =>
-        api.getOrganization({
-            params: {
-                organization: getCurrentOrganizationId()!,
-            },
-        }),
-    enabled: !!getCurrentOrganizationId(),
-});
-
-provide(
-    'organization',
-    computed(() => organization.value?.data)
+const { organization, isLoading: isOrganizationLoading } = useOrganizationQuery(
+    getCurrentOrganizationId()!
 );
 
+provide('organization', organization);
+
 onMounted(async () => {
     useTheme();
     // make sure that the initial requests are only loaded once, this can be removed once we move away from inertia
diff --git a/resources/js/Pages/ProjectShow.vue b/resources/js/Pages/ProjectShow.vue
index a9ca4c9d..503ac550 100644
--- a/resources/js/Pages/ProjectShow.vue
+++ b/resources/js/Pages/ProjectShow.vue
@@ -3,7 +3,7 @@ import MainContainer from '@/packages/ui/src/MainContainer.vue';
 import AppLayout from '@/Layouts/AppLayout.vue';
 import { FolderIcon, PlusIcon } from '@heroicons/vue/16/solid';
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
-import { computed, ref, inject, type ComputedRef } from 'vue';
+import { computed, ref } from 'vue';
 import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import {
     ChevronRightIcon,
@@ -28,11 +28,12 @@ import ProjectEditModal from '@/Components/Common/Project/ProjectEditModal.vue';
 import { Badge } from '@/packages/ui/src';
 import { formatCents } from '../packages/ui/src/utils/money';
 import { getOrganizationCurrencyString } from '../utils/money';
-import type { Organization } from '@/packages/api/src';
+import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
+import { getCurrentOrganizationId } from '@/utils/useUser';
 
 const { projects } = useProjectsQuery();
 
-const organization = inject<ComputedRef<Organization>>('organization');
+const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
 
 const project = computed(() => {
     return projects.value.find((project) => project.id === route().params.project) ?? null;
@@ -48,6 +49,19 @@ const { projectMembers } = canViewProjectMembers()
 
 const showEditProjectModal = ref(false);
 
+const billableRateFormatted = computed(() => {
+    if (project.value?.billable_rate) {
+        return formatCents(
+            project.value.billable_rate,
+            getOrganizationCurrencyString(),
+            organization.value?.currency_format,
+            organization.value?.currency_symbol,
+            organization.value?.number_format
+        );
+    }
+    return null;
+});
+
 const activeTab = ref<'active' | 'done'>('active');
 
 const { tasks } = useTasksQuery();
@@ -96,15 +110,7 @@ const shownTasks = computed(() => {
                 </ol>
                 <div class="px-4">
                     <Badge v-if="project?.billable_rate">
-                        {{
-                            formatCents(
-                                project?.billable_rate ?? 0,
-                                getOrganizationCurrencyString(),
-                                organization?.currency_format,
-                                organization?.currency_symbol,
-                                organization?.number_format
-                            )
-                        }}
+                        {{ billableRateFormatted }}
                         / h
                     </Badge>
                     <Badge v-if="project?.is_billable && !project?.billable_rate">
diff --git a/resources/js/utils/useOrganizationQuery.ts b/resources/js/utils/useOrganizationQuery.ts
new file mode 100644
index 00000000..bee5a693
--- /dev/null
+++ b/resources/js/utils/useOrganizationQuery.ts
@@ -0,0 +1,22 @@
+import { useQuery } from '@tanstack/vue-query';
+import { api } from '@/packages/api/src';
+import { computed } from 'vue';
+
+export function useOrganizationQuery(organizationId: string) {
+    const query = useQuery({
+        queryKey: ['organization', organizationId],
+        queryFn: () =>
+            api.getOrganization({
+                params: {
+                    organization: organizationId,
+                },
+            }),
+    });
+
+    const organization = computed(() => query.data.value?.data);
+
+    return {
+        ...query,
+        organization,
+    };
+}

From 44bcce97cf8e05f87dcd90b9e243d7d3336063a2 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Tue, 27 Jan 2026 20:45:17 +0100
Subject: [PATCH 10/28] fix styling inconsistencies

---
 resources/js/Components/CurrentSidebarTimer.vue             | 2 +-
 .../Components/Dashboard/RecentlyTrackedTasksCardEntry.vue  | 6 ++++--
 resources/js/Pages/Time.vue                                 | 2 +-
 resources/js/packages/ui/src/GroupedItemsCountButton.vue    | 2 +-
 resources/js/packages/ui/src/TimeTrackerStartStop.vue       | 6 ++----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/js/Components/CurrentSidebarTimer.vue b/resources/js/Components/CurrentSidebarTimer.vue
index f5ea33d9..feb910f6 100644
--- a/resources/js/Components/CurrentSidebarTimer.vue
+++ b/resources/js/Components/CurrentSidebarTimer.vue
@@ -51,7 +51,7 @@ const isRunningInDifferentOrganization = computed(() => {
         <TimeTrackerStartStop
             :active="isActive"
             size="base"
-            variant="outline"
+            variant="secondary"
             @changed="setActiveState"></TimeTrackerStartStop>
     </div>
 </template>
diff --git a/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue b/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
index 8473165d..ac6edd68 100644
--- a/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
+++ b/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
@@ -65,9 +65,11 @@ async function startTaskTimer() {
                 </div>
             </ProjectBadge>
         </div>
-        <div class="flex items-center justify-center">
+        <div class="flex items-center justify-end pr-1">
             <TimeTrackerStartStop
-                variant="outline"
+                variant="secondary"
+                size="base"
+                class="w-9 h-9"
                 @changed="startTaskTimer"></TimeTrackerStartStop>
         </div>
     </div>
diff --git a/resources/js/Pages/Time.vue b/resources/js/Pages/Time.vue
index 44f06998..60a7a23f 100644
--- a/resources/js/Pages/Time.vue
+++ b/resources/js/Pages/Time.vue
@@ -159,7 +159,7 @@ function deleteSelected() {
             </div>
             <div
                 v-else-if="!hasNextPage"
-                class="flex justify-center items-center py-5 text-text-secondary font-medium">
+                class="flex justify-center items-center py-5 text-sm text-text-tertiary">
                 All time entries are loaded!
             </div>
         </div>
diff --git a/resources/js/packages/ui/src/GroupedItemsCountButton.vue b/resources/js/packages/ui/src/GroupedItemsCountButton.vue
index 4c52c52c..72d5111b 100644
--- a/resources/js/packages/ui/src/GroupedItemsCountButton.vue
+++ b/resources/js/packages/ui/src/GroupedItemsCountButton.vue
@@ -17,7 +17,7 @@ const expandedStatusClasses = computed(() => {
     if (props.expanded) {
         return 'border-card-border border bg-quaternary text-text-primary';
     }
-    return 'border-card-border border hover:bg-tertiary hover:text-text-primary transition text-text-secondary';
+    return 'border-card-border bg-secondary border hover:bg-tertiary hover:text-text-primary transition text-text-secondary';
 });
 </script>
 
diff --git a/resources/js/packages/ui/src/TimeTrackerStartStop.vue b/resources/js/packages/ui/src/TimeTrackerStartStop.vue
index f0e19f32..bd536f03 100644
--- a/resources/js/packages/ui/src/TimeTrackerStartStop.vue
+++ b/resources/js/packages/ui/src/TimeTrackerStartStop.vue
@@ -10,13 +10,11 @@ const timeTrackerVariants = cva(
                 primary:
                     'text-white ring-accent-200/10 focus-visible:ring-ring focus-visible:ring-2 ring-4 sm:ring-[6px]',
                 secondary:
-                    'bg-tertiary text-text-tertiary hover:text-text-primary focus:ring-2 focus:ring-border-tertiary',
-                outline:
-                    'border border-border-primary text-text-tertiary hover:text-text-primary hover:bg-tertiary/50',
+                    'bg-quaternary text-text-tertiary hover:text-text-primary focus:ring-2 focus:ring-border-tertiary',
             },
             size: {
                 small: 'w-6 h-6',
-                base: 'w-9 h-9 hover:scale-110',
+                base: 'w-8 h-8',
                 large: 'w-11 h-11 hover:scale-110',
             },
             active: {

From bca1e8b3b5cae235d704785f77a98331f211ef45 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Mon, 2 Feb 2026 00:56:06 +0100
Subject: [PATCH 11/28] migrate select/multiselect components to Radix Vue
 primitives

---
 .../Client/ClientMultiselectDropdown.vue      |   8 +-
 .../Common/Member/MemberBillableSelect.vue    |  46 ++--
 .../Common/Member/MemberCombobox.vue          | 101 ++++++--
 .../Common/Member/MemberMergeModal.vue        |   4 +-
 .../Member/MemberMultiselectDropdown.vue      |   7 +-
 .../Common/Member/MemberRoleSelect.vue        |  46 ++--
 .../Project/ProjectMultiselectDropdown.vue    |   8 +-
 .../Common/Reporting/ReportingFilterBar.vue   | 151 +++++++++++
 .../Common/Task/TaskMultiselectDropdown.vue   |   8 +-
 .../js/Components/ui/select/SelectTrigger.vue |  41 ++-
 .../ui/src/Input/MultiselectDropdown.vue      | 212 ++++++----------
 .../ui/src/Input/MultiselectDropdownItem.vue  |  28 ---
 .../packages/ui/src/Input/SelectDropdown.vue  | 188 --------------
 .../ui/src/Input/SelectDropdownItem.vue       |  26 --
 .../js/packages/ui/src/Input/TimePicker.vue   | 162 ------------
 .../packages/ui/src/MoreOptionsDropdown.vue   |  35 ---
 .../ui/src/Project/ProjectBillableSelect.vue  |  46 ++--
 .../js/packages/ui/src/Tag/TagDropdown.vue    | 234 +++++++-----------
 .../ui/src/TimeEntry/TimeEntryCreateModal.vue |  44 ++--
 .../ui/src/TimeEntry/TimeEntryEditModal.vue   |  47 ++--
 .../TimeEntry/TimeEntryMassUpdateModal.vue    |  51 ++--
 resources/js/packages/ui/src/index.ts         |   5 +-
 resources/js/packages/ui/styles.css           |   4 +-
 .../js/utils/useAggregatedTimeEntriesQuery.ts |  29 +++
 24 files changed, 608 insertions(+), 923 deletions(-)
 create mode 100644 resources/js/Components/Common/Reporting/ReportingFilterBar.vue
 delete mode 100644 resources/js/packages/ui/src/Input/MultiselectDropdownItem.vue
 delete mode 100644 resources/js/packages/ui/src/Input/SelectDropdown.vue
 delete mode 100644 resources/js/packages/ui/src/Input/SelectDropdownItem.vue
 delete mode 100644 resources/js/packages/ui/src/Input/TimePicker.vue
 delete mode 100644 resources/js/packages/ui/src/MoreOptionsDropdown.vue
 create mode 100644 resources/js/utils/useAggregatedTimeEntriesQuery.ts

diff --git a/resources/js/Components/Common/Client/ClientMultiselectDropdown.vue b/resources/js/Components/Common/Client/ClientMultiselectDropdown.vue
index 29c37824..be438107 100644
--- a/resources/js/Components/Common/Client/ClientMultiselectDropdown.vue
+++ b/resources/js/Components/Common/Client/ClientMultiselectDropdown.vue
@@ -12,6 +12,10 @@ function getKeyFromItem(item: Client) {
 function getNameForItem(item: Client) {
     return item.name;
 }
+
+const emit = defineEmits<{
+    submit: [];
+}>();
 </script>
 
 <template>
@@ -19,7 +23,9 @@ function getNameForItem(item: Client) {
         search-placeholder="Search for a Client..."
         :items="clients"
         :get-key-from-item="getKeyFromItem"
-        :get-name-for-item="getNameForItem">
+        :get-name-for-item="getNameForItem"
+        no-item-label="No Client"
+        @submit="emit('submit')">
         <template #trigger>
             <slot name="trigger"></slot>
         </template>
diff --git a/resources/js/Components/Common/Member/MemberBillableSelect.vue b/resources/js/Components/Common/Member/MemberBillableSelect.vue
index 3776800b..436e083d 100644
--- a/resources/js/Components/Common/Member/MemberBillableSelect.vue
+++ b/resources/js/Components/Common/Member/MemberBillableSelect.vue
@@ -1,7 +1,11 @@
 <script setup lang="ts">
-import SelectDropdown from '@/packages/ui/src/Input/SelectDropdown.vue';
-import Badge from '@/packages/ui/src/Badge.vue';
-import { ChevronDownIcon } from '@heroicons/vue/20/solid';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
 import type { BillableKey } from '@/types/projects';
 
 const model = defineModel<BillableKey>({
@@ -21,38 +25,26 @@ const options: Option[] = [
     },
 ];
 
-function getKeyFromItem(item: Option) {
-    return item.key;
-}
-
-function getNameFromItem(item: Option) {
-    return item.name;
-}
-
 function getNameForKey(key: BillableKey | undefined) {
-    const item = options.find((item) => getKeyFromItem(item) === key);
+    const item = options.find((item) => item.key === key);
     if (item) {
-        return getNameFromItem(item);
+        return item.name;
     }
     return '';
 }
 </script>
 
 <template>
-    <SelectDropdown
-        v-model="model"
-        :get-key-from-item="getKeyFromItem"
-        :get-name-for-item="getNameFromItem"
-        :items="options">
-        <template #trigger>
-            <Badge size="xlarge" class="bg-input-background cursor-pointer">
-                <span>
-                    {{ getNameForKey(model) }}
-                </span>
-                <ChevronDownIcon class="text-text-secondary w-5"></ChevronDownIcon>
-            </Badge>
-        </template>
-    </SelectDropdown>
+    <Select v-model="model">
+        <SelectTrigger>
+            <SelectValue>{{ getNameForKey(model) }}</SelectValue>
+        </SelectTrigger>
+        <SelectContent>
+            <SelectItem v-for="option in options" :key="option.key" :value="option.key">
+                {{ option.name }}
+            </SelectItem>
+        </SelectContent>
+    </Select>
 </template>
 
 <style scoped></style>
diff --git a/resources/js/Components/Common/Member/MemberCombobox.vue b/resources/js/Components/Common/Member/MemberCombobox.vue
index ccd33bc8..29e9a092 100644
--- a/resources/js/Components/Common/Member/MemberCombobox.vue
+++ b/resources/js/Components/Common/Member/MemberCombobox.vue
@@ -1,11 +1,20 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import { computed, nextTick, ref, watch } from 'vue';
 import { useMembersQuery } from '@/utils/useMembersQuery';
-import { UserIcon, ChevronDownIcon } from '@heroicons/vue/24/solid';
-import { useFocus } from '@vueuse/core';
+import { UserIcon } from '@heroicons/vue/24/solid';
+import { ChevronDown } from 'lucide-vue-next';
 import type { ProjectMember } from '@/packages/api/src';
-import { Badge, SelectDropdown } from '@/packages/ui/src';
 import type { Member } from '@/packages/api/src';
+import {
+    ComboboxAnchor,
+    ComboboxContent,
+    ComboboxInput,
+    ComboboxItem,
+    ComboboxRoot,
+    ComboboxViewport,
+} from 'radix-vue';
+import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
+import { Button } from '@/Components/ui/button';
 
 const { members } = useMembersQuery();
 
@@ -24,16 +33,24 @@ const props = withDefaults(
     }
 );
 
-const searchInput = ref<HTMLInputElement | null>(null);
-
+const open = ref(false);
 const searchValue = ref('');
+const searchInput = ref<HTMLElement | null>(null);
 
-useFocus(searchInput, { initialValue: true });
+watch(open, (isOpen) => {
+    if (isOpen) {
+        searchValue.value = '';
+        nextTick(() => {
+            // @ts-expect-error We need to access the actual HTML Element to focus
+            searchInput.value?.$el?.focus();
+        });
+    }
+});
 
 const filteredMembers = computed<Member[]>(() => {
     return members.value.filter((member) => {
         return (
-            member.name.toLowerCase().includes(searchValue.value?.toLowerCase()?.trim() || '') &&
+            member.name.toLowerCase().includes(searchValue.value.toLowerCase().trim() || '') &&
             !props.hiddenMembers.some((hiddenMember) => hiddenMember.member_id === member.id) &&
             member.is_placeholder === false
         );
@@ -44,29 +61,65 @@ const currentValue = computed(() => {
     if (model.value) {
         return members.value.find((member) => member.id === model.value)?.name;
     }
-    return searchValue.value;
+    return '';
 });
+
+function selectMember(member: Member) {
+    model.value = member.id;
+    open.value = false;
+}
 </script>
 
 <template>
-    <SelectDropdown
-        v-model="model"
-        :items="filteredMembers"
-        :get-key-from-item="(member) => member.id"
-        :get-name-for-item="(member) => member.name">
+    <Dropdown v-model="open" align="start" :close-on-content-click="false">
         <template #trigger>
-            <Badge
-                tag="button"
-                class="flex w-full text-base text-left space-x-3 px-3 text-text-secondary bg-input-background font-normal cursor py-1.5">
-                <UserIcon class="relative z-10 w-4 text-text-secondary"></UserIcon>
-                <div v-if="currentValue" class="flex-1 truncate">
-                    {{ currentValue }}
+            <Button
+                :disabled="disabled"
+                type="button"
+                variant="input"
+                size="input"
+                class="w-full justify-between text-start font-normal">
+                <div class="flex items-center gap-3 truncate">
+                    <UserIcon class="w-4 text-text-secondary shrink-0" />
+                    <span v-if="currentValue" class="truncate text-text-primary">{{
+                        currentValue
+                    }}</span>
+                    <span v-else class="text-muted-foreground">Select a member...</span>
                 </div>
-                <div v-else class="flex-1">Select a member...</div>
-                <ChevronDownIcon class="w-4 text-text-secondary"></ChevronDownIcon>
-            </Badge>
+                <ChevronDown class="w-4 h-4 text-icon-default shrink-0" />
+            </Button>
+        </template>
+        <template #content>
+            <ComboboxRoot
+                v-model:search-term="searchValue"
+                :open="open"
+                class="relative"
+                :filter-function="(val: string[]) => val">
+                <ComboboxAnchor>
+                    <ComboboxInput
+                        ref="searchInput"
+                        class="bg-card-background border-0 placeholder-text-tertiary text-sm text-text-primary py-2.5 focus:ring-0 border-b border-card-background-separator focus:border-card-background-separator w-full"
+                        placeholder="Search for a member..." />
+                </ComboboxAnchor>
+                <ComboboxContent
+                    :dismiss-able="false"
+                    position="inline"
+                    class="w-60 max-h-60 overflow-y-auto">
+                    <ComboboxViewport>
+                        <ComboboxItem
+                            v-for="member in filteredMembers"
+                            :key="member.id"
+                            :value="member.id"
+                            class="flex items-center gap-3 px-3 py-2.5 text-sm text-text-primary data-[highlighted]:bg-card-background-active cursor-default"
+                            @select.prevent="selectMember(member)">
+                            <UserIcon class="w-4 text-text-secondary shrink-0" />
+                            <span class="truncate">{{ member.name }}</span>
+                        </ComboboxItem>
+                    </ComboboxViewport>
+                </ComboboxContent>
+            </ComboboxRoot>
         </template>
-    </SelectDropdown>
+    </Dropdown>
 </template>
 
 <style scoped></style>
diff --git a/resources/js/Components/Common/Member/MemberMergeModal.vue b/resources/js/Components/Common/Member/MemberMergeModal.vue
index 37ba9c01..69441029 100644
--- a/resources/js/Components/Common/Member/MemberMergeModal.vue
+++ b/resources/js/Components/Common/Member/MemberMergeModal.vue
@@ -7,9 +7,10 @@ import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
 import MemberCombobox from '@/Components/Common/Member/MemberCombobox.vue';
 import { UserIcon, ArrowRightIcon } from '@heroicons/vue/24/solid';
 import { Badge } from '@/packages/ui/src';
-import { useMutation } from '@tanstack/vue-query';
+import { useMutation, useQueryClient } from '@tanstack/vue-query';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { useNotificationsStore } from '@/utils/notification';
+const queryClient = useQueryClient();
 const { handleApiRequestNotifications, addNotification } = useNotificationsStore();
 
 const show = defineModel('show', { default: false });
@@ -50,6 +51,7 @@ async function submit() {
             'Members successfully merged!',
             'There was an error merging the members.',
             () => {
+                queryClient.invalidateQueries({ queryKey: ['members'] });
                 show.value = false;
             }
         );
diff --git a/resources/js/Components/Common/Member/MemberMultiselectDropdown.vue b/resources/js/Components/Common/Member/MemberMultiselectDropdown.vue
index 5e7455aa..d44906e1 100644
--- a/resources/js/Components/Common/Member/MemberMultiselectDropdown.vue
+++ b/resources/js/Components/Common/Member/MemberMultiselectDropdown.vue
@@ -12,6 +12,10 @@ function getKeyFromItem(item: Member) {
 function getNameForItem(item: Member) {
     return item.name;
 }
+
+const emit = defineEmits<{
+    submit: [];
+}>();
 </script>
 
 <template>
@@ -19,7 +23,8 @@ function getNameForItem(item: Member) {
         search-placeholder="Search for a Member..."
         :items="members"
         :get-key-from-item="getKeyFromItem"
-        :get-name-for-item="getNameForItem">
+        :get-name-for-item="getNameForItem"
+        @submit="emit('submit')">
         <template #trigger>
             <slot name="trigger"></slot>
         </template>
diff --git a/resources/js/Components/Common/Member/MemberRoleSelect.vue b/resources/js/Components/Common/Member/MemberRoleSelect.vue
index c9f69171..4c7d7d74 100644
--- a/resources/js/Components/Common/Member/MemberRoleSelect.vue
+++ b/resources/js/Components/Common/Member/MemberRoleSelect.vue
@@ -1,7 +1,11 @@
 <script setup lang="ts">
-import SelectDropdown from '@/packages/ui/src/Input/SelectDropdown.vue';
-import Badge from '@/packages/ui/src/Badge.vue';
-import { ChevronDownIcon } from '@heroicons/vue/20/solid';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
 import type { Role } from '@/types/jetstream';
 import { usePage } from '@inertiajs/vue3';
 
@@ -13,38 +17,26 @@ const page = usePage<{
     availableRoles: Role[];
 }>();
 
-function getKeyFromItem(item: Role) {
-    return item.key;
-}
-
-function getNameFromItem(item: Role) {
-    return item.name;
-}
-
 function getNameForKey(key: string | undefined) {
-    const item = page.props.availableRoles.find((item) => getKeyFromItem(item) === key);
+    const item = page.props.availableRoles.find((item) => item.key === key);
     if (item) {
-        return getNameFromItem(item);
+        return item.name;
     }
     return '';
 }
 </script>
 
 <template>
-    <SelectDropdown
-        v-model="model"
-        :get-key-from-item="getKeyFromItem"
-        :get-name-for-item="getNameFromItem"
-        :items="page.props.availableRoles">
-        <template #trigger>
-            <Badge size="xlarge" class="bg-input-background cursor-pointer">
-                <span>
-                    {{ getNameForKey(model) }}
-                </span>
-                <ChevronDownIcon class="text-text-secondary w-5"></ChevronDownIcon>
-            </Badge>
-        </template>
-    </SelectDropdown>
+    <Select v-model="model">
+        <SelectTrigger>
+            <SelectValue>{{ getNameForKey(model) }}</SelectValue>
+        </SelectTrigger>
+        <SelectContent>
+            <SelectItem v-for="role in page.props.availableRoles" :key="role.key" :value="role.key">
+                {{ role.name }}
+            </SelectItem>
+        </SelectContent>
+    </Select>
 </template>
 
 <style scoped></style>
diff --git a/resources/js/Components/Common/Project/ProjectMultiselectDropdown.vue b/resources/js/Components/Common/Project/ProjectMultiselectDropdown.vue
index 75c4ba57..ba28c425 100644
--- a/resources/js/Components/Common/Project/ProjectMultiselectDropdown.vue
+++ b/resources/js/Components/Common/Project/ProjectMultiselectDropdown.vue
@@ -12,6 +12,10 @@ function getKeyFromItem(item: Project) {
 function getNameForItem(item: Project) {
     return item.name;
 }
+
+const emit = defineEmits<{
+    submit: [];
+}>();
 </script>
 
 <template>
@@ -19,7 +23,9 @@ function getNameForItem(item: Project) {
         search-placeholder="Search for a Project..."
         :items="projects"
         :get-key-from-item="getKeyFromItem"
-        :get-name-for-item="getNameForItem">
+        :get-name-for-item="getNameForItem"
+        no-item-label="No Project"
+        @submit="emit('submit')">
         <template #trigger>
             <slot name="trigger"></slot>
         </template>
diff --git a/resources/js/Components/Common/Reporting/ReportingFilterBar.vue b/resources/js/Components/Common/Reporting/ReportingFilterBar.vue
new file mode 100644
index 00000000..085ef5f3
--- /dev/null
+++ b/resources/js/Components/Common/Reporting/ReportingFilterBar.vue
@@ -0,0 +1,151 @@
+<script setup lang="ts">
+import { CheckCircleIcon, TagIcon, UserGroupIcon } from '@heroicons/vue/20/solid';
+import { FolderIcon } from '@heroicons/vue/16/solid';
+import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
+import ReportingRoundingControls from '@/Components/Common/Reporting/ReportingRoundingControls.vue';
+import TaskMultiselectDropdown from '@/Components/Common/Task/TaskMultiselectDropdown.vue';
+import ClientMultiselectDropdown from '@/Components/Common/Client/ClientMultiselectDropdown.vue';
+import MemberMultiselectDropdown from '@/Components/Common/Member/MemberMultiselectDropdown.vue';
+import ReportingFilterBadge from '@/Components/Common/Reporting/ReportingFilterBadge.vue';
+import ProjectMultiselectDropdown from '@/Components/Common/Project/ProjectMultiselectDropdown.vue';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
+import MainContainer from '@/packages/ui/src/MainContainer.vue';
+import DateRangePicker from '@/packages/ui/src/Input/DateRangePicker.vue';
+import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
+import { useTagsQuery } from '@/utils/useTagsQuery';
+import { useTagsStore } from '@/utils/useTags';
+
+type TimeEntryRoundingType = 'up' | 'down' | 'nearest';
+
+const selectedMembers = defineModel<string[]>('selectedMembers', { required: true });
+const selectedProjects = defineModel<string[]>('selectedProjects', { required: true });
+const selectedTasks = defineModel<string[]>('selectedTasks', { required: true });
+const selectedClients = defineModel<string[]>('selectedClients', { required: true });
+const selectedTags = defineModel<string[]>('selectedTags', { required: true });
+const billable = defineModel<'true' | 'false' | null>('billable', { required: true });
+const roundingEnabled = defineModel<boolean>('roundingEnabled', { required: true });
+const roundingType = defineModel<TimeEntryRoundingType>('roundingType', { required: true });
+const roundingMinutes = defineModel<number>('roundingMinutes', { required: true });
+const startDate = defineModel<string>('startDate', { required: true });
+const endDate = defineModel<string>('endDate', { required: true });
+
+const emit = defineEmits<{
+    submit: [];
+}>();
+
+const { tags } = useTagsQuery();
+
+async function createTag(name: string) {
+    return await useTagsStore().createTag(name);
+}
+</script>
+
+<template>
+    <div class="py-2.5 w-full border-b border-default-background-separator">
+        <MainContainer class="sm:flex space-y-4 sm:space-y-0 justify-between">
+            <div class="flex flex-wrap items-center space-y-2 sm:space-y-0 space-x-3">
+                <div class="text-sm font-medium">Filters</div>
+                <MemberMultiselectDropdown
+                    v-model="selectedMembers"
+                    @submit="emit('submit')">
+                    <template #trigger>
+                        <ReportingFilterBadge
+                            :count="selectedMembers.length"
+                            :active="selectedMembers.length > 0"
+                            title="Members"
+                            :icon="UserGroupIcon" />
+                    </template>
+                </MemberMultiselectDropdown>
+                <ProjectMultiselectDropdown
+                    v-model="selectedProjects"
+                    @submit="emit('submit')">
+                    <template #trigger>
+                        <ReportingFilterBadge
+                            :count="selectedProjects.length"
+                            :active="selectedProjects.length > 0"
+                            title="Projects"
+                            :icon="FolderIcon" />
+                    </template>
+                </ProjectMultiselectDropdown>
+                <TaskMultiselectDropdown
+                    v-model="selectedTasks"
+                    @submit="emit('submit')">
+                    <template #trigger>
+                        <ReportingFilterBadge
+                            :count="selectedTasks.length"
+                            :active="selectedTasks.length > 0"
+                            title="Tasks"
+                            :icon="CheckCircleIcon" />
+                    </template>
+                </TaskMultiselectDropdown>
+                <ClientMultiselectDropdown
+                    v-model="selectedClients"
+                    @submit="emit('submit')">
+                    <template #trigger>
+                        <ReportingFilterBadge
+                            :count="selectedClients.length"
+                            :active="selectedClients.length > 0"
+                            title="Clients"
+                            :icon="FolderIcon" />
+                    </template>
+                </ClientMultiselectDropdown>
+                <TagDropdown
+                    v-model="selectedTags"
+                    :create-tag
+                    :tags="tags"
+                    @submit="emit('submit')">
+                    <template #trigger>
+                        <ReportingFilterBadge
+                            :count="selectedTags.length"
+                            :active="selectedTags.length > 0"
+                            title="Tags"
+                            :icon="TagIcon" />
+                    </template>
+                </TagDropdown>
+
+                <Select v-model="billable" @update:model-value="emit('submit')">
+                    <SelectTrigger
+                        size="small"
+                        variant="outline"
+                        :active="billable !== null"
+                        :show-chevron="false">
+                        <SelectValue class="flex items-center gap-2">
+                            <BillableIcon
+                                class="h-4"
+                                :class="
+                                    billable !== null
+                                        ? 'dark:text-accent-300/80 text-accent-400/80'
+                                        : 'text-text-quaternary'
+                                " />
+                            <span class="text-text-secondary">{{
+                                billable === 'false' ? 'Non Billable' : 'Billable'
+                            }}</span>
+                        </SelectValue>
+                    </SelectTrigger>
+                    <SelectContent>
+                        <SelectItem :value="null">Both</SelectItem>
+                        <SelectItem value="true">Billable</SelectItem>
+                        <SelectItem value="false">Non Billable</SelectItem>
+                    </SelectContent>
+                </Select>
+                <ReportingRoundingControls
+                    v-model:enabled="roundingEnabled"
+                    v-model:type="roundingType"
+                    v-model:minutes="roundingMinutes"
+                    @change="emit('submit')" />
+            </div>
+            <div>
+                <DateRangePicker
+                    v-model:start="startDate"
+                    v-model:end="endDate"
+                    @submit="emit('submit')" />
+            </div>
+        </MainContainer>
+    </div>
+</template>
diff --git a/resources/js/Components/Common/Task/TaskMultiselectDropdown.vue b/resources/js/Components/Common/Task/TaskMultiselectDropdown.vue
index 1c2b78cb..69bd6e02 100644
--- a/resources/js/Components/Common/Task/TaskMultiselectDropdown.vue
+++ b/resources/js/Components/Common/Task/TaskMultiselectDropdown.vue
@@ -12,6 +12,10 @@ function getKeyFromItem(item: Task) {
 function getNameForItem(item: Task) {
     return item.name;
 }
+
+const emit = defineEmits<{
+    submit: [];
+}>();
 </script>
 
 <template>
@@ -19,7 +23,9 @@ function getNameForItem(item: Task) {
         search-placeholder="Search for a Task..."
         :items="tasks"
         :get-key-from-item="getKeyFromItem"
-        :get-name-for-item="getNameForItem">
+        :get-name-for-item="getNameForItem"
+        no-item-label="No Task"
+        @submit="emit('submit')">
         <template #trigger>
             <slot name="trigger"></slot>
         </template>
diff --git a/resources/js/Components/ui/select/SelectTrigger.vue b/resources/js/Components/ui/select/SelectTrigger.vue
index e883e1d0..5192c179 100644
--- a/resources/js/Components/ui/select/SelectTrigger.vue
+++ b/resources/js/Components/ui/select/SelectTrigger.vue
@@ -4,19 +4,43 @@ import { ChevronDown } from 'lucide-vue-next';
 import { SelectIcon, SelectTrigger, type SelectTriggerProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
-const props = defineProps<
-    SelectTriggerProps & { size?: 'small'; class?: HTMLAttributes['class'] }
->();
+const props = withDefaults(
+    defineProps<
+        SelectTriggerProps & {
+            size?: 'small';
+            class?: HTMLAttributes['class'];
+            showChevron?: boolean;
+            variant?: 'default' | 'outline';
+            active?: boolean;
+        }
+    >(),
+    {
+        showChevron: true,
+        variant: 'default',
+        active: false,
+    }
+);
 
 const delegatedProps = computed(() => {
-    const { class: _, ...delegated } = props;
+    const { class: _, showChevron: __, variant: ___, active: ____, ...delegated } = props;
 
     return delegated;
 });
 
 const forwardedProps = useForwardProps(delegatedProps);
+
 const sizeClasses = computed(() => {
-    return props.size === 'small' ? 'h-[34px] text-sm' : 'h-[42px]';
+    return props.size === 'small' ? 'h-8 text-xs' : 'h-[42px] w-full text-sm';
+});
+
+const variantClasses = computed(() => {
+    if (props.variant === 'outline') {
+        if (props.active) {
+            return 'border border-accent-300/50 bg-accent-50 hover:bg-accent-100 dark:border-accent-300/50 dark:bg-accent-300/5 dark:hover:bg-accent-300/10';
+        }
+        return 'border shadow-xs hover:text-text-primary bg-card-background dark:bg-transparent border-input dark:border-input hover:bg-white/5';
+    }
+    return 'border border-input-border bg-input-background shadow-sm';
 });
 </script>
 
@@ -25,14 +49,15 @@ const sizeClasses = computed(() => {
         v-bind="forwardedProps"
         :class="
             cn(
-                'flex w-full items-center justify-between whitespace-nowrap rounded-md border border-input-border bg-input-background px-3 py-2.5 shadow-sm data-[placeholder]:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&>span]:truncate text-start',
+                'flex items-center justify-between gap-3 whitespace-nowrap rounded-md px-3 py-2.5 data-[placeholder]:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&>span]:truncate text-start font-medium transition-colors',
                 sizeClasses,
+                variantClasses,
                 props.class
             )
         ">
         <slot />
-        <SelectIcon as-child>
-            <ChevronDown class="w-4 h-4 opacity-50 shrink-0" />
+        <SelectIcon v-if="showChevron" as-child>
+            <ChevronDown class="w-4 h-4 text-icon-default shrink-0" />
         </SelectIcon>
     </SelectTrigger>
 </template>
diff --git a/resources/js/packages/ui/src/Input/MultiselectDropdown.vue b/resources/js/packages/ui/src/Input/MultiselectDropdown.vue
index c64b2ebe..7fcf2853 100644
--- a/resources/js/packages/ui/src/Input/MultiselectDropdown.vue
+++ b/resources/js/packages/ui/src/Input/MultiselectDropdown.vue
@@ -1,7 +1,17 @@
 <script setup lang="ts" generic="T">
 import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
-import { type Component, computed, nextTick, ref, watch } from 'vue';
-import MultiselectDropdownItem from '@/packages/ui/src/Input/MultiselectDropdownItem.vue';
+import { computed, ref, watch } from 'vue';
+import Checkbox from '@/packages/ui/src/Input/Checkbox.vue';
+import {
+    ComboboxAnchor,
+    ComboboxContent,
+    ComboboxInput,
+    ComboboxItem,
+    ComboboxRoot,
+    ComboboxViewport,
+} from 'radix-vue';
+
+const NONE_ID = 'none';
 
 const model = defineModel<string[]>({
     default: [],
@@ -12,164 +22,98 @@ const props = defineProps<{
     searchPlaceholder: string;
     getKeyFromItem: (item: T) => string;
     getNameForItem: (item: T) => string;
+    noItemLabel?: string;
 }>();
 
-const searchInput = ref<HTMLInputElement | null>(null);
 const open = ref(false);
-const dropdownViewport = ref<Component | null>(null);
-
 const searchValue = ref('');
-
-function isItemSelected(id: string) {
-    return model.value.includes(id);
-}
-
-function addOrRemoveItemFromSelection(id: string) {
-    if (model.value.includes(id)) {
-        model.value = model.value.filter((itemId) => itemId !== id);
-    } else {
-        model.value.push(id);
-    }
-    emit('changed');
-}
+const sortedItems = ref<T[]>([]);
 
 watch(open, (isOpen) => {
     if (isOpen) {
-        nextTick(() => {
-            searchInput.value?.focus();
-        });
-
-        // sort tags alphabetically
-        [...props.items].sort((a, b) => {
-            const aIsSelected = model.value.includes(props.getKeyFromItem(a));
-            const bIsSelected = model.value.includes(props.getKeyFromItem(b));
-            if (aIsSelected === bIsSelected) {
-                return props.getNameForItem(a).localeCompare(props.getNameForItem(b));
-            }
-            return model.value.includes(props.getKeyFromItem(a)) ? -1 : 1;
-        });
-        nextTick(() => {
-            if (filteredItems.value.length > 0) {
-                highlightedItemId.value = props.getKeyFromItem(filteredItems.value[0]);
-            }
+        searchValue.value = '';
+        sortedItems.value = [...props.items].sort((a, b) => {
+            const aSelected = model.value.includes(props.getKeyFromItem(a)) ? 0 : 1;
+            const bSelected = model.value.includes(props.getKeyFromItem(b)) ? 0 : 1;
+            return aSelected - bSelected;
         });
     }
 });
 
-const filteredItems = computed<T[]>(() => {
-    return props.items.filter((item: T) => {
-        return props
-            .getNameForItem(item)
-            .toLowerCase()
-            .includes(searchValue.value?.toLowerCase()?.trim() || '');
-    });
+const filteredItems = computed(() => {
+    const search = searchValue.value.toLowerCase().trim();
+    if (!search) return sortedItems.value;
+    return sortedItems.value.filter((item) => props.getNameForItem(item).toLowerCase().includes(search));
 });
 
-watch(filteredItems, () => {
-    if (filteredItems.value.length > 0) {
-        highlightedItemId.value = props.getKeyFromItem(filteredItems.value[0]);
-    }
+const showNoItem = computed(() => {
+    if (!props.noItemLabel) return false;
+    const search = searchValue.value.toLowerCase().trim();
+    if (!search) return true;
+    return props.noItemLabel.toLowerCase().includes(search);
 });
 
-function updateSearchValue(event: Event) {
-    const newInput = (event.target as HTMLInputElement).value;
-    if (newInput === ' ') {
-        searchValue.value = '';
-        const highlightedTagId = highlightedItemId.value;
-        if (highlightedTagId) {
-            const highlightedItem = props.items.find(
-                (item) => props.getKeyFromItem(item) === highlightedTagId
-            );
-            if (highlightedItem) {
-                addOrRemoveItemFromSelection(props.getKeyFromItem(highlightedItem));
-            }
-        }
+function toggleItem(id: string) {
+    if (model.value.includes(id)) {
+        model.value = model.value.filter((itemId) => itemId !== id);
     } else {
-        searchValue.value = newInput;
-    }
-}
-
-const emit = defineEmits(['update:modelValue', 'changed']);
-
-function toggleItem(newValue: string | null) {
-    if (newValue !== null) {
-        if (model.value.includes(newValue)) {
-            model.value = [...model.value].filter((id) => id !== newValue);
-        } else {
-            model.value = [...model.value, newValue];
-        }
-        emit('changed');
-    }
-}
-
-function moveHighlightUp() {
-    if (highlightedItem.value) {
-        const currentHightlightedIndex = filteredItems.value.indexOf(highlightedItem.value);
-        if (currentHightlightedIndex === 0) {
-            highlightedItemId.value = props.getKeyFromItem(
-                filteredItems.value[filteredItems.value.length - 1]
-            );
-        } else {
-            highlightedItemId.value = props.getKeyFromItem(
-                filteredItems.value[currentHightlightedIndex - 1]
-            );
-        }
-    }
-}
-
-function moveHighlightDown() {
-    if (highlightedItem.value) {
-        const currentHightlightedIndex = filteredItems.value.indexOf(highlightedItem.value);
-        if (currentHightlightedIndex === filteredItems.value.length - 1) {
-            highlightedItemId.value = props.getKeyFromItem(filteredItems.value[0]);
-        } else {
-            highlightedItemId.value = props.getKeyFromItem(
-                filteredItems.value[currentHightlightedIndex + 1]
-            );
-        }
+        model.value = [...model.value, id];
     }
+    emit('changed');
 }
 
-const highlightedItemId = ref<string | null>(null);
-const highlightedItem = computed(() => {
-    return props.items.find((item) => props.getKeyFromItem(item) === highlightedItemId.value);
-});
+const emit = defineEmits(['update:modelValue', 'changed', 'submit']);
 </script>
 
 <template>
-    <Dropdown v-model="open" align="start" :close-on-content-click="false">
+    <Dropdown v-model="open" align="start" :close-on-content-click="false" @submit="emit('submit')">
         <template #trigger>
             <slot name="trigger"></slot>
         </template>
         <template #content>
-            <input
-                ref="searchInput"
-                :value="searchValue"
-                class="bg-card-background border-0 placeholder-text-tertiary text-sm text-text-primary py-2.5 focus:ring-0 border-b border-card-background-separator focus:border-card-background-separator w-full"
-                :placeholder="searchPlaceholder"
-                @input="updateSearchValue"
-                @keydown.up.prevent="moveHighlightUp"
-                @keydown.down.prevent="moveHighlightDown"
-                @keydown.enter="toggleItem(highlightedItemId)" />
-            <div ref="dropdownViewport" class="min-w-60 max-w-80 max-h-60 overflow-y-scroll">
-                <div
-                    v-for="item in filteredItems"
-                    :key="props.getKeyFromItem(item)"
-                    role="option"
-                    :value="props.getKeyFromItem(item)"
-                    :class="{
-                        'bg-card-background-active':
-                            props.getKeyFromItem(item) === highlightedItemId,
-                    }"
-                    :data-item-id="props.getKeyFromItem(item)">
-                    <MultiselectDropdownItem
-                        :selected="isItemSelected(props.getKeyFromItem(item))"
-                        :name="props.getNameForItem(item)"
-                        @click="toggleItem(props.getKeyFromItem(item))"></MultiselectDropdownItem>
-                </div>
-            </div>
+            <ComboboxRoot
+                v-model:search-term="searchValue"
+                :open="open"
+                class="p-2"
+                :filter-function="(val: string[]) => val">
+                <ComboboxAnchor>
+                    <ComboboxInput
+                        class="w-full rounded-md border border-input-border bg-input-background px-3 py-1.5 text-sm text-text-primary placeholder:text-text-tertiary focus:outline-none"
+                        :placeholder="searchPlaceholder" />
+                </ComboboxAnchor>
+                <ComboboxContent
+                    :dismiss-able="false"
+                    position="inline"
+                    class="mt-2 min-w-60 max-w-80 max-h-60 overflow-y-auto">
+                    <ComboboxViewport>
+                        <ComboboxItem
+                            v-if="showNoItem"
+                            :value="NONE_ID"
+                            class="flex items-center gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary data-[highlighted]:bg-card-background-active cursor-default"
+                            @select.prevent="toggleItem(NONE_ID)">
+                            <Checkbox
+                                :checked="model.includes(NONE_ID)"
+                                aria-hidden="true"
+                                :tabindex="-1"
+                                class="pointer-events-none" />
+                            <span class="truncate">{{ noItemLabel }}</span>
+                        </ComboboxItem>
+                        <ComboboxItem
+                            v-for="item in filteredItems"
+                            :key="getKeyFromItem(item)"
+                            :value="getKeyFromItem(item)"
+                            class="flex items-center gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary data-[highlighted]:bg-card-background-active cursor-default"
+                            @select.prevent="toggleItem(getKeyFromItem(item))">
+                            <Checkbox
+                                :checked="model.includes(getKeyFromItem(item))"
+                                aria-hidden="true"
+                                :tabindex="-1"
+                                class="pointer-events-none" />
+                            <span class="truncate">{{ getNameForItem(item) }}</span>
+                        </ComboboxItem>
+                    </ComboboxViewport>
+                </ComboboxContent>
+            </ComboboxRoot>
         </template>
     </Dropdown>
 </template>
-
-<style scoped></style>
diff --git a/resources/js/packages/ui/src/Input/MultiselectDropdownItem.vue b/resources/js/packages/ui/src/Input/MultiselectDropdownItem.vue
deleted file mode 100644
index 246beb72..00000000
--- a/resources/js/packages/ui/src/Input/MultiselectDropdownItem.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<script setup lang="ts">
-import { CheckCircleIcon } from '@heroicons/vue/20/solid';
-import { computed } from 'vue';
-import { twMerge } from 'tailwind-merge';
-
-const props = defineProps<{
-    name: string;
-    selected: boolean;
-}>();
-
-const iconClasses = computed(() => {
-    if (props.selected) {
-        return 'text-input-select-active';
-    } else {
-        return 'text-text-quaternary opacity-50';
-    }
-});
-</script>
-
-<template>
-    <div
-        class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-text-primary hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out">
-        <CheckCircleIcon :class="twMerge(iconClasses, 'w-5')"></CheckCircleIcon>
-        <span class="flex-1 min-w-0 overflow-ellipsis overflow-hidden">{{ name }}</span>
-    </div>
-</template>
-
-<style scoped></style>
diff --git a/resources/js/packages/ui/src/Input/SelectDropdown.vue b/resources/js/packages/ui/src/Input/SelectDropdown.vue
deleted file mode 100644
index a347009c..00000000
--- a/resources/js/packages/ui/src/Input/SelectDropdown.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<script setup lang="ts" generic="T">
-import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
-import { computed, nextTick, onMounted, ref, watch } from 'vue';
-import SelectDropdownItem from '@/packages/ui/src/Input/SelectDropdownItem.vue';
-import { onKeyStroke } from '@vueuse/core';
-import { twMerge } from 'tailwind-merge';
-const model = defineModel<string | null>({
-    default: null,
-});
-
-const open = defineModel('open', {
-    default: false,
-});
-
-const props = withDefaults(
-    defineProps<{
-        items: T[];
-        getKeyFromItem: (item: T) => string | null;
-        getNameForItem: (item: T) => string;
-        align?: 'center' | 'end' | 'start';
-        class?: string;
-    }>(),
-    {
-        align: 'start',
-    }
-);
-
-const dropdownViewport = ref<HTMLDivElement | null>(null);
-
-const searchValue = ref('');
-
-// DropdownMultiselect
-const filteredItems = computed<T[]>(() => {
-    return props.items.filter((item: T) => {
-        return props
-            .getNameForItem(item)
-            .toLowerCase()
-            .includes(searchValue.value?.toLowerCase()?.trim() || '');
-    });
-});
-
-const highlightedItemId = ref<string | null>(model.value);
-
-watch(model, () => {
-    if (model.value) {
-        highlightedItemId.value = model.value;
-    }
-});
-
-onMounted(() => {
-    if (!highlightedItemId.value) {
-        resetHightlightedItem();
-    }
-});
-
-watch(filteredItems, () => {
-    resetHightlightedItem();
-});
-
-function resetHightlightedItem() {
-    if (
-        filteredItems.value.length > 0 &&
-        filteredItems.value.find(
-            (item) => props.getKeyFromItem(item) === highlightedItemId.value
-        ) === undefined
-    ) {
-        highlightedItemId.value = props.getKeyFromItem(filteredItems.value[0]);
-    }
-}
-
-watch(highlightedItemId, () => {
-    if (highlightedItemId.value) {
-        const highlightedDomElement = dropdownViewport.value?.querySelector(
-            `[data-select-id="${highlightedItemId.value}"]`
-        ) as HTMLElement;
-
-        highlightedDomElement?.scrollIntoView({
-            block: 'nearest',
-            inline: 'nearest',
-        });
-    }
-});
-
-const emit = defineEmits(['update:modelValue', 'changed']);
-
-function setItem(newValue: string | null) {
-    model.value = newValue;
-    emit('changed');
-    open.value = false;
-}
-
-function moveHighlightUp() {
-    if (highlightedItem.value) {
-        const currentHightlightedIndex = filteredItems.value.indexOf(highlightedItem.value);
-        if (currentHightlightedIndex === 0) {
-            highlightedItemId.value = props.getKeyFromItem(
-                filteredItems.value[filteredItems.value.length - 1]
-            );
-        } else {
-            highlightedItemId.value = props.getKeyFromItem(
-                filteredItems.value[currentHightlightedIndex - 1]
-            );
-        }
-    }
-}
-
-function moveHighlightDown() {
-    if (highlightedItem.value) {
-        const currentHightlightedIndex = filteredItems.value.indexOf(highlightedItem.value);
-        if (currentHightlightedIndex === filteredItems.value.length - 1) {
-            highlightedItemId.value = props.getKeyFromItem(filteredItems.value[0]);
-        } else {
-            highlightedItemId.value = props.getKeyFromItem(
-                filteredItems.value[currentHightlightedIndex + 1]
-            );
-        }
-    }
-}
-
-const highlightedItem = computed(() => {
-    return props.items.find((item) => props.getKeyFromItem(item) === highlightedItemId.value);
-});
-
-onKeyStroke('ArrowDown', (e) => {
-    if (open.value === true) {
-        moveHighlightDown();
-        e.preventDefault();
-    }
-});
-
-onKeyStroke('ArrowUp', (e) => {
-    if (open.value === true) {
-        moveHighlightUp();
-        e.preventDefault();
-    }
-});
-
-onKeyStroke('Enter', (e) => {
-    if (open.value === true) {
-        setItem(highlightedItemId.value);
-        e.preventDefault();
-    }
-});
-
-watch(open, () => {
-    if (open.value === true) {
-        nextTick(() => {
-            const highlightedDomElement = dropdownViewport.value?.querySelector(
-                `[data-select-id="${model.value}"]`
-            ) as HTMLElement;
-            dropdownViewport.value?.scrollTo({
-                top: highlightedDomElement?.offsetTop ?? 0,
-                behavior: 'instant',
-            });
-        });
-    }
-});
-</script>
-
-<template>
-    <Dropdown v-model="open" :align="align" :close-on-content-click="false">
-        <template #trigger>
-            <slot name="trigger"> </slot>
-        </template>
-        <template #content>
-            <div
-                ref="dropdownViewport"
-                :class="twMerge('w-60 py-1.5 max-h-60 overflow-y-scroll', props.class)">
-                <div
-                    v-for="item in filteredItems"
-                    :key="props.getKeyFromItem(item) ?? 'none'"
-                    role="option"
-                    :data-select-id="props.getKeyFromItem(item)"
-                    :value="props.getKeyFromItem(item)"
-                    :data-item-id="props.getKeyFromItem(item)">
-                    <SelectDropdownItem
-                        :highlighted="props.getKeyFromItem(item) === highlightedItemId"
-                        :selected="props.getKeyFromItem(item) === model"
-                        :name="props.getNameForItem(item)"
-                        @mouseenter="highlightedItemId = props.getKeyFromItem(item)"
-                        @click="setItem(props.getKeyFromItem(item))"></SelectDropdownItem>
-                </div>
-            </div>
-        </template>
-    </Dropdown>
-</template>
-
-<style scoped></style>
diff --git a/resources/js/packages/ui/src/Input/SelectDropdownItem.vue b/resources/js/packages/ui/src/Input/SelectDropdownItem.vue
deleted file mode 100644
index 0958cf2a..00000000
--- a/resources/js/packages/ui/src/Input/SelectDropdownItem.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<script setup lang="ts">
-import { twMerge } from 'tailwind-merge';
-
-const props = defineProps<{
-    name: string;
-    selected: boolean;
-    highlighted: boolean;
-}>();
-</script>
-
-<template>
-    <div class="px-1">
-        <div
-            :class="
-                twMerge(
-                    'flex items-center space-x-3 w-full px-1.5 py-1.5 rounded text-start text-sm font-medium leading-5 text-text-primary focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out cursor-pointer ',
-                    props.highlighted && 'bg-card-background-active',
-                    props.selected ? 'bg-accent-300/20' : 'hover:bg-card-background-active'
-                )
-            ">
-            <span>{{ name }}</span>
-        </div>
-    </div>
-</template>
-
-<style scoped></style>
diff --git a/resources/js/packages/ui/src/Input/TimePicker.vue b/resources/js/packages/ui/src/Input/TimePicker.vue
deleted file mode 100644
index 775f2bb2..00000000
--- a/resources/js/packages/ui/src/Input/TimePicker.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<script setup lang="ts">
-import { computed, ref, watch } from 'vue';
-import { getDayJsInstance, getLocalizedDayJs } from '@/packages/ui/src/utils/time';
-import { useFocus } from '@vueuse/core';
-import { SelectDropdown, TextInput } from '@/packages/ui/src';
-import { twMerge } from 'tailwind-merge';
-
-// This has to be a localized timestamp, not UTC
-const model = defineModel<string | null>({
-    default: null,
-});
-
-const props = withDefaults(
-    defineProps<{
-        size?: 'base' | 'large';
-        focus?: boolean;
-    }>(),
-    {
-        size: 'base',
-        focus: false,
-    }
-);
-
-function updateTime(event: Event) {
-    const target = event.target as HTMLInputElement;
-    const newValue = target.value.trim();
-    if (newValue.split(':').length === 2) {
-        const [hours, minutes] = newValue.split(':');
-        if (!isNaN(parseInt(hours)) && !isNaN(parseInt(minutes))) {
-            model.value = getLocalizedDayJs(model.value)
-                .set('hours', Math.min(parseInt(hours), 23))
-                .set('minutes', Math.min(parseInt(minutes), 59))
-                .format();
-            emit('changed', model.value);
-        }
-    }
-    // check if input is only numbers
-    else if (/^\d+$/.test(newValue)) {
-        if (newValue.length === 4) {
-            // parse 1300 to 13:00
-            const [hours, minutes] = [newValue.slice(0, 2), newValue.slice(2, 4)];
-            model.value = getLocalizedDayJs(model.value)
-                .set('hours', Math.min(parseInt(hours), 23))
-                .set('minutes', Math.min(parseInt(minutes), 59))
-                .format();
-            emit('changed', model.value);
-        } else if (newValue.length === 3) {
-            // parse 130 to 01:30
-            const [hours, minutes] = [newValue.slice(0, 1), newValue.slice(1, 3)];
-            model.value = getLocalizedDayJs(model.value)
-                .set('hours', Math.min(parseInt(hours), 23))
-                .set('minutes', Math.min(parseInt(minutes), 59))
-                .format();
-            emit('changed', model.value);
-        } else if (newValue.length === 2) {
-            // parse 13 to 13:00
-            model.value = getLocalizedDayJs(model.value)
-                .set('hours', Math.min(parseInt(newValue), 23))
-                .set('minutes', 0)
-                .format();
-            emit('changed', model.value);
-        } else if (newValue.length === 1) {
-            // parse 1 to 01:00
-            model.value = getLocalizedDayJs(model.value)
-                .set('hours', Math.min(parseInt(newValue), 23))
-                .set('minutes', 0)
-                .format();
-            emit('changed', model.value);
-        }
-    }
-
-    inputValue.value = getLocalizedDayJs(model.value).format('HH:mm');
-}
-
-watch(model, (value) => {
-    inputValue.value = value ? getLocalizedDayJs(value).format('HH:mm') : null;
-});
-
-const timeInput = ref<HTMLInputElement | null>(null);
-const emit = defineEmits(['changed']);
-
-useFocus(timeInput, { initialValue: props.focus });
-
-type TimeOption = {
-    timestamp: string;
-    name: string;
-};
-
-const getStartOptions = computed<TimeOption[]>(() => {
-    // options for the entire day in 15 minute intervals
-    const options = [];
-    for (let hour = 0; hour < 24; hour++) {
-        for (let minute = 0; minute < 60; minute += 15) {
-            const timestamp = getLocalizedDayJs(model.value)
-                .set('hour', hour)
-                .set('minute', minute)
-                .format();
-            const name = getLocalizedDayJs(model.value)
-                .set('hour', hour)
-                .set('minute', minute)
-                .format('HH:mm');
-            options.push({ timestamp, name });
-        }
-    }
-    return options;
-});
-const inputValue = ref(model.value ? getLocalizedDayJs(model.value).format('HH:mm') : null);
-const open = ref(false);
-const closestValue = computed({
-    get() {
-        const target = getDayJsInstance()(model.value);
-        let closestDiff: number | null = null;
-        let closest = target;
-        for (const option of getStartOptions.value) {
-            const diff = Math.abs(getDayJsInstance()(option.timestamp).diff(target));
-            if (closestDiff === null || diff < closestDiff) {
-                closestDiff = diff;
-                closest = getDayJsInstance()(option.timestamp);
-            }
-        }
-        return closest.format();
-    },
-    set(value: string) {
-        model.value = value;
-        emit('changed', model.value);
-    },
-});
-</script>
-
-<template>
-    <div class="flex min-w-0 items-center justify-center text-text-primary">
-        <SelectDropdown
-            v-model="closestValue"
-            v-model:open="open"
-            :class="twMerge('mine-w-0 w-24', size === 'large' && 'w-28')"
-            :get-key-from-item="(item: TimeOption) => item.timestamp"
-            :get-name-for-item="(item: TimeOption) => item.name"
-            :items="getStartOptions">
-            <template #trigger>
-                <TextInput
-                    ref="timeInput"
-                    v-model="inputValue"
-                    :class="twMerge('text-center w-24 px-3 py-2', size === 'large' && 'w-28')"
-                    data-testid="time_picker_input"
-                    type="text"
-                    @blur="updateTime"
-                    @keydown.enter="
-                        updateTime($event);
-                        open = false;
-                    "
-                    @keydown.tab="open = false"
-                    @focus="($event.target as HTMLInputElement).select()"
-                    @mouseup="($event.target as HTMLInputElement).select()"
-                    @click="($event.target as HTMLInputElement).select()"
-                    @pointerup="($event.target as HTMLInputElement).select()"
-                    @focusin="open = true" />
-            </template>
-        </SelectDropdown>
-    </div>
-</template>
-
-<style scoped></style>
diff --git a/resources/js/packages/ui/src/MoreOptionsDropdown.vue b/resources/js/packages/ui/src/MoreOptionsDropdown.vue
deleted file mode 100644
index a0c71963..00000000
--- a/resources/js/packages/ui/src/MoreOptionsDropdown.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<script setup lang="ts">
-import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
-
-defineProps<{
-    label: string;
-}>();
-</script>
-
-<template>
-    <Dropdown align="end">
-        <template #trigger>
-            <button
-                class="focus-visible:outline-none focus-visible:bg-card-background rounded-full focus-visible:ring-2 focus-visible:ring-ring focus-visible:opacity-100 hover:bg-card-background group-hover:opacity-100 opacity-20 transition-opacity text-text-secondary"
-                :aria-label="label">
-                <svg
-                    class="h-8 w-8 p-1 rounded-full"
-                    viewBox="0 0 24 24"
-                    xmlns="http://www.w3.org/2000/svg">
-                    <path
-                        fill="none"
-                        stroke="currentColor"
-                        stroke-linecap="round"
-                        stroke-linejoin="round"
-                        stroke-width="1.5"
-                        d="M12 5.92A.96.96 0 1 0 12 4a.96.96 0 0 0 0 1.92m0 7.04a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92M12 20a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92" />
-                </svg>
-            </button>
-        </template>
-        <template #content>
-            <slot></slot>
-        </template>
-    </Dropdown>
-</template>
-
-<style scoped></style>
diff --git a/resources/js/packages/ui/src/Project/ProjectBillableSelect.vue b/resources/js/packages/ui/src/Project/ProjectBillableSelect.vue
index 5f773257..40c58ceb 100644
--- a/resources/js/packages/ui/src/Project/ProjectBillableSelect.vue
+++ b/resources/js/packages/ui/src/Project/ProjectBillableSelect.vue
@@ -1,7 +1,11 @@
 <script setup lang="ts">
-import SelectDropdown from '@/packages/ui/src/Input/SelectDropdown.vue';
-import Badge from '@/packages/ui/src/Badge.vue';
-import { ChevronDownIcon } from '@heroicons/vue/20/solid';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
 import type { BillableKey } from '@/types/projects';
 
 const model = defineModel<BillableKey>({
@@ -25,38 +29,26 @@ const options: Option[] = [
     },
 ];
 
-function getKeyFromItem(item: Option) {
-    return item.key;
-}
-
-function getNameFromItem(item: Option) {
-    return item.name;
-}
-
 function getNameForKey(key: BillableKey | undefined) {
-    const item = options.find((item) => getKeyFromItem(item) === key);
+    const item = options.find((item) => item.key === key);
     if (item) {
-        return getNameFromItem(item);
+        return item.name;
     }
     return '';
 }
 </script>
 
 <template>
-    <SelectDropdown
-        v-model="model"
-        :get-key-from-item="getKeyFromItem"
-        :get-name-for-item="getNameFromItem"
-        :items="options">
-        <template #trigger>
-            <Badge tag="button" size="xlarge" class="bg-input-background cursor-pointer">
-                <span>
-                    {{ getNameForKey(model) }}
-                </span>
-                <ChevronDownIcon class="text-text-secondary w-5"></ChevronDownIcon>
-            </Badge>
-        </template>
-    </SelectDropdown>
+    <Select v-model="model">
+        <SelectTrigger>
+            <SelectValue>{{ getNameForKey(model) }}</SelectValue>
+        </SelectTrigger>
+        <SelectContent>
+            <SelectItem v-for="option in options" :key="option.key" :value="option.key">
+                {{ option.name }}
+            </SelectItem>
+        </SelectContent>
+    </Select>
 </template>
 
 <style scoped></style>
diff --git a/resources/js/packages/ui/src/Tag/TagDropdown.vue b/resources/js/packages/ui/src/Tag/TagDropdown.vue
index a988e1b5..4f7d6d54 100644
--- a/resources/js/packages/ui/src/Tag/TagDropdown.vue
+++ b/resources/js/packages/ui/src/Tag/TagDropdown.vue
@@ -1,11 +1,22 @@
 <script setup lang="ts">
 import { PlusCircleIcon } from '@heroicons/vue/20/solid';
 import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
-import { type Component, computed, nextTick, ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import TagCreateModal from '@/packages/ui/src/Tag/TagCreateModal.vue';
-import MultiselectDropdownItem from '@/packages/ui/src/Input/MultiselectDropdownItem.vue';
+import Checkbox from '@/packages/ui/src/Input/Checkbox.vue';
 import type { Tag } from '@/packages/api/src';
-import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';
+import { Button } from '@/Components/ui/button';
+import {
+    ComboboxAnchor,
+    ComboboxContent,
+    ComboboxInput,
+    ComboboxItem,
+    ComboboxRoot,
+    ComboboxViewport,
+} from 'radix-vue';
+
+const NONE_ID = 'none';
+const NO_TAG_LABEL = 'No Tag';
 
 const props = withDefaults(
     defineProps<{
@@ -22,134 +33,56 @@ const model = defineModel<string[]>({
     default: [],
 });
 
-const searchInput = ref<HTMLInputElement | null>(null);
 const open = ref(false);
-const dropdownViewport = ref<Component | null>(null);
-
 const searchValue = ref('');
-
-function isTagSelected(id: string) {
-    return model.value.includes(id);
-}
-
-function addOrRemoveTagFromSelection(id: string) {
-    if (model.value.includes(id)) {
-        model.value = model.value.filter((tagId) => tagId !== id);
-    } else {
-        model.value = [...model.value, id];
-    }
-    emit('changed');
-}
-
-const sortedTags = ref(props.tags);
+const sortedTags = ref<Tag[]>([]);
 
 watch(open, (isOpen) => {
     if (isOpen) {
-        nextTick(() => {
-            searchInput.value?.focus();
-        });
-
-        // sort tags alphabetically
+        searchValue.value = '';
         sortedTags.value = [...props.tags].sort((a, b) => {
-            const aIsSelected = model.value.includes(a.id);
-            const bIsSelected = model.value.includes(b.id);
-            if (aIsSelected === bIsSelected) {
-                return a.name.localeCompare(b.name);
-            }
-            return model.value.includes(a.id) ? -1 : 1;
-        });
-        nextTick(() => {
-            if (filteredTags.value.length > 0) {
-                highlightedItemId.value = filteredTags.value[0].id;
-            }
+            const aSelected = model.value.includes(a.id) ? 0 : 1;
+            const bSelected = model.value.includes(b.id) ? 0 : 1;
+            return aSelected - bSelected;
         });
     }
 });
 
 const filteredTags = computed(() => {
-    return sortedTags.value.filter((tag: Tag) => {
-        return tag.name.toLowerCase().includes(searchValue.value?.toLowerCase()?.trim() || '');
-    });
+    const search = searchValue.value.toLowerCase().trim();
+    if (!search) return sortedTags.value;
+    return sortedTags.value.filter((tag) => tag.name.toLowerCase().includes(search));
 });
 
+const showNoTag = computed(() => {
+    const search = searchValue.value.toLowerCase().trim();
+    if (!search) return true;
+    return NO_TAG_LABEL.toLowerCase().includes(search);
+});
+
+function toggleTag(id: string) {
+    if (model.value.includes(id)) {
+        model.value = model.value.filter((tagId) => tagId !== id);
+    } else {
+        model.value = [...model.value, id];
+    }
+    emit('changed');
+}
+
 async function createAndAddTag(name: string) {
     const newTag = await props.createTag(name);
     if (newTag) {
-        addOrRemoveTagFromSelection(newTag.id);
+        toggleTag(newTag.id);
     }
     searchValue.value = '';
     return newTag;
 }
 
-async function addTagIfNoneExists() {
-    if (highlightedItemId.value) {
-        addOrRemoveTagFromSelection(highlightedItemId.value);
-    }
-}
-
-watch(filteredTags, () => {
-    if (filteredTags.value.length > 0) {
-        highlightedItemId.value = filteredTags.value[0].id;
-    }
-});
-
-function updateSearchValue(event: Event) {
-    const newInput = (event.target as HTMLInputElement).value;
-    if (newInput === ' ') {
-        searchValue.value = '';
-        const highlightedTagId = highlightedItemId.value;
-        if (highlightedTagId) {
-            const highlightedTag = props.tags.find((tag) => tag.id === highlightedTagId);
-            if (highlightedTag) {
-                addOrRemoveTagFromSelection(highlightedTag.id);
-            }
-        }
-    } else {
-        searchValue.value = newInput;
-    }
-}
-
 const emit = defineEmits<{
     changed: [];
     submit: [];
 }>();
 
-function toggleTag(newValue: string) {
-    if (model.value.includes(newValue)) {
-        model.value = [...model.value].filter((id) => id !== newValue);
-    } else {
-        model.value = [...model.value, newValue];
-    }
-    emit('changed');
-}
-
-function moveHighlightUp() {
-    if (highlightedItem.value) {
-        const currentHightlightedIndex = filteredTags.value.indexOf(highlightedItem.value);
-        if (currentHightlightedIndex === 0) {
-            highlightedItemId.value = filteredTags.value[filteredTags.value.length - 1].id;
-        } else {
-            highlightedItemId.value = filteredTags.value[currentHightlightedIndex - 1].id;
-        }
-    }
-}
-
-function moveHighlightDown() {
-    if (highlightedItem.value) {
-        const currentHightlightedIndex = filteredTags.value.indexOf(highlightedItem.value);
-        if (currentHightlightedIndex === filteredTags.value.length - 1) {
-            highlightedItemId.value = filteredTags.value[0].id;
-        } else {
-            highlightedItemId.value = filteredTags.value[currentHightlightedIndex + 1].id;
-        }
-    }
-}
-
-const highlightedItemId = ref<string | null>(null);
-const highlightedItem = computed(() => {
-    return props.tags.find((tag) => tag.id === highlightedItemId.value);
-});
-
 const showCreateTagModal = ref(false);
 </script>
 
@@ -166,50 +99,65 @@ const showCreateTagModal = ref(false);
             <slot name="trigger"></slot>
         </template>
         <template #content>
-            <UseFocusTrap v-if="open" :options="{ immediate: true, allowOutsideClick: true }">
-                <input
-                    ref="searchInput"
-                    :value="searchValue"
-                    data-testid="tag_dropdown_search"
-                    class="bg-card-background border-0 placeholder-text-tertiary text-sm text-text-primary py-2.5 focus:ring-0 border-b border-card-background-separator focus:border-card-background-separator w-full"
-                    placeholder="Search for a Tag..."
-                    @input="updateSearchValue"
-                    @keydown.esc.prevent="open = false"
-                    @keydown.enter="addTagIfNoneExists"
-                    @keydown.up.prevent="moveHighlightUp"
-                    @keydown.down.prevent="moveHighlightDown" />
-                <div ref="dropdownViewport" class="w-60 max-h-60 overflow-y-scroll">
-                    <div
-                        v-for="tag in filteredTags"
-                        :key="tag.id"
-                        role="option"
-                        :value="tag.id"
-                        :class="{
-                            'bg-card-background-active': tag.id === highlightedItemId,
-                        }"
-                        data-testid="tag_dropdown_entries"
-                        :data-tag-id="tag.id">
-                        <MultiselectDropdownItem
-                            :selected="isTagSelected(tag.id)"
-                            :name="tag.name"
-                            @click="toggleTag(tag.id)"></MultiselectDropdownItem>
-                    </div>
-                </div>
-                <div class="hover:bg-card-background-active rounded-b-lg">
-                    <button
-                        class="text-text-primary w-full flex space-x-3 items-center px-4 py-3 text-xs font-semibold border-t border-card-background-separator"
+            <ComboboxRoot
+                v-model:search-term="searchValue"
+                :open="open"
+                class="p-2"
+                :filter-function="(val: string[]) => val">
+                <ComboboxAnchor>
+                    <ComboboxInput
+                        data-testid="tag_dropdown_search"
+                        class="w-full rounded-md border border-input-border bg-input-background px-3 py-1.5 text-sm text-text-primary placeholder:text-text-tertiary focus:outline-none"
+                        placeholder="Search for a Tag..." />
+                </ComboboxAnchor>
+                <ComboboxContent
+                    :dismiss-able="false"
+                    position="inline"
+                    class="mt-2 w-60 max-h-60 overflow-y-auto">
+                    <ComboboxViewport>
+                        <ComboboxItem
+                            v-if="showNoTag"
+                            :value="NONE_ID"
+                            data-testid="tag_dropdown_entries"
+                            class="flex items-center gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary data-[highlighted]:bg-card-background-active cursor-default"
+                            @select.prevent="toggleTag(NONE_ID)">
+                            <Checkbox
+                                :checked="model.includes(NONE_ID)"
+                                aria-hidden="true"
+                                :tabindex="-1"
+                                class="pointer-events-none" />
+                            <span class="truncate">{{ NO_TAG_LABEL }}</span>
+                        </ComboboxItem>
+                        <ComboboxItem
+                            v-for="tag in filteredTags"
+                            :key="tag.id"
+                            :value="tag.id"
+                            data-testid="tag_dropdown_entries"
+                            class="flex items-center gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary data-[highlighted]:bg-card-background-active cursor-default"
+                            @select.prevent="toggleTag(tag.id)">
+                            <Checkbox
+                                :checked="model.includes(tag.id)"
+                                aria-hidden="true"
+                                :tabindex="-1"
+                                class="pointer-events-none" />
+                            <span class="truncate">{{ tag.name }}</span>
+                        </ComboboxItem>
+                    </ComboboxViewport>
+                </ComboboxContent>
+                <div class="mt-1 border-t border-card-background-separator pt-1">
+                    <Button
+                        variant="ghost"
+                        size="sm"
+                        class="w-full justify-start gap-2 px-2 py-1.5 text-sm text-text-primary"
                         @click="
                             open = false;
                             showCreateTagModal = true;
                         ">
-                        <PlusCircleIcon
-                            class="w-5 flex-shrink-0 text-icon-default"></PlusCircleIcon>
+                        <PlusCircleIcon class="w-4 h-4 flex-shrink-0 text-icon-default" />
                         <span>Create new Tag</span>
-                    </button>
+                    </Button>
                 </div>
-            </UseFocusTrap>
+            </ComboboxRoot>
         </template>
     </Dropdown>
 </template>
-
-<style scoped></style>
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
index 11b402be..f229716e 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
@@ -18,7 +18,13 @@ import type {
 import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
 import { Badge } from '@/packages/ui/src';
 import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
-import SelectDropdown from '@/packages/ui/src/Input/SelectDropdown.vue';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
 import DatePicker from '@/packages/ui/src/Input/DatePicker.vue';
 import DurationHumanInput from '@/packages/ui/src/Input/DurationHumanInput.vue';
 
@@ -129,11 +135,6 @@ const billableProxy = computed({
         timeEntry.value.billable = value === 'true';
     },
 });
-
-type BillableOption = {
-    label: string;
-    value: string;
-};
 </script>
 
 <template>
@@ -196,29 +197,20 @@ type BillableOption = {
                             </TagDropdown>
                         </div>
                         <div class="flex-col">
-                            <SelectDropdown
-                                v-model="billableProxy"
-                                :get-key-from-item="(item: BillableOption) => item.value"
-                                :get-name-for-item="(item: BillableOption) => item.label"
-                                :items="[
-                                    {
-                                        label: 'Billable',
-                                        value: 'true',
-                                    },
-                                    {
-                                        label: 'Non Billable',
-                                        value: 'false',
-                                    },
-                                ]">
-                                <template #trigger>
-                                    <Badge class="bg-input-background" tag="button" size="xlarge">
-                                        <BillableIcon class="h-4"></BillableIcon>
+                            <Select v-model="billableProxy">
+                                <SelectTrigger size="small" :show-chevron="false">
+                                    <SelectValue class="flex items-center gap-2">
+                                        <BillableIcon class="h-4 text-icon-default" />
                                         <span>{{
                                             timeEntry.billable ? 'Billable' : 'Non-Billable'
                                         }}</span>
-                                    </Badge>
-                                </template>
-                            </SelectDropdown>
+                                    </SelectValue>
+                                </SelectTrigger>
+                                <SelectContent>
+                                    <SelectItem value="true">Billable</SelectItem>
+                                    <SelectItem value="false">Non Billable</SelectItem>
+                                </SelectContent>
+                            </Select>
                         </div>
                     </div>
                 </div>
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
index fd7260dd..91e9dd18 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
@@ -18,7 +18,13 @@ import type {
 import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
 import { Badge } from '@/packages/ui/src';
 import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
-import SelectDropdown from '@/packages/ui/src/Input/SelectDropdown.vue';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
 import DatePicker from '@/packages/ui/src/Input/DatePicker.vue';
 import DurationHumanInput from '@/packages/ui/src/Input/DurationHumanInput.vue';
 
@@ -124,11 +130,6 @@ const billableProxy = computed({
         }
     },
 });
-
-type BillableOption = {
-    label: string;
-    value: string;
-};
 </script>
 
 <template>
@@ -198,34 +199,22 @@ type BillableOption = {
                                 </TagDropdown>
                             </div>
                             <div class="flex-col">
-                                <SelectDropdown
-                                    v-model="billableProxy"
-                                    :get-key-from-item="(item: BillableOption) => item.value"
-                                    :get-name-for-item="(item: BillableOption) => item.label"
-                                    :items="[
-                                        {
-                                            label: 'Billable',
-                                            value: 'true',
-                                        },
-                                        {
-                                            label: 'Non Billable',
-                                            value: 'false',
-                                        },
-                                    ]">
-                                    <template #trigger>
-                                        <Badge
-                                            class="bg-input-background"
-                                            tag="button"
-                                            size="xlarge">
-                                            <BillableIcon class="h-4"></BillableIcon>
+                                <Select v-model="billableProxy">
+                                    <SelectTrigger size="small" :show-chevron="false">
+                                        <SelectValue class="flex items-center gap-2">
+                                            <BillableIcon class="h-4 text-icon-default" />
                                             <span>{{
                                                 editableTimeEntry.billable
                                                     ? 'Billable'
                                                     : 'Non-Billable'
                                             }}</span>
-                                        </Badge>
-                                    </template>
-                                </SelectDropdown>
+                                        </SelectValue>
+                                    </SelectTrigger>
+                                    <SelectContent>
+                                        <SelectItem value="true">Billable</SelectItem>
+                                        <SelectItem value="false">Non Billable</SelectItem>
+                                    </SelectContent>
+                                </Select>
                             </div>
                         </div>
                     </div>
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue
index fb6a51b6..e9eef647 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue
@@ -15,7 +15,13 @@ import {
     type UpdateMultipleTimeEntriesChangeset,
 } from '@/packages/api/src';
 import { Badge, Checkbox } from '@/packages/ui/src';
-import SelectDropdown from '../Input/SelectDropdown.vue';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
 import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
 import type { Tag, Task } from '@/packages/api/src';
 
@@ -126,7 +132,6 @@ watch(removeAllTags, () => {
         selectedTags.value = [];
     }
 });
-type SelectOption = { label: string; value: string };
 </script>
 
 <template>
@@ -189,32 +194,22 @@ type SelectOption = { label: string; value: string };
                 <div class="space-y-2">
                     <InputLabel for="project" value="Billable" />
                     <div class="flex">
-                        <SelectDropdown
-                            v-model="timeEntryBillable"
-                            :get-key-from-item="(item: SelectOption) => item.value"
-                            :get-name-for-item="(item: SelectOption) => item.label"
-                            :items="[
-                                {
-                                    label: 'Keep current billable status',
-                                    value: 'do-not-update',
-                                },
-                                {
-                                    label: 'Billable',
-                                    value: 'billable',
-                                },
-                                {
-                                    label: 'Non Billable',
-                                    value: 'non-billable',
-                                },
-                            ]">
-                            <template #trigger>
-                                <Badge tag="button" size="xlarge">
-                                    <span v-if="billable === undefined"> Set billable status </span>
-                                    <span v-else-if="billable === true"> Billable </span>
-                                    <span v-else> Non Billable </span></Badge
-                                >
-                            </template>
-                        </SelectDropdown>
+                        <Select v-model="timeEntryBillable">
+                            <SelectTrigger size="small" :show-chevron="false">
+                                <SelectValue>
+                                    <span v-if="billable === undefined">Set billable status</span>
+                                    <span v-else-if="billable === true">Billable</span>
+                                    <span v-else>Non Billable</span>
+                                </SelectValue>
+                            </SelectTrigger>
+                            <SelectContent>
+                                <SelectItem value="do-not-update">
+                                    Keep current billable status
+                                </SelectItem>
+                                <SelectItem value="billable">Billable</SelectItem>
+                                <SelectItem value="non-billable">Non Billable</SelectItem>
+                            </SelectContent>
+                        </Select>
                     </div>
                 </div>
             </div>
diff --git a/resources/js/packages/ui/src/index.ts b/resources/js/packages/ui/src/index.ts
index d2ae9253..469e1564 100644
--- a/resources/js/packages/ui/src/index.ts
+++ b/resources/js/packages/ui/src/index.ts
@@ -26,14 +26,13 @@ import TimeTrackerRunningInDifferentOrganizationOverlay from './TimeTracker/Time
 import TimeTrackerControls from './TimeTracker/TimeTrackerControls.vue';
 import TimeTrackerMoreOptionsDropdown from './TimeTracker/TimeTrackerMoreOptionsDropdown.vue';
 import CardTitle from './CardTitle.vue';
-import SelectDropdown from './Input/SelectDropdown.vue';
 import Badge from './Badge.vue';
 import Checkbox from './Input/Checkbox.vue';
 import TimeEntryGroupedTable from './TimeEntry/TimeEntryGroupedTable.vue';
 import TimeEntryMassActionRow from './TimeEntry/TimeEntryMassActionRow.vue';
 import TimeEntryCreateModal from './TimeEntry/TimeEntryCreateModal.vue';
 import TimeEntryEditModal from './TimeEntry/TimeEntryEditModal.vue';
-import MoreOptionsDropdown from './MoreOptionsDropdown.vue';
+
 import FullCalendarEventContent from './FullCalendar/FullCalendarEventContent.vue';
 import FullCalendarDayHeader from './FullCalendar/FullCalendarDayHeader.vue';
 import TimeEntryCalendar from './FullCalendar/TimeEntryCalendar.vue';
@@ -69,12 +68,10 @@ export {
     TimeTrackerControls,
     TimeTrackerMoreOptionsDropdown,
     CardTitle,
-    SelectDropdown,
     Badge,
     Checkbox,
     TimeEntryGroupedTable,
     TimeEntryMassActionRow,
-    MoreOptionsDropdown,
     TimeEntryCreateModal,
     TimeEntryEditModal,
     FullCalendarEventContent,
diff --git a/resources/js/packages/ui/styles.css b/resources/js/packages/ui/styles.css
index 1314327c..a1ee7180 100644
--- a/resources/js/packages/ui/styles.css
+++ b/resources/js/packages/ui/styles.css
@@ -28,7 +28,7 @@
     --color-border-secondary: oklch(0.25 0.0098 268.31);
     --color-border-tertiary: #2c2e33;
     --color-border-quaternary: #393b42;
-    --color-input-border-active: rgba(255, 255, 255, 0.3);
+    --color-input-border-active: rgba(255, 255, 255, 0.15);
 
     --theme-color-chart: var(--color-accent-200);
 
@@ -51,7 +51,7 @@
     --theme-color-button-primary-border: rgba(var(--color-accent-300), 0.2);
     --theme-color-button-primary-text: var(--color-text-primary);
 
-    --theme-color-input-background: transparent;
+    --theme-color-input-background: var(--color-bg-secondary);
 
     --theme-color-input-select-active: rgb(var(--color-accent-300));
     --theme-color-input-select-active-hover: rgb(var(--color-accent-200));
diff --git a/resources/js/utils/useAggregatedTimeEntriesQuery.ts b/resources/js/utils/useAggregatedTimeEntriesQuery.ts
new file mode 100644
index 00000000..e7cbf510
--- /dev/null
+++ b/resources/js/utils/useAggregatedTimeEntriesQuery.ts
@@ -0,0 +1,29 @@
+import { useQuery } from '@tanstack/vue-query';
+import { api, type AggregatedTimeEntriesQueryParams, type ReportingResponse } from '@/packages/api/src';
+import { getCurrentOrganizationId } from '@/utils/useUser';
+import { computed, type ComputedRef, unref } from 'vue';
+
+export function useAggregatedTimeEntriesQuery(
+    queryKeyPrefix: string,
+    filterParams: ComputedRef<AggregatedTimeEntriesQueryParams>
+) {
+    const query = useQuery<ReportingResponse>({
+        queryKey: computed(() => [
+            'aggregatedTimeEntries',
+            queryKeyPrefix,
+            getCurrentOrganizationId(),
+            unref(filterParams),
+        ]),
+        queryFn: () =>
+            api.getAggregatedTimeEntries({
+                params: {
+                    organization: getCurrentOrganizationId() || '',
+                },
+                queries: unref(filterParams),
+            }),
+        enabled: computed(() => !!getCurrentOrganizationId()),
+        staleTime: 1000 * 30,
+    });
+
+    return query;
+}

From 8524e01033663c5cfc50bb79f79feeac2b884ec1 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Mon, 2 Feb 2026 01:03:00 +0100
Subject: [PATCH 12/28] refactor: extract ReportingFilterBar and migrate
 reporting to TanStack Query

---
 .../Reporting/ReportingExportButton.vue       |  49 ++--
 .../Reporting/ReportingGroupBySelect.vue      |  40 +--
 .../Common/Reporting/ReportingOverview.vue    | 250 +++++-------------
 resources/js/Layouts/AppLayout.vue            |   2 +-
 resources/js/Pages/ReportingDetailed.vue      | 130 +--------
 resources/js/utils/useReporting.ts            |  62 +----
 6 files changed, 134 insertions(+), 399 deletions(-)

diff --git a/resources/js/Components/Common/Reporting/ReportingExportButton.vue b/resources/js/Components/Common/Reporting/ReportingExportButton.vue
index a5910342..3c81b27b 100644
--- a/resources/js/Components/Common/Reporting/ReportingExportButton.vue
+++ b/resources/js/Components/Common/Reporting/ReportingExportButton.vue
@@ -1,7 +1,12 @@
 <script setup lang="ts">
 import { SecondaryButton } from '@/packages/ui/src';
 import { ArrowDownTrayIcon, LockClosedIcon } from '@heroicons/vue/20/solid';
-import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuItem,
+    DropdownMenuTrigger,
+} from '@/Components/ui/dropdown-menu';
 import type { ExportFormat } from '@/types/reporting';
 import { ref } from 'vue';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
@@ -25,32 +30,24 @@ function triggerDownload(format: ExportFormat) {
 </script>
 
 <template>
-    <Dropdown align="end">
-        <template #trigger>
+    <DropdownMenu>
+        <DropdownMenuTrigger as-child>
             <SecondaryButton :icon="ArrowDownTrayIcon" :loading> Export </SecondaryButton>
-        </template>
-        <template #content>
-            <div class="flex flex-col space-y-1 p-1.5">
-                <SecondaryButton class="border-0 px-2" @click="triggerDownload('pdf')">
-                    <div class="flex items-center space-x-2">
-                        <span> Export as PDF </span>
-                        <LockClosedIcon
-                            v-if="!isAllowedToPerformPremiumAction()"
-                            class="w-3.5 text-text-tertiary"></LockClosedIcon>
-                    </div>
-                </SecondaryButton>
-                <SecondaryButton class="border-0 px-2" @click="triggerDownload('xlsx')"
-                    >Export as Excel</SecondaryButton
-                >
-                <SecondaryButton class="border-0 px-2" @click="triggerDownload('csv')"
-                    >Export as CSV</SecondaryButton
-                >
-                <SecondaryButton class="border-0 px-2" @click="triggerDownload('ods')"
-                    >Export as ODS
-                </SecondaryButton>
-            </div>
-        </template>
-    </Dropdown>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="end">
+            <DropdownMenuItem @click="triggerDownload('pdf')">
+                <div class="flex items-center space-x-2">
+                    <span>Export as PDF</span>
+                    <LockClosedIcon
+                        v-if="!isAllowedToPerformPremiumAction()"
+                        class="w-3.5 text-text-tertiary" />
+                </div>
+            </DropdownMenuItem>
+            <DropdownMenuItem @click="triggerDownload('xlsx')"> Export as Excel </DropdownMenuItem>
+            <DropdownMenuItem @click="triggerDownload('csv')"> Export as CSV </DropdownMenuItem>
+            <DropdownMenuItem @click="triggerDownload('ods')"> Export as ODS </DropdownMenuItem>
+        </DropdownMenuContent>
+    </DropdownMenu>
     <UpgradeModal v-model:show="showPremiumModal">
         <strong>PDF Reports</strong> are only available in solidtime Professional.
     </UpgradeModal>
diff --git a/resources/js/Components/Common/Reporting/ReportingGroupBySelect.vue b/resources/js/Components/Common/Reporting/ReportingGroupBySelect.vue
index cf63d1f5..35b1de46 100644
--- a/resources/js/Components/Common/Reporting/ReportingGroupBySelect.vue
+++ b/resources/js/Components/Common/Reporting/ReportingGroupBySelect.vue
@@ -1,12 +1,20 @@
 <script setup lang="ts">
-import SelectDropdown from '@/packages/ui/src/Input/SelectDropdown.vue';
-import Badge from '@/packages/ui/src/Badge.vue';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
 import { type Component, computed } from 'vue';
 
 const model = defineModel<string | null>({ default: null });
 const props = defineProps<{
     groupByOptions: { value: string; label: string; icon: Component }[];
 }>();
+const emit = defineEmits<{
+    changed: [];
+}>();
 const icon = computed(() => {
     return props.groupByOptions.find((option) => option.value === model.value)?.icon;
 });
@@ -16,21 +24,19 @@ const title = computed(() => {
 </script>
 
 <template>
-    <SelectDropdown
-        v-model="model"
-        :get-key-from-item="(item) => item.value"
-        :get-name-for-item="(item) => item.label"
-        :items="groupByOptions">
-        <template #trigger>
-            <Badge
-                size="large"
-                tag="button"
-                class="cursor-pointer hover:bg-card-background transition space-x-5 flex">
-                <component :is="icon" class="h-4 text-text-secondary"></component>
-                <span> {{ title }} </span>
-            </Badge>
-        </template>
-    </SelectDropdown>
+    <Select v-model="model" @update:model-value="emit('changed')">
+        <SelectTrigger size="small" :show-chevron="false">
+            <SelectValue class="flex items-center gap-2">
+                <component :is="icon" class="h-4 text-icon-default" />
+                <span>{{ title }}</span>
+            </SelectValue>
+        </SelectTrigger>
+        <SelectContent>
+            <SelectItem v-for="option in groupByOptions" :key="option.value" :value="option.value">
+                {{ option.label }}
+            </SelectItem>
+        </SelectContent>
+    </Select>
 </template>
 
 <style scoped></style>
diff --git a/resources/js/Components/Common/Reporting/ReportingOverview.vue b/resources/js/Components/Common/Reporting/ReportingOverview.vue
index b1992d8e..5f5caada 100644
--- a/resources/js/Components/Common/Reporting/ReportingOverview.vue
+++ b/resources/js/Components/Common/Reporting/ReportingOverview.vue
@@ -1,7 +1,5 @@
 <script setup lang="ts">
-import { ChartBarIcon, CheckCircleIcon, TagIcon, UserGroupIcon } from '@heroicons/vue/20/solid';
-import { FolderIcon } from '@heroicons/vue/16/solid';
-import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
+import { ChartBarIcon } from '@heroicons/vue/20/solid';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import {
     formatHumanReadableDuration,
@@ -11,43 +9,33 @@ import {
 import { formatCents } from '@/packages/ui/src/utils/money';
 import ReportingTabNavbar from '@/Components/Common/Reporting/ReportingTabNavbar.vue';
 import ReportingExportButton from '@/Components/Common/Reporting/ReportingExportButton.vue';
-import ReportingRoundingControls from '@/Components/Common/Reporting/ReportingRoundingControls.vue';
-import TaskMultiselectDropdown from '@/Components/Common/Task/TaskMultiselectDropdown.vue';
-import ClientMultiselectDropdown from '@/Components/Common/Client/ClientMultiselectDropdown.vue';
 import ReportingRow from '@/Components/Common/Reporting/ReportingRow.vue';
-import MemberMultiselectDropdown from '@/Components/Common/Member/MemberMultiselectDropdown.vue';
-import ReportingFilterBadge from '@/Components/Common/Reporting/ReportingFilterBadge.vue';
 import PageTitle from '@/Components/Common/PageTitle.vue';
-import ProjectMultiselectDropdown from '@/Components/Common/Project/ProjectMultiselectDropdown.vue';
 import ReportingChart from '@/Components/Common/Reporting/ReportingChart.vue';
-import SelectDropdown from '../../../packages/ui/src/Input/SelectDropdown.vue';
 import ReportingGroupBySelect from '@/Components/Common/Reporting/ReportingGroupBySelect.vue';
 import MainContainer from '@/packages/ui/src/MainContainer.vue';
-import DateRangePicker from '@/packages/ui/src/Input/DateRangePicker.vue';
 import ReportingExportModal from '@/Components/Common/Reporting/ReportingExportModal.vue';
 import ReportSaveButton from '@/Components/Common/Report/ReportSaveButton.vue';
-import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
 import ReportingPieChart from '@/Components/Common/Reporting/ReportingPieChart.vue';
+import ReportingFilterBar from '@/Components/Common/Reporting/ReportingFilterBar.vue';
 
-import { computed, type ComputedRef, inject, onMounted, ref, watch } from 'vue';
+import { computed, type ComputedRef, inject, ref, watch } from 'vue';
 import { type GroupingOption, useReportingStore } from '@/utils/useReporting';
-import { storeToRefs } from 'pinia';
 import {
+    type AggregatedTimeEntries,
     type AggregatedTimeEntriesQueryParams,
     api,
     type CreateReportBodyProperties,
     type Organization,
 } from '@/packages/api/src';
 import { getCurrentMembershipId, getCurrentOrganizationId, getCurrentRole } from '@/utils/useUser';
-import { useTagsQuery } from '@/utils/useTagsQuery';
-import { useTagsStore } from '@/utils/useTags';
 import { useSessionStorage, useStorage } from '@vueuse/core';
 import { useNotificationsStore } from '@/utils/notification';
 import type { ExportFormat } from '@/types/reporting';
 import { getRandomColorWithSeed } from '@/packages/ui/src/utils/color';
 import { useProjectsQuery } from '@/utils/useProjectsQuery';
+import { useAggregatedTimeEntriesQuery } from '@/utils/useAggregatedTimeEntriesQuery';
 
-// TimeEntryRoundingType is now defined in ReportingRoundingControls component
 type TimeEntryRoundingType = 'up' | 'down' | 'nearest';
 
 const { handleApiRequestNotifications } = useNotificationsStore();
@@ -75,25 +63,40 @@ const group = useStorage<GroupingOption>('reporting-group', 'project');
 const subGroup = useStorage<GroupingOption>('reporting-sub-group', 'task');
 
 const reportingStore = useReportingStore();
+const { groupByOptions, getNameForReportingRowEntry, emptyPlaceholder } = reportingStore;
 
-const { aggregatedGraphTimeEntries, aggregatedTableTimeEntries } = storeToRefs(reportingStore);
+const organization = inject<ComputedRef<Organization>>('organization');
 
-const { groupByOptions } = reportingStore;
+// Ensure sub-group falls back when it collides with group
+watch(
+    group,
+    () => {
+        if (group.value === subGroup.value) {
+            const fallbackOption = groupByOptions.find((el) => el.value !== group.value);
+            if (fallbackOption?.value) {
+                subGroup.value = fallbackOption.value;
+            }
+        }
+    },
+    { immediate: true }
+);
 
-const organization = inject<ComputedRef<Organization>>('organization');
+function getOptimalGroupingOption(start: string, end: string): 'day' | 'week' | 'month' {
+    const diffInDays = getDayJsInstance()(end).diff(getDayJsInstance()(start), 'd');
 
-// Watch rounding enabled state to trigger updates
-watch(roundingEnabled, () => {
-    updateReporting();
-});
+    if (diffInDays <= 31) {
+        return 'day';
+    } else if (diffInDays <= 200) {
+        return 'week';
+    } else {
+        return 'month';
+    }
+}
 
-function getFilterAttributes(): AggregatedTimeEntriesQueryParams {
-    let params: AggregatedTimeEntriesQueryParams = {
+const filterParams = computed<AggregatedTimeEntriesQueryParams>(() => {
+    return {
         start: getLocalizedDayJs(startDate.value).startOf('day').utc().format(),
         end: getLocalizedDayJs(endDate.value).endOf('day').utc().format(),
-    };
-    params = {
-        ...params,
         member_ids: selectedMembers.value.length > 0 ? selectedMembers.value : undefined,
         project_ids: selectedProjects.value.length > 0 ? selectedProjects.value : undefined,
         task_ids: selectedTasks.value.length > 0 ? selectedTasks.value : undefined,
@@ -104,66 +107,38 @@ function getFilterAttributes(): AggregatedTimeEntriesQueryParams {
         rounding_type: roundingEnabled.value ? roundingType.value : undefined,
         rounding_minutes: roundingEnabled.value ? roundingMinutes.value : undefined,
     };
-    return params;
-}
-
-function updateGraphReporting() {
-    const params = getFilterAttributes();
-    if (getCurrentRole() === 'employee') {
-        params.member_id = getCurrentMembershipId();
-    }
-    params.fill_gaps_in_time_groups = 'true';
-    params.group = getOptimalGroupingOption(startDate.value, endDate.value);
-    useReportingStore().fetchGraphReporting(params);
-}
-
-function updateTableReporting() {
-    const params = getFilterAttributes();
-    if (group.value === subGroup.value) {
-        const fallbackOption = groupByOptions.find((el) => el.value !== group.value);
-        if (fallbackOption?.value) {
-            subGroup.value = fallbackOption.value;
-        }
-    }
-    if (getCurrentRole() === 'employee') {
-        params.member_id = getCurrentMembershipId();
-    }
-    params.group = group.value;
-    params.sub_group = subGroup.value;
-    useReportingStore().fetchTableReporting(params);
-}
+});
 
-function updateReporting() {
-    updateGraphReporting();
-    updateTableReporting();
-}
+const graphQueryParams = computed<AggregatedTimeEntriesQueryParams>(() => {
+    return {
+        ...filterParams.value,
+        fill_gaps_in_time_groups: 'true',
+        group: getOptimalGroupingOption(startDate.value, endDate.value),
+    };
+});
 
-function getOptimalGroupingOption(startDate: string, endDate: string): 'day' | 'week' | 'month' {
-    const diffInDays = getDayJsInstance()(endDate).diff(getDayJsInstance()(startDate), 'd');
+const tableQueryParams = computed<AggregatedTimeEntriesQueryParams>(() => {
+    return {
+        ...filterParams.value,
+        group: group.value,
+        sub_group: subGroup.value,
+    };
+});
 
-    if (diffInDays <= 31) {
-        return 'day';
-    } else if (diffInDays <= 200) {
-        return 'week';
-    } else {
-        return 'month';
-    }
-}
+const { data: graphResponse } = useAggregatedTimeEntriesQuery('graph', graphQueryParams);
+const { data: tableResponse } = useAggregatedTimeEntriesQuery('table', tableQueryParams);
 
-onMounted(() => {
-    updateGraphReporting();
-    updateTableReporting();
+const aggregatedGraphTimeEntries = computed<AggregatedTimeEntries | undefined>(() => {
+    return graphResponse.value?.data as AggregatedTimeEntries | undefined;
 });
 
-const { tags } = useTagsQuery();
-
-async function createTag(tag: string) {
-    return await useTagsStore().createTag(tag);
-}
+const aggregatedTableTimeEntries = computed<AggregatedTimeEntries | undefined>(() => {
+    return tableResponse.value?.data as AggregatedTimeEntries | undefined;
+});
 
 const reportProperties = computed(() => {
     return {
-        ...getFilterAttributes(),
+        ...filterParams.value,
         group: group.value,
         sub_group: subGroup.value,
         history_group: getOptimalGroupingOption(startDate.value, endDate.value),
@@ -180,7 +155,7 @@ async function downloadExport(format: ExportFormat) {
                         organization: organizationId,
                     },
                     queries: {
-                        ...getFilterAttributes(),
+                        ...filterParams.value,
                         group: group.value,
                         sub_group: subGroup.value,
                         history_group: getOptimalGroupingOption(startDate.value, endDate.value),
@@ -198,8 +173,6 @@ async function downloadExport(format: ExportFormat) {
     }
 }
 
-const { getNameForReportingRowEntry, emptyPlaceholder } = useReportingStore();
-
 const { projects } = useProjectsQuery();
 const showExportModal = ref(false);
 const exportUrl = ref<string | null>(null);
@@ -272,100 +245,19 @@ const tableData = computed(() => {
             <ReportSaveButton :report-properties="reportProperties"></ReportSaveButton>
         </div>
     </MainContainer>
-    <div class="py-2.5 w-full border-b border-default-background-separator">
-        <MainContainer class="sm:flex space-y-4 sm:space-y-0 justify-between">
-            <div class="flex flex-wrap items-center space-y-2 sm:space-y-0 space-x-3">
-                <div class="text-sm font-medium">Filters</div>
-                <MemberMultiselectDropdown v-model="selectedMembers" @submit="updateReporting">
-                    <template #trigger>
-                        <ReportingFilterBadge
-                            :count="selectedMembers.length"
-                            :active="selectedMembers.length > 0"
-                            title="Members"
-                            :icon="UserGroupIcon"></ReportingFilterBadge>
-                    </template>
-                </MemberMultiselectDropdown>
-                <ProjectMultiselectDropdown v-model="selectedProjects" @submit="updateReporting">
-                    <template #trigger>
-                        <ReportingFilterBadge
-                            :count="selectedProjects.length"
-                            :active="selectedProjects.length > 0"
-                            title="Projects"
-                            :icon="FolderIcon"></ReportingFilterBadge>
-                    </template>
-                </ProjectMultiselectDropdown>
-                <TaskMultiselectDropdown v-model="selectedTasks" @submit="updateReporting">
-                    <template #trigger>
-                        <ReportingFilterBadge
-                            :count="selectedTasks.length"
-                            :active="selectedTasks.length > 0"
-                            title="Tasks"
-                            :icon="CheckCircleIcon"></ReportingFilterBadge>
-                    </template>
-                </TaskMultiselectDropdown>
-                <ClientMultiselectDropdown v-model="selectedClients" @submit="updateReporting">
-                    <template #trigger>
-                        <ReportingFilterBadge
-                            :count="selectedClients.length"
-                            :active="selectedClients.length > 0"
-                            title="Clients"
-                            :icon="FolderIcon"></ReportingFilterBadge>
-                    </template>
-                </ClientMultiselectDropdown>
-                <TagDropdown
-                    v-model="selectedTags"
-                    :create-tag
-                    :tags="tags"
-                    @submit="updateReporting">
-                    <template #trigger>
-                        <ReportingFilterBadge
-                            :count="selectedTags.length"
-                            :active="selectedTags.length > 0"
-                            title="Tags"
-                            :icon="TagIcon"></ReportingFilterBadge>
-                    </template>
-                </TagDropdown>
-
-                <SelectDropdown
-                    v-model="billable"
-                    :get-key-from-item="(item) => item.value"
-                    :get-name-for-item="(item) => item.label"
-                    :items="[
-                        {
-                            label: 'Both',
-                            value: null,
-                        },
-                        {
-                            label: 'Billable',
-                            value: 'true',
-                        },
-                        {
-                            label: 'Non Billable',
-                            value: 'false',
-                        },
-                    ]"
-                    @changed="updateReporting">
-                    <template #trigger>
-                        <ReportingFilterBadge
-                            :active="billable !== null"
-                            :title="billable === 'false' ? 'Non Billable' : 'Billable'"
-                            :icon="BillableIcon"></ReportingFilterBadge>
-                    </template>
-                </SelectDropdown>
-                <ReportingRoundingControls
-                    v-model:enabled="roundingEnabled"
-                    v-model:type="roundingType"
-                    v-model:minutes="roundingMinutes"
-                    @change="updateReporting"></ReportingRoundingControls>
-            </div>
-            <div>
-                <DateRangePicker
-                    v-model:start="startDate"
-                    v-model:end="endDate"
-                    @submit="updateReporting"></DateRangePicker>
-            </div>
-        </MainContainer>
-    </div>
+    <ReportingFilterBar
+        v-model:selected-members="selectedMembers"
+        v-model:selected-projects="selectedProjects"
+        v-model:selected-tasks="selectedTasks"
+        v-model:selected-clients="selectedClients"
+        v-model:selected-tags="selectedTags"
+        v-model:billable="billable"
+        v-model:rounding-enabled="roundingEnabled"
+        v-model:rounding-type="roundingType"
+        v-model:rounding-minutes="roundingMinutes"
+        v-model:start-date="startDate"
+        v-model:end-date="endDate"
+        />
     <MainContainer>
         <div class="pt-10 w-full px-3 relative">
             <ReportingChart
@@ -382,12 +274,12 @@ const tableData = computed(() => {
                     <ReportingGroupBySelect
                         v-model="group"
                         :group-by-options="groupByOptions"
-                        @changed="updateTableReporting"></ReportingGroupBySelect>
+                        ></ReportingGroupBySelect>
                     <span>and</span>
                     <ReportingGroupBySelect
                         v-model="subGroup"
                         :group-by-options="groupByOptions.filter((el) => el.value !== group)"
-                        @changed="updateTableReporting"></ReportingGroupBySelect>
+                        ></ReportingGroupBySelect>
                 </div>
                 <div class="grid items-center" style="grid-template-columns: 1fr 100px 150px">
                     <div
diff --git a/resources/js/Layouts/AppLayout.vue b/resources/js/Layouts/AppLayout.vue
index 5de76566..aa37b845 100644
--- a/resources/js/Layouts/AppLayout.vue
+++ b/resources/js/Layouts/AppLayout.vue
@@ -22,7 +22,7 @@ import {
 import NavigationSidebarItem from '@/Components/NavigationSidebarItem.vue';
 import UserSettingsIcon from '@/Components/UserSettingsIcon.vue';
 import MainContainer from '@/packages/ui/src/MainContainer.vue';
-import { computed, onMounted, provide, ref } from 'vue';
+import { onMounted, provide, ref } from 'vue';
 import NotificationContainer from '@/Components/NotificationContainer.vue';
 import { initializeStores } from '@/utils/init';
 import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
diff --git a/resources/js/Pages/ReportingDetailed.vue b/resources/js/Pages/ReportingDetailed.vue
index 748fab43..269ae894 100644
--- a/resources/js/Pages/ReportingDetailed.vue
+++ b/resources/js/Pages/ReportingDetailed.vue
@@ -1,26 +1,18 @@
 <script setup lang="ts">
 import MainContainer from '@/packages/ui/src/MainContainer.vue';
 import AppLayout from '@/Layouts/AppLayout.vue';
-import { FolderIcon } from '@heroicons/vue/16/solid';
 import PageTitle from '@/Components/Common/PageTitle.vue';
 import {
     ChartBarIcon,
-    UserGroupIcon,
-    CheckCircleIcon,
-    TagIcon,
     ChevronLeftIcon,
     ChevronDoubleLeftIcon,
     ChevronRightIcon,
     ChevronDoubleRightIcon,
     ClockIcon,
 } from '@heroicons/vue/20/solid';
-import DateRangePicker from '@/packages/ui/src/Input/DateRangePicker.vue';
-import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
-import ReportingRoundingControls from '@/Components/Common/Reporting/ReportingRoundingControls.vue';
 import { computed, onMounted, ref, watch } from 'vue';
 import { getDayJsInstance, getLocalizedDayJs } from '@/packages/ui/src/utils/time';
 import { storeToRefs } from 'pinia';
-import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
 import {
     api,
     type Client,
@@ -29,12 +21,6 @@ import {
     type Project,
     type TimeEntry,
 } from '@/packages/api/src';
-import ReportingFilterBadge from '@/Components/Common/Reporting/ReportingFilterBadge.vue';
-import ProjectMultiselectDropdown from '@/Components/Common/Project/ProjectMultiselectDropdown.vue';
-import MemberMultiselectDropdown from '@/Components/Common/Member/MemberMultiselectDropdown.vue';
-import TaskMultiselectDropdown from '@/Components/Common/Task/TaskMultiselectDropdown.vue';
-import SelectDropdown from '@/packages/ui/src/Input/SelectDropdown.vue';
-import ClientMultiselectDropdown from '@/Components/Common/Client/ClientMultiselectDropdown.vue';
 import { useTagsQuery } from '@/utils/useTagsQuery';
 import { useTagsStore } from '@/utils/useTags';
 import { useSessionStorage } from '@vueuse/core';
@@ -67,6 +53,7 @@ import TimeEntryMassActionRow from '@/packages/ui/src/TimeEntry/TimeEntryMassAct
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import { canCreateProjects, canViewAllTimeEntries } from '@/utils/permissions';
 import ReportingExportModal from '@/Components/Common/Reporting/ReportingExportModal.vue';
+import ReportingFilterBar from '@/Components/Common/Reporting/ReportingFilterBar.vue';
 import { useTimeEntriesReportQuery } from '@/utils/useTimeEntriesReportQuery';
 import { useTimeEntriesMutations } from '@/utils/useTimeEntriesMutations';
 
@@ -258,108 +245,19 @@ async function downloadExport(format: ExportFormat) {
             <ReportingExportButton :download="downloadExport"></ReportingExportButton>
         </MainContainer>
 
-        <div class="py-2.5 w-full border-b border-default-background-separator">
-            <MainContainer class="sm:flex space-y-4 sm:space-y-0 justify-between">
-                <div class="flex flex-wrap items-center space-y-2 sm:space-y-0 space-x-3">
-                    <div class="text-sm font-medium">Filters</div>
-                    <MemberMultiselectDropdown
-                        v-model="selectedMembers"
-                        @submit="updateFilteredTimeEntries">
-                        <template #trigger>
-                            <ReportingFilterBadge
-                                :count="selectedMembers.length"
-                                :active="selectedMembers.length > 0"
-                                title="Members"
-                                :icon="UserGroupIcon"></ReportingFilterBadge>
-                        </template>
-                    </MemberMultiselectDropdown>
-                    <ProjectMultiselectDropdown
-                        v-model="selectedProjects"
-                        @submit="updateFilteredTimeEntries">
-                        <template #trigger>
-                            <ReportingFilterBadge
-                                :count="selectedProjects.length"
-                                :active="selectedProjects.length > 0"
-                                title="Projects"
-                                :icon="FolderIcon"></ReportingFilterBadge>
-                        </template>
-                    </ProjectMultiselectDropdown>
-                    <TaskMultiselectDropdown
-                        v-model="selectedTasks"
-                        @submit="updateFilteredTimeEntries">
-                        <template #trigger>
-                            <ReportingFilterBadge
-                                :count="selectedTasks.length"
-                                :active="selectedTasks.length > 0"
-                                title="Tasks"
-                                :icon="CheckCircleIcon"></ReportingFilterBadge>
-                        </template>
-                    </TaskMultiselectDropdown>
-                    <ClientMultiselectDropdown
-                        v-model="selectedClients"
-                        @submit="updateFilteredTimeEntries">
-                        <template #trigger>
-                            <ReportingFilterBadge
-                                :count="selectedClients.length"
-                                :active="selectedClients.length > 0"
-                                title="Clients"
-                                :icon="FolderIcon"></ReportingFilterBadge>
-                        </template>
-                    </ClientMultiselectDropdown>
-                    <TagDropdown
-                        v-model="selectedTags"
-                        :create-tag
-                        :tags="tags"
-                        @submit="updateFilteredTimeEntries">
-                        <template #trigger>
-                            <ReportingFilterBadge
-                                :count="selectedTags.length"
-                                :active="selectedTags.length > 0"
-                                title="Tags"
-                                :icon="TagIcon"></ReportingFilterBadge>
-                        </template>
-                    </TagDropdown>
-
-                    <SelectDropdown
-                        v-model="billable"
-                        :get-key-from-item="(item) => item.value"
-                        :get-name-for-item="(item) => item.label"
-                        :items="[
-                            {
-                                label: 'Both',
-                                value: null,
-                            },
-                            {
-                                label: 'Billable',
-                                value: 'true',
-                            },
-                            {
-                                label: 'Non Billable',
-                                value: 'false',
-                            },
-                        ]"
-                        @changed="updateFilteredTimeEntries">
-                        <template #trigger>
-                            <ReportingFilterBadge
-                                :active="billable !== null"
-                                :title="billable === 'false' ? 'Non Billable' : 'Billable'"
-                                :icon="BillableIcon"></ReportingFilterBadge>
-                        </template>
-                    </SelectDropdown>
-                    <ReportingRoundingControls
-                        v-model:enabled="roundingEnabled"
-                        v-model:type="roundingType"
-                        v-model:minutes="roundingMinutes"
-                        @change="updateFilteredTimeEntries" />
-                </div>
-                <div>
-                    <DateRangePicker
-                        v-model:start="startDate"
-                        v-model:end="endDate"
-                        @submit="updateFilteredTimeEntries"></DateRangePicker>
-                </div>
-            </MainContainer>
-        </div>
+        <ReportingFilterBar
+            v-model:selected-members="selectedMembers"
+            v-model:selected-projects="selectedProjects"
+            v-model:selected-tasks="selectedTasks"
+            v-model:selected-clients="selectedClients"
+            v-model:selected-tags="selectedTags"
+            v-model:billable="billable"
+            v-model:rounding-enabled="roundingEnabled"
+            v-model:rounding-type="roundingType"
+            v-model:rounding-minutes="roundingMinutes"
+            v-model:start-date="startDate"
+            v-model:end-date="endDate"
+            @submit="updateFilteredTimeEntries" />
         <TimeEntryMassActionRow
             :selected-time-entries="selectedTimeEntries"
             :can-create-project="canCreateProjects()"
diff --git a/resources/js/utils/useReporting.ts b/resources/js/utils/useReporting.ts
index 067d859b..5bb5e115 100644
--- a/resources/js/utils/useReporting.ts
+++ b/resources/js/utils/useReporting.ts
@@ -1,13 +1,6 @@
 import { defineStore } from 'pinia';
-import { api } from '@/packages/api/src';
-import { type Component, computed, ref } from 'vue';
-import type {
-    AggregatedTimeEntries,
-    AggregatedTimeEntriesQueryParams,
-    ReportingResponse,
-} from '@/packages/api/src';
-import { getCurrentOrganizationId, getCurrentRole, getCurrentUser } from '@/utils/useUser';
-import { useNotificationsStore } from '@/utils/notification';
+import { type Component } from 'vue';
+import { getCurrentRole, getCurrentUser } from '@/utils/useUser';
 import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import { useMembersQuery } from '@/utils/useMembersQuery';
 import { useTasksQuery } from '@/utils/useTasksQuery';
@@ -27,11 +20,6 @@ export type GroupingOption =
     | 'tag';
 
 export const useReportingStore = defineStore('reporting', () => {
-    const reportingGraphResponse = ref<ReportingResponse | null>(null);
-    const reportingTableResponse = ref<ReportingResponse | null>(null);
-
-    const { handleApiRequestNotifications } = useNotificationsStore();
-
     // Cache query composables to avoid creating new subscriptions on every call
     const { projects } = useProjectsQuery();
     const { members } = useMembersQuery();
@@ -39,48 +27,6 @@ export const useReportingStore = defineStore('reporting', () => {
     const { clients } = useClientsQuery();
     const { tags } = useTagsQuery();
 
-    async function fetchGraphReporting(params: AggregatedTimeEntriesQueryParams) {
-        const organization = getCurrentOrganizationId();
-        if (organization) {
-            reportingGraphResponse.value = await handleApiRequestNotifications(
-                () =>
-                    api.getAggregatedTimeEntries({
-                        params: {
-                            organization: organization,
-                        },
-                        queries: params,
-                    }),
-                undefined,
-                'Failed to fetch reporting data'
-            );
-        }
-    }
-
-    async function fetchTableReporting(params: AggregatedTimeEntriesQueryParams) {
-        const organization = getCurrentOrganizationId();
-        if (organization) {
-            reportingTableResponse.value = await handleApiRequestNotifications(
-                () =>
-                    api.getAggregatedTimeEntries({
-                        params: {
-                            organization: organization,
-                        },
-                        queries: params,
-                    }),
-                undefined,
-                'Failed to fetch reporting data'
-            );
-        }
-    }
-
-    const aggregatedGraphTimeEntries = computed<AggregatedTimeEntries>(() => {
-        return reportingGraphResponse.value?.data as AggregatedTimeEntries;
-    });
-
-    const aggregatedTableTimeEntries = computed<AggregatedTimeEntries>(() => {
-        return reportingTableResponse.value?.data as AggregatedTimeEntries;
-    });
-
     const emptyPlaceholder = {
         user: 'No User',
         project: 'No Project',
@@ -170,10 +116,6 @@ export const useReportingStore = defineStore('reporting', () => {
     ];
 
     return {
-        aggregatedGraphTimeEntries,
-        fetchGraphReporting,
-        fetchTableReporting,
-        aggregatedTableTimeEntries,
         getNameForReportingRowEntry,
         groupByOptions,
         emptyPlaceholder,

From 66dfc511a933d8d9a5f8613f677f8c500a3b0d95 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Mon, 2 Feb 2026 01:16:28 +0100
Subject: [PATCH 13/28] add no project, no task, no client, no task, no tag
 support to the API

---
 .../TimeEntryAggregateExportRequest.php       |  53 +++--
 .../TimeEntry/TimeEntryAggregateRequest.php   |  53 +++--
 .../TimeEntry/TimeEntryIndexExportRequest.php |  45 ++--
 .../V1/TimeEntry/TimeEntryIndexRequest.php    |  55 +++--
 app/Service/TimeEntryFilter.php               |  48 ++++-
 .../Endpoint/Api/V1/TimeEntryEndpointTest.php | 199 ++++++++++++++++++
 tests/Unit/Service/TimeEntryFilterTest.php    | 166 +++++++++++++++
 7 files changed, 550 insertions(+), 69 deletions(-)

diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateExportRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateExportRequest.php
index 35f84519..a356198c 100644
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateExportRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateExportRequest.php
@@ -16,6 +16,7 @@
 use App\Models\Tag;
 use App\Models\Task;
 use App\Models\User;
+use App\Service\TimeEntryFilter;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
@@ -30,7 +31,7 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule|\Closure>>
      */
     public function rules(): array
     {
@@ -94,10 +95,15 @@ public function rules(): array
             ],
             'project_ids.*' => [
                 'string',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Project> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                        /** @var Builder<Project> $builder */
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter by client IDs, client IDs are OR combined
             'client_ids' => [
@@ -106,10 +112,15 @@ public function rules(): array
             ],
             'client_ids.*' => [
                 'string',
-                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Client> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
+                        /** @var Builder<Client> $builder */
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter by tag IDs, tag IDs are OR combined
             'tag_ids' => [
@@ -118,10 +129,15 @@ public function rules(): array
             ],
             'tag_ids.*' => [
                 'string',
-                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Tag> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                        /** @var Builder<Tag> $builder */
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
@@ -130,9 +146,14 @@ public function rules(): array
             ],
             'task_ids.*' => [
                 'string',
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter only time entries that have a start date after the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
             'start' => [
diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php
index 39c9270e..92378f82 100644
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php
@@ -14,6 +14,7 @@
 use App\Models\Tag;
 use App\Models\Task;
 use App\Models\User;
+use App\Service\TimeEntryFilter;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
@@ -28,7 +29,7 @@ class TimeEntryAggregateRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule|\Closure>>
      */
     public function rules(): array
     {
@@ -80,10 +81,15 @@ public function rules(): array
             ],
             'project_ids.*' => [
                 'string',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Project> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                        /** @var Builder<Project> $builder */
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter by client IDs, client IDs are OR combined
             'client_ids' => [
@@ -92,10 +98,15 @@ public function rules(): array
             ],
             'client_ids.*' => [
                 'string',
-                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Client> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
+                        /** @var Builder<Client> $builder */
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter by tag IDs, tag IDs are OR combined
             'tag_ids' => [
@@ -104,10 +115,15 @@ public function rules(): array
             ],
             'tag_ids.*' => [
                 'string',
-                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Tag> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                        /** @var Builder<Tag> $builder */
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
@@ -116,9 +132,14 @@ public function rules(): array
             ],
             'task_ids.*' => [
                 'string',
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter only time entries that have a start date after the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
             'start' => [
diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexExportRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexExportRequest.php
index 6c3180b2..5daa61e1 100644
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexExportRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexExportRequest.php
@@ -11,6 +11,7 @@
 use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
+use App\Service\TimeEntryFilter;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
@@ -25,7 +26,7 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule|\Closure>>
      */
     public function rules(): array
     {
@@ -64,11 +65,15 @@ public function rules(): array
             ],
             'project_ids.*' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Project> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                        /** @var Builder<Project> $builder */
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter by tag IDs, tag IDs are OR combined
             'tag_ids' => [
@@ -77,11 +82,15 @@ public function rules(): array
             ],
             'tag_ids.*' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Tag::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Tag> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                        /** @var Builder<Tag> $builder */
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
@@ -90,11 +99,15 @@ public function rules(): array
             ],
             'task_ids.*' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Task> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                        /** @var Builder<Task> $builder */
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter only time entries that have a start date after the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
             'start' => [
diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php
index 2c6dd61e..230e5134 100644
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php
@@ -12,6 +12,7 @@
 use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
+use App\Service\TimeEntryFilter;
 use Illuminate\Contracts\Validation\Rule as RuleContract;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
@@ -26,7 +27,7 @@ class TimeEntryIndexRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|RuleContract>>
+     * @return array<string, array<string|ValidationRule|RuleContract|\Closure>>
      */
     public function rules(): array
     {
@@ -58,10 +59,15 @@ public function rules(): array
             ],
             'client_ids.*' => [
                 'string',
-                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Client> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
+                        /** @var Builder<Client> $builder */
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter by project IDs, project IDs are OR combined
             'project_ids' => [
@@ -70,10 +76,15 @@ public function rules(): array
             ],
             'project_ids.*' => [
                 'string',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Project> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                        /** @var Builder<Project> $builder */
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter by tag IDs, tag IDs are OR combined
             'tag_ids' => [
@@ -82,10 +93,15 @@ public function rules(): array
             ],
             'tag_ids.*' => [
                 'string',
-                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Tag> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                        /** @var Builder<Tag> $builder */
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
@@ -94,10 +110,15 @@ public function rules(): array
             ],
             'task_ids.*' => [
                 'string',
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Task> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                        /** @var Builder<Task> $builder */
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
             ],
             // Filter only time entries that have a start date after the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
             'start' => [
diff --git a/app/Service/TimeEntryFilter.php b/app/Service/TimeEntryFilter.php
index 160adddc..02fbe689 100644
--- a/app/Service/TimeEntryFilter.php
+++ b/app/Service/TimeEntryFilter.php
@@ -12,6 +12,8 @@
 
 class TimeEntryFilter
 {
+    public const string NONE_VALUE = 'none';
+
     /**
      * @var Builder<TimeEntry>
      */
@@ -149,7 +151,17 @@ public function addClientIdsFilter(?array $clientIds): self
         if ($clientIds === null) {
             return $this;
         }
-        $this->builder->whereIn('client_id', $clientIds);
+        $includeNone = in_array(self::NONE_VALUE, $clientIds, true);
+        $clientIds = array_values(array_filter($clientIds, fn (string $id): bool => $id !== self::NONE_VALUE));
+
+        $this->builder->where(function (Builder $builder) use ($clientIds, $includeNone): void {
+            if (count($clientIds) > 0) {
+                $builder->whereIn('client_id', $clientIds);
+            }
+            if ($includeNone) {
+                $builder->orWhereNull('client_id');
+            }
+        });
 
         return $this;
     }
@@ -162,7 +174,17 @@ public function addProjectIdsFilter(?array $projectIds): self
         if ($projectIds === null) {
             return $this;
         }
-        $this->builder->whereIn('project_id', $projectIds);
+        $includeNone = in_array(self::NONE_VALUE, $projectIds, true);
+        $projectIds = array_values(array_filter($projectIds, fn (string $id): bool => $id !== self::NONE_VALUE));
+
+        $this->builder->where(function (Builder $builder) use ($projectIds, $includeNone): void {
+            if (count($projectIds) > 0) {
+                $builder->whereIn('project_id', $projectIds);
+            }
+            if ($includeNone) {
+                $builder->orWhereNull('project_id');
+            }
+        });
 
         return $this;
     }
@@ -175,10 +197,18 @@ public function addTagIdsFilter(?array $tagIds): self
         if ($tagIds === null) {
             return $this;
         }
-        $this->builder->where(function (Builder $builder) use ($tagIds): void {
+        $includeNone = in_array(self::NONE_VALUE, $tagIds, true);
+        $tagIds = array_values(array_filter($tagIds, fn (string $id): bool => $id !== self::NONE_VALUE));
+
+        $this->builder->where(function (Builder $builder) use ($tagIds, $includeNone): void {
             foreach ($tagIds as $tagId) {
                 $builder->orWhereJsonContains('tags', $tagId);
             }
+            if ($includeNone) {
+                $builder->orWhere(function (Builder $query): void {
+                    $query->whereJsonLength('tags', 0)->orWhereNull('tags');
+                });
+            }
         });
 
         return $this;
@@ -192,7 +222,17 @@ public function addTaskIdsFilter(?array $taskIds): self
         if ($taskIds === null) {
             return $this;
         }
-        $this->builder->whereIn('task_id', $taskIds);
+        $includeNone = in_array(self::NONE_VALUE, $taskIds, true);
+        $taskIds = array_values(array_filter($taskIds, fn (string $id): bool => $id !== self::NONE_VALUE));
+
+        $this->builder->where(function (Builder $builder) use ($taskIds, $includeNone): void {
+            if (count($taskIds) > 0) {
+                $builder->whereIn('task_id', $taskIds);
+            }
+            if ($includeNone) {
+                $builder->orWhereNull('task_id');
+            }
+        });
 
         return $this;
     }
diff --git a/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php b/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php
index 1a29232e..5e729207 100644
--- a/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php
+++ b/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php
@@ -20,6 +20,7 @@
 use App\Models\Task;
 use App\Models\TimeEntry;
 use App\Models\User;
+use App\Service\TimeEntryFilter;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Log;
@@ -3987,4 +3988,202 @@ public function test_update_multiple_updates_own_time_entries_fails_if_member_id
             'member_id' => $ownTimeEntry->member_id,
         ]);
     }
+
+    public function test_index_endpoint_with_none_project_filter_returns_entries_without_project(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'time-entries:view:all',
+        ]);
+        $project = Project::factory()->forOrganization($data->organization)->create();
+        $timeEntryWithProject = TimeEntry::factory()
+            ->forOrganization($data->organization)
+            ->forProject($project)
+            ->forMember($data->member)
+            ->create([
+                'start' => Carbon::now()->subHour(),
+            ]);
+        $timeEntryWithoutProject = TimeEntry::factory()
+            ->forOrganization($data->organization)
+            ->forMember($data->member)
+            ->create([
+                'project_id' => null,
+                'start' => Carbon::now()->subHour(),
+            ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.time-entries.index', [
+            $data->organization->getKey(),
+            'project_ids' => [TimeEntryFilter::NONE_VALUE],
+            'start' => Carbon::now()->subDay()->toIso8601ZuluString(),
+            'end' => Carbon::now()->addDay()->toIso8601ZuluString(),
+        ]));
+
+        // Assert
+        $this->assertResponseCode($response, 200);
+        $response->assertJsonCount(1, 'data');
+        $response->assertJsonPath('data.0.id', $timeEntryWithoutProject->getKey());
+    }
+
+    public function test_index_endpoint_with_none_and_id_project_filter_returns_both(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'time-entries:view:all',
+        ]);
+        $project = Project::factory()->forOrganization($data->organization)->create();
+        $otherProject = Project::factory()->forOrganization($data->organization)->create();
+        $timeEntryWithProject = TimeEntry::factory()
+            ->forOrganization($data->organization)
+            ->forProject($project)
+            ->forMember($data->member)
+            ->create([
+                'start' => Carbon::now()->subHour(),
+            ]);
+        $timeEntryWithoutProject = TimeEntry::factory()
+            ->forOrganization($data->organization)
+            ->forMember($data->member)
+            ->create([
+                'project_id' => null,
+                'start' => Carbon::now()->subHour(),
+            ]);
+        $timeEntryWithOtherProject = TimeEntry::factory()
+            ->forOrganization($data->organization)
+            ->forProject($otherProject)
+            ->forMember($data->member)
+            ->create([
+                'start' => Carbon::now()->subHour(),
+            ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.time-entries.index', [
+            $data->organization->getKey(),
+            'project_ids' => [TimeEntryFilter::NONE_VALUE, $project->getKey()],
+            'start' => Carbon::now()->subDay()->toIso8601ZuluString(),
+            'end' => Carbon::now()->addDay()->toIso8601ZuluString(),
+        ]));
+
+        // Assert
+        $this->assertResponseCode($response, 200);
+        $response->assertJsonCount(2, 'data');
+        $ids = collect($response->json('data'))->pluck('id')->toArray();
+        $this->assertContains($timeEntryWithProject->getKey(), $ids);
+        $this->assertContains($timeEntryWithoutProject->getKey(), $ids);
+        $this->assertNotContains($timeEntryWithOtherProject->getKey(), $ids);
+    }
+
+    public function test_index_endpoint_with_none_task_filter_returns_entries_without_task(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'time-entries:view:all',
+        ]);
+        $project = Project::factory()->forOrganization($data->organization)->create();
+        $task = Task::factory()->forOrganization($data->organization)->forProject($project)->create();
+        $timeEntryWithTask = TimeEntry::factory()
+            ->forOrganization($data->organization)
+            ->forProject($project)
+            ->forTask($task)
+            ->forMember($data->member)
+            ->create([
+                'start' => Carbon::now()->subHour(),
+            ]);
+        $timeEntryWithoutTask = TimeEntry::factory()
+            ->forOrganization($data->organization)
+            ->forMember($data->member)
+            ->create([
+                'task_id' => null,
+                'start' => Carbon::now()->subHour(),
+            ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.time-entries.index', [
+            $data->organization->getKey(),
+            'task_ids' => [TimeEntryFilter::NONE_VALUE],
+            'start' => Carbon::now()->subDay()->toIso8601ZuluString(),
+            'end' => Carbon::now()->addDay()->toIso8601ZuluString(),
+        ]));
+
+        // Assert
+        $this->assertResponseCode($response, 200);
+        $response->assertJsonCount(1, 'data');
+        $response->assertJsonPath('data.0.id', $timeEntryWithoutTask->getKey());
+    }
+
+    public function test_index_endpoint_with_none_client_filter_returns_entries_without_client(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'time-entries:view:all',
+        ]);
+        $client = Client::factory()->forOrganization($data->organization)->create();
+        $timeEntryWithClient = TimeEntry::factory()
+            ->forOrganization($data->organization)
+            ->forMember($data->member)
+            ->create([
+                'client_id' => $client->getKey(),
+                'start' => Carbon::now()->subHour(),
+            ]);
+        $timeEntryWithoutClient = TimeEntry::factory()
+            ->forOrganization($data->organization)
+            ->forMember($data->member)
+            ->create([
+                'client_id' => null,
+                'start' => Carbon::now()->subHour(),
+            ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.time-entries.index', [
+            $data->organization->getKey(),
+            'client_ids' => [TimeEntryFilter::NONE_VALUE],
+            'start' => Carbon::now()->subDay()->toIso8601ZuluString(),
+            'end' => Carbon::now()->addDay()->toIso8601ZuluString(),
+        ]));
+
+        // Assert
+        $this->assertResponseCode($response, 200);
+        $response->assertJsonCount(1, 'data');
+        $response->assertJsonPath('data.0.id', $timeEntryWithoutClient->getKey());
+    }
+
+    public function test_index_endpoint_with_none_tag_filter_returns_entries_without_tags(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'time-entries:view:all',
+        ]);
+        $tag = Tag::factory()->forOrganization($data->organization)->create();
+        $timeEntryWithTag = TimeEntry::factory()
+            ->forOrganization($data->organization)
+            ->forMember($data->member)
+            ->create([
+                'start' => Carbon::now()->subHour(),
+                'tags' => [$tag->getKey()],
+            ]);
+        $timeEntryWithoutTag = TimeEntry::factory()
+            ->forOrganization($data->organization)
+            ->forMember($data->member)
+            ->create([
+                'start' => Carbon::now()->subHour(),
+                'tags' => [],
+            ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.time-entries.index', [
+            $data->organization->getKey(),
+            'tag_ids' => [TimeEntryFilter::NONE_VALUE],
+            'start' => Carbon::now()->subDay()->toIso8601ZuluString(),
+            'end' => Carbon::now()->addDay()->toIso8601ZuluString(),
+        ]));
+
+        // Assert
+        $this->assertResponseCode($response, 200);
+        $response->assertJsonCount(1, 'data');
+        $response->assertJsonPath('data.0.id', $timeEntryWithoutTag->getKey());
+    }
 }
diff --git a/tests/Unit/Service/TimeEntryFilterTest.php b/tests/Unit/Service/TimeEntryFilterTest.php
index 1c390f7d..9e2312d2 100644
--- a/tests/Unit/Service/TimeEntryFilterTest.php
+++ b/tests/Unit/Service/TimeEntryFilterTest.php
@@ -4,7 +4,10 @@
 
 namespace Tests\Unit\Service;
 
+use App\Models\Client;
+use App\Models\Project;
 use App\Models\Tag;
+use App\Models\Task;
 use App\Models\TimeEntry;
 use App\Service\TimeEntryFilter;
 use PHPUnit\Framework\Attributes\CoversClass;
@@ -39,4 +42,167 @@ public function test_add_tag_ids_filter_is_or(): void
         $this->assertCount(3, $timeEntries);
 
     }
+
+    public function test_add_project_ids_filter_with_none_returns_entries_without_project(): void
+    {
+        // Arrange
+        $project = Project::factory()->create();
+        $timeEntryWithProject = TimeEntry::factory()->create([
+            'project_id' => $project->getKey(),
+            'organization_id' => $project->organization_id,
+        ]);
+        $timeEntryWithoutProject = TimeEntry::factory()->create([
+            'project_id' => null,
+        ]);
+
+        $builder = TimeEntry::query();
+        $filter = new TimeEntryFilter($builder);
+
+        // Act
+        $filter->addProjectIdsFilter([TimeEntryFilter::NONE_VALUE]);
+
+        // Assert
+        $timeEntries = $builder->get();
+        $this->assertCount(1, $timeEntries);
+        $this->assertTrue($timeEntries->contains($timeEntryWithoutProject));
+        $this->assertFalse($timeEntries->contains($timeEntryWithProject));
+    }
+
+    public function test_add_project_ids_filter_with_none_and_ids_returns_both(): void
+    {
+        // Arrange
+        $project = Project::factory()->create();
+        $timeEntryWithProject = TimeEntry::factory()->create([
+            'project_id' => $project->getKey(),
+            'organization_id' => $project->organization_id,
+        ]);
+        $timeEntryWithoutProject = TimeEntry::factory()->create([
+            'project_id' => null,
+        ]);
+        $otherProject = Project::factory()->create();
+        $timeEntryWithOtherProject = TimeEntry::factory()->create([
+            'project_id' => $otherProject->getKey(),
+            'organization_id' => $otherProject->organization_id,
+        ]);
+
+        $builder = TimeEntry::query();
+        $filter = new TimeEntryFilter($builder);
+
+        // Act
+        $filter->addProjectIdsFilter([$project->getKey(), TimeEntryFilter::NONE_VALUE]);
+
+        // Assert
+        $timeEntries = $builder->get();
+        $this->assertCount(2, $timeEntries);
+        $this->assertTrue($timeEntries->contains($timeEntryWithProject));
+        $this->assertTrue($timeEntries->contains($timeEntryWithoutProject));
+        $this->assertFalse($timeEntries->contains($timeEntryWithOtherProject));
+    }
+
+    public function test_add_task_ids_filter_with_none_returns_entries_without_task(): void
+    {
+        // Arrange
+        $task = Task::factory()->create();
+        $timeEntryWithTask = TimeEntry::factory()->create([
+            'task_id' => $task->getKey(),
+            'organization_id' => $task->organization_id,
+        ]);
+        $timeEntryWithoutTask = TimeEntry::factory()->create([
+            'task_id' => null,
+        ]);
+
+        $builder = TimeEntry::query();
+        $filter = new TimeEntryFilter($builder);
+
+        // Act
+        $filter->addTaskIdsFilter([TimeEntryFilter::NONE_VALUE]);
+
+        // Assert
+        $timeEntries = $builder->get();
+        $this->assertCount(1, $timeEntries);
+        $this->assertTrue($timeEntries->contains($timeEntryWithoutTask));
+        $this->assertFalse($timeEntries->contains($timeEntryWithTask));
+    }
+
+    public function test_add_client_ids_filter_with_none_returns_entries_without_client(): void
+    {
+        // Arrange
+        $client = Client::factory()->create();
+        $timeEntryWithClient = TimeEntry::factory()->create([
+            'client_id' => $client->getKey(),
+            'organization_id' => $client->organization_id,
+        ]);
+        $timeEntryWithoutClient = TimeEntry::factory()->create([
+            'client_id' => null,
+        ]);
+
+        $builder = TimeEntry::query();
+        $filter = new TimeEntryFilter($builder);
+
+        // Act
+        $filter->addClientIdsFilter([TimeEntryFilter::NONE_VALUE]);
+
+        // Assert
+        $timeEntries = $builder->get();
+        $this->assertCount(1, $timeEntries);
+        $this->assertTrue($timeEntries->contains($timeEntryWithoutClient));
+        $this->assertFalse($timeEntries->contains($timeEntryWithClient));
+    }
+
+    public function test_add_tag_ids_filter_with_none_returns_entries_without_tags(): void
+    {
+        // Arrange
+        $tag = Tag::factory()->create();
+        $timeEntryWithTag = TimeEntry::factory()->create([
+            'tags' => [$tag->getKey()],
+        ]);
+        $timeEntryWithEmptyTags = TimeEntry::factory()->create([
+            'tags' => [],
+        ]);
+        $timeEntryWithNullTags = TimeEntry::factory()->create([
+            'tags' => null,
+        ]);
+
+        $builder = TimeEntry::query();
+        $filter = new TimeEntryFilter($builder);
+
+        // Act
+        $filter->addTagIdsFilter([TimeEntryFilter::NONE_VALUE]);
+
+        // Assert
+        $timeEntries = $builder->get();
+        $this->assertCount(2, $timeEntries);
+        $this->assertTrue($timeEntries->contains($timeEntryWithEmptyTags));
+        $this->assertTrue($timeEntries->contains($timeEntryWithNullTags));
+        $this->assertFalse($timeEntries->contains($timeEntryWithTag));
+    }
+
+    public function test_add_tag_ids_filter_with_none_and_ids_returns_both(): void
+    {
+        // Arrange
+        $tag1 = Tag::factory()->create();
+        $tag2 = Tag::factory()->create();
+        $timeEntryWithTag1 = TimeEntry::factory()->create([
+            'tags' => [$tag1->getKey()],
+        ]);
+        $timeEntryWithTag2 = TimeEntry::factory()->create([
+            'tags' => [$tag2->getKey()],
+        ]);
+        $timeEntryWithNoTags = TimeEntry::factory()->create([
+            'tags' => [],
+        ]);
+
+        $builder = TimeEntry::query();
+        $filter = new TimeEntryFilter($builder);
+
+        // Act
+        $filter->addTagIdsFilter([$tag1->getKey(), TimeEntryFilter::NONE_VALUE]);
+
+        // Assert
+        $timeEntries = $builder->get();
+        $this->assertCount(2, $timeEntries);
+        $this->assertTrue($timeEntries->contains($timeEntryWithTag1));
+        $this->assertTrue($timeEntries->contains($timeEntryWithNoTags));
+        $this->assertFalse($timeEntries->contains($timeEntryWithTag2));
+    }
 }

From fe8c7e9a7d3285e166e36a637bc430ca4f027572 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Mon, 2 Feb 2026 01:28:42 +0100
Subject: [PATCH 14/28] Update openapi api client spec

---
 resources/js/packages/api/src/openapi.json.client.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/packages/api/src/openapi.json.client.ts b/resources/js/packages/api/src/openapi.json.client.ts
index d9599d29..4bbcd19a 100644
--- a/resources/js/packages/api/src/openapi.json.client.ts
+++ b/resources/js/packages/api/src/openapi.json.client.ts
@@ -4233,17 +4233,17 @@ If the group parameters are all set to &#x60;null&#x60; or are all missing, the
             {
                 name: 'project_ids',
                 type: 'Query',
-                schema: z.array(z.string().uuid()).min(1).optional(),
+                schema: z.array(z.string()).min(1).optional(),
             },
             {
                 name: 'tag_ids',
                 type: 'Query',
-                schema: z.array(z.string().uuid()).min(1).optional(),
+                schema: z.array(z.string()).min(1).optional(),
             },
             {
                 name: 'task_ids',
                 type: 'Query',
-                schema: z.array(z.string().uuid()).min(1).optional(),
+                schema: z.array(z.string()).min(1).optional(),
             },
         ],
         response: z.union([

From 0d3978a55d63eec587bd85a0a37c09bde5307701 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Mon, 2 Feb 2026 01:31:35 +0100
Subject: [PATCH 15/28] Add reporting e2e helpers and detailed tests

---
 e2e/members.spec.ts            | 130 +++++-
 e2e/project-members.spec.ts    |   4 +-
 e2e/reporting-detailed.spec.ts | 598 ++++++++++++++++++++++++
 e2e/reporting.spec.ts          | 832 ++++++++++++++++++++++++++-------
 e2e/time.spec.ts               | 141 +++++-
 e2e/utils/reporting.ts         | 275 +++++++++++
 6 files changed, 1810 insertions(+), 170 deletions(-)
 create mode 100644 e2e/reporting-detailed.spec.ts
 create mode 100644 e2e/utils/reporting.ts

diff --git a/e2e/members.spec.ts b/e2e/members.spec.ts
index 70be0e7c..49661246 100644
--- a/e2e/members.spec.ts
+++ b/e2e/members.spec.ts
@@ -3,12 +3,16 @@
 // TODO: Remove Invitation
 import { expect, test } from '../playwright/fixtures';
 import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
+import type { Page } from '@playwright/test';
+import path from 'path';
+import fs from 'fs';
+import os from 'os';
 
-async function goToMembersPage(page) {
+async function goToMembersPage(page: Page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/members');
 }
 
-async function openInviteMemberModal(page) {
+async function openInviteMemberModal(page: Page) {
     await Promise.all([
         page.getByRole('button', { name: 'Invite Member' }).click(),
         expect(page.getByPlaceholder('Member Email')).toBeVisible(),
@@ -35,7 +39,7 @@ test('test that new employee can be invited', async ({ page }) => {
     await page.getByRole('button', { name: 'Employee' }).click();
     await Promise.all([
         page.getByRole('button', { name: 'Invite Member', exact: true }).click(),
-        await expect(page.getByRole('main')).toContainText(`new+${editorId}@editor.test`),
+        expect(page.getByRole('main')).toContainText(`new+${editorId}@editor.test`),
     ]);
 });
 
@@ -91,3 +95,123 @@ test('test that organization billable rate can be updated with all existing time
         ),
     ]);
 });
+
+async function createPlaceholderMemberViaImport(page: Page, placeholderName: string) {
+    const placeholderEmail = `placeholder+${Math.floor(Math.random() * 100000)}@solidtime-import.test`;
+    const csvContent = [
+        'User,Email,Client,Project,Task,Description,Billable,Start date,Start time,End date,End time,Tags',
+        `${placeholderName},${placeholderEmail},,,,Imported entry,No,2024-01-01,09:00:00,2024-01-01,10:00:00,`,
+    ].join('\n');
+
+    // Write CSV to a temp file for upload
+    const tmpDir = os.tmpdir();
+    const tmpFile = path.join(tmpDir, `import-${Date.now()}.csv`);
+    fs.writeFileSync(tmpFile, csvContent);
+
+    await page.goto(PLAYWRIGHT_BASE_URL + '/import');
+
+    // Select "Toggl Time Entries" import type
+    await page.locator('select#importType').selectOption({ label: 'Toggl Time Entries' });
+
+    // Upload the CSV file
+    await page.locator('input[type="file"]').setInputFiles(tmpFile);
+
+    // Click Import and wait for success
+    await Promise.all([
+        page.getByRole('button', { name: 'Import Data' }).click(),
+        page.waitForResponse(
+            (response) => response.url().includes('/import') && response.status() === 200
+        ),
+    ]);
+
+    // Close the result modal
+    await page.getByRole('button', { name: 'Close' }).click();
+
+    // Clean up temp file
+    fs.unlinkSync(tmpFile);
+}
+
+test('test that changing member role updates the role in the member table', async ({ page }) => {
+    const placeholderName = 'RoleChange ' + Math.floor(Math.random() * 10000);
+
+    // Create a placeholder member via import
+    await createPlaceholderMemberViaImport(page, placeholderName);
+
+    // Go to members page and verify placeholder exists with role "Placeholder"
+    await goToMembersPage(page);
+    const memberRow = page.getByRole('row').filter({ hasText: placeholderName });
+    await expect(memberRow).toBeVisible();
+    await expect(memberRow.getByText('Placeholder')).toBeVisible();
+
+    // Open the edit modal for the placeholder member
+    await memberRow.getByRole('button').click();
+    await page.getByRole('menuitem').getByText('Edit').click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+    await expect(page.getByRole('heading', { name: 'Update Member' })).toBeVisible();
+
+    // Change role to Employee
+    const roleSelect = page.getByRole('dialog').getByRole('combobox').first();
+    await roleSelect.click();
+    await page.getByRole('option', { name: 'Employee' }).click();
+
+    // Submit the change and verify the API call succeeds
+    await Promise.all([
+        page.getByRole('button', { name: 'Update Member' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/members/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+    ]);
+
+    // Verify dialog closed
+    await expect(page.getByRole('dialog')).not.toBeVisible();
+
+    // Verify the role updated in the table
+    await expect(memberRow.getByText('Employee')).toBeVisible();
+});
+
+test('test that merging a placeholder member works', async ({ page }) => {
+    const placeholderName = 'Merge Target ' + Math.floor(Math.random() * 10000);
+
+    // Create a placeholder member via import
+    await createPlaceholderMemberViaImport(page, placeholderName);
+
+    // Go to members page
+    await goToMembersPage(page);
+    await expect(page.getByText(placeholderName)).toBeVisible();
+
+    // Find the placeholder member row and open actions menu
+    const placeholderRow = page.getByRole('row').filter({ hasText: placeholderName });
+    await placeholderRow.getByRole('button').click();
+
+    // Click Merge
+    await page.getByTestId('member_merge').click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+    await expect(page.getByRole('heading', { name: 'Merge Member' })).toBeVisible();
+
+    // Select the current user (the owner) as merge target via MemberCombobox
+    const combobox = page.getByRole('dialog').getByRole('combobox');
+    await combobox.click();
+
+    // Wait for dropdown options to load
+    const firstOption = page.getByRole('option').first();
+    await expect(firstOption).toBeVisible({ timeout: 10000 });
+    await firstOption.click();
+
+    // Submit merge
+    await Promise.all([
+        page.getByRole('button', { name: 'Merge Member' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/member/') && response.url().includes('/merge-into') && response.ok()
+        ),
+    ]);
+
+    // Wait for dialog to close after successful merge
+    await expect(page.getByRole('dialog')).not.toBeVisible();
+
+    // Verify placeholder member is no longer in the members table
+    await expect(page.getByRole('main').getByText(placeholderName)).not.toBeVisible();
+});
diff --git a/e2e/project-members.spec.ts b/e2e/project-members.spec.ts
index 555112e9..20fe201f 100644
--- a/e2e/project-members.spec.ts
+++ b/e2e/project-members.spec.ts
@@ -32,8 +32,8 @@ test('test that updating project member billable rate works for existing time en
     await page.getByRole('button', { name: 'Add Member' }).click();
 
     await expect(page.getByText('Add Project Member').first()).toBeVisible();
-    await page.getByRole('button', { name: 'Select a member' }).click();
-    await page.keyboard.press('Enter');
+    await page.getByRole('combobox').filter({ hasText: 'Select a member' }).click();
+    await page.getByRole('option').first().click();
     await page.getByRole('button', { name: 'Add Project Member' }).click();
 
     await page
diff --git a/e2e/reporting-detailed.spec.ts b/e2e/reporting-detailed.spec.ts
new file mode 100644
index 00000000..d10305b9
--- /dev/null
+++ b/e2e/reporting-detailed.spec.ts
@@ -0,0 +1,598 @@
+import { expect } from '@playwright/test';
+import { test } from '../playwright/fixtures';
+import {
+    goToReportingDetailed,
+    createProject,
+    createClient,
+    createProjectWithClient,
+    createTask,
+    createTimeEntryWithProject,
+    createTimeEntryWithProjectAndTask,
+    createTimeEntryWithTag,
+    createBareTimeEntry,
+    waitForDetailedReportingUpdate,
+} from './utils/reporting';
+
+// Each test registers a new user and creates test data, which needs more time
+test.describe.configure({ timeout: 60000 });
+
+// ──────────────────────────────────────────────────
+// Basic Detailed View Tests
+// ──────────────────────────────────────────────────
+
+test('test that detailed view shows time entries correctly', async ({ page }) => {
+    const projectName = 'Detailed View Project ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+
+    // Go to detailed reporting view
+    await goToReportingDetailed(page);
+
+    // Verify the time entry is shown with all details
+    await expect(page.getByText(projectName, { exact: true })).toBeVisible();
+    await expect(page.locator('input[name="Duration"]')).toHaveValue('1h 00min');
+    await expect(page.getByText('Entry for ' + projectName, { exact: true })).toBeVisible();
+});
+
+test('test that updating duration in detailed view works correctly', async ({ page }) => {
+    const projectName = 'Duration Update Project ' + Math.floor(Math.random() * 10000);
+    const initialDuration = '1h';
+    const updatedDuration = '2h 30min';
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, initialDuration);
+
+    // Go to detailed reporting view
+    await goToReportingDetailed(page);
+
+    // Find and update the duration
+    const durationInput = page.locator('input[name="Duration"]').first();
+    await durationInput.click();
+    await durationInput.fill(updatedDuration);
+    await Promise.all([
+        durationInput.press('Enter'),
+        page.waitForResponse(
+            (response) => response.url().includes('/time-entries') && response.status() === 200
+        ),
+    ]);
+
+    // Verify the new duration is displayed
+    await expect(durationInput).toHaveValue(updatedDuration);
+});
+
+// ──────────────────────────────────────────────────
+// Project Filter Tests
+// ──────────────────────────────────────────────────
+
+test('test that project multiselect filters work on detailed reporting page', async ({ page }) => {
+    const project1 = 'DetailProj1 ' + Math.floor(Math.random() * 10000);
+    const project2 = 'DetailProj2 ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, project1);
+    await createProject(page, project2);
+    await createTimeEntryWithProject(page, project1, '1h');
+    await createTimeEntryWithProject(page, project2, '2h');
+
+    await goToReportingDetailed(page);
+
+    // Wait for initial data load
+    await expect(page.getByText(`Entry for ${project1}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${project2}`)).toBeVisible();
+
+    // Open project multiselect and select project1
+    await page.getByRole('button', { name: 'Projects' }).first().click();
+    await page.getByRole('option').filter({ hasText: project1 }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    // Verify only project1 entry is shown
+    await expect(page.getByText(`Entry for ${project1}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${project2}`)).not.toBeVisible();
+});
+
+// ──────────────────────────────────────────────────
+// Client Filter Tests
+// ──────────────────────────────────────────────────
+
+test('test that client multiselect filters work on detailed reporting page', async ({ page }) => {
+    const client1 = 'DetailClient1 ' + Math.floor(Math.random() * 10000);
+    const project1 = 'DetailClientProj1 ' + Math.floor(Math.random() * 10000);
+    const project2 = 'DetailClientProj2 ' + Math.floor(Math.random() * 10000);
+
+    await createClient(page, client1);
+    await createProjectWithClient(page, project1, client1);
+    await createProject(page, project2);
+    await createTimeEntryWithProject(page, project1, '1h');
+    await createTimeEntryWithProject(page, project2, '2h');
+
+    await goToReportingDetailed(page);
+
+    await expect(page.getByText(`Entry for ${project1}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${project2}`)).toBeVisible();
+
+    // Filter by client1
+    await page.getByRole('button', { name: 'Clients' }).first().click();
+    await page.getByRole('option').filter({ hasText: client1 }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    // Only entries for project1 (with client1) should be visible
+    await expect(page.getByText(`Entry for ${project1}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${project2}`)).not.toBeVisible();
+});
+
+// ──────────────────────────────────────────────────
+// Task Filter Tests
+// ──────────────────────────────────────────────────
+
+test('test that task multiselect dropdown filters reporting by task', async ({ page }) => {
+    const projectName = 'TaskFilterProj ' + Math.floor(Math.random() * 10000);
+    const task1 = 'TaskFilter1 ' + Math.floor(Math.random() * 10000);
+    const task2 = 'TaskFilter2 ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTask(page, projectName, task1);
+    await createTask(page, projectName, task2);
+    await createTimeEntryWithProjectAndTask(page, projectName, task1, '1h');
+    await createTimeEntryWithProjectAndTask(page, projectName, task2, '2h');
+
+    // Use the detailed view to verify task filtering (shows individual entries)
+    await goToReportingDetailed(page);
+
+    await expect(page.getByText(`Entry for ${projectName} - ${task1}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${projectName} - ${task2}`)).toBeVisible();
+
+    // Open task multiselect dropdown
+    await page.getByRole('button', { name: 'Tasks' }).first().click();
+
+    // Verify both tasks appear
+    await expect(page.getByRole('option').filter({ hasText: task1 })).toBeVisible();
+    await expect(page.getByRole('option').filter({ hasText: task2 })).toBeVisible();
+
+    // Select task1
+    await page.getByRole('option').filter({ hasText: task1 }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    // Verify badge shows count of 1
+    await expect(page.getByRole('button', { name: 'Tasks' }).first().getByText('1')).toBeVisible();
+
+    // Verify only task1 entry is shown
+    await expect(page.getByText(`Entry for ${projectName} - ${task1}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${projectName} - ${task2}`)).not.toBeVisible();
+});
+
+test('test that selecting multiple tasks shows correct badge count', async ({ page }) => {
+    const projectName = 'MultiTaskProj ' + Math.floor(Math.random() * 10000);
+    const task1 = 'MultiTask1 ' + Math.floor(Math.random() * 10000);
+    const task2 = 'MultiTask2 ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTask(page, projectName, task1);
+    await createTask(page, projectName, task2);
+    await createTimeEntryWithProjectAndTask(page, projectName, task1, '1h');
+    await createTimeEntryWithProjectAndTask(page, projectName, task2, '2h');
+
+    // Use the detailed view to verify task filtering
+    await goToReportingDetailed(page);
+
+    await expect(page.getByText(`Entry for ${projectName} - ${task1}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${projectName} - ${task2}`)).toBeVisible();
+
+    // Select both tasks
+    await page.getByRole('button', { name: 'Tasks' }).first().click();
+    await page.getByRole('option').filter({ hasText: task1 }).click();
+    await page.getByRole('option').filter({ hasText: task2 }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    // Verify badge shows count of 2
+    await expect(page.getByRole('button', { name: 'Tasks' }).first().getByText('2')).toBeVisible();
+
+    // Verify both task entries are shown
+    await expect(page.getByText(`Entry for ${projectName} - ${task1}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${projectName} - ${task2}`)).toBeVisible();
+});
+
+test('test that deselecting a task removes the filter', async ({ page }) => {
+    const projectName = 'TaskDeselectProj ' + Math.floor(Math.random() * 10000);
+    const task1 = 'TaskDeselect1 ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTask(page, projectName, task1);
+    await createTimeEntryWithProjectAndTask(page, projectName, task1, '1h');
+
+    await goToReportingDetailed(page);
+    await expect(page.getByText(`Entry for ${projectName} - ${task1}`)).toBeVisible();
+
+    // Select task
+    await page.getByRole('button', { name: 'Tasks' }).first().click();
+    await page.getByRole('option').filter({ hasText: task1 }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    await expect(page.getByRole('button', { name: 'Tasks' }).first().getByText('1')).toBeVisible();
+
+    // Deselect task
+    await page.getByRole('button', { name: 'Tasks' }).first().click();
+    await page.getByRole('option').filter({ hasText: task1 }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    await expect(
+        page.getByRole('button', { name: 'Tasks' }).first().getByText(/^\d+$/)
+    ).not.toBeVisible();
+});
+
+// ──────────────────────────────────────────────────
+// Member Filter Tests
+// ──────────────────────────────────────────────────
+
+test('test that member multiselect filters work on detailed reporting page', async ({ page }) => {
+    const projectName = 'DetailMemberProj ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+
+    await goToReportingDetailed(page);
+    await expect(page.getByText(`Entry for ${projectName}`)).toBeVisible();
+
+    // Filter by the current member
+    await page.getByRole('button', { name: 'Members' }).first().click();
+    await page.getByRole('option').filter({ hasText: 'John Doe' }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    // Data should still be visible since all entries belong to this member
+    await expect(page.getByText(`Entry for ${projectName}`)).toBeVisible();
+
+    // Verify badge shows count of 1
+    await expect(
+        page.getByRole('button', { name: 'Members' }).first().getByText('1')
+    ).toBeVisible();
+});
+
+// ──────────────────────────────────────────────────
+// Tag Filter Tests
+// ──────────────────────────────────────────────────
+
+test('test that tag filter works on detailed reporting page', async ({ page }) => {
+    const tag1 = 'DetailTag1 ' + Math.floor(Math.random() * 10000);
+    const tag2 = 'DetailTag2 ' + Math.floor(Math.random() * 10000);
+
+    await createTimeEntryWithTag(page, tag1, '1h');
+    await createTimeEntryWithTag(page, tag2, '2h');
+
+    await goToReportingDetailed(page);
+
+    await expect(page.getByText(`Entry with tag ${tag1}`)).toBeVisible();
+    await expect(page.getByText(`Entry with tag ${tag2}`)).toBeVisible();
+
+    // Filter by tag1
+    await page.getByRole('button', { name: 'Tags' }).click();
+    await page.getByRole('option').filter({ hasText: tag1 }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    await expect(page.getByText(`Entry with tag ${tag1}`)).toBeVisible();
+    await expect(page.getByText(`Entry with tag ${tag2}`)).not.toBeVisible();
+});
+
+// ──────────────────────────────────────────────────
+// Billable Filter Tests
+// ──────────────────────────────────────────────────
+
+test('test that billable filter works on detailed reporting page', async ({ page }) => {
+    const projectName = 'DetailBillProj ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+
+    await goToReportingDetailed(page);
+    await expect(page.getByText(`Entry for ${projectName}`)).toBeVisible();
+
+    // Filter by billable only
+    await page.getByRole('combobox').filter({ hasText: 'Billable' }).click();
+    await Promise.all([
+        page.getByRole('option', { name: 'Billable', exact: true }).click(),
+        waitForDetailedReportingUpdate(page),
+    ]);
+
+    // Switch to Non Billable
+    await page.getByRole('combobox').filter({ hasText: 'Billable' }).click();
+    await Promise.all([
+        page.getByRole('option', { name: 'Non Billable', exact: true }).click(),
+        waitForDetailedReportingUpdate(page),
+    ]);
+
+    // Switch back to Both
+    await page.getByRole('combobox').filter({ hasText: 'Non Billable' }).click();
+    await Promise.all([
+        page.getByRole('option', { name: 'Both' }).click(),
+        waitForDetailedReportingUpdate(page),
+    ]);
+});
+
+// ──────────────────────────────────────────────────
+// Combined Filter Tests
+// ──────────────────────────────────────────────────
+
+test('test that combining project and task filters narrows results', async ({ page }) => {
+    const projectName = 'CombinedProj ' + Math.floor(Math.random() * 10000);
+    const otherProject = 'OtherCombProj ' + Math.floor(Math.random() * 10000);
+    const task1 = 'CombinedTask1 ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createProject(page, otherProject);
+    await createTask(page, projectName, task1);
+    await createTimeEntryWithProjectAndTask(page, projectName, task1, '1h');
+    await createTimeEntryWithProject(page, otherProject, '2h');
+
+    await goToReportingDetailed(page);
+
+    await expect(page.getByText(`Entry for ${projectName} - ${task1}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${otherProject}`)).toBeVisible();
+
+    // Filter by project
+    await page.getByRole('button', { name: 'Projects' }).first().click();
+    await page.getByRole('option').filter({ hasText: projectName }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    // Additionally filter by task
+    await page.getByRole('button', { name: 'Tasks' }).first().click();
+    await page.getByRole('option').filter({ hasText: task1 }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    // Verify both badges show count of 1
+    await expect(
+        page.getByRole('button', { name: 'Projects' }).first().getByText('1')
+    ).toBeVisible();
+    await expect(page.getByRole('button', { name: 'Tasks' }).first().getByText('1')).toBeVisible();
+
+    // Verify only the combined entry is shown
+    await expect(page.getByText(`Entry for ${projectName} - ${task1}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${otherProject}`)).not.toBeVisible();
+});
+
+test('test that combining client and member filters narrows results on detailed page', async ({
+    page,
+}) => {
+    const client1 = 'CombClient ' + Math.floor(Math.random() * 10000);
+    const project1 = 'CombClientProj ' + Math.floor(Math.random() * 10000);
+    const project2 = 'CombNoClientProj ' + Math.floor(Math.random() * 10000);
+
+    await createClient(page, client1);
+    await createProjectWithClient(page, project1, client1);
+    await createProject(page, project2);
+    await createTimeEntryWithProject(page, project1, '1h');
+    await createTimeEntryWithProject(page, project2, '2h');
+
+    await goToReportingDetailed(page);
+
+    await expect(page.getByText(`Entry for ${project1}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${project2}`)).toBeVisible();
+
+    // Filter by client
+    await page.getByRole('button', { name: 'Clients' }).first().click();
+    await page.getByRole('option').filter({ hasText: client1 }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    // Additionally filter by member
+    await page.getByRole('button', { name: 'Members' }).first().click();
+    await page.getByRole('option').filter({ hasText: 'John Doe' }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    // Only project1 entry should be visible (filtered by client + member)
+    await expect(page.getByText(`Entry for ${project1}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${project2}`)).not.toBeVisible();
+
+    // Both badges should show count of 1
+    await expect(
+        page.getByRole('button', { name: 'Clients' }).first().getByText('1')
+    ).toBeVisible();
+    await expect(
+        page.getByRole('button', { name: 'Members' }).first().getByText('1')
+    ).toBeVisible();
+});
+
+test('test that combining tag and project filters narrows results', async ({ page }) => {
+    const tag1 = 'CombTag ' + Math.floor(Math.random() * 10000);
+    const project1 = 'CombTagProj ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, project1);
+
+    // Create a time entry with a project (no tag)
+    await createTimeEntryWithProject(page, project1, '1h');
+
+    // Create a time entry with a tag (no specific project)
+    await createTimeEntryWithTag(page, tag1, '2h');
+
+    await goToReportingDetailed(page);
+
+    await expect(page.getByText(`Entry for ${project1}`)).toBeVisible();
+    await expect(page.getByText(`Entry with tag ${tag1}`)).toBeVisible();
+
+    // Filter by project
+    await page.getByRole('button', { name: 'Projects' }).first().click();
+    await page.getByRole('option').filter({ hasText: project1 }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    // Only the project entry should be visible (tagged entry has no project)
+    await expect(page.getByText(`Entry for ${project1}`)).toBeVisible();
+    await expect(page.getByText(`Entry with tag ${tag1}`)).not.toBeVisible();
+});
+
+// ──────────────────────────────────────────────────
+// "No X" Filter Tests
+// ──────────────────────────────────────────────────
+
+test('test that "No Project" filter shows entries without a project', async ({ page }) => {
+    const project1 = 'NoProj1 ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, project1);
+    await createTimeEntryWithProject(page, project1, '1h');
+    await createBareTimeEntry(page, 'Bare entry no project', '30min');
+
+    await goToReportingDetailed(page);
+
+    await expect(page.getByText(`Entry for ${project1}`)).toBeVisible();
+    await expect(page.getByText('Bare entry no project')).toBeVisible();
+
+    // Open project dropdown and select "No Project"
+    await page.getByRole('button', { name: 'Projects' }).first().click();
+    await page.getByRole('option').filter({ hasText: 'No Project' }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    // Verify badge shows 1
+    await expect(
+        page.getByRole('button', { name: 'Projects' }).first().getByText('1')
+    ).toBeVisible();
+
+    // Only the bare entry (no project) should be visible
+    await expect(page.getByText('Bare entry no project')).toBeVisible();
+    await expect(page.getByText(`Entry for ${project1}`)).not.toBeVisible();
+});
+
+test('test that "No Task" filter shows entries without a task', async ({ page }) => {
+    const projectName = 'NoTaskProj ' + Math.floor(Math.random() * 10000);
+    const task1 = 'NoTaskFilter1 ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTask(page, projectName, task1);
+    await createTimeEntryWithProjectAndTask(page, projectName, task1, '1h');
+    await createTimeEntryWithProject(page, projectName, '30min');
+
+    await goToReportingDetailed(page);
+
+    await expect(page.getByText(`Entry for ${projectName} - ${task1}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${projectName}`).first()).toBeVisible();
+
+    // Open task dropdown and select "No Task"
+    await page.getByRole('button', { name: 'Tasks' }).first().click();
+    await page.getByRole('option').filter({ hasText: 'No Task' }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    await expect(page.getByRole('button', { name: 'Tasks' }).first().getByText('1')).toBeVisible();
+
+    // Only the entry without a task should be visible
+    await expect(page.getByText(`Entry for ${projectName} - ${task1}`)).not.toBeVisible();
+});
+
+test('test that "No Tag" filter shows entries without tags', async ({ page }) => {
+    const tag1 = 'NoTagFilter1 ' + Math.floor(Math.random() * 10000);
+
+    await createTimeEntryWithTag(page, tag1, '1h');
+    await createBareTimeEntry(page, 'Entry without any tag', '30min');
+
+    await goToReportingDetailed(page);
+
+    await expect(page.getByText(`Entry with tag ${tag1}`)).toBeVisible();
+    await expect(page.getByText('Entry without any tag')).toBeVisible();
+
+    // Open tag dropdown and select "No Tag"
+    await page.getByRole('button', { name: 'Tags' }).click();
+    await page.getByRole('option').filter({ hasText: 'No Tag' }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    await expect(page.getByRole('button', { name: 'Tags' }).getByText('1')).toBeVisible();
+
+    await expect(page.getByText('Entry without any tag')).toBeVisible();
+    await expect(page.getByText(`Entry with tag ${tag1}`)).not.toBeVisible();
+});
+
+test('test that "No Client" filter shows entries without a client', async ({ page }) => {
+    const client1 = 'NoClientFilter ' + Math.floor(Math.random() * 10000);
+    const projectWithClient = 'NoClientProj1 ' + Math.floor(Math.random() * 10000);
+    const projectNoClient = 'NoClientProj2 ' + Math.floor(Math.random() * 10000);
+
+    await createClient(page, client1);
+    await createProjectWithClient(page, projectWithClient, client1);
+    await createProject(page, projectNoClient);
+    await createTimeEntryWithProject(page, projectWithClient, '1h');
+    await createTimeEntryWithProject(page, projectNoClient, '30min');
+
+    await goToReportingDetailed(page);
+
+    await expect(page.getByText(`Entry for ${projectWithClient}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${projectNoClient}`)).toBeVisible();
+
+    // Open client dropdown and select "No Client"
+    await page.getByRole('button', { name: 'Clients' }).first().click();
+    await page.getByRole('option').filter({ hasText: 'No Client' }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    await expect(
+        page.getByRole('button', { name: 'Clients' }).first().getByText('1')
+    ).toBeVisible();
+
+    await expect(page.getByText(`Entry for ${projectNoClient}`)).toBeVisible();
+    await expect(page.getByText(`Entry for ${projectWithClient}`)).not.toBeVisible();
+});
+
+test('test that combining "No Project" with a project ID shows both', async ({ page }) => {
+    const project1 = 'CombNoProj ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, project1);
+    await createTimeEntryWithProject(page, project1, '1h');
+    await createBareTimeEntry(page, 'Bare combined entry', '30min');
+
+    await goToReportingDetailed(page);
+
+    await expect(page.getByText(`Entry for ${project1}`)).toBeVisible();
+    await expect(page.getByText('Bare combined entry')).toBeVisible();
+
+    // Select both "No Project" and the specific project
+    await page.getByRole('button', { name: 'Projects' }).first().click();
+    await page.getByRole('option').filter({ hasText: 'No Project' }).click();
+    await page.getByRole('option').filter({ hasText: project1 }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    // Badge should show 2
+    await expect(
+        page.getByRole('button', { name: 'Projects' }).first().getByText('2')
+    ).toBeVisible();
+
+    // Both entries should be visible
+    await expect(page.getByText(`Entry for ${project1}`)).toBeVisible();
+    await expect(page.getByText('Bare combined entry')).toBeVisible();
+});
+
+// ──────────────────────────────────────────────────
+// Keyboard Navigation Tests
+// ──────────────────────────────────────────────────
+
+test('test that keyboard navigation works in multiselect dropdown', async ({ page }) => {
+    const project1 = 'KbNavProj1 ' + Math.floor(Math.random() * 10000);
+    const project2 = 'KbNavProj2 ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, project1);
+    await createProject(page, project2);
+    await createTimeEntryWithProject(page, project1, '1h');
+    await createTimeEntryWithProject(page, project2, '2h');
+
+    await goToReportingDetailed(page);
+    await expect(page.getByText(`Entry for ${project1}`)).toBeVisible();
+
+    // Open project dropdown
+    await page.getByRole('button', { name: 'Projects' }).first().click();
+
+    // The search input should be focused, first item ("No Project") highlighted
+    await expect(page.getByPlaceholder('Search for a Project...')).toBeFocused();
+
+    // Press ArrowDown to move to first project, then Enter to select it
+    await page.keyboard.press('ArrowDown');
+    await page.keyboard.press('ArrowDown');
+    await page.keyboard.press('Enter');
+
+    // Close dropdown and verify filter applied
+    await Promise.all([page.keyboard.press('Escape'), waitForDetailedReportingUpdate(page)]);
+
+    // Badge should show 1
+    await expect(
+        page.getByRole('button', { name: 'Projects' }).first().getByText('1')
+    ).toBeVisible();
+});
diff --git a/e2e/reporting.spec.ts b/e2e/reporting.spec.ts
index 330816e6..02a1825a 100644
--- a/e2e/reporting.spec.ts
+++ b/e2e/reporting.spec.ts
@@ -1,149 +1,431 @@
 import { expect } from '@playwright/test';
-import type { Page } from '@playwright/test';
 import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 import { test } from '../playwright/fixtures';
+import {
+    goToReporting,
+    createProject,
+    createClient,
+    createProjectWithClient,
+    createTask,
+    createTimeEntryWithProject,
+    createTimeEntryWithProjectAndTask,
+    createTimeEntryWithTag,
+    createTimeEntryWithBillableStatus,
+    waitForReportingUpdate,
+} from './utils/reporting';
+
+// Each test registers a new user and creates test data, which needs more time
+test.describe.configure({ timeout: 60000 });
+
+// ──────────────────────────────────────────────────
+// No-op Dropdown Close Tests
+// ──────────────────────────────────────────────────
+
+test('test that opening and closing a filter dropdown without changes does not trigger an API request', async ({
+    page,
+}) => {
+    const projectName = 'NoOpDropdown ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
 
-async function goToTimeOverview(page: Page) {
-    await page.goto(PLAYWRIGHT_BASE_URL + '/time');
-}
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
 
-async function goToReporting(page: Page) {
-    await page.goto(PLAYWRIGHT_BASE_URL + '/reporting');
-}
+    // Wait for initial reporting data to fully load and all network activity to settle
+    await expect(page.getByTestId('reporting_view').getByText(projectName)).toBeVisible();
+    await page.waitForLoadState('networkidle');
 
-async function goToReportingDetailed(page: Page) {
-    await page.goto(PLAYWRIGHT_BASE_URL + '/reporting/detailed');
-}
+    // Set up a request counter for aggregate API calls
+    let aggregateRequestCount = 0;
+    page.on('response', (response) => {
+        if (
+            response.url().includes('/time-entries/aggregate') &&
+            !response.url().includes('/export') &&
+            response.status() === 200
+        ) {
+            aggregateRequestCount++;
+        }
+    });
+
+    // Open project dropdown, change nothing, close it
+    await page.getByRole('button', { name: 'Projects' }).first().click();
+    await expect(page.getByPlaceholder('Search for a Project...')).toBeVisible();
+    await page.keyboard.press('Escape');
 
-async function createTimeEntryWithProject(page: Page, projectName: string, duration: string) {
-    // First create the project through the Projects page
-    await page.goto(PLAYWRIGHT_BASE_URL + '/projects');
-    await page.getByRole('button', { name: 'Create Project' }).click();
-    await page.getByLabel('Project Name').fill(projectName);
-    await page.getByRole('dialog').getByRole('button', { name: 'Create Project' }).click();
+    // Open member dropdown, change nothing, close it
+    await page.getByRole('button', { name: 'Members' }).first().click();
+    await expect(page.getByPlaceholder('Search for a Member...')).toBeVisible();
+    await page.keyboard.press('Escape');
 
-    // Wait for the project to be created and visible in the list
-    await page.getByText(projectName).waitFor({ state: 'visible' });
+    // Open client dropdown, change nothing, close it
+    await page.getByRole('button', { name: 'Clients' }).first().click();
+    await expect(page.getByPlaceholder('Search for a Client...')).toBeVisible();
+    await page.keyboard.press('Escape');
 
-    // Then create the time entry
-    await goToTimeOverview(page);
+    // Wait for all network activity to settle before asserting no requests were made
+    await page.waitForLoadState('networkidle');
 
-    // Open the dropdown menu and click "Manual time entry"
-    await page.getByRole('button', { name: 'Time entry actions' }).click();
-    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
+    // No aggregate API requests should have been made
+    expect(aggregateRequestCount).toBe(0);
 
-    // Fill in the time entry details
-    await page
-        .getByRole('dialog')
-        .getByRole('textbox', { name: 'Description' })
-        .fill(`Time entry for ${projectName}`);
+    // Verify the report data is still intact (no flash/reload)
+    await expect(page.getByTestId('reporting_view').getByText(projectName)).toBeVisible();
+});
 
-    await page.getByRole('button', { name: 'No Project' }).click();
-    await page.getByText(projectName).click();
+// ──────────────────────────────────────────────────
+// Project Multiselect Dropdown Tests
+// ──────────────────────────────────────────────────
 
-    // Set duration
-    await page.locator('[role="dialog"] input[name="Duration"]').fill(duration);
-    await page.locator('[role="dialog"] input[name="Duration"]').press('Tab');
+test('test that project multiselect dropdown shows projects and filters reporting', async ({
+    page,
+}) => {
+    const project1 = 'ProjFilter1 ' + Math.floor(Math.random() * 10000);
+    const project2 = 'ProjFilter2 ' + Math.floor(Math.random() * 10000);
 
-    // Submit the time entry
-    await Promise.all([
-        page.getByRole('button', { name: 'Create Time Entry' }).click(),
-        page.waitForResponse(
-            (response) => response.url().includes('/time-entries') && response.status() === 201
-        ),
-    ]);
-}
+    await createProject(page, project1);
+    await createProject(page, project2);
+    await createTimeEntryWithProject(page, project1, '1h');
+    await createTimeEntryWithProject(page, project2, '2h');
 
-async function createTimeEntryWithTag(page: Page, tagName: string, duration: string) {
-    await goToTimeOverview(page);
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
 
-    // Open the dropdown menu and click "Manual time entry"
-    await page.getByRole('button', { name: 'Time entry actions' }).click();
-    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
+    // Open project multiselect dropdown
+    await page.getByRole('button', { name: 'Projects' }).first().click();
 
-    // Fill in the time entry details
-    await page
-        .getByRole('dialog')
-        .getByRole('textbox', { name: 'Description' })
-        .fill(`Time entry with tag ${tagName}`);
+    // Verify both projects appear as options
+    await expect(page.getByRole('option').filter({ hasText: project1 })).toBeVisible();
+    await expect(page.getByRole('option').filter({ hasText: project2 })).toBeVisible();
 
-    // Add tag
-    await page.getByRole('button', { name: 'Tags' }).click();
-    await page.getByText('Create new tag').click();
-    await page.getByPlaceholder('Tag Name').fill(tagName);
-    await page.getByRole('button', { name: 'Create Tag' }).click();
-    await page.waitForLoadState('networkidle');
+    // Select project1
+    await page.getByRole('option').filter({ hasText: project1 }).click();
+
+    // Close dropdown and wait for report update
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    // Verify filter badge shows count of 1
+    await expect(
+        page.getByRole('button', { name: 'Projects' }).first().getByText('1')
+    ).toBeVisible();
+
+    // Verify only project1 data is shown
+    await expect(page.getByTestId('reporting_view').getByText(project1)).toBeVisible();
+    await expect(page.getByTestId('reporting_view').getByText(project2)).not.toBeVisible();
+});
+
+test('test that project multiselect search filters the option list', async ({ page }) => {
+    const project1 = 'SearchableAlpha ' + Math.floor(Math.random() * 10000);
+    const project2 = 'SearchableBeta ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, project1);
+    await createProject(page, project2);
+    await createTimeEntryWithProject(page, project1, '1h');
+
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    // Open project multiselect dropdown
+    await page.getByRole('button', { name: 'Projects' }).first().click();
+
+    // Type in search
+    await page.getByPlaceholder('Search for a Project...').fill('Alpha');
 
-    // Set duration
-    await page.locator('[role="dialog"] input[name="Duration"]').fill(duration);
-    await page.locator('[role="dialog"] input[name="Duration"]').press('Tab');
-
-    // Submit the time entry
-    await page.getByRole('button', { name: 'Create Time Entry' }).click();
-}
-
-async function createTimeEntryWithBillableStatus(
-    page: Page,
-    isBillable: boolean,
-    duration: string
-) {
-    await goToTimeOverview(page);
-
-    // Open the dropdown menu and click "Manual time entry"
-    await page.getByRole('button', { name: 'Time entry actions' }).click();
-    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
-
-    // Fill in the time entry details
-    await page
-        .getByRole('dialog')
-        .getByRole('textbox', { name: 'Description' })
-        .fill(`Time entry ${isBillable ? 'billable' : 'non-billable'}`);
-
-    // Set billable status
-    await page.getByRole('button', { name: 'Non-Billable' }).click();
-    if (!isBillable) {
-        await page.getByRole('option', { name: 'Non Billable', exact: true }).click();
-    } else {
-        await page.getByRole('option', { name: 'Billable', exact: true }).click();
-    }
-
-    // Set duration
-    await page.locator('[role="dialog"] input[name="Duration"]').fill(duration);
-    await page.locator('[role="dialog"] input[name="Duration"]').press('Tab');
-
-    // Submit the time entry
-    await page.getByRole('button', { name: 'Create Time Entry' }).click();
-}
-
-test('test that project filtering works in reporting', async ({ page }) => {
-    const project1 = 'Test Project 1 ' + Math.floor(Math.random() * 10000);
-    const project2 = 'Test Project 2 ' + Math.floor(Math.random() * 10000);
-
-    // Create time entries for both projects
+    // Verify only matching project is visible
+    await expect(page.getByRole('option').filter({ hasText: project1 })).toBeVisible();
+    await expect(page.getByRole('option').filter({ hasText: project2 })).not.toBeVisible();
+
+    await page.keyboard.press('Escape');
+});
+
+test('test that selecting multiple projects shows correct badge count', async ({ page }) => {
+    const project1 = 'MultiProj1 ' + Math.floor(Math.random() * 10000);
+    const project2 = 'MultiProj2 ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, project1);
+    await createProject(page, project2);
     await createTimeEntryWithProject(page, project1, '1h');
     await createTimeEntryWithProject(page, project2, '2h');
 
-    // Go to reporting and filter by project1
     await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    // Open project dropdown and select both
     await page.getByRole('button', { name: 'Projects' }).first().click();
     await page.getByRole('option').filter({ hasText: project1 }).click();
+    await page.getByRole('option').filter({ hasText: project2 }).click();
 
-    await Promise.all([
-        // escape
-        page.keyboard.press('Escape'),
-        // wait for API request to finish
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/time-entries/aggregate') && response.status() === 200
-        ),
-    ]);
-    await page.waitForLoadState('networkidle');
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    // Verify filter badge shows count of 2
+    await expect(
+        page.getByRole('button', { name: 'Projects' }).first().getByText('2')
+    ).toBeVisible();
 
-    // Verify only project1 time entries are shown
+    // Verify both projects are shown in the report
+    await expect(page.getByTestId('reporting_view').getByText(project1)).toBeVisible();
+    await expect(page.getByTestId('reporting_view').getByText(project2)).toBeVisible();
+});
+
+test('test that deselecting a project removes the filter', async ({ page }) => {
+    const project1 = 'DeselectProj ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, project1);
+    await createTimeEntryWithProject(page, project1, '1h');
+
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    // Select project
+    await page.getByRole('button', { name: 'Projects' }).first().click();
+    await page.getByRole('option').filter({ hasText: project1 }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    // Verify badge count is 1
+    await expect(
+        page.getByRole('button', { name: 'Projects' }).first().getByText('1')
+    ).toBeVisible();
+
+    // Deselect project
+    await page.getByRole('button', { name: 'Projects' }).first().click();
+    await page.getByRole('option').filter({ hasText: project1 }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    // Verify badge count is gone (no count displayed when 0)
+    await expect(
+        page.getByRole('button', { name: 'Projects' }).first().getByText(/^\d+$/)
+    ).not.toBeVisible();
+});
+
+// ──────────────────────────────────────────────────
+// Client Multiselect Dropdown Tests
+// ──────────────────────────────────────────────────
+
+test('test that client multiselect dropdown filters reporting by client', async ({ page }) => {
+    const client1 = 'ClientFilter1 ' + Math.floor(Math.random() * 10000);
+    const client2 = 'ClientFilter2 ' + Math.floor(Math.random() * 10000);
+    const project1 = 'ClientProj1 ' + Math.floor(Math.random() * 10000);
+    const project2 = 'ClientProj2 ' + Math.floor(Math.random() * 10000);
+
+    await createClient(page, client1);
+    await createClient(page, client2);
+    await createProjectWithClient(page, project1, client1);
+    await createProjectWithClient(page, project2, client2);
+    await createTimeEntryWithProject(page, project1, '1h');
+    await createTimeEntryWithProject(page, project2, '2h');
+
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    // Open client multiselect dropdown
+    await page.getByRole('button', { name: 'Clients' }).first().click();
+
+    // Verify both clients appear
+    await expect(page.getByRole('option').filter({ hasText: client1 })).toBeVisible();
+    await expect(page.getByRole('option').filter({ hasText: client2 })).toBeVisible();
+
+    // Select client1
+    await page.getByRole('option').filter({ hasText: client1 }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    // Verify badge shows count of 1
+    await expect(
+        page.getByRole('button', { name: 'Clients' }).first().getByText('1')
+    ).toBeVisible();
+
+    // Verify only project1 (belonging to client1) is shown
     await expect(page.getByTestId('reporting_view').getByText(project1)).toBeVisible();
     await expect(page.getByTestId('reporting_view').getByText(project2)).not.toBeVisible();
 });
 
+test('test that client multiselect search filters the option list', async ({ page }) => {
+    const client1 = 'ClientSearchAlpha ' + Math.floor(Math.random() * 10000);
+    const client2 = 'ClientSearchBeta ' + Math.floor(Math.random() * 10000);
+
+    await createClient(page, client1);
+    await createClient(page, client2);
+
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    await page.getByRole('button', { name: 'Clients' }).first().click();
+
+    // Search for "Alpha"
+    await page.getByPlaceholder('Search for a Client...').fill('Alpha');
+
+    await expect(page.getByRole('option').filter({ hasText: client1 })).toBeVisible();
+    await expect(page.getByRole('option').filter({ hasText: client2 })).not.toBeVisible();
+
+    await page.keyboard.press('Escape');
+});
+
+test('test that deselecting a client removes the filter', async ({ page }) => {
+    const client1 = 'ClientDeselect ' + Math.floor(Math.random() * 10000);
+    const project1 = 'ClientDeselectProj ' + Math.floor(Math.random() * 10000);
+
+    await createClient(page, client1);
+    await createProjectWithClient(page, project1, client1);
+    await createTimeEntryWithProject(page, project1, '1h');
+
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    // Select client
+    await page.getByRole('button', { name: 'Clients' }).first().click();
+    await page.getByRole('option').filter({ hasText: client1 }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    await expect(
+        page.getByRole('button', { name: 'Clients' }).first().getByText('1')
+    ).toBeVisible();
+
+    // Deselect client
+    await page.getByRole('button', { name: 'Clients' }).first().click();
+    await page.getByRole('option').filter({ hasText: client1 }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    await expect(
+        page.getByRole('button', { name: 'Clients' }).first().getByText(/^\d+$/)
+    ).not.toBeVisible();
+});
+
+// ──────────────────────────────────────────────────
+// Task Multiselect Dropdown Tests
+// ──────────────────────────────────────────────────
+
+test('test that task filtering works in reporting', async ({ page }) => {
+    const projectName = 'Task Filter Proj ' + Math.floor(Math.random() * 10000);
+    const task1 = 'Task Filter A ' + Math.floor(Math.random() * 10000);
+    const task2 = 'Task Filter B ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '30min');
+    await createTask(page, projectName, task1);
+    await createTask(page, projectName, task2);
+    await createTimeEntryWithProjectAndTask(page, projectName, task1, '1h');
+    await createTimeEntryWithProjectAndTask(page, projectName, task2, '2h');
+
+    // Go to reporting and group by task to see individual tasks
+    await goToReporting(page);
+
+    // Filter by task1
+    await page.getByRole('button', { name: 'Tasks' }).first().click();
+    await page.getByRole('option').filter({ hasText: task1 }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    // Verify the report only shows 1h (task1's duration)
+    await expect(page.getByTestId('reporting_view').getByText('1h 00min').first()).toBeVisible();
+});
+
+test('test that task multiselect search filters the option list', async ({ page }) => {
+    const projectName = 'TaskSearchProj ' + Math.floor(Math.random() * 10000);
+    const task1 = 'TaskSearchAlpha ' + Math.floor(Math.random() * 10000);
+    const task2 = 'TaskSearchBeta ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTask(page, projectName, task1);
+    await createTask(page, projectName, task2);
+
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    await page.getByRole('button', { name: 'Tasks' }).first().click();
+
+    await page.getByPlaceholder('Search for a Task...').fill('Alpha');
+
+    await expect(page.getByRole('option').filter({ hasText: task1 })).toBeVisible();
+    await expect(page.getByRole('option').filter({ hasText: task2 })).not.toBeVisible();
+
+    await page.keyboard.press('Escape');
+});
+
+// ──────────────────────────────────────────────────
+// Member Multiselect Dropdown Tests
+// ──────────────────────────────────────────────────
+
+test('test that member multiselect dropdown shows current member and filters reporting', async ({
+    page,
+}) => {
+    const projectName = 'MemberFilterProj ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    // Open member multiselect dropdown
+    await page.getByRole('button', { name: 'Members' }).first().click();
+
+    // Verify the current user (John Doe from fixture) appears as an option
+    await expect(page.getByRole('option').filter({ hasText: 'John Doe' })).toBeVisible();
+
+    // Select the member
+    await page.getByRole('option').filter({ hasText: 'John Doe' }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    // Verify badge shows count of 1
+    await expect(
+        page.getByRole('button', { name: 'Members' }).first().getByText('1')
+    ).toBeVisible();
+
+    // Verify data is still shown (since all entries belong to this member)
+    await expect(page.getByTestId('reporting_view').getByText(projectName)).toBeVisible();
+});
+
+test('test that member multiselect search filters the option list', async ({ page }) => {
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    await page.getByRole('button', { name: 'Members' }).first().click();
+
+    // Search for the registered user
+    await page.getByPlaceholder('Search for a Member...').fill('John');
+    await expect(page.getByRole('option').filter({ hasText: 'John Doe' })).toBeVisible();
+
+    // Search for a non-existent member
+    await page.getByPlaceholder('Search for a Member...').fill('NonExistentMember');
+    await expect(page.getByRole('option')).not.toBeVisible();
+
+    await page.keyboard.press('Escape');
+});
+
+test('test that deselecting a member removes the filter', async ({ page }) => {
+    const projectName = 'MemberDeselectProj ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    // Select member
+    await page.getByRole('button', { name: 'Members' }).first().click();
+    await page.getByRole('option').filter({ hasText: 'John Doe' }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    await expect(
+        page.getByRole('button', { name: 'Members' }).first().getByText('1')
+    ).toBeVisible();
+
+    // Deselect member
+    await page.getByRole('button', { name: 'Members' }).first().click();
+    await page.getByRole('option').filter({ hasText: 'John Doe' }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    // Verify badge count is gone
+    await expect(
+        page.getByRole('button', { name: 'Members' }).first().getByText(/^\d+$/)
+    ).not.toBeVisible();
+});
+
+// ──────────────────────────────────────────────────
+// Tag Dropdown Tests
+// ──────────────────────────────────────────────────
+
 test('test that tag filtering works in reporting', async ({ page }) => {
     const tag1 = 'Test Tag 1 ' + Math.floor(Math.random() * 10000);
     const tag2 = 'Test Tag 2 ' + Math.floor(Math.random() * 10000);
@@ -154,26 +436,111 @@ test('test that tag filtering works in reporting', async ({ page }) => {
 
     // Go to reporting and filter by tag1
     await goToReporting(page);
-    // wait for all requests to finish
-    await page.waitForLoadState('networkidle');
+    await expect(page.getByRole('button', { name: 'Tags' })).toBeVisible();
 
     await page.getByRole('button', { name: 'Tags' }).click();
     await page.getByText(tag1).click();
 
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    // Verify only time entries with tag1 are shown
+    await expect(page.getByTestId('reporting_view').getByText('1h 00min').first()).toBeVisible();
+});
+
+test('test that tag dropdown search filters the option list', async ({ page }) => {
+    const tag1 = 'TagSearchAlpha ' + Math.floor(Math.random() * 10000);
+    const tag2 = 'TagSearchBeta ' + Math.floor(Math.random() * 10000);
+
+    await createTimeEntryWithTag(page, tag1, '1h');
+    await createTimeEntryWithTag(page, tag2, '2h');
+
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    await page.getByRole('button', { name: 'Tags' }).click();
+
+    await page.getByPlaceholder('Search for a Tag...').fill('Alpha');
+
+    await expect(page.getByRole('option').filter({ hasText: tag1 })).toBeVisible();
+    await expect(page.getByRole('option').filter({ hasText: tag2 })).not.toBeVisible();
+
+    await page.keyboard.press('Escape');
+});
+
+test('test that selecting multiple tags shows correct badge count', async ({ page }) => {
+    const tag1 = 'MultiTag1 ' + Math.floor(Math.random() * 10000);
+    const tag2 = 'MultiTag2 ' + Math.floor(Math.random() * 10000);
+
+    await createTimeEntryWithTag(page, tag1, '1h');
+    await createTimeEntryWithTag(page, tag2, '2h');
+
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    // Select both tags
+    await page.getByRole('button', { name: 'Tags' }).click();
+    await page.getByRole('option').filter({ hasText: tag1 }).click();
+    await page.getByRole('option').filter({ hasText: tag2 }).click();
+
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    // Verify badge shows count of 2
+    await expect(page.getByRole('button', { name: 'Tags' }).getByText('2')).toBeVisible();
+});
+
+test('test that deselecting a tag removes the filter', async ({ page }) => {
+    const tag1 = 'TagDeselect ' + Math.floor(Math.random() * 10000);
+
+    await createTimeEntryWithTag(page, tag1, '1h');
+
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    // Select tag
+    await page.getByRole('button', { name: 'Tags' }).click();
+    await page.getByRole('option').filter({ hasText: tag1 }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    await expect(page.getByRole('button', { name: 'Tags' }).getByText('1')).toBeVisible();
+
+    // Deselect tag
+    await page.getByRole('button', { name: 'Tags' }).click();
+    await page.getByRole('option').filter({ hasText: tag1 }).click();
+    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+
+    await expect(page.getByRole('button', { name: 'Tags' }).getByText(/^\d+$/)).not.toBeVisible();
+});
+
+test('test that creating a tag inline from the reporting filter works', async ({ page }) => {
+    const projectName = 'TagCreateProj ' + Math.floor(Math.random() * 10000);
+    const newTag = 'InlineTag ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    // Open tag dropdown and create a new tag
+    await page.getByRole('button', { name: 'Tags' }).click();
+    await page.getByText('Create new tag').click();
+    await page.getByPlaceholder('Tag Name').fill(newTag);
+
     await Promise.all([
-        // escape
-        page.keyboard.press('Escape'),
-        // wait for API request to finish
+        page.getByRole('button', { name: 'Create Tag' }).click(),
         page.waitForResponse(
-            (response) =>
-                response.url().includes('/time-entries/aggregate') && response.status() === 200
+            (response) => response.url().includes('/tags') && response.status() === 201
         ),
     ]);
 
-    // Verify only time entries with tag1 are shown
-    await expect(page.getByTestId('reporting_view').getByText('1h 00min').first()).toBeVisible();
+    // The new tag should now be selected in the dropdown (badge should show 1)
+    await expect(page.getByRole('button', { name: 'Tags' }).getByText('1')).toBeVisible();
 });
 
+// ──────────────────────────────────────────────────
+// Billable Select Tests
+// ──────────────────────────────────────────────────
+
 test('test that billable status filtering works in reporting', async ({ page }) => {
     // Create billable and non-billable time entries
     await createTimeEntryWithBillableStatus(page, true, '1h');
@@ -182,60 +549,205 @@ test('test that billable status filtering works in reporting', async ({ page })
     // Go to reporting and filter by billable
     await goToReporting(page);
 
-    await page.getByRole('button', { name: 'Billable' }).click();
-    await page.getByRole('option', { name: 'Billable', exact: true }).click();
+    await page.getByRole('combobox').filter({ hasText: 'Billable' }).click();
+    await Promise.all([
+        page.getByRole('option', { name: 'Billable', exact: true }).click(),
+        waitForReportingUpdate(page),
+    ]);
+
+    await expect(page.getByTestId('reporting_view').getByText('1h 00min').first()).toBeVisible();
+});
+
+test('test that billable filter can switch between all three states', async ({ page }) => {
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    const billableSelect = page.getByRole('combobox').filter({ hasText: 'Billable' });
+
+    // Switch to Billable
+    await billableSelect.click();
+    await Promise.all([
+        page.getByRole('option', { name: 'Billable', exact: true }).click(),
+        waitForReportingUpdate(page),
+    ]);
 
+    // Switch to Non Billable
+    await billableSelect.click();
     await Promise.all([
-        // escape
-        page.keyboard.press('Escape'),
-        // wait for API request to finish
+        page.getByRole('option', { name: 'Non Billable', exact: true }).click(),
+        waitForReportingUpdate(page),
+    ]);
+
+    // Verify "Non Billable" is displayed
+    await expect(billableSelect).toContainText('Non Billable');
+
+    // Switch back to Both (cached by TanStack Query, no new API request)
+    await billableSelect.click();
+    await page.getByRole('option', { name: 'Both' }).click();
+    await expect(billableSelect).toContainText('Billable');
+});
+
+// ──────────────────────────────────────────────────
+// Rounding Controls Tests
+// ──────────────────────────────────────────────────
+
+test('test that rounding can be enabled', async ({ page }) => {
+    const projectName = 'RoundingProj ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h 7min');
+
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    // Verify rounding is off by default
+    await expect(page.getByRole('button', { name: /Rounding off/ })).toBeVisible();
+
+    // Open rounding controls and enable rounding
+    await page.getByRole('button', { name: /Rounding off/ }).click();
+
+    const reportUpdatePromise = waitForReportingUpdate(page);
+    await page.getByRole('switch', { name: 'Enable Rounding' }).click();
+    await reportUpdatePromise;
+
+    // Close the popover by clicking elsewhere
+    await page.keyboard.press('Escape');
+
+    // Verify button text changed to "on"
+    await expect(page.getByRole('button', { name: /Rounding on/ })).toBeVisible();
+});
+
+// ──────────────────────────────────────────────────
+// Export Tests
+// ──────────────────────────────────────────────────
+
+test('test that export dropdown shows all format options', async ({ page }) => {
+    const projectName = 'Export Test ' + Math.floor(Math.random() * 10000);
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+
+    // Go to reporting page
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    // Click the export button
+    await page.getByRole('button', { name: 'Export' }).click();
+
+    // Verify all 4 format options are visible
+    await expect(page.getByRole('menuitem', { name: /Export as PDF/i })).toBeVisible();
+    await expect(page.getByRole('menuitem', { name: /Export as Excel/i })).toBeVisible();
+    await expect(page.getByRole('menuitem', { name: /Export as CSV/i })).toBeVisible();
+    await expect(page.getByRole('menuitem', { name: /Export as ODS/i })).toBeVisible();
+});
+
+test('test that CSV export triggers download', async ({ page }) => {
+    const projectName = 'CSV Export ' + Math.floor(Math.random() * 10000);
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+
+    // Go to reporting page
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    // Click export and select CSV, wait for the export API response with a download URL
+    await page.getByRole('button', { name: 'Export' }).click();
+    const [exportResponse] = await Promise.all([
         page.waitForResponse(
             (response) =>
-                response.url().includes('/time-entries/aggregate') && response.status() === 200
+                response.url().includes('/time-entries/aggregate/export') &&
+                response.status() === 200
         ),
+        page.getByRole('menuitem', { name: /Export as CSV/i }).click(),
     ]);
-    await page.waitForLoadState('networkidle');
 
-    await expect(page.getByTestId('reporting_view').getByText('1h 00min').first()).toBeVisible();
+    // Verify the API returned a download URL
+    const responseBody = await exportResponse.json();
+    expect(responseBody.download_url).toBeTruthy();
+
+    // Verify the export success modal appeared
+    await expect(page.getByText('Export Successful!')).toBeVisible();
+
+    // Verify the download URL is accessible and returns CSV content
+    const downloadResponse = await page.request.get(responseBody.download_url);
+    expect(downloadResponse.ok()).toBeTruthy();
+    const contentType = downloadResponse.headers()['content-type'];
+    expect(contentType).toContain('csv');
 });
 
-test('test that detailed view shows time entries correctly', async ({ page }) => {
-    const projectName = 'Detailed View Project ' + Math.floor(Math.random() * 10000);
+// ──────────────────────────────────────────────────
+// Group By Tests
+// ──────────────────────────────────────────────────
 
-    // Create a time entry
+test('test that group by select changes report grouping', async ({ page }) => {
+    const projectName = 'GroupBy Test ' + Math.floor(Math.random() * 10000);
+    await createProject(page, projectName);
     await createTimeEntryWithProject(page, projectName, '1h');
 
-    // Go to detailed reporting view
-    await goToReportingDetailed(page);
+    // Go to reporting page
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
+
+    // Find the "Group by" selects within the reporting table
+    const groupBySelects = page.locator('[data-testid="reporting_view"]').getByRole('combobox');
 
-    // Verify the time entry is shown with all details
-    await expect(page.getByText(projectName, { exact: true })).toBeVisible();
-    await expect(page.locator('input[name="Duration"]')).toHaveValue('1h 00min');
-    await expect(page.getByText('Time entry for ' + projectName, { exact: true })).toBeVisible();
+    // Click the first group by select to change grouping
+    await groupBySelects.filter({ hasText: 'Project' }).first().click();
+
+    // Select "Members" option and wait for the table query to update (has sub_group param)
+    const [aggregateResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/time-entries/aggregate') &&
+                response.url().includes('sub_group') &&
+                response.status() === 200
+        ),
+        page.getByRole('option', { name: 'Members' }).click(),
+    ]);
+
+    // Verify the API request contains the correct group parameter
+    const requestUrl = new URL(aggregateResponse.url());
+    expect(requestUrl.searchParams.get('group')).toBe('user');
+
+    // Verify the grouping changed (the select should now show "Members")
+    await expect(groupBySelects.filter({ hasText: 'Members' }).first()).toBeVisible();
 });
 
-test('test that updating duration in detailed view works correctly', async ({ page }) => {
-    const projectName = 'Duration Update Project ' + Math.floor(Math.random() * 10000);
-    const initialDuration = '1h';
-    const updatedDuration = '2h 30min';
+test('test that setting group by to current sub group triggers sub group fallback', async ({
+    page,
+}) => {
+    const projectName = 'Fallback Test ' + Math.floor(Math.random() * 10000);
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
 
-    // Create a time entry with initial duration
-    await createTimeEntryWithProject(page, projectName, initialDuration);
+    // Go to reporting page
+    await goToReporting(page);
+    await expect(page.getByRole('button', { name: 'Export' })).toBeVisible();
 
-    // Go to detailed reporting view
-    await goToReportingDetailed(page);
+    // Find the "Group by" selects within the reporting table
+    const groupBySelects = page.locator('[data-testid="reporting_view"]').getByRole('combobox');
 
-    // Find and update the duration
-    const durationInput = page.locator('input[name="Duration"]').first();
-    await durationInput.click();
-    await durationInput.fill(updatedDuration);
-    await durationInput.press('Enter');
+    // Default state: group=Project, subGroup=Tasks
+    // Change group to "Tasks" (which is the current sub group)
+    await groupBySelects.filter({ hasText: 'Projects' }).first().click();
 
-    // Wait for the update to be processed
-    await page.waitForLoadState('networkidle');
+    const [aggregateResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/time-entries/aggregate') &&
+                response.url().includes('sub_group') &&
+                response.status() === 200
+        ),
+        page.getByRole('option', { name: 'Tasks' }).click(),
+    ]);
 
-    // Verify the new duration is displayed
-    await expect(durationInput).toHaveValue(updatedDuration);
-});
+    // Verify the API request has group=task and sub_group changed away from task
+    const requestUrl = new URL(aggregateResponse.url());
+    expect(requestUrl.searchParams.get('group')).toBe('task');
+    expect(requestUrl.searchParams.get('sub_group')).not.toBe('task');
+
+    // The group should now be "Tasks"
+    await expect(groupBySelects.filter({ hasText: 'Tasks' }).first()).toBeVisible();
 
-// TODO: test that date range filtering works in reporting
+    // The sub group should have fallen back to a different value (not "Tasks")
+    await expect(groupBySelects.filter({ hasText: 'Members' }).first()).toBeVisible();
+});
diff --git a/e2e/time.spec.ts b/e2e/time.spec.ts
index 8764d0d3..a5ab5443 100644
--- a/e2e/time.spec.ts
+++ b/e2e/time.spec.ts
@@ -53,7 +53,7 @@ test('test that starting and stopping an empty time entry shows a new time entry
 // Test that description update works
 
 async function assertThatTimeEntryRowIsStopped(newTimeEntry: Locator) {
-    await expect(newTimeEntry.getByTestId('timer_button')).toHaveClass(/bg-tertiary/);
+    await expect(newTimeEntry.getByTestId('timer_button')).toHaveClass(/bg-quaternary/);
 }
 
 test('test that updating a description of a time entry in the overview works on blur', async ({
@@ -224,7 +224,7 @@ test('test that starting a time entry from the overview works', async ({ page })
 
     const newTimeEntry = timeEntryRows.first();
     const startButton = newTimeEntry.getByTestId('timer_button');
-    await expect(startButton).toHaveClass(/bg-tertiary/);
+    await expect(startButton).toHaveClass(/bg-quaternary/);
 
     await Promise.all([
         page.waitForResponse(async (response) => {
@@ -307,12 +307,143 @@ test.skip('test that load more works when the end of page is reached', async ({
 
 // TODO: Test that time entries are loaded at the end of the page
 
-// TODO: Test manual time entries
-
 // TODO: Test Grouped time entries by description/project
 
 // TODO: Add Test for Date Update
 
 // TODO: Test that project can be created in the time entry row
 
-// TODO: Add Tests for Mass Update
+test('test that editing billable status via the edit modal works', async ({ page }) => {
+    await goToTimeOverview(page);
+    await createEmptyTimeEntry(page);
+
+    const timeEntryRows = page.locator('[data-testid="time_entry_row"]');
+    const newTimeEntry = timeEntryRows.first();
+    await assertThatTimeEntryRowIsStopped(newTimeEntry);
+
+    // Open edit modal via the actions dropdown
+    const actionsDropdown = newTimeEntry
+        .getByRole('button', { name: 'Actions for the time entry' })
+        .first();
+    await actionsDropdown.click();
+    await page.getByTestId('time_entry_edit').click();
+
+    // Verify the edit dialog is visible
+    await expect(page.getByRole('dialog')).toBeVisible();
+
+    // Change billable status to Billable
+    await page
+        .getByRole('dialog')
+        .getByRole('combobox')
+        .filter({ hasText: 'Non-Billable' })
+        .click();
+    await page.getByRole('option', { name: 'Billable', exact: true }).click();
+
+    // Save the time entry and verify the response has billable=true
+    const [updateResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) => response.url().includes('/time-entries') && response.status() === 200
+        ),
+        page.getByRole('button', { name: 'Update Time Entry' }).click(),
+    ]);
+    const updateBody = await updateResponse.json();
+    expect(updateBody.data.billable).toBe(true);
+
+    // Verify the dialog closed
+    await expect(page.getByRole('dialog')).not.toBeVisible();
+
+    // Re-open the edit modal and verify it now shows "Billable"
+    await actionsDropdown.click();
+    await page.getByTestId('time_entry_edit').click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Billable' })
+    ).toBeVisible();
+});
+
+test('test that mass update billable status works', async ({ page }) => {
+    await goToTimeOverview(page);
+    await createEmptyTimeEntry(page);
+
+    const timeEntryRows = page.locator('[data-testid="time_entry_row"]');
+    await assertThatTimeEntryRowIsStopped(timeEntryRows.first());
+
+    // Select the time entry via the "Select All" checkbox
+    await page.getByLabel('Select All').click();
+    await expect(page.getByText('1 selected')).toBeVisible();
+
+    // Open mass update modal via the Edit button in the mass action row
+    await page.getByRole('button', { name: 'Edit' }).click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+
+    // Change billable status to Billable
+    await page
+        .getByRole('dialog')
+        .getByRole('combobox')
+        .filter({ hasText: 'Set billable status' })
+        .click();
+    await page.getByRole('option', { name: 'Billable', exact: true }).click();
+
+    // Submit the mass update
+    const [massUpdateResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) => response.url().includes('/time-entries') && response.status() === 200
+        ),
+        page.getByRole('button', { name: 'Update Time Entries' }).click(),
+    ]);
+    const massUpdateBody = await massUpdateResponse.json();
+    expect(massUpdateBody.data.billable).toBe(true);
+
+    // Verify dialog closes
+    await expect(page.getByRole('dialog')).not.toBeVisible();
+
+    // Verify the UI reflects the billable status by re-opening the edit modal
+    const actionsDropdown = page
+        .locator('[data-testid="time_entry_row"]')
+        .first()
+        .getByRole('button', { name: 'Actions' });
+    await actionsDropdown.click();
+    await page.getByTestId('time_entry_edit').click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Billable' })
+    ).toBeVisible();
+});
+
+test('test that setting billable status via the create modal works', async ({ page }) => {
+    await goToTimeOverview(page);
+
+    // Open the dropdown menu and click "Manual time entry"
+    await page.getByRole('button', { name: 'Time entry actions' }).click();
+    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+
+    // Set description
+    await page
+        .getByRole('dialog')
+        .getByRole('textbox', { name: 'Description' })
+        .fill('Billable create test');
+
+    // Change billable status to Billable
+    await page
+        .getByRole('dialog')
+        .getByRole('combobox')
+        .filter({ hasText: 'Non-Billable' })
+        .click();
+    await page.getByRole('option', { name: 'Billable', exact: true }).click();
+
+    // Set duration
+    await page.locator('[role="dialog"] input[name="Duration"]').fill('1h');
+    await page.locator('[role="dialog"] input[name="Duration"]').press('Tab');
+
+    // Submit and verify the time entry was created with billable=true
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Time Entry' }).click(),
+        page.waitForResponse(
+            async (response) =>
+                response.url().includes('/time-entries') &&
+                response.status() === 201 &&
+                (await response.json()).data.billable === true
+        ),
+    ]);
+});
diff --git a/e2e/utils/reporting.ts b/e2e/utils/reporting.ts
new file mode 100644
index 00000000..d7b63421
--- /dev/null
+++ b/e2e/utils/reporting.ts
@@ -0,0 +1,275 @@
+import { expect } from '@playwright/test';
+import type { Page } from '@playwright/test';
+import { PLAYWRIGHT_BASE_URL } from '../../playwright/config';
+
+// ──────────────────────────────────────────────────
+// Navigation
+// ──────────────────────────────────────────────────
+
+export async function goToReporting(page: Page) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/reporting');
+}
+
+export async function goToReportingDetailed(page: Page) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/reporting/detailed');
+}
+
+// ──────────────────────────────────────────────────
+// Entity creation
+// ──────────────────────────────────────────────────
+
+export async function createProject(page: Page, projectName: string) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/projects');
+    await expect(page.getByRole('button', { name: 'Create Project' })).toBeVisible();
+    await page.getByRole('button', { name: 'Create Project' }).click();
+    await page.getByLabel('Project name').fill(projectName);
+    await Promise.all([
+        page.getByRole('dialog').getByRole('button', { name: 'Create Project' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/projects') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201
+        ),
+    ]);
+    await expect(page.getByText(projectName)).toBeVisible();
+}
+
+export async function createClient(page: Page, clientName: string) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/clients');
+    await expect(page.getByRole('button', { name: 'Create Client' })).toBeVisible();
+    await page.getByRole('button', { name: 'Create Client' }).click();
+    await page.getByPlaceholder('Client Name').fill(clientName);
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Client' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/clients') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201
+        ),
+    ]);
+    await expect(page.getByText(clientName)).toBeVisible();
+}
+
+export async function createProjectWithClient(
+    page: Page,
+    projectName: string,
+    clientName: string
+) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/projects');
+    await expect(page.getByRole('button', { name: 'Create Project' })).toBeVisible();
+    await page.getByRole('button', { name: 'Create Project' }).click();
+    await page.getByLabel('Project name').fill(projectName);
+
+    // Select client in the project create modal
+    await page.getByRole('dialog').getByRole('button', { name: 'No Client' }).click();
+    await page.getByRole('option', { name: clientName }).click();
+
+    await Promise.all([
+        page.getByRole('dialog').getByRole('button', { name: 'Create Project' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/projects') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201
+        ),
+    ]);
+    await expect(page.getByText(projectName)).toBeVisible();
+}
+
+export async function createTask(page: Page, projectName: string, taskName: string) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/projects');
+    await expect(page.getByText(projectName)).toBeVisible();
+    await page.getByText(projectName).click();
+    await page.getByRole('button', { name: 'Create Task' }).click();
+    await page.getByPlaceholder('Task Name').fill(taskName);
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Task' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/tasks') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201
+        ),
+    ]);
+    await expect(page.getByText(taskName)).toBeVisible();
+}
+
+// ──────────────────────────────────────────────────
+// Time entry creation
+// ──────────────────────────────────────────────────
+
+export async function createTimeEntryWithProject(
+    page: Page,
+    projectName: string,
+    duration: string
+) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/time');
+    await expect(page.getByRole('button', { name: 'Time entry actions' })).toBeVisible();
+    await page.getByRole('button', { name: 'Time entry actions' }).click();
+    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
+
+    await page
+        .getByRole('dialog')
+        .getByRole('textbox', { name: 'Description' })
+        .fill(`Entry for ${projectName}`);
+
+    await page.getByRole('button', { name: 'No Project' }).click();
+    await page.getByRole('option').filter({ hasText: projectName }).click();
+
+    await page.locator('[role="dialog"] input[name="Duration"]').fill(duration);
+    await page.locator('[role="dialog"] input[name="Duration"]').press('Tab');
+
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Time Entry' }).click(),
+        page.waitForResponse(
+            (response) => response.url().includes('/time-entries') && response.status() === 201
+        ),
+    ]);
+}
+
+export async function createTimeEntryWithProjectAndTask(
+    page: Page,
+    projectName: string,
+    taskName: string,
+    duration: string
+) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/time');
+    await expect(page.getByRole('button', { name: 'Time entry actions' })).toBeVisible();
+    await page.getByRole('button', { name: 'Time entry actions' }).click();
+    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
+
+    await page
+        .getByRole('dialog')
+        .getByRole('textbox', { name: 'Description' })
+        .fill(`Entry for ${projectName} - ${taskName}`);
+
+    // Open the project/task dropdown
+    await page.getByRole('button', { name: 'No Project' }).click();
+
+    // Expand the project's tasks by clicking the "Tasks" button
+    const projectOption = page.getByRole('option').filter({ hasText: projectName });
+    await projectOption.getByText(/Tasks/).click();
+
+    // Select the task (this also selects the project and closes the dropdown)
+    await page.getByText(taskName, { exact: true }).click();
+
+    await page.locator('[role="dialog"] input[name="Duration"]').fill(duration);
+    await page.locator('[role="dialog"] input[name="Duration"]').press('Tab');
+
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Time Entry' }).click(),
+        page.waitForResponse(
+            (response) => response.url().includes('/time-entries') && response.status() === 201
+        ),
+    ]);
+}
+
+export async function createTimeEntryWithTag(page: Page, tagName: string, duration: string) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/time');
+    await expect(page.getByRole('button', { name: 'Time entry actions' })).toBeVisible();
+    await page.getByRole('button', { name: 'Time entry actions' }).click();
+    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
+
+    await page
+        .getByRole('dialog')
+        .getByRole('textbox', { name: 'Description' })
+        .fill(`Entry with tag ${tagName}`);
+
+    // Add tag
+    await page.getByRole('button', { name: 'Tags' }).click();
+    await page.getByText('Create new tag').click();
+    await page.getByPlaceholder('Tag Name').fill(tagName);
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Tag' }).click(),
+        page.waitForResponse(
+            (response) => response.url().includes('/tags') && response.status() === 201
+        ),
+    ]);
+
+    await page.locator('[role="dialog"] input[name="Duration"]').fill(duration);
+    await page.locator('[role="dialog"] input[name="Duration"]').press('Tab');
+
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Time Entry' }).click(),
+        page.waitForResponse(
+            (response) => response.url().includes('/time-entries') && response.status() === 201
+        ),
+    ]);
+}
+
+export async function createBareTimeEntry(page: Page, description: string, duration: string) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/time');
+    await expect(page.getByRole('button', { name: 'Time entry actions' })).toBeVisible();
+    await page.getByRole('button', { name: 'Time entry actions' }).click();
+    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
+
+    await page.getByRole('dialog').getByRole('textbox', { name: 'Description' }).fill(description);
+
+    await page.locator('[role="dialog"] input[name="Duration"]').fill(duration);
+    await page.locator('[role="dialog"] input[name="Duration"]').press('Tab');
+
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Time Entry' }).click(),
+        page.waitForResponse(
+            (response) => response.url().includes('/time-entries') && response.status() === 201
+        ),
+    ]);
+}
+
+export async function createTimeEntryWithBillableStatus(
+    page: Page,
+    isBillable: boolean,
+    duration: string
+) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/time');
+    await expect(page.getByRole('button', { name: 'Time entry actions' })).toBeVisible();
+    await page.getByRole('button', { name: 'Time entry actions' }).click();
+    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
+
+    await page
+        .getByRole('dialog')
+        .getByRole('textbox', { name: 'Description' })
+        .fill(`Time entry ${isBillable ? 'billable' : 'non-billable'}`);
+
+    if (isBillable) {
+        await page
+            .getByRole('dialog')
+            .getByRole('combobox')
+            .filter({ hasText: 'Non-Billable' })
+            .click();
+        await page.getByRole('option', { name: 'Billable', exact: true }).click();
+    }
+
+    await page.locator('[role="dialog"] input[name="Duration"]').fill(duration);
+    await page.locator('[role="dialog"] input[name="Duration"]').press('Tab');
+
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Time Entry' }).click(),
+        page.waitForResponse(
+            (response) => response.url().includes('/time-entries') && response.status() === 201
+        ),
+    ]);
+}
+
+// ──────────────────────────────────────────────────
+// Wait helpers
+// ──────────────────────────────────────────────────
+
+export async function waitForReportingUpdate(page: Page) {
+    await page.waitForResponse(
+        (response) =>
+            response.url().includes('/time-entries/aggregate') && response.status() === 200
+    );
+}
+
+export async function waitForDetailedReportingUpdate(page: Page) {
+    await page.waitForResponse(
+        (response) =>
+            response.url().includes('/time-entries') &&
+            !response.url().includes('/aggregate') &&
+            response.request().method() === 'GET' &&
+            response.status() === 200
+    );
+}

From 72662727c5bffa69bb37c6b58712238c845975be Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Mon, 2 Feb 2026 01:57:40 +0100
Subject: [PATCH 16/28] Add client_ids filter to time entry export

---
 .../TimeEntry/TimeEntryIndexExportRequest.php | 18 +++++
 e2e/members.spec.ts                           |  4 +-
 e2e/utils/reporting.ts                        |  6 +-
 .../Common/Reporting/ReportingFilterBar.vue   | 16 +---
 .../Common/Reporting/ReportingOverview.vue    | 23 +++---
 .../ui/src/Input/MultiselectDropdown.vue      |  8 +-
 .../js/utils/useAggregatedTimeEntriesQuery.ts |  6 +-
 .../Endpoint/Api/V1/TimeEntryEndpointTest.php | 78 +++++++++++++++++++
 8 files changed, 125 insertions(+), 34 deletions(-)

diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexExportRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexExportRequest.php
index 5daa61e1..70447609 100644
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexExportRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexExportRequest.php
@@ -6,6 +6,7 @@
 
 use App\Enums\ExportFormat;
 use App\Enums\TimeEntryRoundingType;
+use App\Models\Client;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
@@ -58,6 +59,23 @@ public function rules(): array
                     return $builder->whereBelongsTo($this->organization, 'organization');
                 }),
             ],
+            // Filter by client IDs, client IDs are OR combined
+            'client_ids' => [
+                'array',
+                'min:1',
+            ],
+            'client_ids.*' => [
+                'string',
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
+                        /** @var Builder<Client> $builder */
+                        return $builder->whereBelongsTo($this->organization, 'organization');
+                    })->uuid()->validate($attribute, $value, $fail);
+                },
+            ],
             // Filter by project IDs, project IDs are OR combined
             'project_ids' => [
                 'array',
diff --git a/e2e/members.spec.ts b/e2e/members.spec.ts
index 49661246..7f182811 100644
--- a/e2e/members.spec.ts
+++ b/e2e/members.spec.ts
@@ -205,7 +205,9 @@ test('test that merging a placeholder member works', async ({ page }) => {
         page.getByRole('button', { name: 'Merge Member' }).click(),
         page.waitForResponse(
             (response) =>
-                response.url().includes('/member/') && response.url().includes('/merge-into') && response.ok()
+                response.url().includes('/member/') &&
+                response.url().includes('/merge-into') &&
+                response.ok()
         ),
     ]);
 
diff --git a/e2e/utils/reporting.ts b/e2e/utils/reporting.ts
index d7b63421..d48c793c 100644
--- a/e2e/utils/reporting.ts
+++ b/e2e/utils/reporting.ts
@@ -52,11 +52,7 @@ export async function createClient(page: Page, clientName: string) {
     await expect(page.getByText(clientName)).toBeVisible();
 }
 
-export async function createProjectWithClient(
-    page: Page,
-    projectName: string,
-    clientName: string
-) {
+export async function createProjectWithClient(page: Page, projectName: string, clientName: string) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/projects');
     await expect(page.getByRole('button', { name: 'Create Project' })).toBeVisible();
     await page.getByRole('button', { name: 'Create Project' }).click();
diff --git a/resources/js/Components/Common/Reporting/ReportingFilterBar.vue b/resources/js/Components/Common/Reporting/ReportingFilterBar.vue
index 085ef5f3..8c6e740c 100644
--- a/resources/js/Components/Common/Reporting/ReportingFilterBar.vue
+++ b/resources/js/Components/Common/Reporting/ReportingFilterBar.vue
@@ -51,9 +51,7 @@ async function createTag(name: string) {
         <MainContainer class="sm:flex space-y-4 sm:space-y-0 justify-between">
             <div class="flex flex-wrap items-center space-y-2 sm:space-y-0 space-x-3">
                 <div class="text-sm font-medium">Filters</div>
-                <MemberMultiselectDropdown
-                    v-model="selectedMembers"
-                    @submit="emit('submit')">
+                <MemberMultiselectDropdown v-model="selectedMembers" @submit="emit('submit')">
                     <template #trigger>
                         <ReportingFilterBadge
                             :count="selectedMembers.length"
@@ -62,9 +60,7 @@ async function createTag(name: string) {
                             :icon="UserGroupIcon" />
                     </template>
                 </MemberMultiselectDropdown>
-                <ProjectMultiselectDropdown
-                    v-model="selectedProjects"
-                    @submit="emit('submit')">
+                <ProjectMultiselectDropdown v-model="selectedProjects" @submit="emit('submit')">
                     <template #trigger>
                         <ReportingFilterBadge
                             :count="selectedProjects.length"
@@ -73,9 +69,7 @@ async function createTag(name: string) {
                             :icon="FolderIcon" />
                     </template>
                 </ProjectMultiselectDropdown>
-                <TaskMultiselectDropdown
-                    v-model="selectedTasks"
-                    @submit="emit('submit')">
+                <TaskMultiselectDropdown v-model="selectedTasks" @submit="emit('submit')">
                     <template #trigger>
                         <ReportingFilterBadge
                             :count="selectedTasks.length"
@@ -84,9 +78,7 @@ async function createTag(name: string) {
                             :icon="CheckCircleIcon" />
                     </template>
                 </TaskMultiselectDropdown>
-                <ClientMultiselectDropdown
-                    v-model="selectedClients"
-                    @submit="emit('submit')">
+                <ClientMultiselectDropdown v-model="selectedClients" @submit="emit('submit')">
                     <template #trigger>
                         <ReportingFilterBadge
                             :count="selectedClients.length"
diff --git a/resources/js/Components/Common/Reporting/ReportingOverview.vue b/resources/js/Components/Common/Reporting/ReportingOverview.vue
index 5f5caada..51316e87 100644
--- a/resources/js/Components/Common/Reporting/ReportingOverview.vue
+++ b/resources/js/Components/Common/Reporting/ReportingOverview.vue
@@ -182,13 +182,13 @@ const groupedPieChartData = computed(() => {
         aggregatedTableTimeEntries.value?.grouped_data?.map((entry) => {
             const name = getNameForReportingRowEntry(
                 entry.key,
-                aggregatedTableTimeEntries.value?.grouped_type
+                aggregatedTableTimeEntries.value?.grouped_type ?? null
             );
             let color = getRandomColorWithSeed(entry.key ?? 'none');
             if (
                 name &&
                 aggregatedTableTimeEntries.value?.grouped_type &&
-                emptyPlaceholder[aggregatedTableTimeEntries.value?.grouped_type] === name
+                emptyPlaceholder[aggregatedTableTimeEntries.value.grouped_type] === name
             ) {
                 color = '#CCCCCC';
             } else if (aggregatedTableTimeEntries.value?.grouped_type === 'project') {
@@ -200,7 +200,7 @@ const groupedPieChartData = computed(() => {
                 name:
                     getNameForReportingRowEntry(
                         entry.key,
-                        aggregatedTableTimeEntries.value?.grouped_type
+                        aggregatedTableTimeEntries.value?.grouped_type ?? null
                     ) ?? '',
                 color: color,
             };
@@ -215,7 +215,7 @@ const tableData = computed(() => {
             cost: entry.cost,
             description: getNameForReportingRowEntry(
                 entry.key,
-                aggregatedTableTimeEntries.value?.grouped_type
+                aggregatedTableTimeEntries.value?.grouped_type ?? null
             ),
             grouped_data:
                 entry.grouped_data?.map((el) => {
@@ -256,13 +256,12 @@ const tableData = computed(() => {
         v-model:rounding-type="roundingType"
         v-model:rounding-minutes="roundingMinutes"
         v-model:start-date="startDate"
-        v-model:end-date="endDate"
-        />
+        v-model:end-date="endDate" />
     <MainContainer>
         <div class="pt-10 w-full px-3 relative">
             <ReportingChart
-                :grouped-type="aggregatedGraphTimeEntries?.grouped_type"
-                :grouped-data="aggregatedGraphTimeEntries?.grouped_data"></ReportingChart>
+                :grouped-type="aggregatedGraphTimeEntries?.grouped_type ?? null"
+                :grouped-data="aggregatedGraphTimeEntries?.grouped_data ?? null"></ReportingChart>
         </div>
     </MainContainer>
     <MainContainer>
@@ -273,13 +272,13 @@ const tableData = computed(() => {
                     <span>Group by</span>
                     <ReportingGroupBySelect
                         v-model="group"
-                        :group-by-options="groupByOptions"
-                        ></ReportingGroupBySelect>
+                        :group-by-options="groupByOptions"></ReportingGroupBySelect>
                     <span>and</span>
                     <ReportingGroupBySelect
                         v-model="subGroup"
-                        :group-by-options="groupByOptions.filter((el) => el.value !== group)"
-                        ></ReportingGroupBySelect>
+                        :group-by-options="
+                            groupByOptions.filter((el) => el.value !== group)
+                        "></ReportingGroupBySelect>
                 </div>
                 <div class="grid items-center" style="grid-template-columns: 1fr 100px 150px">
                     <div
diff --git a/resources/js/packages/ui/src/Input/MultiselectDropdown.vue b/resources/js/packages/ui/src/Input/MultiselectDropdown.vue
index 7fcf2853..4ba6b758 100644
--- a/resources/js/packages/ui/src/Input/MultiselectDropdown.vue
+++ b/resources/js/packages/ui/src/Input/MultiselectDropdown.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" generic="T">
 import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
-import { computed, ref, watch } from 'vue';
+import { computed, type Ref, ref, watch } from 'vue';
 import Checkbox from '@/packages/ui/src/Input/Checkbox.vue';
 import {
     ComboboxAnchor,
@@ -27,7 +27,7 @@ const props = defineProps<{
 
 const open = ref(false);
 const searchValue = ref('');
-const sortedItems = ref<T[]>([]);
+const sortedItems = ref<T[]>([]) as Ref<T[]>;
 
 watch(open, (isOpen) => {
     if (isOpen) {
@@ -43,7 +43,9 @@ watch(open, (isOpen) => {
 const filteredItems = computed(() => {
     const search = searchValue.value.toLowerCase().trim();
     if (!search) return sortedItems.value;
-    return sortedItems.value.filter((item) => props.getNameForItem(item).toLowerCase().includes(search));
+    return sortedItems.value.filter((item) =>
+        props.getNameForItem(item).toLowerCase().includes(search)
+    );
 });
 
 const showNoItem = computed(() => {
diff --git a/resources/js/utils/useAggregatedTimeEntriesQuery.ts b/resources/js/utils/useAggregatedTimeEntriesQuery.ts
index e7cbf510..0fc50bea 100644
--- a/resources/js/utils/useAggregatedTimeEntriesQuery.ts
+++ b/resources/js/utils/useAggregatedTimeEntriesQuery.ts
@@ -1,5 +1,9 @@
 import { useQuery } from '@tanstack/vue-query';
-import { api, type AggregatedTimeEntriesQueryParams, type ReportingResponse } from '@/packages/api/src';
+import {
+    api,
+    type AggregatedTimeEntriesQueryParams,
+    type ReportingResponse,
+} from '@/packages/api/src';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { computed, type ComputedRef, unref } from 'vue';
 
diff --git a/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php b/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php
index 5e729207..9b1f3acd 100644
--- a/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php
+++ b/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php
@@ -1513,6 +1513,84 @@ public function test_aggregate_export_endpoints_can_create_a_pdf_report_as_emplo
         $this->assertResponseCode($response, 200);
     }
 
+    public function test_index_export_endpoint_with_client_ids_filter_returns_filtered_entries(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'time-entries:view:all',
+        ]);
+        $clientA = Client::factory()->forOrganization($data->organization)->create();
+        $clientB = Client::factory()->forOrganization($data->organization)->create();
+        $projectA = Project::factory()->forOrganization($data->organization)->forClient($clientA)->create();
+        $projectB = Project::factory()->forOrganization($data->organization)->forClient($clientB)->create();
+        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forProject($projectA)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
+        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($projectB)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.time-entries.index-export', [
+            $data->organization->getKey(),
+            'format' => ExportFormat::CSV,
+            'client_ids' => [$clientA->getKey()],
+            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
+            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
+        ]));
+
+        // Assert
+        $this->assertResponseCode($response, 200);
+    }
+
+    public function test_index_export_endpoint_with_none_client_ids_filter_succeeds(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'time-entries:view:all',
+        ]);
+        $client = Client::factory()->forOrganization($data->organization)->create();
+        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
+        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
+        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.time-entries.index-export', [
+            $data->organization->getKey(),
+            'format' => ExportFormat::CSV,
+            'client_ids' => [TimeEntryFilter::NONE_VALUE],
+            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
+            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
+        ]));
+
+        // Assert
+        $this->assertResponseCode($response, 200);
+    }
+
+    public function test_index_export_endpoint_with_client_ids_of_other_organization_fails_validation(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'time-entries:view:all',
+        ]);
+        $otherData = $this->createUserWithPermission([
+            'time-entries:view:all',
+        ]);
+        $otherClient = Client::factory()->forOrganization($otherData->organization)->create();
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.time-entries.index-export', [
+            $data->organization->getKey(),
+            'format' => ExportFormat::CSV,
+            'client_ids' => [$otherClient->getKey()],
+            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
+            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
+        ]));
+
+        // Assert
+        $response->assertStatus(422);
+        $response->assertJsonValidationErrorFor('client_ids.0');
+    }
+
     public function test_aggregate_endpoint_fails_if_user_has_only_access_to_own_time_entries_but_does_not_filter_for_this(): void
     {
         // Arrange

From 1597b5490a89134fe448a97e981ae3a1de63e42b Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Mon, 2 Feb 2026 03:19:22 +0100
Subject: [PATCH 17/28] Enable npm workspaces and update dependencies

---
 e2e/timetracker.spec.ts                       |    4 +-
 package-lock.json                             | 4076 ++++++++++-------
 package.json                                  |   33 +-
 .../Common/Project/ProjectTable.vue           |    2 +-
 .../Dashboard/ActivityGraphCard.vue           |    2 +-
 .../Dashboard/LastSevenDaysCard.vue           |    4 +-
 .../Components/Dashboard/ThisWeekOverview.vue |    4 +-
 .../Partials/UpdateProfileInformationForm.vue |    2 +-
 resources/js/Pages/Projects.vue               |    2 +-
 resources/js/Pages/SharedReport.vue           |   16 +-
 .../js/Pages/Teams/Partials/ImportData.vue    |    4 +-
 resources/js/packages/api/package-lock.json   | 2164 ---------
 resources/js/packages/api/package.json        |   14 +-
 resources/js/packages/ui/package-lock.json    | 3925 ----------------
 resources/js/packages/ui/package.json         |   17 +-
 .../ui/src/FullCalendar/idleStatusPlugin.ts   |    4 +-
 .../ui/src/Input/DurationHumanInput.vue       |    4 +-
 .../ui/src/Input/TimePickerSimple.vue         |    2 +-
 .../ui/src/Input/TimeRangeSelector.vue        |    2 +-
 .../src/TimeEntry/TimeEntryGroupedTable.vue   |   22 +-
 .../src/TimeEntry/TimeEntryRangeSelector.vue  |    2 +-
 .../TimeEntry/TimeEntryRowDurationInput.vue   |    2 +-
 .../TimeTrackerProjectTaskDropdown.vue        |   42 +-
 resources/js/packages/ui/src/utils/color.ts   |    4 +-
 resources/js/packages/ui/src/utils/number.ts  |    4 +-
 resources/js/packages/ui/src/utils/random.ts  |    2 +-
 resources/js/packages/ui/src/utils/select.ts  |   12 +-
 resources/js/packages/ui/src/utils/time.ts    |   10 +-
 resources/js/utils/prefetch.ts                |    8 +-
 resources/js/utils/useCommandPalette.ts       |    4 +-
 .../js/utils/useTimeEntriesInfiniteQuery.ts   |    2 +-
 31 files changed, 2472 insertions(+), 7923 deletions(-)
 delete mode 100644 resources/js/packages/api/package-lock.json
 delete mode 100644 resources/js/packages/ui/package-lock.json

diff --git a/e2e/timetracker.spec.ts b/e2e/timetracker.spec.ts
index e37f1fbd..ef4063d2 100644
--- a/e2e/timetracker.spec.ts
+++ b/e2e/timetracker.spec.ts
@@ -187,10 +187,10 @@ test('test that entering a random value in the time range does not start the tim
 }) => {
     await goToDashboard(page);
     await page.getByTestId('time_entry_time').fill('asdasdasd');
-    await page.getByTestId('time_entry_time').press('Tab'),
+    (await page.getByTestId('time_entry_time').press('Tab'),
         await page.locator(
             '[data-testid="dashboard_timer"] [data-testid="timer_button"].bg-accent-300/70'
-        );
+        ));
 });
 
 test('test that entering a time starts the timer on enter', async ({ page }) => {
diff --git a/package-lock.json b/package-lock.json
index ced2f53a..1af5326c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,9 +1,13 @@
 {
-    "name": "html",
+    "name": "solidtime",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
+            "workspaces": [
+                "resources/js/packages/ui",
+                "resources/js/packages/api"
+            ],
             "dependencies": {
                 "@floating-ui/core": "^1.6.0",
                 "@floating-ui/vue": "^1.0.6",
@@ -21,22 +25,24 @@
                 "@tanstack/vue-table": "^8.21.2",
                 "@vue/eslint-config-prettier": "^10.2.0",
                 "@vue/eslint-config-typescript": "^14.3.0",
-                "@vueuse/core": "^12.8.2",
-                "@vueuse/integrations": "^12.5.0",
+                "@vueuse/core": "^14.0.0",
+                "@vueuse/integrations": "^14.0.0",
+                "@zodios/core": "^10.9.6",
                 "chroma-js": "3.1.2",
                 "class-variance-authority": "^0.7.1",
                 "clsx": "^2.1.1",
                 "dayjs": "^1.11.11",
-                "echarts": "^5.5.0",
-                "focus-trap": "^7.6.0",
+                "echarts": "^6.0.0",
+                "focus-trap": "^8.0.0",
                 "lucide-vue-next": "^0.487.0",
                 "parse-duration": "^2.0.1",
-                "pinia": "^2.1.7",
+                "pinia": "^3.0.0",
                 "radix-vue": "^1.9.6",
                 "reka-ui": "^2.7.0",
                 "tailwind-merge": "^2.6.0",
                 "tailwindcss-animate": "^1.0.7",
-                "vue-echarts": "^7.0.3"
+                "vue-echarts": "^8.0.0",
+                "zod": "^3.23.8"
             },
             "devDependencies": {
                 "@eslint/eslintrc": "^3.2.0",
@@ -45,23 +51,24 @@
                 "@playwright/test": "^1.41.1",
                 "@tailwindcss/forms": "^0.5.9",
                 "@tailwindcss/typography": "^0.5.15",
-                "@types/chroma-js": "2.4.5",
+                "@types/chroma-js": "^3.1.0",
                 "@types/node": "^22.10.10",
-                "@vitejs/plugin-vue": "^5.2.1",
-                "@vue/tsconfig": "^0.5.1",
+                "@vitejs/plugin-vue": "^6.0.3",
+                "@vue/tsconfig": "^0.8.0",
                 "autoprefixer": "^10.4.20",
                 "axios": "^1.6.4",
                 "eslint-plugin-unused-imports": "^4.1.4",
-                "laravel-vite-plugin": "^1.0.0",
+                "laravel-vite-plugin": "^2.1.0",
                 "openapi-zod-client": "^1.16.2",
                 "postcss": "^8.4.47",
+                "postcss-import": "^15.1.0",
                 "postcss-nesting": "^12.1.5",
                 "tailwindcss": "^3.4.13",
                 "typescript": "^5.7.3",
-                "vite": "^6.0.11",
-                "vite-plugin-checker": "^0.8.0",
+                "vite": "^7.0.0",
+                "vite-plugin-checker": "^0.12.0",
                 "vue": "^3.5.0",
-                "vue-tsc": "^2.2.0"
+                "vue-tsc": "^3.0.0"
             }
         },
         "node_modules/@alloc/quick-lru": {
@@ -76,20 +83,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/@ampproject/remapping": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-            "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@jridgewell/gen-mapping": "^0.3.5",
-                "@jridgewell/trace-mapping": "^0.3.24"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
         "node_modules/@apidevtools/json-schema-ref-parser": {
             "version": "11.7.2",
             "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-11.7.2.tgz",
@@ -184,24 +177,24 @@
             "license": "MIT"
         },
         "node_modules/@babel/code-frame": {
-            "version": "7.26.2",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
-            "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+            "version": "7.29.0",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
+            "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.25.9",
+                "@babel/helper-validator-identifier": "^7.28.5",
                 "js-tokens": "^4.0.0",
-                "picocolors": "^1.0.0"
+                "picocolors": "^1.1.1"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.26.8",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
-            "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
+            "version": "7.29.0",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
+            "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -209,22 +202,22 @@
             }
         },
         "node_modules/@babel/core": {
-            "version": "7.26.10",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz",
-            "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@ampproject/remapping": "^2.2.0",
-                "@babel/code-frame": "^7.26.2",
-                "@babel/generator": "^7.26.10",
-                "@babel/helper-compilation-targets": "^7.26.5",
-                "@babel/helper-module-transforms": "^7.26.0",
-                "@babel/helpers": "^7.26.10",
-                "@babel/parser": "^7.26.10",
-                "@babel/template": "^7.26.9",
-                "@babel/traverse": "^7.26.10",
-                "@babel/types": "^7.26.10",
+            "version": "7.29.0",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
+            "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/code-frame": "^7.29.0",
+                "@babel/generator": "^7.29.0",
+                "@babel/helper-compilation-targets": "^7.28.6",
+                "@babel/helper-module-transforms": "^7.28.6",
+                "@babel/helpers": "^7.28.6",
+                "@babel/parser": "^7.29.0",
+                "@babel/template": "^7.28.6",
+                "@babel/traverse": "^7.29.0",
+                "@babel/types": "^7.29.0",
+                "@jridgewell/remapping": "^2.3.5",
                 "convert-source-map": "^2.0.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
@@ -250,16 +243,16 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz",
-            "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==",
+            "version": "7.29.0",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.0.tgz",
+            "integrity": "sha512-vSH118/wwM/pLR38g/Sgk05sNtro6TlTJKuiMXDaZqPUfjTFcudpCOt00IhOfj+1BFAX+UFAlzCU+6WXr3GLFQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.27.0",
-                "@babel/types": "^7.27.0",
-                "@jridgewell/gen-mapping": "^0.3.5",
-                "@jridgewell/trace-mapping": "^0.3.25",
+                "@babel/parser": "^7.29.0",
+                "@babel/types": "^7.29.0",
+                "@jridgewell/gen-mapping": "^0.3.12",
+                "@jridgewell/trace-mapping": "^0.3.28",
                 "jsesc": "^3.0.2"
             },
             "engines": {
@@ -267,14 +260,14 @@
             }
         },
         "node_modules/@babel/helper-compilation-targets": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz",
-            "integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==",
+            "version": "7.28.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
+            "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/compat-data": "^7.26.8",
-                "@babel/helper-validator-option": "^7.25.9",
+                "@babel/compat-data": "^7.28.6",
+                "@babel/helper-validator-option": "^7.27.1",
                 "browserslist": "^4.24.0",
                 "lru-cache": "^5.1.1",
                 "semver": "^6.3.1"
@@ -293,30 +286,40 @@
                 "semver": "bin/semver.js"
             }
         },
+        "node_modules/@babel/helper-globals": {
+            "version": "7.28.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+            "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
         "node_modules/@babel/helper-module-imports": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
-            "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+            "version": "7.28.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
+            "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/traverse": "^7.25.9",
-                "@babel/types": "^7.25.9"
+                "@babel/traverse": "^7.28.6",
+                "@babel/types": "^7.28.6"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-module-transforms": {
-            "version": "7.26.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
-            "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
+            "version": "7.28.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
+            "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-module-imports": "^7.25.9",
-                "@babel/helper-validator-identifier": "^7.25.9",
-                "@babel/traverse": "^7.25.9"
+                "@babel/helper-module-imports": "^7.28.6",
+                "@babel/helper-validator-identifier": "^7.28.5",
+                "@babel/traverse": "^7.28.6"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -326,27 +329,27 @@
             }
         },
         "node_modules/@babel/helper-string-parser": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-            "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+            "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-            "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+            "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-validator-option": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
-            "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+            "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -354,26 +357,26 @@
             }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz",
-            "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==",
+            "version": "7.28.6",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.6.tgz",
+            "integrity": "sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/template": "^7.27.0",
-                "@babel/types": "^7.27.0"
+                "@babel/template": "^7.28.6",
+                "@babel/types": "^7.28.6"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz",
-            "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
+            "version": "7.29.0",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz",
+            "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==",
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.27.0"
+                "@babel/types": "^7.29.0"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -383,70 +386,59 @@
             }
         },
         "node_modules/@babel/template": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz",
-            "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==",
+            "version": "7.28.6",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
+            "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/code-frame": "^7.26.2",
-                "@babel/parser": "^7.27.0",
-                "@babel/types": "^7.27.0"
+                "@babel/code-frame": "^7.28.6",
+                "@babel/parser": "^7.28.6",
+                "@babel/types": "^7.28.6"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz",
-            "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==",
+            "version": "7.29.0",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
+            "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/code-frame": "^7.26.2",
-                "@babel/generator": "^7.27.0",
-                "@babel/parser": "^7.27.0",
-                "@babel/template": "^7.27.0",
-                "@babel/types": "^7.27.0",
-                "debug": "^4.3.1",
-                "globals": "^11.1.0"
+                "@babel/code-frame": "^7.29.0",
+                "@babel/generator": "^7.29.0",
+                "@babel/helper-globals": "^7.28.0",
+                "@babel/parser": "^7.29.0",
+                "@babel/template": "^7.28.6",
+                "@babel/types": "^7.29.0",
+                "debug": "^4.3.1"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
-        "node_modules/@babel/traverse/node_modules/globals": {
-            "version": "11.12.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/@babel/types": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz",
-            "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
+            "version": "7.29.0",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
+            "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-string-parser": "^7.25.9",
-                "@babel/helper-validator-identifier": "^7.25.9"
+                "@babel/helper-string-parser": "^7.27.1",
+                "@babel/helper-validator-identifier": "^7.28.5"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz",
-            "integrity": "sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz",
+            "integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==",
             "cpu": [
                 "ppc64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -457,13 +449,12 @@
             }
         },
         "node_modules/@esbuild/android-arm": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.2.tgz",
-            "integrity": "sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.2.tgz",
+            "integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==",
             "cpu": [
                 "arm"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -474,13 +465,12 @@
             }
         },
         "node_modules/@esbuild/android-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.2.tgz",
-            "integrity": "sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz",
+            "integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -491,13 +481,12 @@
             }
         },
         "node_modules/@esbuild/android-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.2.tgz",
-            "integrity": "sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.2.tgz",
+            "integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -508,13 +497,12 @@
             }
         },
         "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.2.tgz",
-            "integrity": "sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz",
+            "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -525,13 +513,12 @@
             }
         },
         "node_modules/@esbuild/darwin-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.2.tgz",
-            "integrity": "sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz",
+            "integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -542,13 +529,12 @@
             }
         },
         "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.2.tgz",
-            "integrity": "sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz",
+            "integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -559,13 +545,12 @@
             }
         },
         "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.2.tgz",
-            "integrity": "sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz",
+            "integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -576,13 +561,12 @@
             }
         },
         "node_modules/@esbuild/linux-arm": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.2.tgz",
-            "integrity": "sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz",
+            "integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==",
             "cpu": [
                 "arm"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -593,13 +577,12 @@
             }
         },
         "node_modules/@esbuild/linux-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz",
-            "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz",
+            "integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -610,13 +593,12 @@
             }
         },
         "node_modules/@esbuild/linux-ia32": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.2.tgz",
-            "integrity": "sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz",
+            "integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==",
             "cpu": [
                 "ia32"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -627,13 +609,12 @@
             }
         },
         "node_modules/@esbuild/linux-loong64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.2.tgz",
-            "integrity": "sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz",
+            "integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==",
             "cpu": [
                 "loong64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -644,13 +625,12 @@
             }
         },
         "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.2.tgz",
-            "integrity": "sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz",
+            "integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==",
             "cpu": [
                 "mips64el"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -661,13 +641,12 @@
             }
         },
         "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.2.tgz",
-            "integrity": "sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz",
+            "integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==",
             "cpu": [
                 "ppc64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -678,13 +657,12 @@
             }
         },
         "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.2.tgz",
-            "integrity": "sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz",
+            "integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==",
             "cpu": [
                 "riscv64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -695,13 +673,12 @@
             }
         },
         "node_modules/@esbuild/linux-s390x": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.2.tgz",
-            "integrity": "sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz",
+            "integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==",
             "cpu": [
                 "s390x"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -712,13 +689,12 @@
             }
         },
         "node_modules/@esbuild/linux-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.2.tgz",
-            "integrity": "sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz",
+            "integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -729,13 +705,12 @@
             }
         },
         "node_modules/@esbuild/netbsd-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.2.tgz",
-            "integrity": "sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz",
+            "integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -746,13 +721,12 @@
             }
         },
         "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.2.tgz",
-            "integrity": "sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz",
+            "integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -763,13 +737,12 @@
             }
         },
         "node_modules/@esbuild/openbsd-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.2.tgz",
-            "integrity": "sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz",
+            "integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -780,13 +753,12 @@
             }
         },
         "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.2.tgz",
-            "integrity": "sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz",
+            "integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -796,14 +768,29 @@
                 "node": ">=18"
             }
         },
+        "node_modules/@esbuild/openharmony-arm64": {
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz",
+            "integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openharmony"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
         "node_modules/@esbuild/sunos-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.2.tgz",
-            "integrity": "sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz",
+            "integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -814,13 +801,12 @@
             }
         },
         "node_modules/@esbuild/win32-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.2.tgz",
-            "integrity": "sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz",
+            "integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -831,13 +817,12 @@
             }
         },
         "node_modules/@esbuild/win32-ia32": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.2.tgz",
-            "integrity": "sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz",
+            "integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==",
             "cpu": [
                 "ia32"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -848,13 +833,12 @@
             }
         },
         "node_modules/@esbuild/win32-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.2.tgz",
-            "integrity": "sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==",
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz",
+            "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -865,9 +849,9 @@
             }
         },
         "node_modules/@eslint-community/eslint-utils": {
-            "version": "4.6.0",
-            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.6.0.tgz",
-            "integrity": "sha512-WhCn7Z7TauhBtmzhvKpoQs0Wwb/kBcy4CwpuI0/eEIr2Lx2auxmulAzLr91wVZJaz47iUZdkXOK7WlAfxGKCnA==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz",
+            "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==",
             "license": "MIT",
             "dependencies": {
                 "eslint-visitor-keys": "^3.4.3"
@@ -883,22 +867,22 @@
             }
         },
         "node_modules/@eslint-community/regexpp": {
-            "version": "4.12.1",
-            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-            "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+            "version": "4.12.2",
+            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
+            "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
             "license": "MIT",
             "engines": {
                 "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
             }
         },
         "node_modules/@eslint/config-array": {
-            "version": "0.20.0",
-            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
-            "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+            "version": "0.21.1",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
+            "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==",
             "license": "Apache-2.0",
             "peer": true,
             "dependencies": {
-                "@eslint/object-schema": "^2.1.6",
+                "@eslint/object-schema": "^2.1.7",
                 "debug": "^4.3.1",
                 "minimatch": "^3.1.2"
             },
@@ -907,19 +891,22 @@
             }
         },
         "node_modules/@eslint/config-helpers": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.1.tgz",
-            "integrity": "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==",
+            "version": "0.4.2",
+            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz",
+            "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==",
             "license": "Apache-2.0",
             "peer": true,
+            "dependencies": {
+                "@eslint/core": "^0.17.0"
+            },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
         },
         "node_modules/@eslint/core": {
-            "version": "0.12.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
-            "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==",
+            "version": "0.17.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
+            "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
             "license": "Apache-2.0",
             "peer": true,
             "dependencies": {
@@ -930,9 +917,9 @@
             }
         },
         "node_modules/@eslint/eslintrc": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
-            "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz",
+            "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==",
             "license": "MIT",
             "dependencies": {
                 "ajv": "^6.12.4",
@@ -941,7 +928,7 @@
                 "globals": "^14.0.0",
                 "ignore": "^5.2.0",
                 "import-fresh": "^3.2.1",
-                "js-yaml": "^4.1.0",
+                "js-yaml": "^4.1.1",
                 "minimatch": "^3.1.2",
                 "strip-json-comments": "^3.1.1"
             },
@@ -953,18 +940,21 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "9.24.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.24.0.tgz",
-            "integrity": "sha512-uIY/y3z0uvOGX8cp1C2fiC4+ZmBhp6yZWkojtHL1YEMnRt1Y63HB9TM17proGEmeG7HeUY+UP36F0aknKYTpYA==",
+            "version": "9.39.2",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.2.tgz",
+            "integrity": "sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==",
             "license": "MIT",
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://eslint.org/donate"
             }
         },
         "node_modules/@eslint/object-schema": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
-            "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+            "version": "2.1.7",
+            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
+            "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
             "license": "Apache-2.0",
             "peer": true,
             "engines": {
@@ -972,114 +962,127 @@
             }
         },
         "node_modules/@eslint/plugin-kit": {
-            "version": "0.2.8",
-            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz",
-            "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==",
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz",
+            "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==",
             "license": "Apache-2.0",
             "peer": true,
             "dependencies": {
-                "@eslint/core": "^0.13.0",
+                "@eslint/core": "^0.17.0",
                 "levn": "^0.4.1"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
         },
-        "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
-            "version": "0.13.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
-            "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
-            "license": "Apache-2.0",
-            "peer": true,
-            "dependencies": {
-                "@types/json-schema": "^7.0.15"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            }
-        },
         "node_modules/@floating-ui/core": {
-            "version": "1.6.9",
-            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.9.tgz",
-            "integrity": "sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==",
+            "version": "1.7.4",
+            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.4.tgz",
+            "integrity": "sha512-C3HlIdsBxszvm5McXlB8PeOEWfBhcGBTZGkGlWc2U0KFY5IwG5OQEuQ8rq52DZmcHDlPLd+YFBK+cZcytwIFWg==",
             "license": "MIT",
             "dependencies": {
-                "@floating-ui/utils": "^0.2.9"
+                "@floating-ui/utils": "^0.2.10"
             }
         },
         "node_modules/@floating-ui/dom": {
-            "version": "1.6.13",
-            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.13.tgz",
-            "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==",
+            "version": "1.7.5",
+            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.5.tgz",
+            "integrity": "sha512-N0bD2kIPInNHUHehXhMke1rBGs1dwqvC9O9KYMyyjK7iXt7GAhnro7UlcuYcGdS/yYOlq0MAVgrow8IbWJwyqg==",
             "license": "MIT",
             "dependencies": {
-                "@floating-ui/core": "^1.6.0",
-                "@floating-ui/utils": "^0.2.9"
+                "@floating-ui/core": "^1.7.4",
+                "@floating-ui/utils": "^0.2.10"
             }
         },
         "node_modules/@floating-ui/utils": {
-            "version": "0.2.9",
-            "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.9.tgz",
-            "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==",
+            "version": "0.2.10",
+            "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
+            "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
             "license": "MIT"
         },
         "node_modules/@floating-ui/vue": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/@floating-ui/vue/-/vue-1.1.6.tgz",
-            "integrity": "sha512-XFlUzGHGv12zbgHNk5FN2mUB7ROul3oG2ENdTpWdE+qMFxyNxWSRmsoyhiEnpmabNm6WnUvR1OvJfUfN4ojC1A==",
+            "version": "1.1.10",
+            "resolved": "https://registry.npmjs.org/@floating-ui/vue/-/vue-1.1.10.tgz",
+            "integrity": "sha512-vdf8f6rHnFPPLRsmL4p12wYl+Ux4mOJOkjzKEMYVnwdf7UFdvBtHlLvQyx8iKG5vhPRbDRgZxdtpmyigDPjzYg==",
             "license": "MIT",
             "dependencies": {
-                "@floating-ui/dom": "^1.0.0",
-                "@floating-ui/utils": "^0.2.9",
+                "@floating-ui/dom": "^1.7.5",
+                "@floating-ui/utils": "^0.2.10",
                 "vue-demi": ">=0.13.0"
             }
         },
+        "node_modules/@floating-ui/vue/node_modules/vue-demi": {
+            "version": "0.14.10",
+            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+            "hasInstallScript": true,
+            "license": "MIT",
+            "bin": {
+                "vue-demi-fix": "bin/vue-demi-fix.js",
+                "vue-demi-switch": "bin/vue-demi-switch.js"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.0.0-rc.1",
+                "vue": "^3.0.0-0 || ^2.6.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/@fullcalendar/core": {
-            "version": "6.1.18",
-            "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.18.tgz",
-            "integrity": "sha512-cD7XtZIZZ87Cg2+itnpsONCsZ89VIfLLDZ22pQX4IQVWlpYUB3bcCf878DhWkqyEen6dhi5ePtBoqYgm5K+0fQ==",
+            "version": "6.1.20",
+            "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.20.tgz",
+            "integrity": "sha512-1cukXLlePFiJ8YKXn/4tMKsy0etxYLCkXk8nUCFi11nRONF2Ba2CD5b21/ovtOO2tL6afTJfwmc1ed3HG7eB1g==",
             "license": "MIT",
             "dependencies": {
                 "preact": "~10.12.1"
             }
         },
         "node_modules/@fullcalendar/daygrid": {
-            "version": "6.1.18",
-            "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.18.tgz",
-            "integrity": "sha512-s452Zle1SdMEzZDw+pDczm8m3JLIZzS9ANMThXTnqeqJewW1gqNFYas18aHypJSgF9Fh9rDJjTSUw04BpXB/Mg==",
+            "version": "6.1.20",
+            "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.20.tgz",
+            "integrity": "sha512-AO9vqhkLP77EesmJzuU+IGXgxNulsA8mgQHynclJ8U70vSwAVnbcLG9qftiTAFSlZjiY/NvhE7sflve6cJelyQ==",
             "license": "MIT",
             "peerDependencies": {
-                "@fullcalendar/core": "~6.1.18"
+                "@fullcalendar/core": "~6.1.20"
             }
         },
         "node_modules/@fullcalendar/interaction": {
-            "version": "6.1.18",
-            "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-6.1.18.tgz",
-            "integrity": "sha512-f/mD5RTjzw+Q6MGTMZrLCgIrQLIUUO9NV/58aM2J6ZBQZeRlNizDqmqldqyG+j49zj2vFhUfZibPrVKWm5yA4Q==",
+            "version": "6.1.20",
+            "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-6.1.20.tgz",
+            "integrity": "sha512-p6txmc5txL0bMiPaJxe2ip6o0T384TyoD2KGdsU6UjZ5yoBlaY+dg7kxfnYKpYMzEJLG58n+URrHr2PgNL2fyA==",
             "license": "MIT",
             "peerDependencies": {
-                "@fullcalendar/core": "~6.1.18"
+                "@fullcalendar/core": "~6.1.20"
             }
         },
         "node_modules/@fullcalendar/timegrid": {
-            "version": "6.1.18",
-            "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-6.1.18.tgz",
-            "integrity": "sha512-T/ouhs+T1tM8JcW7Cjx+KiohL/qQWKqvRITwjol8ktJ1e1N/6noC40/obR1tyolqOxMRWHjJkYoj9fUqfoez9A==",
+            "version": "6.1.20",
+            "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-6.1.20.tgz",
+            "integrity": "sha512-4H+/MWbz3ntA50lrPif+7TsvMeX3R1GSYjiLULz0+zEJ7/Yfd9pupZmAwUs/PBpA6aAcFmeRr0laWfcz1a9V1A==",
             "license": "MIT",
             "dependencies": {
-                "@fullcalendar/daygrid": "~6.1.18"
+                "@fullcalendar/daygrid": "~6.1.20"
             },
             "peerDependencies": {
-                "@fullcalendar/core": "~6.1.18"
+                "@fullcalendar/core": "~6.1.20"
             }
         },
         "node_modules/@fullcalendar/vue3": {
-            "version": "6.1.18",
-            "resolved": "https://registry.npmjs.org/@fullcalendar/vue3/-/vue3-6.1.18.tgz",
-            "integrity": "sha512-YMagwTumxsIx3GFYWLa9Yr73EMA+JuH6S3EeZGS+rEjvG5fDGdf+33rxGMzmw+LdO7SWi3ctbzRnJlv3fnm3RQ==",
+            "version": "6.1.20",
+            "resolved": "https://registry.npmjs.org/@fullcalendar/vue3/-/vue3-6.1.20.tgz",
+            "integrity": "sha512-8qg6pS27II9QBwFkkJC+7SfflMpWqOe7i3ii5ODq9KpLAjwQAd/zjfq8RvKR1Yryoh5UmMCmvRbMB7i4RGtqog==",
             "license": "MIT",
             "peerDependencies": {
-                "@fullcalendar/core": "~6.1.18",
+                "@fullcalendar/core": "~6.1.20",
                 "vue": "^3.0.11"
             }
         },
@@ -1103,33 +1106,19 @@
             }
         },
         "node_modules/@humanfs/node": {
-            "version": "0.16.6",
-            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
-            "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+            "version": "0.16.7",
+            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
+            "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
             "license": "Apache-2.0",
             "peer": true,
             "dependencies": {
                 "@humanfs/core": "^0.19.1",
-                "@humanwhocodes/retry": "^0.3.0"
+                "@humanwhocodes/retry": "^0.4.0"
             },
             "engines": {
                 "node": ">=18.18.0"
             }
         },
-        "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
-            "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
-            "license": "Apache-2.0",
-            "peer": true,
-            "engines": {
-                "node": ">=18.18"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/nzakas"
-            }
-        },
         "node_modules/@humanwhocodes/module-importer": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -1145,9 +1134,9 @@
             }
         },
         "node_modules/@humanwhocodes/retry": {
-            "version": "0.4.2",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
-            "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
+            "version": "0.4.3",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+            "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
             "license": "Apache-2.0",
             "peer": true,
             "engines": {
@@ -1159,82 +1148,95 @@
             }
         },
         "node_modules/@inertiajs/core": {
-            "version": "2.3.7",
-            "resolved": "https://registry.npmjs.org/@inertiajs/core/-/core-2.3.7.tgz",
-            "integrity": "sha512-gBu2m71KoAu3kyaBDeszYiInkPqR0lIe+mRpI1JQyOlX1CT+Hwn+Tk5O7Dsr3dRMphEkRj6H9oVmJ19jHSNTIA==",
+            "version": "2.3.13",
+            "resolved": "https://registry.npmjs.org/@inertiajs/core/-/core-2.3.13.tgz",
+            "integrity": "sha512-qMHRnb59k/HehXw/WfQt5kPV0k9RapfFcWJZINJnYMwfHDEJ21iNVZjsJHmDN7yWdZmG1Dxi9FP4xarWWgdosQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@types/lodash-es": "^4.17.12",
                 "axios": "^1.13.2",
-                "laravel-precognition": "^1.0.0",
-                "lodash-es": "^4.17.21",
+                "laravel-precognition": "^1.0.1",
+                "lodash-es": "^4.17.23",
                 "qs": "^6.14.1"
             }
         },
         "node_modules/@inertiajs/vue3": {
-            "version": "2.3.7",
-            "resolved": "https://registry.npmjs.org/@inertiajs/vue3/-/vue3-2.3.7.tgz",
-            "integrity": "sha512-jaJtOPjulmLy4uKHL8BlYRjXGKk5FMccjczCePJzKS1JJYaF0aixpY046HzlKDtbnU9xn2h2tZRwu4kQ1uoTTg==",
+            "version": "2.3.13",
+            "resolved": "https://registry.npmjs.org/@inertiajs/vue3/-/vue3-2.3.13.tgz",
+            "integrity": "sha512-e3uAc4Em6GrUo/51IXmckXyv7GTX0QacTGyP80NVXYhcgUJOH/lp+fzLbAhaiTSoG+4zuT/aKMAJRmXXX6CEGg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@inertiajs/core": "2.3.7",
+                "@inertiajs/core": "2.3.13",
                 "@types/lodash-es": "^4.17.12",
-                "laravel-precognition": "^1.0.0",
-                "lodash-es": "^4.17.21"
+                "laravel-precognition": "^1.0.1",
+                "lodash-es": "^4.17.23"
             },
             "peerDependencies": {
                 "vue": "^3.0.0"
             }
         },
         "node_modules/@internationalized/date": {
-            "version": "3.8.0",
-            "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.8.0.tgz",
-            "integrity": "sha512-J51AJ0fEL68hE4CwGPa6E0PO6JDaVLd8aln48xFCSy7CZkZc96dGEGmLs2OEEbBxcsVZtfrqkXJwI2/MSG8yKw==",
+            "version": "3.10.1",
+            "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.10.1.tgz",
+            "integrity": "sha512-oJrXtQiAXLvT9clCf1K4kxp3eKsQhIaZqxEyowkBcsvZDdZkbWrVmnGknxs5flTD0VGsxrxKgBCZty1EzoiMzA==",
             "license": "Apache-2.0",
             "dependencies": {
                 "@swc/helpers": "^0.5.0"
             }
         },
         "node_modules/@internationalized/number": {
-            "version": "3.6.1",
-            "resolved": "https://registry.npmjs.org/@internationalized/number/-/number-3.6.1.tgz",
-            "integrity": "sha512-UVsb4bCwbL944E0SX50CHFtWEeZ2uB5VozZ5yDXJdq6iPZsZO5p+bjVMZh2GxHf4Bs/7xtDCcPwEa2NU9DaG/g==",
+            "version": "3.6.5",
+            "resolved": "https://registry.npmjs.org/@internationalized/number/-/number-3.6.5.tgz",
+            "integrity": "sha512-6hY4Kl4HPBvtfS62asS/R22JzNNy8vi/Ssev7x6EobfCp+9QIB2hKvI2EtbdJ0VSQacxVNtqhE/NmF/NZ0gm6g==",
             "license": "Apache-2.0",
             "dependencies": {
                 "@swc/helpers": "^0.5.0"
             }
         },
-        "node_modules/@isaacs/cliui": {
-            "version": "8.0.2",
-            "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-            "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-            "license": "ISC",
+        "node_modules/@isaacs/balanced-match": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+            "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "20 || >=22"
+            }
+        },
+        "node_modules/@isaacs/brace-expansion": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+            "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+            "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "string-width": "^5.1.2",
-                "string-width-cjs": "npm:string-width@^4.2.0",
-                "strip-ansi": "^7.0.1",
-                "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-                "wrap-ansi": "^8.1.0",
-                "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+                "@isaacs/balanced-match": "^4.0.1"
             },
             "engines": {
-                "node": ">=12"
+                "node": "20 || >=22"
             }
         },
         "node_modules/@jridgewell/gen-mapping": {
-            "version": "0.3.8",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-            "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+            "version": "0.3.13",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+            "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
             "license": "MIT",
             "dependencies": {
-                "@jridgewell/set-array": "^1.2.1",
-                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/sourcemap-codec": "^1.5.0",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            }
+        },
+        "node_modules/@jridgewell/remapping": {
+            "version": "2.3.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+            "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.5",
                 "@jridgewell/trace-mapping": "^0.3.24"
-            },
-            "engines": {
-                "node": ">=6.0.0"
             }
         },
         "node_modules/@jridgewell/resolve-uri": {
@@ -1246,25 +1248,16 @@
                 "node": ">=6.0.0"
             }
         },
-        "node_modules/@jridgewell/set-array": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-            "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
         "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-            "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+            "version": "1.5.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+            "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
             "license": "MIT"
         },
         "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.25",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-            "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+            "version": "0.3.31",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+            "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
             "license": "MIT",
             "dependencies": {
                 "@jridgewell/resolve-uri": "^3.1.0",
@@ -1289,6 +1282,154 @@
                 "fs-extra": "^10.1.0"
             }
         },
+        "node_modules/@microsoft/api-extractor": {
+            "version": "7.56.0",
+            "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.56.0.tgz",
+            "integrity": "sha512-H0V69QG5jIb9Ayx35NVBv2lOgFSS3q+Eab2oyGEy0POL3ovYPST+rCNPbwYoczOZXNG8IKjWUmmAMxmDTsXlQA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@microsoft/api-extractor-model": "7.32.2",
+                "@microsoft/tsdoc": "~0.16.0",
+                "@microsoft/tsdoc-config": "~0.18.0",
+                "@rushstack/node-core-library": "5.19.1",
+                "@rushstack/rig-package": "0.6.0",
+                "@rushstack/terminal": "0.21.0",
+                "@rushstack/ts-command-line": "5.1.7",
+                "diff": "~8.0.2",
+                "lodash": "~4.17.15",
+                "minimatch": "10.0.3",
+                "resolve": "~1.22.1",
+                "semver": "~7.5.4",
+                "source-map": "~0.6.1",
+                "typescript": "5.8.2"
+            },
+            "bin": {
+                "api-extractor": "bin/api-extractor"
+            }
+        },
+        "node_modules/@microsoft/api-extractor-model": {
+            "version": "7.32.2",
+            "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.32.2.tgz",
+            "integrity": "sha512-Ussc25rAalc+4JJs9HNQE7TuO9y6jpYQX9nWD1DhqUzYPBr3Lr7O9intf+ZY8kD5HnIqeIRJX7ccCT0QyBy2Ww==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@microsoft/tsdoc": "~0.16.0",
+                "@microsoft/tsdoc-config": "~0.18.0",
+                "@rushstack/node-core-library": "5.19.1"
+            }
+        },
+        "node_modules/@microsoft/api-extractor/node_modules/lru-cache": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "yallist": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@microsoft/api-extractor/node_modules/minimatch": {
+            "version": "10.0.3",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz",
+            "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "@isaacs/brace-expansion": "^5.0.0"
+            },
+            "engines": {
+                "node": "20 || >=22"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/@microsoft/api-extractor/node_modules/semver": {
+            "version": "7.5.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "lru-cache": "^6.0.0"
+            },
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@microsoft/api-extractor/node_modules/typescript": {
+            "version": "5.8.2",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz",
+            "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
+            }
+        },
+        "node_modules/@microsoft/api-extractor/node_modules/yallist": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/@microsoft/tsdoc": {
+            "version": "0.16.0",
+            "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.16.0.tgz",
+            "integrity": "sha512-xgAyonlVVS+q7Vc7qLW0UrJU7rSFcETRWsqdXZtjzRU8dF+6CkozTK4V4y1LwOX7j8r/vHphjDeMeGI4tNGeGA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@microsoft/tsdoc-config": {
+            "version": "0.18.0",
+            "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.18.0.tgz",
+            "integrity": "sha512-8N/vClYyfOH+l4fLkkr9+myAoR6M7akc8ntBJ4DJdWH2b09uVfr71+LTMpNyG19fNqWDg8KEDZhx5wxuqHyGjw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@microsoft/tsdoc": "0.16.0",
+                "ajv": "~8.12.0",
+                "jju": "~1.4.0",
+                "resolve": "~1.22.2"
+            }
+        },
+        "node_modules/@microsoft/tsdoc-config/node_modules/ajv": {
+            "version": "8.12.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/@microsoft/tsdoc-config/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -1324,36 +1465,26 @@
                 "node": ">= 8"
             }
         },
-        "node_modules/@pkgjs/parseargs": {
-            "version": "0.11.0",
-            "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-            "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-            "license": "MIT",
-            "optional": true,
-            "engines": {
-                "node": ">=14"
-            }
-        },
         "node_modules/@pkgr/core": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.2.tgz",
-            "integrity": "sha512-25L86MyPvnlQoX2MTIV2OiUcb6vJ6aRbFa9pbwByn95INKD5mFH2smgjDhq+fwJoqAgvgbdJLj6Tz7V9X5CFAQ==",
+            "version": "0.2.9",
+            "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
+            "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
             "license": "MIT",
             "engines": {
                 "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
             },
             "funding": {
-                "url": "https://opencollective.com/unts"
+                "url": "https://opencollective.com/pkgr"
             }
         },
         "node_modules/@playwright/test": {
-            "version": "1.51.1",
-            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.51.1.tgz",
-            "integrity": "sha512-nM+kEaTSAoVlXmMPH10017vn3FSiFqr/bh4fKg9vmAdMfd9SDqRZNvPSiAHADc/itWak+qPvMPZQOPwCBW7k7Q==",
+            "version": "1.58.1",
+            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.1.tgz",
+            "integrity": "sha512-6LdVIUERWxQMmUSSQi0I53GgCBYgM2RpGngCPY7hSeju+VrKjq3lvs7HpJoPbDiY5QM5EYRtRX5fvrinnMAz3w==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "playwright": "1.51.1"
+                "playwright": "1.58.1"
             },
             "bin": {
                 "playwright": "cli.js"
@@ -1362,42 +1493,81 @@
                 "node": ">=18"
             }
         },
-        "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.0.tgz",
-            "integrity": "sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "android"
-            ]
+        "node_modules/@rolldown/pluginutils": {
+            "version": "1.0.0-beta.53",
+            "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.53.tgz",
+            "integrity": "sha512-vENRlFU4YbrwVqNDZ7fLvy+JR1CRkyr01jhSiDpE1u6py3OMzQfztQU2jxykW3ALNxO4kSlqIDeYyD0Y9RcQeQ==",
+            "license": "MIT"
         },
-        "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.0.tgz",
-            "integrity": "sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==",
-            "cpu": [
-                "arm64"
-            ],
+        "node_modules/@rollup/pluginutils": {
+            "version": "5.3.0",
+            "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz",
+            "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==",
             "dev": true,
             "license": "MIT",
-            "optional": true,
+            "dependencies": {
+                "@types/estree": "^1.0.0",
+                "estree-walker": "^2.0.2",
+                "picomatch": "^4.0.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/pluginutils/node_modules/picomatch": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+            "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/@rollup/rollup-android-arm-eabi": {
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.1.tgz",
+            "integrity": "sha512-A6ehUVSiSaaliTxai040ZpZ2zTevHYbvu/lDoeAteHI8QnaosIzm4qwtezfRg1jOYaUmnzLX1AOD6Z+UJjtifg==",
+            "cpu": [
+                "arm"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ]
+        },
+        "node_modules/@rollup/rollup-android-arm64": {
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.1.tgz",
+            "integrity": "sha512-dQaAddCY9YgkFHZcFNS/606Exo8vcLHwArFZ7vxXq4rigo2bb494/xKMMwRRQW6ug7Js6yXmBZhSBRuBvCCQ3w==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
             "os": [
                 "android"
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.0.tgz",
-            "integrity": "sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.1.tgz",
+            "integrity": "sha512-crNPrwJOrRxagUYeMn/DZwqN88SDmwaJ8Cvi/TN1HnWBU7GwknckyosC2gd0IqYRsHDEnXf328o9/HC6OkPgOg==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1405,13 +1575,12 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.0.tgz",
-            "integrity": "sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.1.tgz",
+            "integrity": "sha512-Ji8g8ChVbKrhFtig5QBV7iMaJrGtpHelkB3lsaKzadFBe58gmjfGXAOfI5FV0lYMH8wiqsxKQ1C9B0YTRXVy4w==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1419,13 +1588,12 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.0.tgz",
-            "integrity": "sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.1.tgz",
+            "integrity": "sha512-R+/WwhsjmwodAcz65guCGFRkMb4gKWTcIeLy60JJQbXrJ97BOXHxnkPFrP+YwFlaS0m+uWJTstrUA9o+UchFug==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1433,13 +1601,12 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.0.tgz",
-            "integrity": "sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.1.tgz",
+            "integrity": "sha512-IEQTCHeiTOnAUC3IDQdzRAGj3jOAYNr9kBguI7MQAAZK3caezRrg0GxAb6Hchg4lxdZEI5Oq3iov/w/hnFWY9Q==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1447,13 +1614,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.0.tgz",
-            "integrity": "sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.1.tgz",
+            "integrity": "sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==",
             "cpu": [
                 "arm"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1461,13 +1627,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.0.tgz",
-            "integrity": "sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.1.tgz",
+            "integrity": "sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==",
             "cpu": [
                 "arm"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1475,13 +1640,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.0.tgz",
-            "integrity": "sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.1.tgz",
+            "integrity": "sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1489,41 +1653,64 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.0.tgz",
-            "integrity": "sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.1.tgz",
+            "integrity": "sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
                 "linux"
             ]
         },
-        "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.0.tgz",
-            "integrity": "sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==",
+        "node_modules/@rollup/rollup-linux-loong64-gnu": {
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.1.tgz",
+            "integrity": "sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==",
             "cpu": [
                 "loong64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
                 "linux"
             ]
         },
-        "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.0.tgz",
-            "integrity": "sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==",
+        "node_modules/@rollup/rollup-linux-loong64-musl": {
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.1.tgz",
+            "integrity": "sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==",
+            "cpu": [
+                "loong64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.1.tgz",
+            "integrity": "sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==",
+            "cpu": [
+                "ppc64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-ppc64-musl": {
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.1.tgz",
+            "integrity": "sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==",
             "cpu": [
                 "ppc64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1531,13 +1718,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.0.tgz",
-            "integrity": "sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.1.tgz",
+            "integrity": "sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==",
             "cpu": [
                 "riscv64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1545,13 +1731,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.0.tgz",
-            "integrity": "sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.1.tgz",
+            "integrity": "sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==",
             "cpu": [
                 "riscv64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1559,13 +1744,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.0.tgz",
-            "integrity": "sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.1.tgz",
+            "integrity": "sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==",
             "cpu": [
                 "s390x"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1573,13 +1757,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.0.tgz",
-            "integrity": "sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.57.1.tgz",
+            "integrity": "sha512-ABca4ceT4N+Tv/GtotnWAeXZUZuM/9AQyCyKYyKnpk4yoA7QIAuBt6Hkgpw8kActYlew2mvckXkvx0FfoInnLg==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1587,27 +1770,51 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.0.tgz",
-            "integrity": "sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.1.tgz",
+            "integrity": "sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
                 "linux"
             ]
         },
+        "node_modules/@rollup/rollup-openbsd-x64": {
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.1.tgz",
+            "integrity": "sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openbsd"
+            ]
+        },
+        "node_modules/@rollup/rollup-openharmony-arm64": {
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.1.tgz",
+            "integrity": "sha512-4wYoDpNg6o/oPximyc/NG+mYUejZrCU2q+2w6YZqrAs2UcNUChIZXjtafAiiZSUc7On8v5NyNj34Kzj/Ltk6dQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openharmony"
+            ]
+        },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.0.tgz",
-            "integrity": "sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.1.tgz",
+            "integrity": "sha512-O54mtsV/6LW3P8qdTcamQmuC990HDfR71lo44oZMZlXU4tzLrbvTii87Ni9opq60ds0YzuAlEr/GNwuNluZyMQ==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1615,13 +1822,25 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.0.tgz",
-            "integrity": "sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.1.tgz",
+            "integrity": "sha512-P3dLS+IerxCT/7D2q2FYcRdWRl22dNbrbBEtxdWhXrfIMPP9lQhb5h4Du04mdl5Woq05jVCDPCMF7Ub0NAjIew==",
             "cpu": [
                 "ia32"
             ],
-            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/@rollup/rollup-win32-x64-gnu": {
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.1.tgz",
+            "integrity": "sha512-VMBH2eOOaKGtIJYleXsi2B8CPVADrh+TyNxJ4mWPnKfLB/DBUmzW+5m1xUrcwWoMfSLagIRpjUFeW5CO5hyciQ==",
+            "cpu": [
+                "x64"
+            ],
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1629,13 +1848,12 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.0.tgz",
-            "integrity": "sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==",
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.1.tgz",
+            "integrity": "sha512-mxRFDdHIWRxg3UfIIAwCm6NzvxG0jDX/wBN6KsQFTvKFqqg9vTrWUE68qEjHt19A5wwx5X5aUi2zuZT7YR0jrA==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1643,15 +1861,223 @@
             ]
         },
         "node_modules/@rushstack/eslint-patch": {
-            "version": "1.11.0",
-            "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.11.0.tgz",
-            "integrity": "sha512-zxnHvoMQVqewTJr/W4pKjF0bMGiKJv1WX7bSrkl46Hg0QjESbzBROWK0Wg4RphzSOS5Jiy7eFimmM3UgMrMZbQ==",
+            "version": "1.15.0",
+            "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.15.0.tgz",
+            "integrity": "sha512-ojSshQPKwVvSMR8yT2L/QtUkV5SXi/IfDiJ4/8d6UbTPjiHVmxZzUAzGD8Tzks1b9+qQkZa0isUOvYObedITaw==",
+            "license": "MIT"
+        },
+        "node_modules/@rushstack/node-core-library": {
+            "version": "5.19.1",
+            "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.19.1.tgz",
+            "integrity": "sha512-ESpb2Tajlatgbmzzukg6zyAhH+sICqJR2CNXNhXcEbz6UGCQfrKCtkxOpJTftWc8RGouroHG0Nud1SJAszvpmA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ajv": "~8.13.0",
+                "ajv-draft-04": "~1.0.0",
+                "ajv-formats": "~3.0.1",
+                "fs-extra": "~11.3.0",
+                "import-lazy": "~4.0.0",
+                "jju": "~1.4.0",
+                "resolve": "~1.22.1",
+                "semver": "~7.5.4"
+            },
+            "peerDependencies": {
+                "@types/node": "*"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rushstack/node-core-library/node_modules/ajv": {
+            "version": "8.13.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz",
+            "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.4.1"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/@rushstack/node-core-library/node_modules/ajv-draft-04": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz",
+            "integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "ajv": "^8.5.0"
+            },
+            "peerDependenciesMeta": {
+                "ajv": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rushstack/node-core-library/node_modules/fs-extra": {
+            "version": "11.3.3",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.3.tgz",
+            "integrity": "sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=14.14"
+            }
+        },
+        "node_modules/@rushstack/node-core-library/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true,
             "license": "MIT"
         },
+        "node_modules/@rushstack/node-core-library/node_modules/lru-cache": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "yallist": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@rushstack/node-core-library/node_modules/semver": {
+            "version": "7.5.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "lru-cache": "^6.0.0"
+            },
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@rushstack/node-core-library/node_modules/yallist": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/@rushstack/problem-matcher": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/@rushstack/problem-matcher/-/problem-matcher-0.1.1.tgz",
+            "integrity": "sha512-Fm5XtS7+G8HLcJHCWpES5VmeMyjAKaWeyZU5qPzZC+22mPlJzAsOxymHiWIfuirtPckX3aptWws+K2d0BzniJA==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "@types/node": "*"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rushstack/rig-package": {
+            "version": "0.6.0",
+            "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.6.0.tgz",
+            "integrity": "sha512-ZQmfzsLE2+Y91GF15c65L/slMRVhF6Hycq04D4TwtdGaUAbIXXg9c5pKA5KFU7M4QMaihoobp9JJYpYcaY3zOw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "resolve": "~1.22.1",
+                "strip-json-comments": "~3.1.1"
+            }
+        },
+        "node_modules/@rushstack/terminal": {
+            "version": "0.21.0",
+            "resolved": "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.21.0.tgz",
+            "integrity": "sha512-cLaI4HwCNYmknM5ns4G+drqdEB6q3dCPV423+d3TZeBusYSSm09+nR7CnhzJMjJqeRcdMAaLnrA4M/3xDz4R3w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@rushstack/node-core-library": "5.19.1",
+                "@rushstack/problem-matcher": "0.1.1",
+                "supports-color": "~8.1.1"
+            },
+            "peerDependencies": {
+                "@types/node": "*"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rushstack/terminal/node_modules/supports-color": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            }
+        },
+        "node_modules/@rushstack/ts-command-line": {
+            "version": "5.1.7",
+            "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-5.1.7.tgz",
+            "integrity": "sha512-Ugwl6flarZcL2nqH5IXFYk3UR3mBVDsVFlCQW/Oaqidvdb/5Ota6b/Z3JXWIdqV3rOR2/JrYoAHanWF5rgenXA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@rushstack/terminal": "0.21.0",
+                "@types/argparse": "1.0.38",
+                "argparse": "~1.0.9",
+                "string-argv": "~0.3.1"
+            }
+        },
+        "node_modules/@rushstack/ts-command-line/node_modules/argparse": {
+            "version": "1.0.10",
+            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "sprintf-js": "~1.0.2"
+            }
+        },
+        "node_modules/@solidtime/api": {
+            "resolved": "resources/js/packages/api",
+            "link": true
+        },
+        "node_modules/@solidtime/ui": {
+            "resolved": "resources/js/packages/ui",
+            "link": true
+        },
         "node_modules/@swc/helpers": {
-            "version": "0.5.17",
-            "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.17.tgz",
-            "integrity": "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==",
+            "version": "0.5.18",
+            "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.18.tgz",
+            "integrity": "sha512-TXTnIcNJQEKwThMMqBXsZ4VGAza6bvN4pa41Rkqoio6QBKMvo+5lexeTMScGCIxtzgQJzElcvIltani+adC5PQ==",
             "license": "Apache-2.0",
             "dependencies": {
                 "tslib": "^2.8.0"
@@ -1673,9 +2099,9 @@
             }
         },
         "node_modules/@tailwindcss/forms": {
-            "version": "0.5.10",
-            "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.10.tgz",
-            "integrity": "sha512-utI1ONF6uf/pPNO68kmN1b8rEwNXv3czukalo8VtJH8ksIkZXr3Q3VYudZLkCsDd4Wku120uF02hYK25XGPorw==",
+            "version": "0.5.11",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.11.tgz",
+            "integrity": "sha512-h9wegbZDPurxG22xZSoWtdzc41/OlNEUQERNqI/0fOwa2aVlWGu7C35E/x6LDyD3lgtztFSSjKZyuVM0hxhbgA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1686,28 +2112,40 @@
             }
         },
         "node_modules/@tailwindcss/typography": {
-            "version": "0.5.16",
-            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.16.tgz",
-            "integrity": "sha512-0wDLwCVF5V3x3b1SGXPCDcdsbDHMBe+lkFzBRaHeLvNi+nrrnZ1lA18u+OTWO8iSWU2GxUOCvlXtDuqftc1oiA==",
+            "version": "0.5.19",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.19.tgz",
+            "integrity": "sha512-w31dd8HOx3k9vPtcQh5QHP9GwKcgbMp87j58qi6xgiBnFFtKEAgCWnDw4qUT8aHwkCp8bKvb/KGKWWHedP0AAg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "lodash.castarray": "^4.4.0",
-                "lodash.isplainobject": "^4.0.6",
-                "lodash.merge": "^4.6.2",
                 "postcss-selector-parser": "6.0.10"
             },
             "peerDependencies": {
                 "tailwindcss": ">=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1"
             }
         },
+        "node_modules/@tanstack/devtools-event-client": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/@tanstack/devtools-event-client/-/devtools-event-client-0.4.0.tgz",
+            "integrity": "sha512-RPfGuk2bDZgcu9bAJodvO2lnZeHuz4/71HjZ0bGb/SPg8+lyTA+RLSKQvo7fSmPSi8/vcH3aKQ8EM9ywf1olaw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/tannerlinsley"
+            }
+        },
         "node_modules/@tanstack/form-core": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/@tanstack/form-core/-/form-core-1.3.2.tgz",
-            "integrity": "sha512-hqRLw9EJ8bLJ5zvorGgTI4INcKh1hAtjPRTslwdB529soP8LpguzqWhn7yVV5/c2GcMSlqmpy5NZarkF5Mf54A==",
+            "version": "1.28.0",
+            "resolved": "https://registry.npmjs.org/@tanstack/form-core/-/form-core-1.28.0.tgz",
+            "integrity": "sha512-MX3YveB6SKHAJ2yUwp+Ca/PCguub8bVEnLcLUbFLwdkSRMkP0lMGdaZl+F0JuEgZw56c6iFoRyfILhS7OQpydA==",
             "license": "MIT",
             "dependencies": {
-                "@tanstack/store": "^0.7.0"
+                "@tanstack/devtools-event-client": "^0.4.0",
+                "@tanstack/pacer-lite": "^0.1.1",
+                "@tanstack/store": "^0.7.7"
             },
             "funding": {
                 "type": "github",
@@ -1730,10 +2168,23 @@
                 "url": "https://github.com/sponsors/tannerlinsley"
             }
         },
+        "node_modules/@tanstack/pacer-lite": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/@tanstack/pacer-lite/-/pacer-lite-0.1.1.tgz",
+            "integrity": "sha512-y/xtNPNt/YeyoVxE/JCx+T7yjEzpezmbb+toK8DDD1P4m7Kzs5YR956+7OKexG3f8aXgC3rLZl7b1V+yNUSy5w==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/tannerlinsley"
+            }
+        },
         "node_modules/@tanstack/query-core": {
-            "version": "5.74.0",
-            "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.74.0.tgz",
-            "integrity": "sha512-kMqBfXA06INskI06rm+abAY3/Vi/Kq1nRNfLbpwuhuMJ5lMAI5qASretlvjEO5OJoze6w7OB3pNvsbztirIWWQ==",
+            "version": "5.90.20",
+            "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.90.20.tgz",
+            "integrity": "sha512-OMD2HLpNouXEfZJWcKeVKUgQ5n+n3A2JFmBaScpNDUqSrQSjiveC7dKMe53uJUg1nDG16ttFPz2xfilz6i2uVg==",
             "license": "MIT",
             "funding": {
                 "type": "github",
@@ -1741,9 +2192,9 @@
             }
         },
         "node_modules/@tanstack/query-devtools": {
-            "version": "5.73.3",
-            "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.73.3.tgz",
-            "integrity": "sha512-hBQyYwsOuO7QOprK75NzfrWs/EQYjgFA0yykmcvsV62q0t6Ua97CU3sYgjHx0ZvxkXSOMkY24VRJ5uv9f5Ik4w==",
+            "version": "5.90.1",
+            "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.90.1.tgz",
+            "integrity": "sha512-GtINOPjPUH0OegJExZ70UahT9ykmAhmtNVcmtdnOZbxLwT7R5OmRztR5Ahe3/Cu7LArEmR6/588tAycuaWb1xQ==",
             "license": "MIT",
             "funding": {
                 "type": "github",
@@ -1751,9 +2202,9 @@
             }
         },
         "node_modules/@tanstack/store": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/@tanstack/store/-/store-0.7.0.tgz",
-            "integrity": "sha512-CNIhdoUsmD2NolYuaIs8VfWM467RK6oIBAW4nPEKZhg1smZ+/CwtCdpURgp7nxSqOaV9oKkzdWD80+bC66F/Jg==",
+            "version": "0.7.7",
+            "resolved": "https://registry.npmjs.org/@tanstack/store/-/store-0.7.7.tgz",
+            "integrity": "sha512-xa6pTan1bcaqYDS9BDpSiS63qa6EoDkPN9RsRaxHuDdVDNntzq3xNwR5YKTU/V3SkSyC9T4YVOPh2zRQN0nhIQ==",
             "license": "MIT",
             "funding": {
                 "type": "github",
@@ -1761,9 +2212,9 @@
             }
         },
         "node_modules/@tanstack/table-core": {
-            "version": "8.21.2",
-            "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.2.tgz",
-            "integrity": "sha512-uvXk/U4cBiFMxt+p9/G7yUWI/UbHYbyghLCjlpWZ3mLeIZiUBSKcUnw9UnKkdRz7Z/N4UBuFLWQdJCjUe7HjvA==",
+            "version": "8.21.3",
+            "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.3.tgz",
+            "integrity": "sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==",
             "license": "MIT",
             "engines": {
                 "node": ">=12"
@@ -1774,9 +2225,9 @@
             }
         },
         "node_modules/@tanstack/virtual-core": {
-            "version": "3.13.6",
-            "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.6.tgz",
-            "integrity": "sha512-cnQUeWnhNP8tJ4WsGcYiX24Gjkc9ALstLbHcBj1t3E7EimN6n6kHH+DPV4PpDnuw00NApQp+ViojMj1GRdwYQg==",
+            "version": "3.13.18",
+            "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.18.tgz",
+            "integrity": "sha512-Mx86Hqu1k39icq2Zusq+Ey2J6dDWTjDvEv43PJtRCoEYTLyfaPnxIQ6iy7YAOK0NV/qOEmZQ/uCufrppZxTgcg==",
             "license": "MIT",
             "funding": {
                 "type": "github",
@@ -1784,13 +2235,13 @@
             }
         },
         "node_modules/@tanstack/vue-form": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/@tanstack/vue-form/-/vue-form-1.3.2.tgz",
-            "integrity": "sha512-7DIRyhqbY6nDXKlhQo5OyYFzWjvsX8UCLNiUYb6p4x+W32rBMzJgvVobgH0CHftZuTcXZLGU1GXYlqGHpGQi+g==",
+            "version": "1.28.0",
+            "resolved": "https://registry.npmjs.org/@tanstack/vue-form/-/vue-form-1.28.0.tgz",
+            "integrity": "sha512-UBO9DLFHrOyxDRQ0qLd789vgaKRECsNOYupW+ATjmqnOOV6l7JzTjCnjc35GVjIAgYyiZ1un4bPw1qyFM2G1OQ==",
             "license": "MIT",
             "dependencies": {
-                "@tanstack/form-core": "1.3.2",
-                "@tanstack/vue-store": "^0.7.0"
+                "@tanstack/form-core": "1.28.0",
+                "@tanstack/vue-store": "^0.7.7"
             },
             "funding": {
                 "type": "github",
@@ -1801,13 +2252,13 @@
             }
         },
         "node_modules/@tanstack/vue-query": {
-            "version": "5.74.0",
-            "resolved": "https://registry.npmjs.org/@tanstack/vue-query/-/vue-query-5.74.0.tgz",
-            "integrity": "sha512-YP6muhx9R9O5jPu3HV1b5fMLf/X+8PJmv1X1iOTdrBr394RVhMxWzTsyTwdrDLs1ydJBfOnop7ZFFCex5LlozA==",
+            "version": "5.92.9",
+            "resolved": "https://registry.npmjs.org/@tanstack/vue-query/-/vue-query-5.92.9.tgz",
+            "integrity": "sha512-jjAZcqKveyX0C4w/6zUqbnqk/XzuxNWaFsWjGTJWULVFizUNeLGME2gf9vVSDclIyiBhR13oZJPPs6fJgfpIJQ==",
             "license": "MIT",
             "dependencies": {
                 "@tanstack/match-sorter-utils": "^8.19.4",
-                "@tanstack/query-core": "5.74.0",
+                "@tanstack/query-core": "5.90.20",
                 "@vue/devtools-api": "^6.6.3",
                 "vue-demi": "^0.14.10"
             },
@@ -1826,29 +2277,55 @@
             }
         },
         "node_modules/@tanstack/vue-query-devtools": {
-            "version": "5.74.0",
-            "resolved": "https://registry.npmjs.org/@tanstack/vue-query-devtools/-/vue-query-devtools-5.74.0.tgz",
-            "integrity": "sha512-3k3jINbZ22xn0R1dwrutOOB5b88qGf4fTKXmXiVQi98DHCs0g+4w5ItuIxo644eXqc8DWEsFzTxcJ6UFBrwOpg==",
+            "version": "5.91.0",
+            "resolved": "https://registry.npmjs.org/@tanstack/vue-query-devtools/-/vue-query-devtools-5.91.0.tgz",
+            "integrity": "sha512-Kn6p5ffEKUj+YGEP+BapoPI8kUiPtNnFDyzjTvUx6GHbyfzfefQPhYoRtFiWeyrGHjUB/Mvtnr7Rosbzs/ngVg==",
             "license": "MIT",
             "dependencies": {
-                "@tanstack/query-devtools": "5.73.3"
+                "@tanstack/query-devtools": "5.90.1"
             },
             "funding": {
                 "type": "github",
                 "url": "https://github.com/sponsors/tannerlinsley"
             },
             "peerDependencies": {
-                "@tanstack/vue-query": "^5.74.0",
+                "@tanstack/vue-query": "^5.90.5",
                 "vue": "^3.3.0"
             }
         },
-        "node_modules/@tanstack/vue-store": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/@tanstack/vue-store/-/vue-store-0.7.0.tgz",
-            "integrity": "sha512-oLB/WuD26caR86rxLz39LvS5YdY0KIThJFEHIW/mXujC2+M/z3GxVZFJsZianAzr3tH56sZQ8kkq4NvwwsOBkQ==",
-            "license": "MIT",
+        "node_modules/@tanstack/vue-query/node_modules/vue-demi": {
+            "version": "0.14.10",
+            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+            "hasInstallScript": true,
+            "license": "MIT",
+            "bin": {
+                "vue-demi-fix": "bin/vue-demi-fix.js",
+                "vue-demi-switch": "bin/vue-demi-switch.js"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.0.0-rc.1",
+                "vue": "^3.0.0-0 || ^2.6.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@tanstack/vue-store": {
+            "version": "0.7.7",
+            "resolved": "https://registry.npmjs.org/@tanstack/vue-store/-/vue-store-0.7.7.tgz",
+            "integrity": "sha512-6iv1Odmreff6TgEjQN11xoddsCnpn+/ul7MZ2DadHT3/RSY1YdoFafK8lCa889MEFi/5K0zAhf8psIkgTrRa9A==",
+            "license": "MIT",
             "dependencies": {
-                "@tanstack/store": "0.7.0",
+                "@tanstack/store": "0.7.7",
                 "vue-demi": "^0.14.10"
             },
             "funding": {
@@ -1865,13 +2342,39 @@
                 }
             }
         },
+        "node_modules/@tanstack/vue-store/node_modules/vue-demi": {
+            "version": "0.14.10",
+            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+            "hasInstallScript": true,
+            "license": "MIT",
+            "bin": {
+                "vue-demi-fix": "bin/vue-demi-fix.js",
+                "vue-demi-switch": "bin/vue-demi-switch.js"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.0.0-rc.1",
+                "vue": "^3.0.0-0 || ^2.6.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/@tanstack/vue-table": {
-            "version": "8.21.2",
-            "resolved": "https://registry.npmjs.org/@tanstack/vue-table/-/vue-table-8.21.2.tgz",
-            "integrity": "sha512-KBgOWxha/x4m1EdhVWxOpqHb661UjqAxzPcmXR3QiA7aShZ547x19Gw0UJX9we+m+tVcPuLRZ61JsYW47QZFfQ==",
+            "version": "8.21.3",
+            "resolved": "https://registry.npmjs.org/@tanstack/vue-table/-/vue-table-8.21.3.tgz",
+            "integrity": "sha512-rusRyd77c5tDPloPskctMyPLFEQUeBzxdQ+2Eow4F7gDPlPOB1UnnhzfpdvqZ8ZyX2rRNGmqNnQWm87OI2OQPw==",
             "license": "MIT",
             "dependencies": {
-                "@tanstack/table-core": "8.21.2"
+                "@tanstack/table-core": "8.21.3"
             },
             "engines": {
                 "node": ">=12"
@@ -1885,12 +2388,12 @@
             }
         },
         "node_modules/@tanstack/vue-virtual": {
-            "version": "3.13.6",
-            "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.6.tgz",
-            "integrity": "sha512-GYdZ3SJBQPzgxhuCE2fvpiH46qzHiVx5XzBSdtESgiqh4poj8UgckjGWYEhxaBbcVt1oLzh1m3Ql4TyH32TOzQ==",
+            "version": "3.13.18",
+            "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.18.tgz",
+            "integrity": "sha512-6pT8HdHtTU5Z+t906cGdCroUNA5wHjFXsNss9gwk7QAr1VNZtz9IQCs2Nhx0gABK48c+OocHl2As+TMg8+Hy4A==",
             "license": "MIT",
             "dependencies": {
-                "@tanstack/virtual-core": "3.13.6"
+                "@tanstack/virtual-core": "3.13.18"
             },
             "funding": {
                 "type": "github",
@@ -1900,17 +2403,24 @@
                 "vue": "^2.7.0 || ^3.0.0"
             }
         },
+        "node_modules/@types/argparse": {
+            "version": "1.0.38",
+            "resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz",
+            "integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@types/chroma-js": {
-            "version": "2.4.5",
-            "resolved": "https://registry.npmjs.org/@types/chroma-js/-/chroma-js-2.4.5.tgz",
-            "integrity": "sha512-6ISjhzJViaPCy2q2e6PgK+8HcHQDQ0V2LDiKmYAh+jJlLqDa6HbwDh0wOevHY0kHHUx0iZwjSRbVD47WOUx5EQ==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/@types/chroma-js/-/chroma-js-3.1.2.tgz",
+            "integrity": "sha512-YBTQqArPN8A0niHXCwrO1z5x++a+6l0mLBykncUpr23oIPW7L4h39s6gokdK/bDrPmSh8+TjMmrhBPnyiaWPmQ==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@types/estree": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
-            "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+            "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
             "license": "MIT"
         },
         "node_modules/@types/fs-extra": {
@@ -1930,9 +2440,9 @@
             "license": "MIT"
         },
         "node_modules/@types/lodash": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.21.tgz",
-            "integrity": "sha512-FOvQ0YPD5NOfPgMzJihoT+Za5pdkDJWcbpuj1DjaKZIr/gxodQjY/uWEFlTNqW2ugXHUiL8lRQgw63dzKHZdeQ==",
+            "version": "4.17.23",
+            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.23.tgz",
+            "integrity": "sha512-RDvF6wTulMPjrNdCoYRC8gNR880JNGT8uB+REUpC2Ns4pRqQJhGz90wh7rgdXDPpCczF3VGktDuFGVnz8zP7HA==",
             "dev": true,
             "license": "MIT"
         },
@@ -1947,10 +2457,10 @@
             }
         },
         "node_modules/@types/node": {
-            "version": "22.14.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz",
-            "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==",
-            "dev": true,
+            "version": "22.19.7",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.7.tgz",
+            "integrity": "sha512-MciR4AKGHWl7xwxkBa6xUGxQJ4VBOmPTF7sL+iGzuahOFaO0jHCsuEfS80pan1ef4gWId1oWOweIhrDEYLuaOw==",
+            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "undici-types": "~6.21.0"
@@ -1963,20 +2473,19 @@
             "license": "MIT"
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.29.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.29.1.tgz",
-            "integrity": "sha512-ba0rr4Wfvg23vERs3eB+P3lfj2E+2g3lhWcCVukUuhtcdUx5lSIFZlGFEBHKr+3zizDa/TvZTptdNHVZWAkSBg==",
-            "license": "MIT",
-            "dependencies": {
-                "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.29.1",
-                "@typescript-eslint/type-utils": "8.29.1",
-                "@typescript-eslint/utils": "8.29.1",
-                "@typescript-eslint/visitor-keys": "8.29.1",
-                "graphemer": "^1.4.0",
-                "ignore": "^5.3.1",
+            "version": "8.54.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.54.0.tgz",
+            "integrity": "sha512-hAAP5io/7csFStuOmR782YmTthKBJ9ND3WVL60hcOjvtGFb+HJxH4O5huAcmcZ9v9G8P+JETiZ/G1B8MALnWZQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/regexpp": "^4.12.2",
+                "@typescript-eslint/scope-manager": "8.54.0",
+                "@typescript-eslint/type-utils": "8.54.0",
+                "@typescript-eslint/utils": "8.54.0",
+                "@typescript-eslint/visitor-keys": "8.54.0",
+                "ignore": "^7.0.5",
                 "natural-compare": "^1.4.0",
-                "ts-api-utils": "^2.0.1"
+                "ts-api-utils": "^2.4.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1986,22 +2495,31 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+                "@typescript-eslint/parser": "^8.54.0",
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
+            }
+        },
+        "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+            "version": "7.0.5",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+            "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.29.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.29.1.tgz",
-            "integrity": "sha512-zczrHVEqEaTwh12gWBIJWj8nx+ayDcCJs06yoNMY0kwjMWDM6+kppljY+BxWI06d2Ja+h4+WdufDcwMnnMEWmg==",
+            "version": "8.54.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.54.0.tgz",
+            "integrity": "sha512-BtE0k6cjwjLZoZixN0t5AKP0kSzlGu7FctRXYuPAm//aaiZhmfq1JwdYpYr1brzEspYyFeF+8XF5j2VK6oalrA==",
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.29.1",
-                "@typescript-eslint/types": "8.29.1",
-                "@typescript-eslint/typescript-estree": "8.29.1",
-                "@typescript-eslint/visitor-keys": "8.29.1",
-                "debug": "^4.3.4"
+                "@typescript-eslint/scope-manager": "8.54.0",
+                "@typescript-eslint/types": "8.54.0",
+                "@typescript-eslint/typescript-estree": "8.54.0",
+                "@typescript-eslint/visitor-keys": "8.54.0",
+                "debug": "^4.4.3"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2012,17 +2530,38 @@
             },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
+            }
+        },
+        "node_modules/@typescript-eslint/project-service": {
+            "version": "8.54.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.54.0.tgz",
+            "integrity": "sha512-YPf+rvJ1s7MyiWM4uTRhE4DvBXrEV+d8oC3P9Y2eT7S+HBS0clybdMIPnhiATi9vZOYDc7OQ1L/i6ga6NFYK/g==",
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/tsconfig-utils": "^8.54.0",
+                "@typescript-eslint/types": "^8.54.0",
+                "debug": "^4.4.3"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.29.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.29.1.tgz",
-            "integrity": "sha512-2nggXGX5F3YrsGN08pw4XpMLO1Rgtnn4AzTegC2MDesv6q3QaTU5yU7IbS1tf1IwCR0Hv/1EFygLn9ms6LIpDA==",
+            "version": "8.54.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.54.0.tgz",
+            "integrity": "sha512-27rYVQku26j/PbHYcVfRPonmOlVI6gihHtXFbTdB5sb6qA0wdAQAbyXFVarQ5t4HRojIz64IV90YtsjQSSGlQg==",
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.29.1",
-                "@typescript-eslint/visitor-keys": "8.29.1"
+                "@typescript-eslint/types": "8.54.0",
+                "@typescript-eslint/visitor-keys": "8.54.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2032,16 +2571,33 @@
                 "url": "https://opencollective.com/typescript-eslint"
             }
         },
+        "node_modules/@typescript-eslint/tsconfig-utils": {
+            "version": "8.54.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.54.0.tgz",
+            "integrity": "sha512-dRgOyT2hPk/JwxNMZDsIXDgyl9axdJI3ogZ2XWhBPsnZUv+hPesa5iuhdYt2gzwA9t8RE5ytOJ6xB0moV0Ujvw==",
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4 <6.0.0"
+            }
+        },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.29.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.29.1.tgz",
-            "integrity": "sha512-DkDUSDwZVCYN71xA4wzySqqcZsHKic53A4BLqmrWFFpOpNSoxX233lwGu/2135ymTCR04PoKiEEEvN1gFYg4Tw==",
+            "version": "8.54.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.54.0.tgz",
+            "integrity": "sha512-hiLguxJWHjjwL6xMBwD903ciAwd7DmK30Y9Axs/etOkftC3ZNN9K44IuRD/EB08amu+Zw6W37x9RecLkOo3pMA==",
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/typescript-estree": "8.29.1",
-                "@typescript-eslint/utils": "8.29.1",
-                "debug": "^4.3.4",
-                "ts-api-utils": "^2.0.1"
+                "@typescript-eslint/types": "8.54.0",
+                "@typescript-eslint/typescript-estree": "8.54.0",
+                "@typescript-eslint/utils": "8.54.0",
+                "debug": "^4.4.3",
+                "ts-api-utils": "^2.4.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2052,13 +2608,13 @@
             },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.29.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.29.1.tgz",
-            "integrity": "sha512-VT7T1PuJF1hpYC3AGm2rCgJBjHL3nc+A/bhOp9sGMKfi5v0WufsX/sHCFBfNTx2F+zA6qBc/PD0/kLRLjdt8mQ==",
+            "version": "8.54.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.54.0.tgz",
+            "integrity": "sha512-PDUI9R1BVjqu7AUDsRBbKMtwmjWcn4J3le+5LpcFgWULN3LvHC5rkc9gCVxbrsrGmO1jfPybN5s6h4Jy+OnkAA==",
             "license": "MIT",
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2069,19 +2625,20 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.29.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.29.1.tgz",
-            "integrity": "sha512-l1enRoSaUkQxOQnbi0KPUtqeZkSiFlqrx9/3ns2rEDhGKfTa+88RmXqedC1zmVTOWrLc2e6DEJrTA51C9iLH5g==",
+            "version": "8.54.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.54.0.tgz",
+            "integrity": "sha512-BUwcskRaPvTk6fzVWgDPdUndLjB87KYDrN5EYGetnktoeAvPtO4ONHlAZDnj5VFnUANg0Sjm7j4usBlnoVMHwA==",
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.29.1",
-                "@typescript-eslint/visitor-keys": "8.29.1",
-                "debug": "^4.3.4",
-                "fast-glob": "^3.3.2",
-                "is-glob": "^4.0.3",
-                "minimatch": "^9.0.4",
-                "semver": "^7.6.0",
-                "ts-api-utils": "^2.0.1"
+                "@typescript-eslint/project-service": "8.54.0",
+                "@typescript-eslint/tsconfig-utils": "8.54.0",
+                "@typescript-eslint/types": "8.54.0",
+                "@typescript-eslint/visitor-keys": "8.54.0",
+                "debug": "^4.4.3",
+                "minimatch": "^9.0.5",
+                "semver": "^7.7.3",
+                "tinyglobby": "^0.2.15",
+                "ts-api-utils": "^2.4.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2091,13 +2648,13 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
             "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0"
@@ -2119,15 +2676,15 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.29.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.29.1.tgz",
-            "integrity": "sha512-QAkFEbytSaB8wnmB+DflhUPz6CLbFWE2SnSCrRMEa+KnXIzDYbpsn++1HGvnfAsUY44doDXmvRkO5shlM/3UfA==",
+            "version": "8.54.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.54.0.tgz",
+            "integrity": "sha512-9Cnda8GS57AQakvRyG0PTejJNlA2xhvyNtEVIMlDWOOeEyBkYWhGPnfrIAnqxLMTSTo6q8g12XVjjev5l1NvMA==",
             "license": "MIT",
             "dependencies": {
-                "@eslint-community/eslint-utils": "^4.4.0",
-                "@typescript-eslint/scope-manager": "8.29.1",
-                "@typescript-eslint/types": "8.29.1",
-                "@typescript-eslint/typescript-estree": "8.29.1"
+                "@eslint-community/eslint-utils": "^4.9.1",
+                "@typescript-eslint/scope-manager": "8.54.0",
+                "@typescript-eslint/types": "8.54.0",
+                "@typescript-eslint/typescript-estree": "8.54.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2138,17 +2695,17 @@
             },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.29.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.29.1.tgz",
-            "integrity": "sha512-RGLh5CRaUEf02viP5c1Vh1cMGffQscyHe7HPAzGpfmfflFg1wUz2rYxd+OZqwpeypYvZ8UxSxuIpF++fmOzEcg==",
+            "version": "8.54.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.54.0.tgz",
+            "integrity": "sha512-VFlhGSl4opC0bprJiItPQ1RfUhGDIBokcPwaFH4yiBCaNPeld/9VeXbiPO1cLyorQi1G1vL+ecBk1x8o1axORA==",
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.29.1",
-                "eslint-visitor-keys": "^4.2.0"
+                "@typescript-eslint/types": "8.54.0",
+                "eslint-visitor-keys": "^4.2.1"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2159,9 +2716,9 @@
             }
         },
         "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+            "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
             "license": "Apache-2.0",
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2171,96 +2728,95 @@
             }
         },
         "node_modules/@vitejs/plugin-vue": {
-            "version": "5.2.3",
-            "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.3.tgz",
-            "integrity": "sha512-IYSLEQj4LgZZuoVpdSUCw3dIynTWQgPlaRP6iAvMle4My0HdYwr5g5wQAfwOeHQBmYwEkqF70nRpSilr6PoUDg==",
-            "dev": true,
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.3.tgz",
+            "integrity": "sha512-TlGPkLFLVOY3T7fZrwdvKpjprR3s4fxRln0ORDo1VQ7HHyxJwTlrjKU3kpVWTlaAjIEuCTokmjkZnr8Tpc925w==",
             "license": "MIT",
+            "dependencies": {
+                "@rolldown/pluginutils": "1.0.0-beta.53"
+            },
             "engines": {
-                "node": "^18.0.0 || >=20.0.0"
+                "node": "^20.19.0 || >=22.12.0"
             },
             "peerDependencies": {
-                "vite": "^5.0.0 || ^6.0.0",
+                "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0",
                 "vue": "^3.2.25"
             }
         },
         "node_modules/@volar/language-core": {
-            "version": "2.4.12",
-            "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.12.tgz",
-            "integrity": "sha512-RLrFdXEaQBWfSnYGVxvR2WrO6Bub0unkdHYIdC31HzIEqATIuuhRRzYu76iGPZ6OtA4Au1SnW0ZwIqPP217YhA==",
-            "dev": true,
+            "version": "2.4.27",
+            "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.27.tgz",
+            "integrity": "sha512-DjmjBWZ4tJKxfNC1F6HyYERNHPYS7L7OPFyCrestykNdUZMFYzI9WTyvwPcaNaHlrEUwESHYsfEw3isInncZxQ==",
             "license": "MIT",
             "dependencies": {
-                "@volar/source-map": "2.4.12"
+                "@volar/source-map": "2.4.27"
             }
         },
         "node_modules/@volar/source-map": {
-            "version": "2.4.12",
-            "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.12.tgz",
-            "integrity": "sha512-bUFIKvn2U0AWojOaqf63ER0N/iHIBYZPpNGogfLPQ68F5Eet6FnLlyho7BS0y2HJ1jFhSif7AcuTx1TqsCzRzw==",
-            "dev": true,
+            "version": "2.4.27",
+            "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.27.tgz",
+            "integrity": "sha512-ynlcBReMgOZj2i6po+qVswtDUeeBRCTgDurjMGShbm8WYZgJ0PA4RmtebBJ0BCYol1qPv3GQF6jK7C9qoVc7lg==",
             "license": "MIT"
         },
         "node_modules/@volar/typescript": {
-            "version": "2.4.12",
-            "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.12.tgz",
-            "integrity": "sha512-HJB73OTJDgPc80K30wxi3if4fSsZZAOScbj2fcicMuOPoOkcf9NNAINb33o+DzhBdF9xTKC1gnPmIRDous5S0g==",
-            "dev": true,
+            "version": "2.4.27",
+            "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.27.tgz",
+            "integrity": "sha512-eWaYCcl/uAPInSK2Lze6IqVWaBu/itVqR5InXcHXFyles4zO++Mglt3oxdgj75BDcv1Knr9Y93nowS8U3wqhxg==",
             "license": "MIT",
             "dependencies": {
-                "@volar/language-core": "2.4.12",
+                "@volar/language-core": "2.4.27",
                 "path-browserify": "^1.0.1",
                 "vscode-uri": "^3.0.8"
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
-            "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+            "version": "3.5.27",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.27.tgz",
+            "integrity": "sha512-gnSBQjZA+//qDZen+6a2EdHqJ68Z7uybrMf3SPjEGgG4dicklwDVmMC1AeIHxtLVPT7sn6sH1KOO+tS6gwOUeQ==",
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.25.3",
-                "@vue/shared": "3.5.13",
-                "entities": "^4.5.0",
+                "@babel/parser": "^7.28.5",
+                "@vue/shared": "3.5.27",
+                "entities": "^7.0.0",
                 "estree-walker": "^2.0.2",
-                "source-map-js": "^1.2.0"
+                "source-map-js": "^1.2.1"
             }
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
-            "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+            "version": "3.5.27",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.27.tgz",
+            "integrity": "sha512-oAFea8dZgCtVVVTEC7fv3T5CbZW9BxpFzGGxC79xakTr6ooeEqmRuvQydIiDAkglZEAd09LgVf1RoDnL54fu5w==",
             "license": "MIT",
             "dependencies": {
-                "@vue/compiler-core": "3.5.13",
-                "@vue/shared": "3.5.13"
+                "@vue/compiler-core": "3.5.27",
+                "@vue/shared": "3.5.27"
             }
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz",
-            "integrity": "sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==",
+            "version": "3.5.27",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.27.tgz",
+            "integrity": "sha512-sHZu9QyDPeDmN/MRoshhggVOWE5WlGFStKFwu8G52swATgSny27hJRWteKDSUUzUH+wp+bmeNbhJnEAel/auUQ==",
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.25.3",
-                "@vue/compiler-core": "3.5.13",
-                "@vue/compiler-dom": "3.5.13",
-                "@vue/compiler-ssr": "3.5.13",
-                "@vue/shared": "3.5.13",
+                "@babel/parser": "^7.28.5",
+                "@vue/compiler-core": "3.5.27",
+                "@vue/compiler-dom": "3.5.27",
+                "@vue/compiler-ssr": "3.5.27",
+                "@vue/shared": "3.5.27",
                 "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.11",
-                "postcss": "^8.4.48",
-                "source-map-js": "^1.2.0"
+                "magic-string": "^0.30.21",
+                "postcss": "^8.5.6",
+                "source-map-js": "^1.2.1"
             }
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
-            "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
+            "version": "3.5.27",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.27.tgz",
+            "integrity": "sha512-Sj7h+JHt512fV1cTxKlYhg7qxBvack+BGncSpH+8vnN+KN95iPIcqB5rsbblX40XorP+ilO7VIKlkuu3Xq2vjw==",
             "license": "MIT",
             "dependencies": {
-                "@vue/compiler-dom": "3.5.13",
-                "@vue/shared": "3.5.13"
+                "@vue/compiler-dom": "3.5.27",
+                "@vue/shared": "3.5.27"
             }
         },
         "node_modules/@vue/compiler-vue2": {
@@ -2280,6 +2836,30 @@
             "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
             "license": "MIT"
         },
+        "node_modules/@vue/devtools-kit": {
+            "version": "7.7.9",
+            "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.9.tgz",
+            "integrity": "sha512-PyQ6odHSgiDVd4hnTP+aDk2X4gl2HmLDfiyEnn3/oV+ckFDuswRs4IbBT7vacMuGdwY/XemxBoh302ctbsptuA==",
+            "license": "MIT",
+            "dependencies": {
+                "@vue/devtools-shared": "^7.7.9",
+                "birpc": "^2.3.0",
+                "hookable": "^5.5.3",
+                "mitt": "^3.0.1",
+                "perfect-debounce": "^1.0.0",
+                "speakingurl": "^14.0.1",
+                "superjson": "^2.2.2"
+            }
+        },
+        "node_modules/@vue/devtools-shared": {
+            "version": "7.7.9",
+            "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.9.tgz",
+            "integrity": "sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==",
+            "license": "MIT",
+            "dependencies": {
+                "rfdc": "^1.4.1"
+            }
+        },
         "node_modules/@vue/eslint-config-prettier": {
             "version": "10.2.0",
             "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-10.2.0.tgz",
@@ -2295,15 +2875,15 @@
             }
         },
         "node_modules/@vue/eslint-config-typescript": {
-            "version": "14.5.0",
-            "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-14.5.0.tgz",
-            "integrity": "sha512-5oPOyuwkw++AP5gHDh5YFmST50dPfWOcm3/W7Nbh42IK5O3H74ytWAw0TrCRTaBoD/02khnWXuZf1Bz1xflavQ==",
+            "version": "14.6.0",
+            "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-14.6.0.tgz",
+            "integrity": "sha512-UpiRY/7go4Yps4mYCjkvlIbVWmn9YvPGQDxTAlcKLphyaD77LjIu3plH4Y9zNT0GB4f3K5tMmhhtRhPOgrQ/bQ==",
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/utils": "^8.26.0",
+                "@typescript-eslint/utils": "^8.35.1",
                 "fast-glob": "^3.3.3",
-                "typescript-eslint": "^8.26.0",
-                "vue-eslint-parser": "^10.1.1"
+                "typescript-eslint": "^8.35.1",
+                "vue-eslint-parser": "^10.2.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2320,137 +2900,126 @@
             }
         },
         "node_modules/@vue/language-core": {
-            "version": "2.2.8",
-            "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.2.8.tgz",
-            "integrity": "sha512-rrzB0wPGBvcwaSNRriVWdNAbHQWSf0NlGqgKHK5mEkXpefjUlVRP62u03KvwZpvKVjRnBIQ/Lwre+Mx9N6juUQ==",
-            "dev": true,
+            "version": "3.2.4",
+            "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.2.4.tgz",
+            "integrity": "sha512-bqBGuSG4KZM45KKTXzGtoCl9cWju5jsaBKaJJe3h5hRAAWpZUuj5G+L+eI01sPIkm4H6setKRlw7E85wLdDNew==",
             "license": "MIT",
             "dependencies": {
-                "@volar/language-core": "~2.4.11",
+                "@volar/language-core": "2.4.27",
                 "@vue/compiler-dom": "^3.5.0",
-                "@vue/compiler-vue2": "^2.7.16",
                 "@vue/shared": "^3.5.0",
-                "alien-signals": "^1.0.3",
-                "minimatch": "^9.0.3",
+                "alien-signals": "^3.0.0",
                 "muggle-string": "^0.4.1",
-                "path-browserify": "^1.0.1"
-            },
-            "peerDependencies": {
-                "typescript": "*"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
+                "path-browserify": "^1.0.1",
+                "picomatch": "^4.0.2"
             }
         },
-        "node_modules/@vue/language-core/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-            "dev": true,
+        "node_modules/@vue/language-core/node_modules/picomatch": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+            "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
             "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^1.0.0"
-            }
-        },
-        "node_modules/@vue/language-core/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
             "engines": {
-                "node": ">=16 || 14 >=14.17"
+                "node": ">=12"
             },
             "funding": {
-                "url": "https://github.com/sponsors/isaacs"
+                "url": "https://github.com/sponsors/jonschlinkert"
             }
         },
         "node_modules/@vue/reactivity": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.13.tgz",
-            "integrity": "sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==",
+            "version": "3.5.27",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.27.tgz",
+            "integrity": "sha512-vvorxn2KXfJ0nBEnj4GYshSgsyMNFnIQah/wczXlsNXt+ijhugmW+PpJ2cNPe4V6jpnBcs0MhCODKllWG+nvoQ==",
             "license": "MIT",
             "dependencies": {
-                "@vue/shared": "3.5.13"
+                "@vue/shared": "3.5.27"
             }
         },
         "node_modules/@vue/runtime-core": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.13.tgz",
-            "integrity": "sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==",
+            "version": "3.5.27",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.27.tgz",
+            "integrity": "sha512-fxVuX/fzgzeMPn/CLQecWeDIFNt3gQVhxM0rW02Tvp/YmZfXQgcTXlakq7IMutuZ/+Ogbn+K0oct9J3JZfyk3A==",
             "license": "MIT",
             "dependencies": {
-                "@vue/reactivity": "3.5.13",
-                "@vue/shared": "3.5.13"
+                "@vue/reactivity": "3.5.27",
+                "@vue/shared": "3.5.27"
             }
         },
         "node_modules/@vue/runtime-dom": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz",
-            "integrity": "sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==",
+            "version": "3.5.27",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.27.tgz",
+            "integrity": "sha512-/QnLslQgYqSJ5aUmb5F0z0caZPGHRB8LEAQ1s81vHFM5CBfnun63rxhvE/scVb/j3TbBuoZwkJyiLCkBluMpeg==",
             "license": "MIT",
             "dependencies": {
-                "@vue/reactivity": "3.5.13",
-                "@vue/runtime-core": "3.5.13",
-                "@vue/shared": "3.5.13",
-                "csstype": "^3.1.3"
+                "@vue/reactivity": "3.5.27",
+                "@vue/runtime-core": "3.5.27",
+                "@vue/shared": "3.5.27",
+                "csstype": "^3.2.3"
             }
         },
         "node_modules/@vue/server-renderer": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.13.tgz",
-            "integrity": "sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==",
+            "version": "3.5.27",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.27.tgz",
+            "integrity": "sha512-qOz/5thjeP1vAFc4+BY3Nr6wxyLhpeQgAE/8dDtKo6a6xdk+L4W46HDZgNmLOBUDEkFXV3G7pRiUqxjX0/2zWA==",
             "license": "MIT",
             "dependencies": {
-                "@vue/compiler-ssr": "3.5.13",
-                "@vue/shared": "3.5.13"
+                "@vue/compiler-ssr": "3.5.27",
+                "@vue/shared": "3.5.27"
             },
             "peerDependencies": {
-                "vue": "3.5.13"
+                "vue": "3.5.27"
             }
         },
         "node_modules/@vue/shared": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz",
-            "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==",
+            "version": "3.5.27",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.27.tgz",
+            "integrity": "sha512-dXr/3CgqXsJkZ0n9F3I4elY8wM9jMJpP3pvRG52r6m0tu/MsAFIe6JpXVGeNMd/D9F4hQynWT8Rfuj0bdm9kFQ==",
             "license": "MIT"
         },
         "node_modules/@vue/tsconfig": {
-            "version": "0.5.1",
-            "resolved": "https://registry.npmjs.org/@vue/tsconfig/-/tsconfig-0.5.1.tgz",
-            "integrity": "sha512-VcZK7MvpjuTPx2w6blwnwZAu5/LgBUtejFOi3pPGQFXQN5Ela03FUtd2Qtg4yWGGissVL0dr6Ro1LfOFh+PCuQ==",
+            "version": "0.8.1",
+            "resolved": "https://registry.npmjs.org/@vue/tsconfig/-/tsconfig-0.8.1.tgz",
+            "integrity": "sha512-aK7feIWPXFSUhsCP9PFqPyFOcz4ENkb8hZ2pneL6m2UjCkccvaOhC/5KCKluuBufvp2KzkbdA2W2pk20vLzu3g==",
             "dev": true,
-            "license": "MIT"
+            "license": "MIT",
+            "peerDependencies": {
+                "typescript": "5.x",
+                "vue": "^3.4.0"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                },
+                "vue": {
+                    "optional": true
+                }
+            }
         },
         "node_modules/@vueuse/core": {
-            "version": "12.8.2",
-            "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-12.8.2.tgz",
-            "integrity": "sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==",
+            "version": "14.2.0",
+            "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-14.2.0.tgz",
+            "integrity": "sha512-tpjzVl7KCQNVd/qcaCE9XbejL38V6KJAEq/tVXj7mDPtl6JtzmUdnXelSS+ULRkkrDgzYVK7EerQJvd2jR794Q==",
             "license": "MIT",
             "dependencies": {
                 "@types/web-bluetooth": "^0.0.21",
-                "@vueuse/metadata": "12.8.2",
-                "@vueuse/shared": "12.8.2",
-                "vue": "^3.5.13"
+                "@vueuse/metadata": "14.2.0",
+                "@vueuse/shared": "14.2.0"
             },
             "funding": {
                 "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "vue": "^3.5.0"
             }
         },
         "node_modules/@vueuse/integrations": {
-            "version": "12.8.2",
-            "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-12.8.2.tgz",
-            "integrity": "sha512-fbGYivgK5uBTRt7p5F3zy6VrETlV9RtZjBqd1/HxGdjdckBgBM4ugP8LHpjolqTj14TXTxSK1ZfgPbHYyGuH7g==",
+            "version": "14.2.0",
+            "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-14.2.0.tgz",
+            "integrity": "sha512-Yuo5XbIi6XkfSXOYKd5SBZwyBEyO3Hd41eeG2555hDbE0Maz/P0BfPJDYhgDXjS9xI0jkWUUp1Zh5lXHOgkwLw==",
             "license": "MIT",
             "dependencies": {
-                "@vueuse/core": "12.8.2",
-                "@vueuse/shared": "12.8.2",
-                "vue": "^3.5.13"
+                "@vueuse/core": "14.2.0",
+                "@vueuse/shared": "14.2.0"
             },
             "funding": {
                 "url": "https://github.com/sponsors/antfu"
@@ -2460,14 +3029,15 @@
                 "axios": "^1",
                 "change-case": "^5",
                 "drauu": "^0.4",
-                "focus-trap": "^7",
+                "focus-trap": "^7 || ^8",
                 "fuse.js": "^7",
                 "idb-keyval": "^6",
                 "jwt-decode": "^4",
                 "nprogress": "^0.2",
                 "qrcode": "^1.5",
                 "sortablejs": "^1",
-                "universal-cookie": "^7"
+                "universal-cookie": "^7 || ^8",
+                "vue": "^3.5.0"
             },
             "peerDependenciesMeta": {
                 "async-validator": {
@@ -2509,31 +3079,30 @@
             }
         },
         "node_modules/@vueuse/metadata": {
-            "version": "12.8.2",
-            "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-12.8.2.tgz",
-            "integrity": "sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==",
+            "version": "14.2.0",
+            "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-14.2.0.tgz",
+            "integrity": "sha512-i3axTGjU8b13FtyR4Keeama+43iD+BwX9C2TmzBVKqjSHArF03hjkp2SBZ1m72Jk2UtrX0aYCugBq2R1fhkuAQ==",
             "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/antfu"
             }
         },
         "node_modules/@vueuse/shared": {
-            "version": "12.8.2",
-            "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-12.8.2.tgz",
-            "integrity": "sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==",
+            "version": "14.2.0",
+            "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-14.2.0.tgz",
+            "integrity": "sha512-Z0bmluZTlAXgUcJ4uAFaML16JcD8V0QG00Db3quR642I99JXIDRa2MI2LGxiLVhcBjVnL1jOzIvT5TT2lqJlkA==",
             "license": "MIT",
-            "dependencies": {
-                "vue": "^3.5.13"
-            },
             "funding": {
                 "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "vue": "^3.5.0"
             }
         },
         "node_modules/@zodios/core": {
             "version": "10.9.6",
             "resolved": "https://registry.npmjs.org/@zodios/core/-/core-10.9.6.tgz",
             "integrity": "sha512-aH4rOdb3AcezN7ws8vDgBfGboZMk2JGGzEq/DtW65MhnRxyTGRuLJRWVQ/2KxDgWvV2F5oTkAS+5pnjKbl0n+A==",
-            "dev": true,
             "license": "MIT",
             "peerDependencies": {
                 "axios": "^0.x || ^1.0.0",
@@ -2541,9 +3110,9 @@
             }
         },
         "node_modules/acorn": {
-            "version": "8.14.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-            "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+            "version": "8.15.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+            "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
             "license": "MIT",
             "bin": {
                 "acorn": "bin/acorn"
@@ -2577,59 +3146,60 @@
                 "url": "https://github.com/sponsors/epoberezkin"
             }
         },
-        "node_modules/alien-signals": {
-            "version": "1.0.13",
-            "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-1.0.13.tgz",
-            "integrity": "sha512-OGj9yyTnJEttvzhTUWuscOvtqxq5vrhF7vL9oS0xJ2mK0ItPYP1/y+vCFebfxoEyAz0++1AIwJ5CMr+Fk3nDmg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/ansi-escapes": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-            "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+        "node_modules/ajv-formats": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
+            "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "type-fest": "^0.21.3"
+                "ajv": "^8.0.0"
             },
-            "engines": {
-                "node": ">=8"
+            "peerDependencies": {
+                "ajv": "^8.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "peerDependenciesMeta": {
+                "ajv": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/ansi-escapes/node_modules/type-fest": {
-            "version": "0.21.3",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-            "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+        "node_modules/ajv-formats/node_modules/ajv": {
+            "version": "8.17.1",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
             "dev": true,
-            "license": "(MIT OR CC0-1.0)",
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/ansi-regex": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-            "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
             "license": "MIT",
-            "engines": {
-                "node": ">=12"
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
             },
             "funding": {
-                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
             }
         },
+        "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/alien-signals": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-3.1.2.tgz",
+            "integrity": "sha512-d9dYqZTS90WLiU0I5c6DHj/HcKkF8ZyGN3G5x8wSbslulz70KOxaqCT0hQCo9KOyhVqzqGojvNdJXoTumZOtcw==",
+            "license": "MIT"
+        },
         "node_modules/ansi-styles": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -2672,9 +3242,9 @@
             "license": "Python-2.0"
         },
         "node_modules/aria-hidden": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.4.tgz",
-            "integrity": "sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==",
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz",
+            "integrity": "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.0.0"
@@ -2687,13 +3257,12 @@
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
             "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-            "devOptional": true,
             "license": "MIT"
         },
         "node_modules/autoprefixer": {
-            "version": "10.4.21",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.21.tgz",
-            "integrity": "sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==",
+            "version": "10.4.24",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.24.tgz",
+            "integrity": "sha512-uHZg7N9ULTVbutaIsDRoUkoS8/h3bdsmVJYZ5l3wv8Cp/6UIIoRDm90hZ+BwxUj/hGBEzLxdHNSKuFpn8WOyZw==",
             "dev": true,
             "funding": [
                 {
@@ -2711,10 +3280,9 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "browserslist": "^4.24.4",
-                "caniuse-lite": "^1.0.30001702",
-                "fraction.js": "^4.3.7",
-                "normalize-range": "^0.1.2",
+                "browserslist": "^4.28.1",
+                "caniuse-lite": "^1.0.30001766",
+                "fraction.js": "^5.3.4",
                 "picocolors": "^1.1.1",
                 "postcss-value-parser": "^4.2.0"
             },
@@ -2729,10 +3297,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.13.2",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz",
-            "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
-            "devOptional": true,
+            "version": "1.13.4",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.4.tgz",
+            "integrity": "sha512-1wVkUaAO6WyaYtCkcYCOx12ZgpGf9Zif+qXa4n+oYzK558YryKqiL6UWwd5DqiH3VRW0GYhTZQ/vlgJrCoNQlg==",
             "license": "MIT",
             "dependencies": {
                 "follow-redirects": "^1.15.6",
@@ -2746,6 +3313,16 @@
             "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
             "license": "MIT"
         },
+        "node_modules/baseline-browser-mapping": {
+            "version": "2.9.19",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.19.tgz",
+            "integrity": "sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "baseline-browser-mapping": "dist/cli.js"
+            }
+        },
         "node_modules/binary-extensions": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -2758,6 +3335,15 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/birpc": {
+            "version": "2.9.0",
+            "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.9.0.tgz",
+            "integrity": "sha512-KrayHS5pBi69Xi9JmvoqrIgYGDkD6mcSe/i6YKi3w5kekCLzrX4+nawcXqrj2tIp50Kw/mT/s3p+GVK0A0sKxw==",
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            }
+        },
         "node_modules/boolbase": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
@@ -2766,9 +3352,9 @@
             "peer": true
         },
         "node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "version": "1.1.12",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
             "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0",
@@ -2788,9 +3374,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.24.4",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-            "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz",
+            "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==",
             "dev": true,
             "funding": [
                 {
@@ -2808,10 +3394,11 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001688",
-                "electron-to-chromium": "^1.5.73",
-                "node-releases": "^2.0.19",
-                "update-browserslist-db": "^1.1.1"
+                "baseline-browser-mapping": "^2.9.0",
+                "caniuse-lite": "^1.0.30001759",
+                "electron-to-chromium": "^1.5.263",
+                "node-releases": "^2.0.27",
+                "update-browserslist-db": "^1.2.0"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -2834,7 +3421,6 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
             "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
-            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "es-errors": "^1.3.0",
@@ -2887,9 +3473,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001713",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001713.tgz",
-            "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==",
+            "version": "1.0.30001766",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001766.tgz",
+            "integrity": "sha512-4C0lfJ0/YPjJQHagaE9x2Elb69CIqEPZeG0anQt9SIvIoOH4a4uaRl73IavyO+0qZh6MDLH//DrXThEYKHkmYA==",
             "dev": true,
             "funding": [
                 {
@@ -2912,6 +3498,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -2991,6 +3578,7 @@
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
             "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "color-name": "~1.1.4"
             },
@@ -3002,13 +3590,13 @@
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
             "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/combined-stream": {
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
             "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "delayed-stream": "~1.0.0"
@@ -3026,12 +3614,26 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/compare-versions": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz",
+            "integrity": "sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
             "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
             "license": "MIT"
         },
+        "node_modules/confbox": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.2.tgz",
+            "integrity": "sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/convert-source-map": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
@@ -3039,11 +3641,27 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/copy-anything": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-4.0.5.tgz",
+            "integrity": "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA==",
+            "license": "MIT",
+            "dependencies": {
+                "is-what": "^5.2.0"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/mesqueeb"
+            }
+        },
         "node_modules/cross-spawn": {
             "version": "7.0.6",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
             "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "path-key": "^3.1.0",
                 "shebang-command": "^2.0.0",
@@ -3066,15 +3684,15 @@
             }
         },
         "node_modules/csstype": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+            "version": "3.2.3",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
+            "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
             "license": "MIT"
         },
         "node_modules/dayjs": {
-            "version": "1.11.13",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
-            "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
+            "version": "1.11.19",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
+            "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==",
             "license": "MIT"
         },
         "node_modules/de-indent": {
@@ -3085,9 +3703,9 @@
             "license": "MIT"
         },
         "node_modules/debug": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-            "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.3"
@@ -3118,7 +3736,6 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
             "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-            "devOptional": true,
             "license": "MIT",
             "engines": {
                 "node": ">=0.4.0"
@@ -3130,6 +3747,16 @@
             "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
             "license": "Apache-2.0"
         },
+        "node_modules/diff": {
+            "version": "8.0.3",
+            "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.3.tgz",
+            "integrity": "sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.3.1"
+            }
+        },
         "node_modules/dlv": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
@@ -3140,7 +3767,6 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
             "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind-apply-helpers": "^1.0.1",
@@ -3151,39 +3777,27 @@
                 "node": ">= 0.4"
             }
         },
-        "node_modules/eastasianwidth": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-            "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-            "license": "MIT"
-        },
         "node_modules/echarts": {
-            "version": "5.6.0",
-            "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.6.0.tgz",
-            "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==",
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/echarts/-/echarts-6.0.0.tgz",
+            "integrity": "sha512-Tte/grDQRiETQP4xz3iZWSvoHrkCQtwqd6hs+mifXcjrCuo2iKWbajFObuLJVBlDIJlOzgQPd1hsaKt/3+OMkQ==",
             "license": "Apache-2.0",
             "dependencies": {
                 "tslib": "2.3.0",
-                "zrender": "5.6.1"
+                "zrender": "6.0.0"
             }
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.136",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.136.tgz",
-            "integrity": "sha512-kL4+wUTD7RSA5FHx5YwWtjDnEEkIIikFgWHR4P6fqjw1PPLlqYkxeOb++wAauAssat0YClCy8Y3C5SxgSkjibQ==",
+            "version": "1.5.283",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.283.tgz",
+            "integrity": "sha512-3vifjt1HgrGW/h76UEeny+adYApveS9dH2h3p57JYzBSXJIKUJAvtmIytDKjcSCt9xHfrNCFJ7gts6vkhuq++w==",
             "dev": true,
             "license": "ISC"
         },
-        "node_modules/emoji-regex": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-            "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-            "license": "MIT"
-        },
         "node_modules/entities": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-            "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
+            "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
             "license": "BSD-2-Clause",
             "engines": {
                 "node": ">=0.12"
@@ -3196,7 +3810,6 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
             "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-            "devOptional": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -3206,7 +3819,6 @@
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
             "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-            "devOptional": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -3216,7 +3828,6 @@
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
             "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
-            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "es-errors": "^1.3.0"
@@ -3229,7 +3840,6 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
             "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "es-errors": "^1.3.0",
@@ -3242,10 +3852,9 @@
             }
         },
         "node_modules/esbuild": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.2.tgz",
-            "integrity": "sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==",
-            "dev": true,
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz",
+            "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==",
             "hasInstallScript": true,
             "license": "MIT",
             "bin": {
@@ -3255,31 +3864,32 @@
                 "node": ">=18"
             },
             "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.25.2",
-                "@esbuild/android-arm": "0.25.2",
-                "@esbuild/android-arm64": "0.25.2",
-                "@esbuild/android-x64": "0.25.2",
-                "@esbuild/darwin-arm64": "0.25.2",
-                "@esbuild/darwin-x64": "0.25.2",
-                "@esbuild/freebsd-arm64": "0.25.2",
-                "@esbuild/freebsd-x64": "0.25.2",
-                "@esbuild/linux-arm": "0.25.2",
-                "@esbuild/linux-arm64": "0.25.2",
-                "@esbuild/linux-ia32": "0.25.2",
-                "@esbuild/linux-loong64": "0.25.2",
-                "@esbuild/linux-mips64el": "0.25.2",
-                "@esbuild/linux-ppc64": "0.25.2",
-                "@esbuild/linux-riscv64": "0.25.2",
-                "@esbuild/linux-s390x": "0.25.2",
-                "@esbuild/linux-x64": "0.25.2",
-                "@esbuild/netbsd-arm64": "0.25.2",
-                "@esbuild/netbsd-x64": "0.25.2",
-                "@esbuild/openbsd-arm64": "0.25.2",
-                "@esbuild/openbsd-x64": "0.25.2",
-                "@esbuild/sunos-x64": "0.25.2",
-                "@esbuild/win32-arm64": "0.25.2",
-                "@esbuild/win32-ia32": "0.25.2",
-                "@esbuild/win32-x64": "0.25.2"
+                "@esbuild/aix-ppc64": "0.27.2",
+                "@esbuild/android-arm": "0.27.2",
+                "@esbuild/android-arm64": "0.27.2",
+                "@esbuild/android-x64": "0.27.2",
+                "@esbuild/darwin-arm64": "0.27.2",
+                "@esbuild/darwin-x64": "0.27.2",
+                "@esbuild/freebsd-arm64": "0.27.2",
+                "@esbuild/freebsd-x64": "0.27.2",
+                "@esbuild/linux-arm": "0.27.2",
+                "@esbuild/linux-arm64": "0.27.2",
+                "@esbuild/linux-ia32": "0.27.2",
+                "@esbuild/linux-loong64": "0.27.2",
+                "@esbuild/linux-mips64el": "0.27.2",
+                "@esbuild/linux-ppc64": "0.27.2",
+                "@esbuild/linux-riscv64": "0.27.2",
+                "@esbuild/linux-s390x": "0.27.2",
+                "@esbuild/linux-x64": "0.27.2",
+                "@esbuild/netbsd-arm64": "0.27.2",
+                "@esbuild/netbsd-x64": "0.27.2",
+                "@esbuild/openbsd-arm64": "0.27.2",
+                "@esbuild/openbsd-x64": "0.27.2",
+                "@esbuild/openharmony-arm64": "0.27.2",
+                "@esbuild/sunos-x64": "0.27.2",
+                "@esbuild/win32-arm64": "0.27.2",
+                "@esbuild/win32-ia32": "0.27.2",
+                "@esbuild/win32-x64": "0.27.2"
             }
         },
         "node_modules/escalade": {
@@ -3306,33 +3916,32 @@
             }
         },
         "node_modules/eslint": {
-            "version": "9.24.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.24.0.tgz",
-            "integrity": "sha512-eh/jxIEJyZrvbWRe4XuVclLPDYSYYYgLy5zXGGxD6j8zjSAxFEzI2fL/8xNq6O2yKqVt+eF2YhV+hxjV6UKXwQ==",
+            "version": "9.39.2",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.2.tgz",
+            "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
             "license": "MIT",
             "peer": true,
             "dependencies": {
-                "@eslint-community/eslint-utils": "^4.2.0",
+                "@eslint-community/eslint-utils": "^4.8.0",
                 "@eslint-community/regexpp": "^4.12.1",
-                "@eslint/config-array": "^0.20.0",
-                "@eslint/config-helpers": "^0.2.0",
-                "@eslint/core": "^0.12.0",
+                "@eslint/config-array": "^0.21.1",
+                "@eslint/config-helpers": "^0.4.2",
+                "@eslint/core": "^0.17.0",
                 "@eslint/eslintrc": "^3.3.1",
-                "@eslint/js": "9.24.0",
-                "@eslint/plugin-kit": "^0.2.7",
+                "@eslint/js": "9.39.2",
+                "@eslint/plugin-kit": "^0.4.1",
                 "@humanfs/node": "^0.16.6",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@humanwhocodes/retry": "^0.4.2",
                 "@types/estree": "^1.0.6",
-                "@types/json-schema": "^7.0.15",
                 "ajv": "^6.12.4",
                 "chalk": "^4.0.0",
                 "cross-spawn": "^7.0.6",
                 "debug": "^4.3.2",
                 "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^8.3.0",
-                "eslint-visitor-keys": "^4.2.0",
-                "espree": "^10.3.0",
+                "eslint-scope": "^8.4.0",
+                "eslint-visitor-keys": "^4.2.1",
+                "espree": "^10.4.0",
                 "esquery": "^1.5.0",
                 "esutils": "^2.0.2",
                 "fast-deep-equal": "^3.1.3",
@@ -3367,25 +3976,28 @@
             }
         },
         "node_modules/eslint-config-prettier": {
-            "version": "10.1.2",
-            "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.2.tgz",
-            "integrity": "sha512-Epgp/EofAUeEpIdZkW60MHKvPyru1ruQJxPL+WIycnaPApuseK0Zpkrh/FwL9oIpQvIhJwV7ptOy0DWUjTlCiA==",
+            "version": "10.1.8",
+            "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.8.tgz",
+            "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
             "license": "MIT",
             "bin": {
                 "eslint-config-prettier": "bin/cli.js"
             },
+            "funding": {
+                "url": "https://opencollective.com/eslint-config-prettier"
+            },
             "peerDependencies": {
                 "eslint": ">=7.0.0"
             }
         },
         "node_modules/eslint-plugin-prettier": {
-            "version": "5.2.6",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.6.tgz",
-            "integrity": "sha512-mUcf7QG2Tjk7H055Jk0lGBjbgDnfrvqjhXh9t2xLMSCjZVcw9Rb1V6sVNXO0th3jgeO7zllWPTNRil3JW94TnQ==",
+            "version": "5.5.5",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.5.tgz",
+            "integrity": "sha512-hscXkbqUZ2sPithAuLm5MXL+Wph+U7wHngPBv9OMWwlP8iaflyxpjTYZkmdgB4/vPIhemRlBEoLrH7UC1n7aUw==",
             "license": "MIT",
             "dependencies": {
-                "prettier-linter-helpers": "^1.0.0",
-                "synckit": "^0.11.0"
+                "prettier-linter-helpers": "^1.0.1",
+                "synckit": "^0.11.12"
             },
             "engines": {
                 "node": "^14.18.0 || >=16.0.0"
@@ -3409,9 +4021,9 @@
             }
         },
         "node_modules/eslint-plugin-unused-imports": {
-            "version": "4.1.4",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.4.tgz",
-            "integrity": "sha512-YptD6IzQjDardkl0POxnnRBhU1OEePMV0nd6siHaRBbd+lyh6NAhFEobiznKU7kTsSsDeSD62Pe7kAM1b7dAZQ==",
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.3.0.tgz",
+            "integrity": "sha512-ZFBmXMGBYfHttdRtOG9nFFpmUvMtbHSjsKrS20vdWdbfiVYsO3yA2SGYy9i9XmZJDfMGBflZGBCm70SEnFQtOA==",
             "dev": true,
             "license": "MIT",
             "peerDependencies": {
@@ -3425,16 +4037,16 @@
             }
         },
         "node_modules/eslint-plugin-vue": {
-            "version": "10.0.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-10.0.0.tgz",
-            "integrity": "sha512-XKckedtajqwmaX6u1VnECmZ6xJt+YvlmMzBPZd+/sI3ub2lpYZyFnsyWo7c3nMOQKJQudeyk1lw/JxdgeKT64w==",
+            "version": "10.7.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-10.7.0.tgz",
+            "integrity": "sha512-r2XFCK4qlo1sxEoAMIoTTX0PZAdla0JJDt1fmYiworZUX67WeEGqm+JbyAg3M+pGiJ5U6Mp5WQbontXWtIW7TA==",
             "license": "MIT",
             "peer": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.4.0",
                 "natural-compare": "^1.4.0",
                 "nth-check": "^2.1.1",
-                "postcss-selector-parser": "^6.0.15",
+                "postcss-selector-parser": "^7.1.0",
                 "semver": "^7.6.3",
                 "xml-name-validator": "^4.0.0"
             },
@@ -3442,14 +4054,24 @@
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             },
             "peerDependencies": {
+                "@stylistic/eslint-plugin": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0",
+                "@typescript-eslint/parser": "^7.0.0 || ^8.0.0",
                 "eslint": "^8.57.0 || ^9.0.0",
                 "vue-eslint-parser": "^10.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@stylistic/eslint-plugin": {
+                    "optional": true
+                },
+                "@typescript-eslint/parser": {
+                    "optional": true
+                }
             }
         },
         "node_modules/eslint-plugin-vue/node_modules/postcss-selector-parser": {
-            "version": "6.1.2",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
-            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
+            "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
             "license": "MIT",
             "peer": true,
             "dependencies": {
@@ -3461,9 +4083,9 @@
             }
         },
         "node_modules/eslint-scope": {
-            "version": "8.3.0",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-            "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+            "version": "8.4.0",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+            "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
             "license": "BSD-2-Clause",
             "dependencies": {
                 "esrecurse": "^4.3.0",
@@ -3489,9 +4111,9 @@
             }
         },
         "node_modules/eslint/node_modules/eslint-visitor-keys": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+            "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
             "license": "Apache-2.0",
             "peer": true,
             "engines": {
@@ -3502,14 +4124,14 @@
             }
         },
         "node_modules/espree": {
-            "version": "10.3.0",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-            "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+            "version": "10.4.0",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+            "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
             "license": "BSD-2-Clause",
             "dependencies": {
-                "acorn": "^8.14.0",
+                "acorn": "^8.15.0",
                 "acorn-jsx": "^5.3.2",
-                "eslint-visitor-keys": "^4.2.0"
+                "eslint-visitor-keys": "^4.2.1"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3519,9 +4141,9 @@
             }
         },
         "node_modules/espree/node_modules/eslint-visitor-keys": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+            "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
             "license": "Apache-2.0",
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3531,9 +4153,9 @@
             }
         },
         "node_modules/esquery": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-            "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz",
+            "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==",
             "license": "BSD-3-Clause",
             "dependencies": {
                 "estraverse": "^5.1.0"
@@ -3580,9 +4202,16 @@
             }
         },
         "node_modules/eval-estree-expression": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/eval-estree-expression/-/eval-estree-expression-2.1.1.tgz",
-            "integrity": "sha512-9kNUU4c+kUs5rKR7V5n81Ebp6fId1v01XSHshPuDIQ8N2VKAAzSzN3o/hfzERdNU6ZGh97LYFT7wWrL0cqhV3A==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/eval-estree-expression/-/eval-estree-expression-3.0.1.tgz",
+            "integrity": "sha512-zTLKGbiVdQYp4rQkSoXPibrFf5ZoPn6jzExegRLEQ13F+FSxu5iLgaRH6hlDs2kWSUa6vp8yD20cdJi0me6pEw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/exsolve": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.8.tgz",
+            "integrity": "sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==",
             "dev": true,
             "license": "MIT"
         },
@@ -3640,9 +4269,9 @@
             "peer": true
         },
         "node_modules/fast-uri": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
-            "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
+            "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
             "dev": true,
             "funding": [
                 {
@@ -3657,9 +4286,9 @@
             "license": "BSD-3-Clause"
         },
         "node_modules/fastq": {
-            "version": "1.19.1",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
-            "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+            "version": "1.20.1",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
+            "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
             "license": "ISC",
             "dependencies": {
                 "reusify": "^1.0.4"
@@ -3729,19 +4358,18 @@
             "peer": true
         },
         "node_modules/focus-trap": {
-            "version": "7.6.4",
-            "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.4.tgz",
-            "integrity": "sha512-xx560wGBk7seZ6y933idtjJQc1l+ck+pI3sKvhKozdBV1dRZoKhkW5xoCaFv9tQiX5RH1xfSxjuNu6g+lmN/gw==",
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-8.0.0.tgz",
+            "integrity": "sha512-Aa84FOGHs99vVwufDMdq2qgOwXPC2e9U66GcqBhn1/jEHPDhJaP8PYhkIbqG9lhfL5Kddk/567lj46LLHYCRUw==",
             "license": "MIT",
             "dependencies": {
-                "tabbable": "^6.2.0"
+                "tabbable": "^6.4.0"
             }
         },
         "node_modules/follow-redirects": {
-            "version": "1.15.9",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
-            "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
-            "devOptional": true,
+            "version": "1.15.11",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
+            "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
             "funding": [
                 {
                     "type": "individual",
@@ -3758,27 +4386,10 @@
                 }
             }
         },
-        "node_modules/foreground-child": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
-            "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
-            "license": "ISC",
-            "dependencies": {
-                "cross-spawn": "^7.0.6",
-                "signal-exit": "^4.0.1"
-            },
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/form-data": {
             "version": "4.0.5",
             "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
             "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
-            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "asynckit": "^0.4.0",
@@ -3792,16 +4403,16 @@
             }
         },
         "node_modules/fraction.js": {
-            "version": "4.3.7",
-            "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
-            "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+            "version": "5.3.4",
+            "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz",
+            "integrity": "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
                 "node": "*"
             },
             "funding": {
-                "type": "patreon",
+                "type": "github",
                 "url": "https://github.com/sponsors/rawify"
             }
         },
@@ -3857,7 +4468,6 @@
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
             "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
-            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind-apply-helpers": "^1.0.2",
@@ -3882,7 +4492,6 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
             "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "dunder-proto": "^1.0.1",
@@ -3892,26 +4501,6 @@
                 "node": ">= 0.4"
             }
         },
-        "node_modules/glob": {
-            "version": "10.4.5",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-            "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-            "license": "ISC",
-            "dependencies": {
-                "foreground-child": "^3.1.0",
-                "jackspeak": "^3.1.2",
-                "minimatch": "^9.0.4",
-                "minipass": "^7.1.2",
-                "package-json-from-dist": "^1.0.0",
-                "path-scurry": "^1.11.1"
-            },
-            "bin": {
-                "glob": "dist/esm/bin.mjs"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/glob-parent": {
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -3924,30 +4513,6 @@
                 "node": ">=10.13.0"
             }
         },
-        "node_modules/glob/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-            "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^1.0.0"
-            }
-        },
-        "node_modules/glob/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/globals": {
             "version": "14.0.0",
             "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
@@ -3964,7 +4529,6 @@
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
             "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-            "devOptional": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -3980,12 +4544,6 @@
             "dev": true,
             "license": "ISC"
         },
-        "node_modules/graphemer": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-            "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-            "license": "MIT"
-        },
         "node_modules/handlebars": {
             "version": "4.7.8",
             "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
@@ -4021,7 +4579,6 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
             "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
-            "devOptional": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -4034,7 +4591,6 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
             "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "has-symbols": "^1.0.3"
@@ -4068,6 +4624,12 @@
                 "he": "bin/he"
             }
         },
+        "node_modules/hookable": {
+            "version": "5.5.3",
+            "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
+            "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
+            "license": "MIT"
+        },
         "node_modules/ignore": {
             "version": "5.3.2",
             "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -4093,6 +4655,16 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/import-lazy": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+            "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/imurmurhash": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -4139,15 +4711,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/is-fullwidth-code-point": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/is-glob": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -4169,26 +4732,24 @@
                 "node": ">=0.12.0"
             }
         },
+        "node_modules/is-what": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/is-what/-/is-what-5.5.0.tgz",
+            "integrity": "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/mesqueeb"
+            }
+        },
         "node_modules/isexe": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
             "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-            "license": "ISC"
-        },
-        "node_modules/jackspeak": {
-            "version": "3.4.3",
-            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-            "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
-            "license": "BlueOak-1.0.0",
-            "dependencies": {
-                "@isaacs/cliui": "^8.0.2"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            },
-            "optionalDependencies": {
-                "@pkgjs/parseargs": "^0.11.0"
-            }
+            "license": "ISC",
+            "peer": true
         },
         "node_modules/jiti": {
             "version": "1.21.7",
@@ -4199,6 +4760,13 @@
                 "jiti": "bin/jiti.js"
             }
         },
+        "node_modules/jju": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+            "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/js-tokens": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -4207,9 +4775,9 @@
             "license": "MIT"
         },
         "node_modules/js-yaml": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-            "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+            "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
             "license": "MIT",
             "dependencies": {
                 "argparse": "^2.0.1"
@@ -4265,9 +4833,9 @@
             }
         },
         "node_modules/jsonfile": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+            "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -4287,10 +4855,17 @@
                 "json-buffer": "3.0.1"
             }
         },
+        "node_modules/kolorist": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/kolorist/-/kolorist-1.8.0.tgz",
+            "integrity": "sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/laravel-precognition": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/laravel-precognition/-/laravel-precognition-1.0.0.tgz",
-            "integrity": "sha512-hvXPT7dayCQAidxnsY0hab9Q+Y2rsh7xRpH9uiFtXN8Dekc3tIZt+NrxrOZ9N5SwHBmRBze/Bv+ElfXac0kD6g==",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/laravel-precognition/-/laravel-precognition-1.0.1.tgz",
+            "integrity": "sha512-BYaDUjEclKbxuQTG9yZnRjjD7ag1Xh+8hGOXmcrw91/vpbIOJ8cSFADTI0kvwetIr3AM1vOJzYwaoA9+KHhLwA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -4299,9 +4874,9 @@
             }
         },
         "node_modules/laravel-vite-plugin": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.2.0.tgz",
-            "integrity": "sha512-R0pJ+IcTVeqEMoKz/B2Ij57QVq3sFTABiFmb06gAwFdivbOgsUtuhX6N2MGLEArajrS3U5JbberzwOe7uXHMHQ==",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-2.1.0.tgz",
+            "integrity": "sha512-z+ck2BSV6KWtYcoIzk9Y5+p4NEjqM+Y4i8/H+VZRLq0OgNjW2DqyADquwYu5j8qRvaXwzNmfCWl1KrMlV1zpsg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -4312,10 +4887,10 @@
                 "clean-orphaned-assets": "bin/clean.js"
             },
             "engines": {
-                "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+                "node": "^20.19.0 || >=22.12.0"
             },
             "peerDependencies": {
-                "vite": "^5.0.0 || ^6.0.0"
+                "vite": "^7.0.0"
             }
         },
         "node_modules/levn": {
@@ -4350,6 +4925,24 @@
             "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
             "license": "MIT"
         },
+        "node_modules/local-pkg": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.1.2.tgz",
+            "integrity": "sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "mlly": "^1.7.4",
+                "pkg-types": "^2.3.0",
+                "quansync": "^0.2.11"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            }
+        },
         "node_modules/locate-path": {
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -4367,29 +4960,16 @@
             }
         },
         "node_modules/lodash": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-            "license": "MIT"
-        },
-        "node_modules/lodash-es": {
-            "version": "4.17.22",
-            "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.22.tgz",
-            "integrity": "sha512-XEawp1t0gxSi9x01glktRZ5HDy0HXqrM0x5pXQM98EaI0NxO6jVM7omDOxsuEo5UIASAnm2bRp1Jt/e0a2XU8Q==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/lodash.castarray": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz",
-            "integrity": "sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==",
+            "version": "4.17.23",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+            "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/lodash.isplainobject": {
-            "version": "4.0.6",
-            "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-            "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+        "node_modules/lodash-es": {
+            "version": "4.17.23",
+            "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz",
+            "integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==",
             "dev": true,
             "license": "MIT"
         },
@@ -4397,7 +4977,8 @@
             "version": "4.6.2",
             "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
             "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/lru-cache": {
             "version": "5.1.1",
@@ -4419,19 +5000,18 @@
             }
         },
         "node_modules/magic-string": {
-            "version": "0.30.17",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
-            "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+            "version": "0.30.21",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+            "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
             "license": "MIT",
             "dependencies": {
-                "@jridgewell/sourcemap-codec": "^1.5.0"
+                "@jridgewell/sourcemap-codec": "^1.5.5"
             }
         },
         "node_modules/math-intrinsics": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
             "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
-            "devOptional": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -4463,7 +5043,6 @@
             "version": "1.52.0",
             "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
             "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-            "devOptional": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.6"
@@ -4473,7 +5052,6 @@
             "version": "2.1.35",
             "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
             "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "mime-db": "1.52.0"
@@ -4514,13 +5092,42 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/minipass": {
-            "version": "7.1.2",
-            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-            "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-            "license": "ISC",
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
+        "node_modules/mitt": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+            "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+            "license": "MIT"
+        },
+        "node_modules/mlly": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.8.0.tgz",
+            "integrity": "sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "acorn": "^8.15.0",
+                "pathe": "^2.0.3",
+                "pkg-types": "^1.3.1",
+                "ufo": "^1.6.1"
+            }
+        },
+        "node_modules/mlly/node_modules/confbox": {
+            "version": "0.1.8",
+            "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
+            "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/mlly/node_modules/pkg-types": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz",
+            "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "confbox": "^0.1.8",
+                "mlly": "^1.7.4",
+                "pathe": "^2.0.1"
             }
         },
         "node_modules/ms": {
@@ -4533,7 +5140,6 @@
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz",
             "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==",
-            "dev": true,
             "license": "MIT"
         },
         "node_modules/mz": {
@@ -4579,9 +5185,9 @@
             "license": "MIT"
         },
         "node_modules/node-releases": {
-            "version": "2.0.19",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-            "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+            "version": "2.0.27",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
+            "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==",
             "dev": true,
             "license": "MIT"
         },
@@ -4594,27 +5200,34 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/normalize-range": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-            "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+        "node_modules/npm-run-path": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz",
+            "integrity": "sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==",
             "dev": true,
             "license": "MIT",
+            "dependencies": {
+                "path-key": "^4.0.0",
+                "unicorn-magic": "^0.3.0"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/npm-run-path": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+        "node_modules/npm-run-path/node_modules/path-key": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+            "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
             "dev": true,
             "license": "MIT",
-            "dependencies": {
-                "path-key": "^3.0.0"
-            },
             "engines": {
-                "node": ">=8"
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/nth-check": {
@@ -4776,12 +5389,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/package-json-from-dist": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
-            "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
-            "license": "BlueOak-1.0.0"
-        },
         "node_modules/parent-module": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -4795,9 +5402,9 @@
             }
         },
         "node_modules/parse-duration": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-2.1.4.tgz",
-            "integrity": "sha512-b98m6MsCh+akxfyoz9w9dt0AlH2dfYLOBss5SdDsr9pkhKNvkWBXU/r8A4ahmIGByBOLV2+4YwfCuFxbDDaGyg==",
+            "version": "2.1.5",
+            "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-2.1.5.tgz",
+            "integrity": "sha512-/IX1KRw6zHDOOJrgIz++gvFASbFl7nc8GEXaLdD7d1t1x/GnrK6hh5Fgk8G3RLpkIEi4tsGj9pupGLWNg0EiJA==",
             "license": "MIT"
         },
         "node_modules/pastable": {
@@ -4830,7 +5437,6 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
             "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-            "dev": true,
             "license": "MIT"
         },
         "node_modules/path-exists": {
@@ -4848,6 +5454,7 @@
             "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
             "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=8"
             }
@@ -4858,27 +5465,18 @@
             "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
             "license": "MIT"
         },
-        "node_modules/path-scurry": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-            "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
-            "license": "BlueOak-1.0.0",
-            "dependencies": {
-                "lru-cache": "^10.2.0",
-                "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.18"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
+        "node_modules/pathe": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
+            "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+            "dev": true,
+            "license": "MIT"
         },
-        "node_modules/path-scurry/node_modules/lru-cache": {
-            "version": "10.4.3",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-            "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-            "license": "ISC"
+        "node_modules/perfect-debounce": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
+            "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
+            "license": "MIT"
         },
         "node_modules/picocolors": {
             "version": "1.1.1",
@@ -4908,20 +5506,19 @@
             }
         },
         "node_modules/pinia": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.3.1.tgz",
-            "integrity": "sha512-khUlZSwt9xXCaTbbxFYBKDc/bWAGWJjOgvxETwkTN7KRm66EeT1ZdZj6i2ceh9sP2Pzqsbc704r2yngBrxBVug==",
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.4.tgz",
+            "integrity": "sha512-l7pqLUFTI/+ESXn6k3nu30ZIzW5E2WZF/LaHJEpoq6ElcLD+wduZoB2kBN19du6K/4FDpPMazY2wJr+IndBtQw==",
             "license": "MIT",
             "dependencies": {
-                "@vue/devtools-api": "^6.6.3",
-                "vue-demi": "^0.14.10"
+                "@vue/devtools-api": "^7.7.7"
             },
             "funding": {
                 "url": "https://github.com/sponsors/posva"
             },
             "peerDependencies": {
-                "typescript": ">=4.4.4",
-                "vue": "^2.7.0 || ^3.5.11"
+                "typescript": ">=4.5.0",
+                "vue": "^3.5.11"
             },
             "peerDependenciesMeta": {
                 "typescript": {
@@ -4929,6 +5526,15 @@
                 }
             }
         },
+        "node_modules/pinia/node_modules/@vue/devtools-api": {
+            "version": "7.7.9",
+            "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.9.tgz",
+            "integrity": "sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==",
+            "license": "MIT",
+            "dependencies": {
+                "@vue/devtools-kit": "^7.7.9"
+            }
+        },
         "node_modules/pirates": {
             "version": "4.0.7",
             "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
@@ -4938,14 +5544,26 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/pkg-types": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.0.tgz",
+            "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "confbox": "^0.2.2",
+                "exsolve": "^1.0.7",
+                "pathe": "^2.0.3"
+            }
+        },
         "node_modules/playwright": {
-            "version": "1.51.1",
-            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.51.1.tgz",
-            "integrity": "sha512-kkx+MB2KQRkyxjYPc3a0wLZZoDczmppyGJIvQ43l+aZihkaVvmu/21kiyaHeHjiFxjxNNFnUncKmcGIyOojsaw==",
+            "version": "1.58.1",
+            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.1.tgz",
+            "integrity": "sha512-+2uTZHxSCcxjvGc5C891LrS1/NlxglGxzrC4seZiVjcYVQfUa87wBL6rTDqzGjuoWNjnBzRqKmF6zRYGMvQUaQ==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "playwright-core": "1.51.1"
+                "playwright-core": "1.58.1"
             },
             "bin": {
                 "playwright": "cli.js"
@@ -4958,9 +5576,9 @@
             }
         },
         "node_modules/playwright-core": {
-            "version": "1.51.1",
-            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.51.1.tgz",
-            "integrity": "sha512-/crRMj8+j/Nq5s8QcvegseuyeZPxpQCZb6HNk3Sos3BlZyAknRjoyJPFWkpNn8v0+P3WiwqFF8P+zQo4eqiNuw==",
+            "version": "1.58.1",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.1.tgz",
+            "integrity": "sha512-bcWzOaTxcW+VOOGBCQgnaKToLJ65d6AqfLVKEWvexyS3AS6rbXl+xdpYRMGSRBClPvyj44njOWoxjNdL/H9UNg==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -4971,9 +5589,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.5.3",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-            "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+            "version": "8.5.6",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+            "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -4990,7 +5608,7 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "nanoid": "^3.3.8",
+                "nanoid": "^3.3.11",
                 "picocolors": "^1.1.1",
                 "source-map-js": "^1.2.1"
             },
@@ -5016,9 +5634,19 @@
             }
         },
         "node_modules/postcss-js": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
-            "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.1.0.tgz",
+            "integrity": "sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==",
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
             "license": "MIT",
             "dependencies": {
                 "camelcase-css": "^2.0.1"
@@ -5026,18 +5654,14 @@
             "engines": {
                 "node": "^12 || ^14 || >= 16"
             },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/postcss/"
-            },
             "peerDependencies": {
                 "postcss": "^8.4.21"
             }
         },
         "node_modules/postcss-load-config": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
-            "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-6.0.1.tgz",
+            "integrity": "sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -5050,24 +5674,31 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "lilconfig": "^3.0.0",
-                "yaml": "^2.3.4"
+                "lilconfig": "^3.1.1"
             },
             "engines": {
-                "node": ">= 14"
+                "node": ">= 18"
             },
             "peerDependencies": {
+                "jiti": ">=1.21.0",
                 "postcss": ">=8.0.9",
-                "ts-node": ">=9.0.0"
+                "tsx": "^4.8.1",
+                "yaml": "^2.4.2"
             },
             "peerDependenciesMeta": {
+                "jiti": {
+                    "optional": true
+                },
                 "postcss": {
                     "optional": true
                 },
-                "ts-node": {
+                "tsx": {
                     "optional": true
-                }
-            }
+                },
+                "yaml": {
+                    "optional": true
+                }
+            }
         },
         "node_modules/postcss-nested": {
             "version": "6.2.0",
@@ -5236,9 +5867,9 @@
             }
         },
         "node_modules/prettier": {
-            "version": "3.5.3",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-            "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+            "version": "3.8.1",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz",
+            "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
             "license": "MIT",
             "peer": true,
             "bin": {
@@ -5252,9 +5883,9 @@
             }
         },
         "node_modules/prettier-linter-helpers": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
-            "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.1.tgz",
+            "integrity": "sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg==",
             "license": "MIT",
             "dependencies": {
                 "fast-diff": "^1.1.2"
@@ -5267,7 +5898,6 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
             "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-            "devOptional": true,
             "license": "MIT"
         },
         "node_modules/punycode": {
@@ -5295,6 +5925,23 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/quansync": {
+            "version": "0.2.11",
+            "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.11.tgz",
+            "integrity": "sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "individual",
+                    "url": "https://github.com/sponsors/antfu"
+                },
+                {
+                    "type": "individual",
+                    "url": "https://github.com/sponsors/sxzz"
+                }
+            ],
+            "license": "MIT"
+        },
         "node_modules/queue-microtask": {
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -5358,6 +6005,32 @@
                 "url": "https://github.com/sponsors/antfu"
             }
         },
+        "node_modules/radix-vue/node_modules/@vueuse/core/node_modules/vue-demi": {
+            "version": "0.14.10",
+            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+            "hasInstallScript": true,
+            "license": "MIT",
+            "bin": {
+                "vue-demi-fix": "bin/vue-demi-fix.js",
+                "vue-demi-switch": "bin/vue-demi-switch.js"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.0.0-rc.1",
+                "vue": "^3.0.0-0 || ^2.6.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/radix-vue/node_modules/@vueuse/metadata": {
             "version": "10.11.1",
             "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.11.1.tgz",
@@ -5379,10 +6052,36 @@
                 "url": "https://github.com/sponsors/antfu"
             }
         },
+        "node_modules/radix-vue/node_modules/@vueuse/shared/node_modules/vue-demi": {
+            "version": "0.14.10",
+            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+            "hasInstallScript": true,
+            "license": "MIT",
+            "bin": {
+                "vue-demi-fix": "bin/vue-demi-fix.js",
+                "vue-demi-switch": "bin/vue-demi-switch.js"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.0.0-rc.1",
+                "vue": "^3.0.0-0 || ^2.6.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/radix-vue/node_modules/nanoid": {
-            "version": "5.1.5",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.5.tgz",
-            "integrity": "sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==",
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.6.tgz",
+            "integrity": "sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==",
             "funding": [
                 {
                     "type": "github",
@@ -5419,9 +6118,9 @@
             }
         },
         "node_modules/reka-ui": {
-            "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.7.0.tgz",
-            "integrity": "sha512-m+XmxQN2xtFzBP3OAdIafKq7C8OETo2fqfxcIIxYmNN2Ch3r5oAf6yEYCIJg5tL/yJU2mHqF70dCCekUkrAnXA==",
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.8.0.tgz",
+            "integrity": "sha512-N4JOyIrmDE7w2i06WytqcV2QICubtS2PsK5Uo8FIMAgmO13KhUAgAByP26cXjjm2oF/w7rTyRs8YaqtvaBT+SA==",
             "license": "MIT",
             "dependencies": {
                 "@floating-ui/dom": "^1.6.13",
@@ -5429,8 +6128,8 @@
                 "@internationalized/date": "^3.5.0",
                 "@internationalized/number": "^3.5.0",
                 "@tanstack/vue-virtual": "^3.12.0",
-                "@vueuse/core": "^12.5.0",
-                "@vueuse/shared": "^12.5.0",
+                "@vueuse/core": "^14.1.0",
+                "@vueuse/shared": "^14.1.0",
                 "aria-hidden": "^1.2.4",
                 "defu": "^6.1.4",
                 "ohash": "^2.0.11"
@@ -5456,12 +6155,12 @@
             }
         },
         "node_modules/resolve": {
-            "version": "1.22.10",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-            "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+            "version": "1.22.11",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
+            "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
             "license": "MIT",
             "dependencies": {
-                "is-core-module": "^2.16.0",
+                "is-core-module": "^2.16.1",
                 "path-parse": "^1.0.7",
                 "supports-preserve-symlinks-flag": "^1.0.0"
             },
@@ -5494,14 +6193,19 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/rfdc": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+            "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+            "license": "MIT"
+        },
         "node_modules/rollup": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.0.tgz",
-            "integrity": "sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==",
-            "dev": true,
+            "version": "4.57.1",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.1.tgz",
+            "integrity": "sha512-oQL6lgK3e2QZeQ7gcgIkS2YZPg5slw37hYufJ3edKlfQSGGm8ICoxswK15ntSzF/a8+h7ekRy7k7oWc3BQ7y8A==",
             "license": "MIT",
             "dependencies": {
-                "@types/estree": "1.0.7"
+                "@types/estree": "1.0.8"
             },
             "bin": {
                 "rollup": "dist/bin/rollup"
@@ -5511,26 +6215,31 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.40.0",
-                "@rollup/rollup-android-arm64": "4.40.0",
-                "@rollup/rollup-darwin-arm64": "4.40.0",
-                "@rollup/rollup-darwin-x64": "4.40.0",
-                "@rollup/rollup-freebsd-arm64": "4.40.0",
-                "@rollup/rollup-freebsd-x64": "4.40.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.40.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.40.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.40.0",
-                "@rollup/rollup-linux-arm64-musl": "4.40.0",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.40.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.40.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.40.0",
-                "@rollup/rollup-linux-riscv64-musl": "4.40.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.40.0",
-                "@rollup/rollup-linux-x64-gnu": "4.40.0",
-                "@rollup/rollup-linux-x64-musl": "4.40.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.40.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.40.0",
-                "@rollup/rollup-win32-x64-msvc": "4.40.0",
+                "@rollup/rollup-android-arm-eabi": "4.57.1",
+                "@rollup/rollup-android-arm64": "4.57.1",
+                "@rollup/rollup-darwin-arm64": "4.57.1",
+                "@rollup/rollup-darwin-x64": "4.57.1",
+                "@rollup/rollup-freebsd-arm64": "4.57.1",
+                "@rollup/rollup-freebsd-x64": "4.57.1",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.57.1",
+                "@rollup/rollup-linux-arm-musleabihf": "4.57.1",
+                "@rollup/rollup-linux-arm64-gnu": "4.57.1",
+                "@rollup/rollup-linux-arm64-musl": "4.57.1",
+                "@rollup/rollup-linux-loong64-gnu": "4.57.1",
+                "@rollup/rollup-linux-loong64-musl": "4.57.1",
+                "@rollup/rollup-linux-ppc64-gnu": "4.57.1",
+                "@rollup/rollup-linux-ppc64-musl": "4.57.1",
+                "@rollup/rollup-linux-riscv64-gnu": "4.57.1",
+                "@rollup/rollup-linux-riscv64-musl": "4.57.1",
+                "@rollup/rollup-linux-s390x-gnu": "4.57.1",
+                "@rollup/rollup-linux-x64-gnu": "4.57.1",
+                "@rollup/rollup-linux-x64-musl": "4.57.1",
+                "@rollup/rollup-openbsd-x64": "4.57.1",
+                "@rollup/rollup-openharmony-arm64": "4.57.1",
+                "@rollup/rollup-win32-arm64-msvc": "4.57.1",
+                "@rollup/rollup-win32-ia32-msvc": "4.57.1",
+                "@rollup/rollup-win32-x64-gnu": "4.57.1",
+                "@rollup/rollup-win32-x64-msvc": "4.57.1",
                 "fsevents": "~2.3.2"
             }
         },
@@ -5558,9 +6267,9 @@
             }
         },
         "node_modules/semver": {
-            "version": "7.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-            "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+            "version": "7.7.3",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+            "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
             "license": "ISC",
             "bin": {
                 "semver": "bin/semver.js"
@@ -5574,6 +6283,7 @@
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
             "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "shebang-regex": "^3.0.0"
             },
@@ -5586,6 +6296,7 @@
             "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
             "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=8"
             }
@@ -5666,18 +6377,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/signal-exit": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-            "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-            "license": "ISC",
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/source-map": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -5697,100 +6396,30 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/string-width": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-            "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-            "license": "MIT",
-            "dependencies": {
-                "eastasianwidth": "^0.2.0",
-                "emoji-regex": "^9.2.2",
-                "strip-ansi": "^7.0.1"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/string-width-cjs": {
-            "name": "string-width",
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "license": "MIT",
-            "dependencies": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/string-width-cjs/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/string-width-cjs/node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "license": "MIT"
-        },
-        "node_modules/string-width-cjs/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/strip-ansi": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-            "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^6.0.1"
-            },
+        "node_modules/speakingurl": {
+            "version": "14.0.1",
+            "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz",
+            "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==",
+            "license": "BSD-3-Clause",
             "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+                "node": ">=0.10.0"
             }
         },
-        "node_modules/strip-ansi-cjs": {
-            "name": "strip-ansi",
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
+        "node_modules/sprintf-js": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+            "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+            "dev": true,
+            "license": "BSD-3-Clause"
         },
-        "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+        "node_modules/string-argv": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
+            "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
+            "dev": true,
             "license": "MIT",
             "engines": {
-                "node": ">=8"
+                "node": ">=0.6.19"
             }
         },
         "node_modules/strip-json-comments": {
@@ -5806,17 +6435,17 @@
             }
         },
         "node_modules/sucrase": {
-            "version": "3.35.0",
-            "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
-            "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
+            "version": "3.35.1",
+            "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.1.tgz",
+            "integrity": "sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==",
             "license": "MIT",
             "dependencies": {
                 "@jridgewell/gen-mapping": "^0.3.2",
                 "commander": "^4.0.0",
-                "glob": "^10.3.10",
                 "lines-and-columns": "^1.1.6",
                 "mz": "^2.7.0",
                 "pirates": "^4.0.1",
+                "tinyglobby": "^0.2.11",
                 "ts-interface-checker": "^0.1.9"
             },
             "bin": {
@@ -5827,11 +6456,24 @@
                 "node": ">=16 || 14 >=14.17"
             }
         },
+        "node_modules/superjson": {
+            "version": "2.2.6",
+            "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.6.tgz",
+            "integrity": "sha512-H+ue8Zo4vJmV2nRjpx86P35lzwDT3nItnIsocgumgr0hHMQ+ZGq5vrERg9kJBo5AWGmxZDhzDo+WVIJqkB0cGA==",
+            "license": "MIT",
+            "dependencies": {
+                "copy-anything": "^4"
+            },
+            "engines": {
+                "node": ">=16"
+            }
+        },
         "node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -5852,13 +6494,12 @@
             }
         },
         "node_modules/synckit": {
-            "version": "0.11.3",
-            "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.3.tgz",
-            "integrity": "sha512-szhWDqNNI9etJUvbZ1/cx1StnZx8yMmFxme48SwR4dty4ioSY50KEZlpv0qAfgc1fpRzuh9hBXEzoCpJ779dLg==",
+            "version": "0.11.12",
+            "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.12.tgz",
+            "integrity": "sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==",
             "license": "MIT",
             "dependencies": {
-                "@pkgr/core": "^0.2.1",
-                "tslib": "^2.8.1"
+                "@pkgr/core": "^0.2.9"
             },
             "engines": {
                 "node": "^14.18.0 || >=16.0.0"
@@ -5867,22 +6508,16 @@
                 "url": "https://opencollective.com/synckit"
             }
         },
-        "node_modules/synckit/node_modules/tslib": {
-            "version": "2.8.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-            "license": "0BSD"
-        },
         "node_modules/tabbable": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
-            "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==",
+            "version": "6.4.0",
+            "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.4.0.tgz",
+            "integrity": "sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==",
             "license": "MIT"
         },
         "node_modules/tailwind-merge": {
-            "version": "2.6.0",
-            "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
-            "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
+            "version": "2.6.1",
+            "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.1.tgz",
+            "integrity": "sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==",
             "license": "MIT",
             "funding": {
                 "type": "github",
@@ -5890,9 +6525,9 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.17",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
-            "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
+            "version": "3.4.19",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.19.tgz",
+            "integrity": "sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==",
             "license": "MIT",
             "dependencies": {
                 "@alloc/quick-lru": "^5.2.0",
@@ -5903,7 +6538,7 @@
                 "fast-glob": "^3.3.2",
                 "glob-parent": "^6.0.2",
                 "is-glob": "^4.0.3",
-                "jiti": "^1.21.6",
+                "jiti": "^1.21.7",
                 "lilconfig": "^3.1.3",
                 "micromatch": "^4.0.8",
                 "normalize-path": "^3.0.0",
@@ -5912,7 +6547,7 @@
                 "postcss": "^8.4.47",
                 "postcss-import": "^15.1.0",
                 "postcss-js": "^4.0.1",
-                "postcss-load-config": "^4.0.2",
+                "postcss-load-config": "^4.0.2 || ^5.0 || ^6.0",
                 "postcss-nested": "^6.2.0",
                 "postcss-selector-parser": "^6.1.2",
                 "resolve": "^1.22.8",
@@ -6008,6 +6643,51 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/tinyglobby": {
+            "version": "0.2.15",
+            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+            "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+            "license": "MIT",
+            "dependencies": {
+                "fdir": "^6.5.0",
+                "picomatch": "^4.0.3"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/SuperchupuDev"
+            }
+        },
+        "node_modules/tinyglobby/node_modules/fdir": {
+            "version": "6.5.0",
+            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+            "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "peerDependencies": {
+                "picomatch": "^3 || ^4"
+            },
+            "peerDependenciesMeta": {
+                "picomatch": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/tinyglobby/node_modules/picomatch": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+            "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
         "node_modules/to-regex-range": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -6021,9 +6701,9 @@
             }
         },
         "node_modules/ts-api-utils": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
-            "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz",
+            "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.12"
@@ -6039,9 +6719,9 @@
             "license": "Apache-2.0"
         },
         "node_modules/ts-pattern": {
-            "version": "5.7.0",
-            "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-5.7.0.tgz",
-            "integrity": "sha512-0/FvIG4g3kNkYgbNwBBW5pZBkfpeYQnH+2AA3xmjkCAit/DSDPKmgwC3fKof4oYUq6gupClVOJlFl+939VRBMg==",
+            "version": "5.9.0",
+            "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-5.9.0.tgz",
+            "integrity": "sha512-6s5V71mX8qBUmlgbrfL33xDUwO0fq48rxAu2LBE11WBeGdpCPOsXksQbZJHvHwhrd3QjUusd3mAOM5Gg0mFBLg==",
             "dev": true,
             "license": "MIT"
         },
@@ -6085,9 +6765,9 @@
             }
         },
         "node_modules/typescript": {
-            "version": "5.8.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
-            "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+            "version": "5.9.3",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+            "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
             "license": "Apache-2.0",
             "bin": {
                 "tsc": "bin/tsc",
@@ -6098,14 +6778,15 @@
             }
         },
         "node_modules/typescript-eslint": {
-            "version": "8.29.1",
-            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.29.1.tgz",
-            "integrity": "sha512-f8cDkvndhbQMPcysk6CUSGBWV+g1utqdn71P5YKwMumVMOG/5k7cHq0KyG4O52nB0oKS4aN2Tp5+wB4APJGC+w==",
+            "version": "8.54.0",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.54.0.tgz",
+            "integrity": "sha512-CKsJ+g53QpsNPqbzUsfKVgd3Lny4yKZ1pP4qN3jdMOg/sisIDLGyDMezycquXLE5JsEU0wp3dGNdzig0/fmSVQ==",
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/eslint-plugin": "8.29.1",
-                "@typescript-eslint/parser": "8.29.1",
-                "@typescript-eslint/utils": "8.29.1"
+                "@typescript-eslint/eslint-plugin": "8.54.0",
+                "@typescript-eslint/parser": "8.54.0",
+                "@typescript-eslint/typescript-estree": "8.54.0",
+                "@typescript-eslint/utils": "8.54.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6116,9 +6797,16 @@
             },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
+        "node_modules/ufo": {
+            "version": "1.6.3",
+            "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.3.tgz",
+            "integrity": "sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/uglify-js": {
             "version": "3.19.3",
             "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
@@ -6137,9 +6825,22 @@
             "version": "6.21.0",
             "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
             "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT"
         },
+        "node_modules/unicorn-magic": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
+            "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/universalify": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
@@ -6151,9 +6852,9 @@
             }
         },
         "node_modules/update-browserslist-db": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
-            "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
+            "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
             "dev": true,
             "funding": [
                 {
@@ -6197,21 +6898,23 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "6.2.6",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.6.tgz",
-            "integrity": "sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==",
-            "dev": true,
+            "version": "7.3.1",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
+            "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
             "license": "MIT",
             "dependencies": {
-                "esbuild": "^0.25.0",
-                "postcss": "^8.5.3",
-                "rollup": "^4.30.1"
+                "esbuild": "^0.27.0",
+                "fdir": "^6.5.0",
+                "picomatch": "^4.0.3",
+                "postcss": "^8.5.6",
+                "rollup": "^4.43.0",
+                "tinyglobby": "^0.2.15"
             },
             "bin": {
                 "vite": "bin/vite.js"
             },
             "engines": {
-                "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+                "node": "^20.19.0 || >=22.12.0"
             },
             "funding": {
                 "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -6220,14 +6923,14 @@
                 "fsevents": "~2.3.3"
             },
             "peerDependencies": {
-                "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+                "@types/node": "^20.19.0 || >=22.12.0",
                 "jiti": ">=1.21.0",
-                "less": "*",
+                "less": "^4.0.0",
                 "lightningcss": "^1.21.0",
-                "sass": "*",
-                "sass-embedded": "*",
-                "stylus": "*",
-                "sugarss": "*",
+                "sass": "^1.70.0",
+                "sass-embedded": "^1.70.0",
+                "stylus": ">=0.54.8",
+                "sugarss": "^5.0.0",
                 "terser": "^5.16.0",
                 "tsx": "^4.8.1",
                 "yaml": "^2.4.2"
@@ -6269,41 +6972,36 @@
             }
         },
         "node_modules/vite-plugin-checker": {
-            "version": "0.8.0",
-            "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.8.0.tgz",
-            "integrity": "sha512-UA5uzOGm97UvZRTdZHiQVYFnd86AVn8EVaD4L3PoVzxH+IZSfaAw14WGFwX9QS23UW3lV/5bVKZn6l0w+q9P0g==",
+            "version": "0.12.0",
+            "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.12.0.tgz",
+            "integrity": "sha512-CmdZdDOGss7kdQwv73UyVgLPv0FVYe5czAgnmRX2oKljgEvSrODGuClaV3PDR2+3ou7N/OKGauDDBjy2MB07Rg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/code-frame": "^7.12.13",
-                "ansi-escapes": "^4.3.0",
-                "chalk": "^4.1.1",
-                "chokidar": "^3.5.1",
-                "commander": "^8.0.0",
-                "fast-glob": "^3.2.7",
-                "fs-extra": "^11.1.0",
-                "npm-run-path": "^4.0.1",
-                "strip-ansi": "^6.0.0",
-                "tiny-invariant": "^1.1.0",
-                "vscode-languageclient": "^7.0.0",
-                "vscode-languageserver": "^7.0.0",
-                "vscode-languageserver-textdocument": "^1.0.1",
-                "vscode-uri": "^3.0.2"
+                "@babel/code-frame": "^7.27.1",
+                "chokidar": "^4.0.3",
+                "npm-run-path": "^6.0.0",
+                "picocolors": "^1.1.1",
+                "picomatch": "^4.0.3",
+                "tiny-invariant": "^1.3.3",
+                "tinyglobby": "^0.2.15",
+                "vscode-uri": "^3.1.0"
             },
             "engines": {
-                "node": ">=14.16"
+                "node": ">=16.11"
             },
             "peerDependencies": {
                 "@biomejs/biome": ">=1.7",
-                "eslint": ">=7",
-                "meow": "^9.0.0",
-                "optionator": "^0.9.1",
-                "stylelint": ">=13",
+                "eslint": ">=9.39.1",
+                "meow": "^13.2.0",
+                "optionator": "^0.9.4",
+                "oxlint": ">=1",
+                "stylelint": ">=16",
                 "typescript": "*",
-                "vite": ">=2.0.0",
+                "vite": ">=5.4.21",
                 "vls": "*",
                 "vti": "*",
-                "vue-tsc": "~2.1.6"
+                "vue-tsc": "~2.2.10 || ^3.0.0"
             },
             "peerDependenciesMeta": {
                 "@biomejs/biome": {
@@ -6318,6 +7016,9 @@
                 "optionator": {
                     "optional": true
                 },
+                "oxlint": {
+                    "optional": true
+                },
                 "stylelint": {
                     "optional": true
                 },
@@ -6335,52 +7036,132 @@
                 }
             }
         },
-        "node_modules/vite-plugin-checker/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+        "node_modules/vite-plugin-checker/node_modules/chokidar": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+            "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
             "dev": true,
             "license": "MIT",
+            "dependencies": {
+                "readdirp": "^4.0.1"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">= 14.16.0"
+            },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            }
+        },
+        "node_modules/vite-plugin-checker/node_modules/picomatch": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+            "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
             }
         },
-        "node_modules/vite-plugin-checker/node_modules/commander": {
-            "version": "8.3.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-            "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+        "node_modules/vite-plugin-checker/node_modules/readdirp": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+            "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
             "dev": true,
             "license": "MIT",
             "engines": {
-                "node": ">= 12"
+                "node": ">= 14.18.0"
+            },
+            "funding": {
+                "type": "individual",
+                "url": "https://paulmillr.com/funding/"
             }
         },
-        "node_modules/vite-plugin-checker/node_modules/fs-extra": {
-            "version": "11.3.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
-            "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
+        "node_modules/vite-plugin-dts": {
+            "version": "4.5.4",
+            "resolved": "https://registry.npmjs.org/vite-plugin-dts/-/vite-plugin-dts-4.5.4.tgz",
+            "integrity": "sha512-d4sOM8M/8z7vRXHHq/ebbblfaxENjogAAekcfcDCCwAyvGqnPrc7f4NZbvItS+g4WTgerW0xDwSz5qz11JT3vg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
+                "@microsoft/api-extractor": "^7.50.1",
+                "@rollup/pluginutils": "^5.1.4",
+                "@volar/typescript": "^2.4.11",
+                "@vue/language-core": "2.2.0",
+                "compare-versions": "^6.1.1",
+                "debug": "^4.4.0",
+                "kolorist": "^1.8.0",
+                "local-pkg": "^1.0.0",
+                "magic-string": "^0.30.17"
             },
-            "engines": {
-                "node": ">=14.14"
+            "peerDependencies": {
+                "typescript": "*",
+                "vite": "*"
+            },
+            "peerDependenciesMeta": {
+                "vite": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/vite-plugin-checker/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+        "node_modules/vite-plugin-dts/node_modules/@vue/language-core": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.2.0.tgz",
+            "integrity": "sha512-O1ZZFaaBGkKbsRfnVH1ifOK1/1BUkyK+3SQsfnh6PmMmD4qJcTU8godCeA96jjDRTL6zgnK7YzCHfaUlH2r0Mw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "ansi-regex": "^5.0.1"
+                "@volar/language-core": "~2.4.11",
+                "@vue/compiler-dom": "^3.5.0",
+                "@vue/compiler-vue2": "^2.7.16",
+                "@vue/shared": "^3.5.0",
+                "alien-signals": "^0.4.9",
+                "minimatch": "^9.0.3",
+                "muggle-string": "^0.4.1",
+                "path-browserify": "^1.0.1"
+            },
+            "peerDependencies": {
+                "typescript": "*"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vite-plugin-dts/node_modules/alien-signals": {
+            "version": "0.4.14",
+            "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-0.4.14.tgz",
+            "integrity": "sha512-itUAVzhczTmP2U5yX67xVpsbbOiquusbWVyA9N+sy6+r6YVbFkahXvNCeEPWEOMhwDYwbVbGHFkVL03N9I5g+Q==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/vite-plugin-dts/node_modules/brace-expansion": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/vite-plugin-dts/node_modules/minimatch": {
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
         "node_modules/vite-plugin-full-reload": {
@@ -6394,11 +7175,27 @@
                 "picomatch": "^2.3.1"
             }
         },
+        "node_modules/vite/node_modules/fdir": {
+            "version": "6.5.0",
+            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+            "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "peerDependencies": {
+                "picomatch": "^3 || ^4"
+            },
+            "peerDependenciesMeta": {
+                "picomatch": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/vite/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,
@@ -6409,87 +7206,35 @@
                 "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
             }
         },
-        "node_modules/vscode-jsonrpc": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
-            "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==",
-            "dev": true,
+        "node_modules/vite/node_modules/picomatch": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+            "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
             "license": "MIT",
             "engines": {
-                "node": ">=8.0.0 || >=10.0.0"
-            }
-        },
-        "node_modules/vscode-languageclient": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz",
-            "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "minimatch": "^3.0.4",
-                "semver": "^7.3.4",
-                "vscode-languageserver-protocol": "3.16.0"
-            },
-            "engines": {
-                "vscode": "^1.52.0"
-            }
-        },
-        "node_modules/vscode-languageserver": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz",
-            "integrity": "sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "vscode-languageserver-protocol": "3.16.0"
+                "node": ">=12"
             },
-            "bin": {
-                "installServerIntoExtension": "bin/installServerIntoExtension"
-            }
-        },
-        "node_modules/vscode-languageserver-protocol": {
-            "version": "3.16.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz",
-            "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "vscode-jsonrpc": "6.0.0",
-                "vscode-languageserver-types": "3.16.0"
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
             }
         },
-        "node_modules/vscode-languageserver-textdocument": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
-            "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/vscode-languageserver-types": {
-            "version": "3.16.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
-            "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/vscode-uri": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
             "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
-            "dev": true,
             "license": "MIT"
         },
         "node_modules/vue": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
-            "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
+            "version": "3.5.27",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.27.tgz",
+            "integrity": "sha512-aJ/UtoEyFySPBGarREmN4z6qNKpbEguYHMmXSiOGk69czc+zhs0NF6tEFrY8TZKAl8N/LYAkd4JHVd5E/AsSmw==",
             "license": "MIT",
             "dependencies": {
-                "@vue/compiler-dom": "3.5.13",
-                "@vue/compiler-sfc": "3.5.13",
-                "@vue/runtime-dom": "3.5.13",
-                "@vue/server-renderer": "3.5.13",
-                "@vue/shared": "3.5.13"
+                "@vue/compiler-dom": "3.5.27",
+                "@vue/compiler-sfc": "3.5.27",
+                "@vue/runtime-dom": "3.5.27",
+                "@vue/server-renderer": "3.5.27",
+                "@vue/shared": "3.5.27"
             },
             "peerDependencies": {
                 "typescript": "*"
@@ -6500,81 +7245,20 @@
                 }
             }
         },
-        "node_modules/vue-demi": {
-            "version": "0.14.10",
-            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
-            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
-            "hasInstallScript": true,
-            "license": "MIT",
-            "bin": {
-                "vue-demi-fix": "bin/vue-demi-fix.js",
-                "vue-demi-switch": "bin/vue-demi-switch.js"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            },
-            "peerDependencies": {
-                "@vue/composition-api": "^1.0.0-rc.1",
-                "vue": "^3.0.0-0 || ^2.6.0"
-            },
-            "peerDependenciesMeta": {
-                "@vue/composition-api": {
-                    "optional": true
-                }
-            }
-        },
         "node_modules/vue-echarts": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-7.0.3.tgz",
-            "integrity": "sha512-/jSxNwOsw5+dYAUcwSfkLwKPuzTQ0Cepz1LxCOpj2QcHrrmUa/Ql0eQqMmc1rTPQVrh2JQ29n2dhq75ZcHvRDw==",
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-8.0.1.tgz",
+            "integrity": "sha512-23rJTFLu1OUEGRWjJGmdGt8fP+8+ja1gVgzMYPIPaHWpXegcO1viIAaeu2H4QHESlVeHzUAHIxKXGrwjsyXAaA==",
             "license": "MIT",
-            "dependencies": {
-                "vue-demi": "^0.13.11"
-            },
             "peerDependencies": {
-                "@vue/runtime-core": "^3.0.0",
-                "echarts": "^5.5.1",
-                "vue": "^2.7.0 || ^3.1.1"
-            },
-            "peerDependenciesMeta": {
-                "@vue/runtime-core": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/vue-echarts/node_modules/vue-demi": {
-            "version": "0.13.11",
-            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
-            "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==",
-            "hasInstallScript": true,
-            "license": "MIT",
-            "bin": {
-                "vue-demi-fix": "bin/vue-demi-fix.js",
-                "vue-demi-switch": "bin/vue-demi-switch.js"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            },
-            "peerDependencies": {
-                "@vue/composition-api": "^1.0.0-rc.1",
-                "vue": "^3.0.0-0 || ^2.6.0"
-            },
-            "peerDependenciesMeta": {
-                "@vue/composition-api": {
-                    "optional": true
-                }
+                "echarts": "^6.0.0",
+                "vue": "^3.3.0"
             }
         },
         "node_modules/vue-eslint-parser": {
-            "version": "10.1.3",
-            "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.1.3.tgz",
-            "integrity": "sha512-dbCBnd2e02dYWsXoqX5yKUZlOt+ExIpq7hmHKPb5ZqKcjf++Eo0hMseFTZMLKThrUk61m+Uv6A2YSBve6ZvuDQ==",
+            "version": "10.2.0",
+            "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.2.0.tgz",
+            "integrity": "sha512-CydUvFOQKD928UzZhTp4pr2vWz1L+H99t7Pkln2QSPdvmURT0MoC4wUccfCnuEaihNsu9aYYyk+bep8rlfkUXw==",
             "license": "MIT",
             "dependencies": {
                 "debug": "^4.4.0",
@@ -6582,7 +7266,6 @@
                 "eslint-visitor-keys": "^4.2.0",
                 "espree": "^10.3.0",
                 "esquery": "^1.6.0",
-                "lodash": "^4.17.21",
                 "semver": "^7.6.3"
             },
             "engines": {
@@ -6596,9 +7279,9 @@
             }
         },
         "node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+            "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
             "license": "Apache-2.0",
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6608,14 +7291,13 @@
             }
         },
         "node_modules/vue-tsc": {
-            "version": "2.2.8",
-            "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.2.8.tgz",
-            "integrity": "sha512-jBYKBNFADTN+L+MdesNX/TB3XuDSyaWynKMDgR+yCSln0GQ9Tfb7JS2lr46s2LiFUT1WsmfWsSvIElyxzOPqcQ==",
-            "dev": true,
+            "version": "3.2.4",
+            "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.2.4.tgz",
+            "integrity": "sha512-xj3YCvSLNDKt1iF9OcImWHhmYcihVu9p4b9s4PGR/qp6yhW+tZJaypGxHScRyOrdnHvaOeF+YkZOdKwbgGvp5g==",
             "license": "MIT",
             "dependencies": {
-                "@volar/typescript": "~2.4.11",
-                "@vue/language-core": "2.2.8"
+                "@volar/typescript": "2.4.27",
+                "@vue/language-core": "3.2.4"
             },
             "bin": {
                 "vue-tsc": "bin/vue-tsc.js"
@@ -6625,14 +7307,14 @@
             }
         },
         "node_modules/whence": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/whence/-/whence-2.0.2.tgz",
-            "integrity": "sha512-dSzQeVdKM4BJ+mVMXD/MOt4LrZxMpjuNmRi7hqkDEmFJMPnLbEc0hSWR3mN/S0xkLlWuWTPg89lrTNFX4lGpdA==",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/whence/-/whence-2.1.0.tgz",
+            "integrity": "sha512-4UBPMg5mng5KLzdliVQdQ4fJwCdIMXkE8CkoDmGKRy5r8pV9xq+nVgf/sKXpmNEIOtFp7m7v2bFdb7JoLvh+Hg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.26.7",
-                "eval-estree-expression": "^2.1.1"
+                "@babel/parser": "^7.28.0",
+                "eval-estree-expression": "^3.0.0"
             },
             "engines": {
                 "node": ">=14"
@@ -6643,6 +7325,7 @@
             "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
             "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
             "license": "ISC",
+            "peer": true,
             "dependencies": {
                 "isexe": "^2.0.0"
             },
@@ -6670,94 +7353,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/wrap-ansi": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-            "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-            "license": "MIT",
-            "dependencies": {
-                "ansi-styles": "^6.1.0",
-                "string-width": "^5.0.1",
-                "strip-ansi": "^7.0.1"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-            }
-        },
-        "node_modules/wrap-ansi-cjs": {
-            "name": "wrap-ansi",
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-            "license": "MIT",
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-            }
-        },
-        "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "license": "MIT"
-        },
-        "node_modules/wrap-ansi-cjs/node_modules/string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "license": "MIT",
-            "dependencies": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/wrap-ansi/node_modules/ansi-styles": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-            "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
         "node_modules/xml-name-validator": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
@@ -6776,15 +7371,19 @@
             "license": "ISC"
         },
         "node_modules/yaml": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz",
-            "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==",
+            "version": "2.8.2",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
+            "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
+            "devOptional": true,
             "license": "ISC",
             "bin": {
                 "yaml": "bin.mjs"
             },
             "engines": {
-                "node": ">= 14"
+                "node": ">= 14.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/eemeli"
             }
         },
         "node_modules/yocto-queue": {
@@ -6801,23 +7400,62 @@
             }
         },
         "node_modules/zod": {
-            "version": "3.24.2",
-            "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz",
-            "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==",
-            "dev": true,
+            "version": "3.25.76",
+            "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
+            "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
             "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/colinhacks"
             }
         },
         "node_modules/zrender": {
-            "version": "5.6.1",
-            "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.6.1.tgz",
-            "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==",
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/zrender/-/zrender-6.0.0.tgz",
+            "integrity": "sha512-41dFXEEXuJpNecuUQq6JlbybmnHaqqpGlbH1yxnA5V9MMP4SbohSVZsJIwz+zdjQXSSlR1Vc34EgH1zxyTDvhg==",
             "license": "BSD-3-Clause",
             "dependencies": {
                 "tslib": "2.3.0"
             }
+        },
+        "resources/js/packages/api": {
+            "name": "@solidtime/api",
+            "version": "0.0.6",
+            "license": "AGPL-3.0",
+            "devDependencies": {
+                "vite-plugin-dts": "^4.0.3"
+            },
+            "peerDependencies": {
+                "@zodios/core": "^10.9.6",
+                "axios": "^1.6.4",
+                "typescript": "^5.5.4",
+                "vite": "^5.4.1 || ^6.0.0 || ^7.0.0",
+                "zod": "^3.23.8"
+            }
+        },
+        "resources/js/packages/ui": {
+            "name": "@solidtime/ui",
+            "version": "0.0.15",
+            "license": "AGPL-3.0",
+            "devDependencies": {
+                "vite-plugin-dts": "^4.0.3"
+            },
+            "peerDependencies": {
+                "@floating-ui/vue": "^1.1.4",
+                "@heroicons/vue": "^2.1.5",
+                "@vitejs/plugin-vue": "^5.1.2 || ^6.0.0",
+                "@vueuse/core": "^12.5.0 || ^14.0.0",
+                "class-variance-authority": "^0.7.1",
+                "clsx": "^2.1.1",
+                "dayjs": "^1.11.13",
+                "parse-duration": "^2.0.1",
+                "reka-ui": "^2.2.0",
+                "tailwind-merge": "^2.5.2",
+                "tailwindcss": "^3.1.0",
+                "typescript": "^5.5.4",
+                "vite": "^5.4.1 || ^6.0.0 || ^7.0.0",
+                "vue": "^3.5.0",
+                "vue-tsc": "^2.2.0 || ^3.0.0"
+            }
         }
     }
 }
diff --git a/package.json b/package.json
index c743fb5c..17a1c0ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,10 @@
 {
     "private": true,
     "type": "module",
+    "workspaces": [
+        "resources/js/packages/ui",
+        "resources/js/packages/api"
+    ],
     "scripts": {
         "dev": "vite",
         "build": "vite build",
@@ -19,27 +23,29 @@
         "@playwright/test": "^1.41.1",
         "@tailwindcss/forms": "^0.5.9",
         "@tailwindcss/typography": "^0.5.15",
-        "@types/chroma-js": "2.4.5",
+        "@types/chroma-js": "^3.1.0",
         "@types/node": "^22.10.10",
-        "@vitejs/plugin-vue": "^5.2.1",
-        "@vue/tsconfig": "^0.5.1",
+        "@vitejs/plugin-vue": "^6.0.3",
+        "@vue/tsconfig": "^0.8.0",
         "autoprefixer": "^10.4.20",
         "axios": "^1.6.4",
         "eslint-plugin-unused-imports": "^4.1.4",
-        "laravel-vite-plugin": "^1.0.0",
+        "laravel-vite-plugin": "^2.1.0",
         "openapi-zod-client": "^1.16.2",
         "postcss": "^8.4.47",
+        "postcss-import": "^15.1.0",
         "postcss-nesting": "^12.1.5",
         "tailwindcss": "^3.4.13",
         "typescript": "^5.7.3",
-        "vite": "^6.0.11",
-        "vite-plugin-checker": "^0.8.0",
+        "vite": "^7.0.0",
+        "vite-plugin-checker": "^0.12.0",
         "vue": "^3.5.0",
-        "vue-tsc": "^2.2.0"
+        "vue-tsc": "^3.0.0"
     },
     "dependencies": {
         "@floating-ui/core": "^1.6.0",
         "@floating-ui/vue": "^1.0.6",
+        "@zodios/core": "^10.9.6",
         "@fullcalendar/core": "^6.1.18",
         "@fullcalendar/daygrid": "^6.1.18",
         "@fullcalendar/interaction": "^6.1.18",
@@ -54,22 +60,23 @@
         "@tanstack/vue-table": "^8.21.2",
         "@vue/eslint-config-prettier": "^10.2.0",
         "@vue/eslint-config-typescript": "^14.3.0",
-        "@vueuse/core": "^12.8.2",
-        "@vueuse/integrations": "^12.5.0",
+        "@vueuse/core": "^14.0.0",
+        "@vueuse/integrations": "^14.0.0",
         "chroma-js": "3.1.2",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
         "dayjs": "^1.11.11",
-        "echarts": "^5.5.0",
-        "focus-trap": "^7.6.0",
+        "echarts": "^6.0.0",
+        "focus-trap": "^8.0.0",
         "lucide-vue-next": "^0.487.0",
         "parse-duration": "^2.0.1",
-        "pinia": "^2.1.7",
+        "pinia": "^3.0.0",
         "radix-vue": "^1.9.6",
         "reka-ui": "^2.7.0",
         "tailwind-merge": "^2.6.0",
         "tailwindcss-animate": "^1.0.7",
-        "vue-echarts": "^7.0.3"
+        "vue-echarts": "^8.0.0",
+        "zod": "^3.23.8"
     },
     "overrides": {
         "vite-plugin-checker": {
diff --git a/resources/js/Components/Common/Project/ProjectTable.vue b/resources/js/Components/Common/Project/ProjectTable.vue
index 0102a42f..d40ce3e3 100644
--- a/resources/js/Components/Common/Project/ProjectTable.vue
+++ b/resources/js/Components/Common/Project/ProjectTable.vue
@@ -125,7 +125,7 @@ const gridTemplate = computed(() => {
         :create-client
         :currency="getOrganizationCurrencyString()"
         :clients="clients"
-        :enable-estimated-time="isAllowedToPerformPremiumAction"></ProjectCreateModal>
+        :enable-estimated-time="isAllowedToPerformPremiumAction()"></ProjectCreateModal>
     <div class="flow-root max-w-[100vw] overflow-x-auto">
         <div class="inline-block min-w-full align-middle">
             <div data-testid="project_table" class="grid min-w-full" :style="gridTemplate">
diff --git a/resources/js/Components/Dashboard/ActivityGraphCard.vue b/resources/js/Components/Dashboard/ActivityGraphCard.vue
index 19ad0471..fbe50dea 100644
--- a/resources/js/Components/Dashboard/ActivityGraphCard.vue
+++ b/resources/js/Components/Dashboard/ActivityGraphCard.vue
@@ -158,7 +158,7 @@ const option = computed(() => {
                     if (dailyHoursTracked?.value) {
                         return (
                             formatDate(
-                                dailyHoursTracked?.value[dataIndex].date,
+                                dailyHoursTracked?.value[dataIndex]?.date ?? '',
                                 organization?.value?.date_format
                             ) +
                             ': ' +
diff --git a/resources/js/Components/Dashboard/LastSevenDaysCard.vue b/resources/js/Components/Dashboard/LastSevenDaysCard.vue
index 7c46c4e4..7ffdb338 100644
--- a/resources/js/Components/Dashboard/LastSevenDaysCard.vue
+++ b/resources/js/Components/Dashboard/LastSevenDaysCard.vue
@@ -23,9 +23,9 @@ const { data: last7Days, isLoading } = useQuery({
     },
     enabled: computed(() => !!organizationId.value),
     placeholderData: Array.from({ length: 7 }, (_, i) => ({
-        date: new Date(Date.now() - i * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
+        date: new Date(Date.now() - i * 24 * 60 * 60 * 1000).toISOString().split('T')[0]!,
         duration: 0,
-        history: Array(8).fill(0),
+        history: Array(8).fill(0) as number[],
     })),
 });
 </script>
diff --git a/resources/js/Components/Dashboard/ThisWeekOverview.vue b/resources/js/Components/Dashboard/ThisWeekOverview.vue
index b6bd4268..6ca2316b 100644
--- a/resources/js/Components/Dashboard/ThisWeekOverview.vue
+++ b/resources/js/Components/Dashboard/ThisWeekOverview.vue
@@ -42,10 +42,10 @@ const weekdays = computed(() => {
     };
     if (dayMapping[getWeekStart()]) {
         const customOrder = [];
-        const startIndex = daysOrder.indexOf(dayMapping[getWeekStart()]);
+        const startIndex = daysOrder.indexOf(dayMapping[getWeekStart()]!);
 
         for (let i = startIndex; i < 7 + startIndex; i++) {
-            customOrder.push(daysOrder[i % daysOrder.length]);
+            customOrder.push(daysOrder[i % daysOrder.length]!);
         }
 
         return customOrder;
diff --git a/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue b/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue
index 770207a5..7e860389 100644
--- a/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue
+++ b/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue
@@ -29,7 +29,7 @@ const photoInput = ref<HTMLInputElement | null>(null);
 
 const updateProfileInformation = () => {
     if (photoInput.value && photoInput.value.files && photoInput.value.files?.length > 0) {
-        form.photo = photoInput.value?.files[0];
+        form.photo = photoInput.value?.files[0] ?? null;
     }
 
     form.post(route('user-profile-information.update'), {
diff --git a/resources/js/Pages/Projects.vue b/resources/js/Pages/Projects.vue
index e808dd18..b91a00b9 100644
--- a/resources/js/Pages/Projects.vue
+++ b/resources/js/Pages/Projects.vue
@@ -137,7 +137,7 @@ const showBillableRate = computed(() => {
             <ProjectCreateModal
                 v-model:show="showCreateProjectModal"
                 :create-project
-                :enable-estimated-time="isAllowedToPerformPremiumAction"
+                :enable-estimated-time="isAllowedToPerformPremiumAction()"
                 :create-client
                 :currency="getOrganizationCurrencyString()"
                 :clients="clients"
diff --git a/resources/js/Pages/SharedReport.vue b/resources/js/Pages/SharedReport.vue
index 8f038456..28adad6d 100644
--- a/resources/js/Pages/SharedReport.vue
+++ b/resources/js/Pages/SharedReport.vue
@@ -37,7 +37,7 @@ onMounted(() => {
     const currentUrl = window.location.href;
     // check if # exists exactly once in the URL
     if (currentUrl.split('#').length === 2) {
-        sharedSecret.value = currentUrl.split('#')[1];
+        sharedSecret.value = currentUrl.split('#')[1] ?? null;
     }
 });
 
@@ -124,9 +124,10 @@ const groupedPieChartData = computed(() => {
             if (entry.description === null) {
                 return {
                     value: entry.seconds,
-                    name: emptyPlaceholder[
-                        aggregatedTableTimeEntries.value?.grouped_type ?? 'project'
-                    ],
+                    name:
+                        emptyPlaceholder[
+                            aggregatedTableTimeEntries.value?.grouped_type ?? 'project'
+                        ] ?? '',
                     color: '#CCCCCC',
                 };
             }
@@ -146,14 +147,17 @@ const tableData = computed(() => {
             cost: entry.cost,
             description:
                 entry.description ??
-                emptyPlaceholder[aggregatedTableTimeEntries.value?.grouped_type ?? 'project'],
+                emptyPlaceholder[aggregatedTableTimeEntries.value?.grouped_type ?? 'project'] ??
+                '',
             grouped_data:
                 entry.grouped_data?.map((el) => {
                     return {
                         seconds: el.seconds,
                         cost: el.cost,
                         description:
-                            el.description ?? emptyPlaceholder[entry.grouped_type ?? 'project'],
+                            el.description ??
+                            emptyPlaceholder[entry.grouped_type ?? 'project'] ??
+                            '',
                     };
                 }) ?? [],
         };
diff --git a/resources/js/Pages/Teams/Partials/ImportData.vue b/resources/js/Pages/Teams/Partials/ImportData.vue
index 24c0e1e3..52b20cbc 100644
--- a/resources/js/Pages/Teams/Partials/ImportData.vue
+++ b/resources/js/Pages/Teams/Partials/ImportData.vue
@@ -46,8 +46,8 @@ async function importData() {
         addNotification('error', 'Please select the CSV or ZIP file that you want to import');
         return;
     }
-    const rawBase64String = await toBase64(files.value[0]);
-    const base64String = rawBase64String.split(';')[1].replace('base64,', '') as string;
+    const rawBase64String = await toBase64(files.value[0]!);
+    const base64String = rawBase64String.split(';')[1]!.replace('base64,', '') as string;
     const organizationId = getCurrentOrganizationId();
     if (organizationId !== null) {
         const { handleApiRequestNotifications } = useNotificationsStore();
diff --git a/resources/js/packages/api/package-lock.json b/resources/js/packages/api/package-lock.json
deleted file mode 100644
index df2d3a3a..00000000
--- a/resources/js/packages/api/package-lock.json
+++ /dev/null
@@ -1,2164 +0,0 @@
-{
-    "name": "@solidtime/api",
-    "version": "0.0.6",
-    "lockfileVersion": 3,
-    "requires": true,
-    "packages": {
-        "": {
-            "name": "@solidtime/api",
-            "version": "0.0.6",
-            "license": "AGPL-3.0",
-            "dependencies": {
-                "@zodios/core": "^10.9.6",
-                "axios": "^1.13.2",
-                "typescript": "^5.5.4",
-                "zod": "^3.23.8"
-            },
-            "devDependencies": {
-                "vite": "^5.4.2",
-                "vite-plugin-dts": "^4.0.3"
-            }
-        },
-        "node_modules/@babel/helper-string-parser": {
-            "version": "7.24.8",
-            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
-            "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-            "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/parser": {
-            "version": "7.25.4",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.4.tgz",
-            "integrity": "sha512-nq+eWrOgdtu3jG5Os4TQP3x3cLA8hR8TvJNjD8vnPa20WGycimcparWnLK4jJhElTK6SDyuJo1weMKO/5LpmLA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/types": "^7.25.4"
-            },
-            "bin": {
-                "parser": "bin/babel-parser.js"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/@babel/types": {
-            "version": "7.25.4",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.4.tgz",
-            "integrity": "sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-string-parser": "^7.24.8",
-                "@babel/helper-validator-identifier": "^7.24.7",
-                "to-fast-properties": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-            "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-            "cpu": [
-                "ppc64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "aix"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/android-arm": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-            "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "android"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/android-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-            "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "android"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/android-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-            "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "android"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-            "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/darwin-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-            "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-            "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "freebsd"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-            "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "freebsd"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-arm": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-            "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-            "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-ia32": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-            "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-            "cpu": [
-                "ia32"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-loong64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-            "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-            "cpu": [
-                "loong64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-            "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-            "cpu": [
-                "mips64el"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-            "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-            "cpu": [
-                "ppc64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-            "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-            "cpu": [
-                "riscv64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-s390x": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-            "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-            "cpu": [
-                "s390x"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-            "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-            "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "netbsd"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-            "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "openbsd"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/sunos-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-            "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "sunos"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/win32-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-            "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/win32-ia32": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-            "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-            "cpu": [
-                "ia32"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/win32-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-            "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-            "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@microsoft/api-extractor": {
-            "version": "7.47.4",
-            "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.47.4.tgz",
-            "integrity": "sha512-HKm+P4VNzWwvq1Ey+Jfhhj/3MjsD+ka2hbt8L5AcRM95lu1MFOYnz3XlU7Gr79Q/ZhOb7W/imAKeYrOI0bFydg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@microsoft/api-extractor-model": "7.29.4",
-                "@microsoft/tsdoc": "~0.15.0",
-                "@microsoft/tsdoc-config": "~0.17.0",
-                "@rushstack/node-core-library": "5.5.1",
-                "@rushstack/rig-package": "0.5.3",
-                "@rushstack/terminal": "0.13.3",
-                "@rushstack/ts-command-line": "4.22.3",
-                "lodash": "~4.17.15",
-                "minimatch": "~3.0.3",
-                "resolve": "~1.22.1",
-                "semver": "~7.5.4",
-                "source-map": "~0.6.1",
-                "typescript": "5.4.2"
-            },
-            "bin": {
-                "api-extractor": "bin/api-extractor"
-            }
-        },
-        "node_modules/@microsoft/api-extractor-model": {
-            "version": "7.29.4",
-            "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.29.4.tgz",
-            "integrity": "sha512-LHOMxmT8/tU1IiiiHOdHFF83Qsi+V8d0kLfscG4EvQE9cafiR8blOYr8SfkQKWB1wgEilQgXJX3MIA4vetDLZw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@microsoft/tsdoc": "~0.15.0",
-                "@microsoft/tsdoc-config": "~0.17.0",
-                "@rushstack/node-core-library": "5.5.1"
-            }
-        },
-        "node_modules/@microsoft/api-extractor/node_modules/typescript": {
-            "version": "5.4.2",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz",
-            "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "bin": {
-                "tsc": "bin/tsc",
-                "tsserver": "bin/tsserver"
-            },
-            "engines": {
-                "node": ">=14.17"
-            }
-        },
-        "node_modules/@microsoft/tsdoc": {
-            "version": "0.15.0",
-            "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.15.0.tgz",
-            "integrity": "sha512-HZpPoABogPvjeJOdzCOSJsXeL/SMCBgBZMVC3X3d7YYp2gf31MfxhUoYUNwf1ERPJOnQc0wkFn9trqI6ZEdZuA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@microsoft/tsdoc-config": {
-            "version": "0.17.0",
-            "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.17.0.tgz",
-            "integrity": "sha512-v/EYRXnCAIHxOHW+Plb6OWuUoMotxTN0GLatnpOb1xq0KuTNw/WI3pamJx/UbsoJP5k9MCw1QxvvhPcF9pH3Zg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@microsoft/tsdoc": "0.15.0",
-                "ajv": "~8.12.0",
-                "jju": "~1.4.0",
-                "resolve": "~1.22.2"
-            }
-        },
-        "node_modules/@rollup/pluginutils": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
-            "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/estree": "^1.0.0",
-                "estree-walker": "^2.0.2",
-                "picomatch": "^2.3.1"
-            },
-            "engines": {
-                "node": ">=14.0.0"
-            },
-            "peerDependencies": {
-                "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
-            },
-            "peerDependenciesMeta": {
-                "rollup": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.0.tgz",
-            "integrity": "sha512-WTWD8PfoSAJ+qL87lE7votj3syLavxunWhzCnx3XFxFiI/BA/r3X7MUM8dVrH8rb2r4AiO8jJsr3ZjdaftmnfA==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "android"
-            ]
-        },
-        "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.0.tgz",
-            "integrity": "sha512-a1sR2zSK1B4eYkiZu17ZUZhmUQcKjk2/j9Me2IDjk1GHW7LB5Z35LEzj9iJch6gtUfsnvZs1ZNyDW2oZSThrkA==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "android"
-            ]
-        },
-        "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.0.tgz",
-            "integrity": "sha512-zOnKWLgDld/svhKO5PD9ozmL6roy5OQ5T4ThvdYZLpiOhEGY+dp2NwUmxK0Ld91LrbjrvtNAE0ERBwjqhZTRAA==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ]
-        },
-        "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.0.tgz",
-            "integrity": "sha512-7doS8br0xAkg48SKE2QNtMSFPFUlRdw9+votl27MvT46vo44ATBmdZdGysOevNELmZlfd+NEa0UYOA8f01WSrg==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.0.tgz",
-            "integrity": "sha512-pWJsfQjNWNGsoCq53KjMtwdJDmh/6NubwQcz52aEwLEuvx08bzcy6tOUuawAOncPnxz/3siRtd8hiQ32G1y8VA==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.0.tgz",
-            "integrity": "sha512-efRIANsz3UHZrnZXuEvxS9LoCOWMGD1rweciD6uJQIx2myN3a8Im1FafZBzh7zk1RJ6oKcR16dU3UPldaKd83w==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.0.tgz",
-            "integrity": "sha512-ZrPhydkTVhyeGTW94WJ8pnl1uroqVHM3j3hjdquwAcWnmivjAwOYjTEAuEDeJvGX7xv3Z9GAvrBkEzCgHq9U1w==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.0.tgz",
-            "integrity": "sha512-cfaupqd+UEFeURmqNP2eEvXqgbSox/LHOyN9/d2pSdV8xTrjdg3NgOFJCtc1vQ/jEke1qD0IejbBfxleBPHnPw==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.0.tgz",
-            "integrity": "sha512-ZKPan1/RvAhrUylwBXC9t7B2hXdpb/ufeu22pG2psV7RN8roOfGurEghw1ySmX/CmDDHNTDDjY3lo9hRlgtaHg==",
-            "cpu": [
-                "ppc64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.0.tgz",
-            "integrity": "sha512-H1eRaCwd5E8eS8leiS+o/NqMdljkcb1d6r2h4fKSsCXQilLKArq6WS7XBLDu80Yz+nMqHVFDquwcVrQmGr28rg==",
-            "cpu": [
-                "riscv64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.0.tgz",
-            "integrity": "sha512-zJ4hA+3b5tu8u7L58CCSI0A9N1vkfwPhWd/puGXwtZlsB5bTkwDNW/+JCU84+3QYmKpLi+XvHdmrlwUwDA6kqw==",
-            "cpu": [
-                "s390x"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.0.tgz",
-            "integrity": "sha512-e2hrvElFIh6kW/UNBQK/kzqMNY5mO+67YtEh9OA65RM5IJXYTWiXjX6fjIiPaqOkBthYF1EqgiZ6OXKcQsM0hg==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.0.tgz",
-            "integrity": "sha512-1vvmgDdUSebVGXWX2lIcgRebqfQSff0hMEkLJyakQ9JQUbLDkEaMsPTLOmyccyC6IJ/l3FZuJbmrBw/u0A0uCQ==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.0.tgz",
-            "integrity": "sha512-s5oFkZ/hFcrlAyBTONFY1TWndfyre1wOMwU+6KCpm/iatybvrRgmZVM+vCFwxmC5ZhdlgfE0N4XorsDpi7/4XQ==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ]
-        },
-        "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.0.tgz",
-            "integrity": "sha512-G9+TEqRnAA6nbpqyUqgTiopmnfgnMkR3kMukFBDsiyy23LZvUCpiUwjTRx6ezYCjJODXrh52rBR9oXvm+Fp5wg==",
-            "cpu": [
-                "ia32"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ]
-        },
-        "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.0.tgz",
-            "integrity": "sha512-2jsCDZwtQvRhejHLfZ1JY6w6kEuEtfF9nzYsZxzSlNVKDX+DpsDJ+Rbjkm74nvg2rdx0gwBS+IMdvwJuq3S9pQ==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ]
-        },
-        "node_modules/@rushstack/node-core-library": {
-            "version": "5.5.1",
-            "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.5.1.tgz",
-            "integrity": "sha512-ZutW56qIzH8xIOlfyaLQJFx+8IBqdbVCZdnj+XT1MorQ1JqqxHse8vbCpEM+2MjsrqcbxcgDIbfggB1ZSQ2A3g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ajv": "~8.13.0",
-                "ajv-draft-04": "~1.0.0",
-                "ajv-formats": "~3.0.1",
-                "fs-extra": "~7.0.1",
-                "import-lazy": "~4.0.0",
-                "jju": "~1.4.0",
-                "resolve": "~1.22.1",
-                "semver": "~7.5.4"
-            },
-            "peerDependencies": {
-                "@types/node": "*"
-            },
-            "peerDependenciesMeta": {
-                "@types/node": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@rushstack/node-core-library/node_modules/ajv": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz",
-            "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.4.1"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/@rushstack/rig-package": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.5.3.tgz",
-            "integrity": "sha512-olzSSjYrvCNxUFZowevC3uz8gvKr3WTpHQ7BkpjtRpA3wK+T0ybep/SRUMfr195gBzJm5gaXw0ZMgjIyHqJUow==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "resolve": "~1.22.1",
-                "strip-json-comments": "~3.1.1"
-            }
-        },
-        "node_modules/@rushstack/terminal": {
-            "version": "0.13.3",
-            "resolved": "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.13.3.tgz",
-            "integrity": "sha512-fc3zjXOw8E0pXS5t9vTiIPx9gHA0fIdTXsu9mT4WbH+P3mYvnrX0iAQ5a6NvyK1+CqYWBTw/wVNx7SDJkI+WYQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@rushstack/node-core-library": "5.5.1",
-                "supports-color": "~8.1.1"
-            },
-            "peerDependencies": {
-                "@types/node": "*"
-            },
-            "peerDependenciesMeta": {
-                "@types/node": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@rushstack/ts-command-line": {
-            "version": "4.22.3",
-            "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.22.3.tgz",
-            "integrity": "sha512-edMpWB3QhFFZ4KtSzS8WNjBgR4PXPPOVrOHMbb7kNpmQ1UFS9HdVtjCXg1H5fG+xYAbeE+TMPcVPUyX2p84STA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@rushstack/terminal": "0.13.3",
-                "@types/argparse": "1.0.38",
-                "argparse": "~1.0.9",
-                "string-argv": "~0.3.1"
-            }
-        },
-        "node_modules/@types/argparse": {
-            "version": "1.0.38",
-            "resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz",
-            "integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@types/estree": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-            "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@volar/language-core": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.0.tgz",
-            "integrity": "sha512-FTla+khE+sYK0qJP+6hwPAAUwiNHVMph4RUXpxf/FIPKUP61NFrVZorml4mjFShnueR2y9/j8/vnh09YwVdH7A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@volar/source-map": "2.4.0"
-            }
-        },
-        "node_modules/@volar/source-map": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0.tgz",
-            "integrity": "sha512-2ceY8/NEZvN6F44TXw2qRP6AQsvCYhV2bxaBPWxV9HqIfkbRydSksTFObCF1DBDNBfKiZTS8G/4vqV6cvjdOIQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@volar/typescript": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.0.tgz",
-            "integrity": "sha512-9zx3lQWgHmVd+JRRAHUSRiEhe4TlzL7U7e6ulWXOxHH/WNYxzKwCvZD7WYWEZFdw4dHfTD9vUR0yPQO6GilCaQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@volar/language-core": "2.4.0",
-                "path-browserify": "^1.0.1",
-                "vscode-uri": "^3.0.8"
-            }
-        },
-        "node_modules/@vue/compiler-core": {
-            "version": "3.4.38",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.38.tgz",
-            "integrity": "sha512-8IQOTCWnLFqfHzOGm9+P8OPSEDukgg3Huc92qSG49if/xI2SAwLHQO2qaPQbjCWPBcQoO1WYfXfTACUrWV3c5A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/parser": "^7.24.7",
-                "@vue/shared": "3.4.38",
-                "entities": "^4.5.0",
-                "estree-walker": "^2.0.2",
-                "source-map-js": "^1.2.0"
-            }
-        },
-        "node_modules/@vue/compiler-dom": {
-            "version": "3.4.38",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.38.tgz",
-            "integrity": "sha512-Osc/c7ABsHXTsETLgykcOwIxFktHfGSUDkb05V61rocEfsFDcjDLH/IHJSNJP+/Sv9KeN2Lx1V6McZzlSb9EhQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@vue/compiler-core": "3.4.38",
-                "@vue/shared": "3.4.38"
-            }
-        },
-        "node_modules/@vue/compiler-vue2": {
-            "version": "2.7.16",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz",
-            "integrity": "sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "de-indent": "^1.0.2",
-                "he": "^1.2.0"
-            }
-        },
-        "node_modules/@vue/language-core": {
-            "version": "2.0.29",
-            "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.29.tgz",
-            "integrity": "sha512-o2qz9JPjhdoVj8D2+9bDXbaI4q2uZTHQA/dbyZT4Bj1FR9viZxDJnLcKVHfxdn6wsOzRgpqIzJEEmSSvgMvDTQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@volar/language-core": "~2.4.0-alpha.18",
-                "@vue/compiler-dom": "^3.4.0",
-                "@vue/compiler-vue2": "^2.7.16",
-                "@vue/shared": "^3.4.0",
-                "computeds": "^0.0.1",
-                "minimatch": "^9.0.3",
-                "muggle-string": "^0.4.1",
-                "path-browserify": "^1.0.1"
-            },
-            "peerDependencies": {
-                "typescript": "*"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@vue/language-core/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^1.0.0"
-            }
-        },
-        "node_modules/@vue/language-core/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/@vue/shared": {
-            "version": "3.4.38",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.38.tgz",
-            "integrity": "sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@zodios/core": {
-            "version": "10.9.6",
-            "resolved": "https://registry.npmjs.org/@zodios/core/-/core-10.9.6.tgz",
-            "integrity": "sha512-aH4rOdb3AcezN7ws8vDgBfGboZMk2JGGzEq/DtW65MhnRxyTGRuLJRWVQ/2KxDgWvV2F5oTkAS+5pnjKbl0n+A==",
-            "license": "MIT",
-            "peerDependencies": {
-                "axios": "^0.x || ^1.0.0",
-                "zod": "^3.x"
-            }
-        },
-        "node_modules/acorn": {
-            "version": "8.12.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-            "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
-            "dev": true,
-            "license": "MIT",
-            "bin": {
-                "acorn": "bin/acorn"
-            },
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/ajv": {
-            "version": "8.12.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.2.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/ajv-draft-04": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz",
-            "integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==",
-            "dev": true,
-            "license": "MIT",
-            "peerDependencies": {
-                "ajv": "^8.5.0"
-            },
-            "peerDependenciesMeta": {
-                "ajv": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/ajv-formats": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
-            "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ajv": "^8.0.0"
-            },
-            "peerDependencies": {
-                "ajv": "^8.0.0"
-            },
-            "peerDependenciesMeta": {
-                "ajv": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "sprintf-js": "~1.0.2"
-            }
-        },
-        "node_modules/asynckit": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-            "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-            "license": "MIT"
-        },
-        "node_modules/axios": {
-            "version": "1.13.2",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz",
-            "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
-            "license": "MIT",
-            "dependencies": {
-                "follow-redirects": "^1.15.6",
-                "form-data": "^4.0.4",
-                "proxy-from-env": "^1.1.0"
-            }
-        },
-        "node_modules/balanced-match": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-            }
-        },
-        "node_modules/call-bind-apply-helpers": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-            "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
-            "license": "MIT",
-            "dependencies": {
-                "es-errors": "^1.3.0",
-                "function-bind": "^1.1.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/combined-stream": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-            "license": "MIT",
-            "dependencies": {
-                "delayed-stream": "~1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
-        "node_modules/compare-versions": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz",
-            "integrity": "sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/computeds": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/computeds/-/computeds-0.0.1.tgz",
-            "integrity": "sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/concat-map": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/confbox": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz",
-            "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/de-indent": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-            "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/debug": {
-            "version": "4.3.6",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-            "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ms": "2.1.2"
-            },
-            "engines": {
-                "node": ">=6.0"
-            },
-            "peerDependenciesMeta": {
-                "supports-color": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/delayed-stream": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/dunder-proto": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-            "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-            "license": "MIT",
-            "dependencies": {
-                "call-bind-apply-helpers": "^1.0.1",
-                "es-errors": "^1.3.0",
-                "gopd": "^1.2.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/entities": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-            "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "engines": {
-                "node": ">=0.12"
-            },
-            "funding": {
-                "url": "https://github.com/fb55/entities?sponsor=1"
-            }
-        },
-        "node_modules/es-define-property": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-            "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/es-errors": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-            "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/es-object-atoms": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-            "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
-            "license": "MIT",
-            "dependencies": {
-                "es-errors": "^1.3.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/es-set-tostringtag": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-            "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-            "license": "MIT",
-            "dependencies": {
-                "es-errors": "^1.3.0",
-                "get-intrinsic": "^1.2.6",
-                "has-tostringtag": "^1.0.2",
-                "hasown": "^2.0.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/esbuild": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-            "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-            "dev": true,
-            "hasInstallScript": true,
-            "license": "MIT",
-            "bin": {
-                "esbuild": "bin/esbuild"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.21.5",
-                "@esbuild/android-arm": "0.21.5",
-                "@esbuild/android-arm64": "0.21.5",
-                "@esbuild/android-x64": "0.21.5",
-                "@esbuild/darwin-arm64": "0.21.5",
-                "@esbuild/darwin-x64": "0.21.5",
-                "@esbuild/freebsd-arm64": "0.21.5",
-                "@esbuild/freebsd-x64": "0.21.5",
-                "@esbuild/linux-arm": "0.21.5",
-                "@esbuild/linux-arm64": "0.21.5",
-                "@esbuild/linux-ia32": "0.21.5",
-                "@esbuild/linux-loong64": "0.21.5",
-                "@esbuild/linux-mips64el": "0.21.5",
-                "@esbuild/linux-ppc64": "0.21.5",
-                "@esbuild/linux-riscv64": "0.21.5",
-                "@esbuild/linux-s390x": "0.21.5",
-                "@esbuild/linux-x64": "0.21.5",
-                "@esbuild/netbsd-x64": "0.21.5",
-                "@esbuild/openbsd-x64": "0.21.5",
-                "@esbuild/sunos-x64": "0.21.5",
-                "@esbuild/win32-arm64": "0.21.5",
-                "@esbuild/win32-ia32": "0.21.5",
-                "@esbuild/win32-x64": "0.21.5"
-            }
-        },
-        "node_modules/estree-walker": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/fast-deep-equal": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/follow-redirects": {
-            "version": "1.15.6",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-            "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://github.com/sponsors/RubenVerborgh"
-                }
-            ],
-            "license": "MIT",
-            "engines": {
-                "node": ">=4.0"
-            },
-            "peerDependenciesMeta": {
-                "debug": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/form-data": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-            "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
-            "license": "MIT",
-            "dependencies": {
-                "asynckit": "^0.4.0",
-                "combined-stream": "^1.0.8",
-                "es-set-tostringtag": "^2.1.0",
-                "hasown": "^2.0.2",
-                "mime-types": "^2.1.12"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/fs-extra": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-            "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "graceful-fs": "^4.1.2",
-                "jsonfile": "^4.0.0",
-                "universalify": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=6 <7 || >=8"
-            }
-        },
-        "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.2",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-            "license": "MIT",
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/get-intrinsic": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-            "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
-            "license": "MIT",
-            "dependencies": {
-                "call-bind-apply-helpers": "^1.0.2",
-                "es-define-property": "^1.0.1",
-                "es-errors": "^1.3.0",
-                "es-object-atoms": "^1.1.1",
-                "function-bind": "^1.1.2",
-                "get-proto": "^1.0.1",
-                "gopd": "^1.2.0",
-                "has-symbols": "^1.1.0",
-                "hasown": "^2.0.2",
-                "math-intrinsics": "^1.1.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/get-proto": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-            "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-            "license": "MIT",
-            "dependencies": {
-                "dunder-proto": "^1.0.1",
-                "es-object-atoms": "^1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/gopd": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-            "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/graceful-fs": {
-            "version": "4.2.11",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/has-symbols": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-            "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/has-tostringtag": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-            "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-            "license": "MIT",
-            "dependencies": {
-                "has-symbols": "^1.0.3"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/hasown": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-            "license": "MIT",
-            "dependencies": {
-                "function-bind": "^1.1.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/he": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-            "dev": true,
-            "license": "MIT",
-            "bin": {
-                "he": "bin/he"
-            }
-        },
-        "node_modules/import-lazy": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-            "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-core-module": {
-            "version": "2.15.1",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
-            "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "hasown": "^2.0.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/jju": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
-            "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/jsonfile": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-            "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-            "dev": true,
-            "license": "MIT",
-            "optionalDependencies": {
-                "graceful-fs": "^4.1.6"
-            }
-        },
-        "node_modules/kolorist": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/kolorist/-/kolorist-1.8.0.tgz",
-            "integrity": "sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/local-pkg": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz",
-            "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "mlly": "^1.4.2",
-                "pkg-types": "^1.0.3"
-            },
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            }
-        },
-        "node_modules/lodash": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/magic-string": {
-            "version": "0.30.11",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
-            "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jridgewell/sourcemap-codec": "^1.5.0"
-            }
-        },
-        "node_modules/math-intrinsics": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-            "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/mime-db": {
-            "version": "1.52.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.6"
-            }
-        },
-        "node_modules/mime-types": {
-            "version": "2.1.35",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-            "license": "MIT",
-            "dependencies": {
-                "mime-db": "1.52.0"
-            },
-            "engines": {
-                "node": ">= 0.6"
-            }
-        },
-        "node_modules/minimatch": {
-            "version": "3.0.8",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
-            "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^1.1.7"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/mlly": {
-            "version": "1.7.1",
-            "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.1.tgz",
-            "integrity": "sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "acorn": "^8.11.3",
-                "pathe": "^1.1.2",
-                "pkg-types": "^1.1.1",
-                "ufo": "^1.5.3"
-            }
-        },
-        "node_modules/ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/muggle-string": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz",
-            "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/nanoid": {
-            "version": "3.3.7",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-            "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "bin": {
-                "nanoid": "bin/nanoid.cjs"
-            },
-            "engines": {
-                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-            }
-        },
-        "node_modules/path-browserify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-            "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/path-parse": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/pathe": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
-            "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/picocolors": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-            "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/picomatch": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8.6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/jonschlinkert"
-            }
-        },
-        "node_modules/pkg-types": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.0.tgz",
-            "integrity": "sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "confbox": "^0.1.7",
-                "mlly": "^1.7.1",
-                "pathe": "^1.1.2"
-            }
-        },
-        "node_modules/postcss": {
-            "version": "8.4.41",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
-            "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/postcss/"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/postcss"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "nanoid": "^3.3.7",
-                "picocolors": "^1.0.1",
-                "source-map-js": "^1.2.0"
-            },
-            "engines": {
-                "node": "^10 || ^12 || >=14"
-            }
-        },
-        "node_modules/proxy-from-env": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-            "license": "MIT"
-        },
-        "node_modules/punycode": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-            "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/require-from-string": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/resolve": {
-            "version": "1.22.8",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-            "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "is-core-module": "^2.13.0",
-                "path-parse": "^1.0.7",
-                "supports-preserve-symlinks-flag": "^1.0.0"
-            },
-            "bin": {
-                "resolve": "bin/resolve"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/rollup": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.0.tgz",
-            "integrity": "sha512-vo+S/lfA2lMS7rZ2Qoubi6I5hwZwzXeUIctILZLbHI+laNtvhhOIon2S1JksA5UEDQ7l3vberd0fxK44lTYjbQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/estree": "1.0.5"
-            },
-            "bin": {
-                "rollup": "dist/bin/rollup"
-            },
-            "engines": {
-                "node": ">=18.0.0",
-                "npm": ">=8.0.0"
-            },
-            "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.21.0",
-                "@rollup/rollup-android-arm64": "4.21.0",
-                "@rollup/rollup-darwin-arm64": "4.21.0",
-                "@rollup/rollup-darwin-x64": "4.21.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.21.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.21.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.21.0",
-                "@rollup/rollup-linux-arm64-musl": "4.21.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.21.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.21.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.21.0",
-                "@rollup/rollup-linux-x64-gnu": "4.21.0",
-                "@rollup/rollup-linux-x64-musl": "4.21.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.21.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.21.0",
-                "@rollup/rollup-win32-x64-msvc": "4.21.0",
-                "fsevents": "~2.3.2"
-            }
-        },
-        "node_modules/semver": {
-            "version": "7.5.4",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
-            "bin": {
-                "semver": "bin/semver.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/source-map-js": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-            "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/sprintf-js": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-            "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-            "dev": true,
-            "license": "BSD-3-Clause"
-        },
-        "node_modules/string-argv": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
-            "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.6.19"
-            }
-        },
-        "node_modules/strip-json-comments": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/supports-color": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/supports-color?sponsor=1"
-            }
-        },
-        "node_modules/supports-preserve-symlinks-flag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/to-fast-properties": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-            "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/typescript": {
-            "version": "5.5.4",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-            "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
-            "license": "Apache-2.0",
-            "bin": {
-                "tsc": "bin/tsc",
-                "tsserver": "bin/tsserver"
-            },
-            "engines": {
-                "node": ">=14.17"
-            }
-        },
-        "node_modules/ufo": {
-            "version": "1.5.4",
-            "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.4.tgz",
-            "integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/universalify": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-            "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 4.0.0"
-            }
-        },
-        "node_modules/uri-js": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "dependencies": {
-                "punycode": "^2.1.0"
-            }
-        },
-        "node_modules/vite": {
-            "version": "5.4.2",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.2.tgz",
-            "integrity": "sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "esbuild": "^0.21.3",
-                "postcss": "^8.4.41",
-                "rollup": "^4.20.0"
-            },
-            "bin": {
-                "vite": "bin/vite.js"
-            },
-            "engines": {
-                "node": "^18.0.0 || >=20.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/vitejs/vite?sponsor=1"
-            },
-            "optionalDependencies": {
-                "fsevents": "~2.3.3"
-            },
-            "peerDependencies": {
-                "@types/node": "^18.0.0 || >=20.0.0",
-                "less": "*",
-                "lightningcss": "^1.21.0",
-                "sass": "*",
-                "sass-embedded": "*",
-                "stylus": "*",
-                "sugarss": "*",
-                "terser": "^5.4.0"
-            },
-            "peerDependenciesMeta": {
-                "@types/node": {
-                    "optional": true
-                },
-                "less": {
-                    "optional": true
-                },
-                "lightningcss": {
-                    "optional": true
-                },
-                "sass": {
-                    "optional": true
-                },
-                "sass-embedded": {
-                    "optional": true
-                },
-                "stylus": {
-                    "optional": true
-                },
-                "sugarss": {
-                    "optional": true
-                },
-                "terser": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/vite-plugin-dts": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/vite-plugin-dts/-/vite-plugin-dts-4.0.3.tgz",
-            "integrity": "sha512-+xnTsaONwU2kV6zhRjtbRJSGN41uFR/whqmcb4k4fftLFDJElxthp0PP5Fq8gMeM9ytWMt1yk5gGgekLREWYQQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@microsoft/api-extractor": "7.47.4",
-                "@rollup/pluginutils": "^5.1.0",
-                "@volar/typescript": "^2.3.4",
-                "@vue/language-core": "2.0.29",
-                "compare-versions": "^6.1.1",
-                "debug": "^4.3.6",
-                "kolorist": "^1.8.0",
-                "local-pkg": "^0.5.0",
-                "magic-string": "^0.30.11",
-                "vue-tsc": "2.0.29"
-            },
-            "engines": {
-                "node": "^14.18.0 || >=16.0.0"
-            },
-            "peerDependencies": {
-                "typescript": "*",
-                "vite": "*"
-            },
-            "peerDependenciesMeta": {
-                "vite": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/vscode-uri": {
-            "version": "3.0.8",
-            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
-            "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/vue-tsc": {
-            "version": "2.0.29",
-            "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.0.29.tgz",
-            "integrity": "sha512-MHhsfyxO3mYShZCGYNziSbc63x7cQ5g9kvijV7dRe1TTXBRLxXyL0FnXWpUF1xII2mJ86mwYpYsUmMwkmerq7Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@volar/typescript": "~2.4.0-alpha.18",
-                "@vue/language-core": "2.0.29",
-                "semver": "^7.5.4"
-            },
-            "bin": {
-                "vue-tsc": "bin/vue-tsc.js"
-            },
-            "peerDependencies": {
-                "typescript": ">=5.0.0"
-            }
-        },
-        "node_modules/yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/zod": {
-            "version": "3.23.8",
-            "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
-            "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
-            "license": "MIT",
-            "funding": {
-                "url": "https://github.com/sponsors/colinhacks"
-            }
-        }
-    }
-}
diff --git a/resources/js/packages/api/package.json b/resources/js/packages/api/package.json
index 7c25c473..67125c37 100644
--- a/resources/js/packages/api/package.json
+++ b/resources/js/packages/api/package.json
@@ -11,7 +11,7 @@
         "directory": "resources/js/packages/api"
     },
     "scripts": {
-        "build": "npx vite build",
+        "build": "vite build",
         "test": "echo \"Error: no test specified\" && exit 1"
     },
     "files": [
@@ -27,14 +27,14 @@
     "type": "module",
     "author": "solidtime",
     "license": "AGPL-3.0",
-    "dependencies": {
+    "devDependencies": {
+        "vite-plugin-dts": "^4.0.3"
+    },
+    "peerDependencies": {
         "@zodios/core": "^10.9.6",
-        "axios": "^1.13.2",
+        "axios": "^1.6.4",
         "typescript": "^5.5.4",
+        "vite": "^5.4.1 || ^6.0.0 || ^7.0.0",
         "zod": "^3.23.8"
-    },
-    "devDependencies": {
-        "vite": "^5.4.2",
-        "vite-plugin-dts": "^4.0.3"
     }
 }
diff --git a/resources/js/packages/ui/package-lock.json b/resources/js/packages/ui/package-lock.json
deleted file mode 100644
index 1412d51b..00000000
--- a/resources/js/packages/ui/package-lock.json
+++ /dev/null
@@ -1,3925 +0,0 @@
-{
-    "name": "@solidtime/ui",
-    "version": "0.0.15",
-    "lockfileVersion": 3,
-    "requires": true,
-    "packages": {
-        "": {
-            "name": "@solidtime/ui",
-            "version": "0.0.15",
-            "license": "AGPL-3.0",
-            "devDependencies": {
-                "@types/node": "^22.4.1",
-                "@vitejs/plugin-vue": "^5.1.2",
-                "@vue/tsconfig": "^0.5.1",
-                "autoprefixer": "^10.4.20",
-                "postcss": "^8.4.14",
-                "postcss-import": "^15.1.0",
-                "postcss-nesting": "^12.1.0",
-                "typescript": "^5.5.4",
-                "vite": "^5.4.1",
-                "vite-plugin-dts": "^4.0.3"
-            },
-            "peerDependencies": {
-                "@floating-ui/vue": "^1.1.4",
-                "@heroicons/vue": "^2.1.5",
-                "@vueuse/core": "^12.5.0",
-                "@zodios/core": "^10.9.6",
-                "class-variance-authority": "^0.7.1",
-                "clsx": "^2.1.1",
-                "dayjs": "^1.11.13",
-                "parse-duration": "^2.0.1",
-                "reka-ui": "^2.2.0",
-                "tailwind-merge": "^2.5.2",
-                "tailwindcss": "^3.1.0",
-                "vue": "^3.5.0",
-                "vue-tsc": "^2.2.0"
-            }
-        },
-        "node_modules/@alloc/quick-lru": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
-            "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/@babel/helper-string-parser": {
-            "version": "7.27.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-            "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.28.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
-            "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/parser": {
-            "version": "7.28.5",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
-            "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
-            "license": "MIT",
-            "dependencies": {
-                "@babel/types": "^7.28.5"
-            },
-            "bin": {
-                "parser": "bin/babel-parser.js"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/@babel/types": {
-            "version": "7.28.5",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
-            "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-string-parser": "^7.27.1",
-                "@babel/helper-validator-identifier": "^7.28.5"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@csstools/selector-resolve-nested": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-1.1.0.tgz",
-            "integrity": "sha512-uWvSaeRcHyeNenKg8tp17EVDRkpflmdyvbE0DHo6D/GdBb6PDnCYYU6gRpXhtICMGMcahQmj2zGxwFM/WC8hCg==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/csstools"
-                },
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/csstools"
-                }
-            ],
-            "license": "MIT-0",
-            "engines": {
-                "node": "^14 || ^16 || >=18"
-            },
-            "peerDependencies": {
-                "postcss-selector-parser": "^6.0.13"
-            }
-        },
-        "node_modules/@csstools/selector-specificity": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz",
-            "integrity": "sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/csstools"
-                },
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/csstools"
-                }
-            ],
-            "license": "MIT-0",
-            "engines": {
-                "node": "^14 || ^16 || >=18"
-            },
-            "peerDependencies": {
-                "postcss-selector-parser": "^6.0.13"
-            }
-        },
-        "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-            "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-            "cpu": [
-                "ppc64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "aix"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/android-arm": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-            "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "android"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/android-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-            "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "android"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/android-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-            "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "android"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-            "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/darwin-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-            "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-            "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "freebsd"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-            "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "freebsd"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-arm": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-            "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-            "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-ia32": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-            "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-            "cpu": [
-                "ia32"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-loong64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-            "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-            "cpu": [
-                "loong64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-            "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-            "cpu": [
-                "mips64el"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-            "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-            "cpu": [
-                "ppc64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-            "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-            "cpu": [
-                "riscv64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-s390x": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-            "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-            "cpu": [
-                "s390x"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/linux-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-            "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-            "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "netbsd"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-            "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "openbsd"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/sunos-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-            "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "sunos"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/win32-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-            "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/win32-ia32": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-            "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-            "cpu": [
-                "ia32"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@esbuild/win32-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-            "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@floating-ui/core": {
-            "version": "1.7.3",
-            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.3.tgz",
-            "integrity": "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@floating-ui/utils": "^0.2.10"
-            }
-        },
-        "node_modules/@floating-ui/dom": {
-            "version": "1.7.4",
-            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz",
-            "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@floating-ui/core": "^1.7.3",
-                "@floating-ui/utils": "^0.2.10"
-            }
-        },
-        "node_modules/@floating-ui/utils": {
-            "version": "0.2.10",
-            "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
-            "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/@floating-ui/vue": {
-            "version": "1.1.9",
-            "resolved": "https://registry.npmjs.org/@floating-ui/vue/-/vue-1.1.9.tgz",
-            "integrity": "sha512-BfNqNW6KA83Nexspgb9DZuz578R7HT8MZw1CfK9I6Ah4QReNWEJsXWHN+SdmOVLNGmTPDi+fDT535Df5PzMLbQ==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@floating-ui/dom": "^1.7.4",
-                "@floating-ui/utils": "^0.2.10",
-                "vue-demi": ">=0.13.0"
-            }
-        },
-        "node_modules/@floating-ui/vue/node_modules/vue-demi": {
-            "version": "0.14.10",
-            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
-            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
-            "hasInstallScript": true,
-            "license": "MIT",
-            "peer": true,
-            "bin": {
-                "vue-demi-fix": "bin/vue-demi-fix.js",
-                "vue-demi-switch": "bin/vue-demi-switch.js"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            },
-            "peerDependencies": {
-                "@vue/composition-api": "^1.0.0-rc.1",
-                "vue": "^3.0.0-0 || ^2.6.0"
-            },
-            "peerDependenciesMeta": {
-                "@vue/composition-api": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@heroicons/vue": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/@heroicons/vue/-/vue-2.2.0.tgz",
-            "integrity": "sha512-G3dbSxoeEKqbi/DFalhRxJU4mTXJn7GwZ7ae8NuEQzd1bqdd0jAbdaBZlHPcvPD2xI1iGzNVB4k20Un2AguYPw==",
-            "license": "MIT",
-            "peer": true,
-            "peerDependencies": {
-                "vue": ">= 3"
-            }
-        },
-        "node_modules/@internationalized/date": {
-            "version": "3.10.0",
-            "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.10.0.tgz",
-            "integrity": "sha512-oxDR/NTEJ1k+UFVQElaNIk65E/Z83HK1z1WI3lQyhTtnNg4R5oVXaPzK3jcpKG8UHKDVuDQHzn+wsxSz8RP3aw==",
-            "license": "Apache-2.0",
-            "peer": true,
-            "dependencies": {
-                "@swc/helpers": "^0.5.0"
-            }
-        },
-        "node_modules/@internationalized/number": {
-            "version": "3.6.5",
-            "resolved": "https://registry.npmjs.org/@internationalized/number/-/number-3.6.5.tgz",
-            "integrity": "sha512-6hY4Kl4HPBvtfS62asS/R22JzNNy8vi/Ssev7x6EobfCp+9QIB2hKvI2EtbdJ0VSQacxVNtqhE/NmF/NZ0gm6g==",
-            "license": "Apache-2.0",
-            "peer": true,
-            "dependencies": {
-                "@swc/helpers": "^0.5.0"
-            }
-        },
-        "node_modules/@isaacs/balanced-match": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
-            "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "20 || >=22"
-            }
-        },
-        "node_modules/@isaacs/brace-expansion": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
-            "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@isaacs/balanced-match": "^4.0.1"
-            },
-            "engines": {
-                "node": "20 || >=22"
-            }
-        },
-        "node_modules/@jridgewell/gen-mapping": {
-            "version": "0.3.13",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
-            "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@jridgewell/sourcemap-codec": "^1.5.0",
-                "@jridgewell/trace-mapping": "^0.3.24"
-            }
-        },
-        "node_modules/@jridgewell/resolve-uri": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-            "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.5.5",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-            "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
-            "license": "MIT"
-        },
-        "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.31",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
-            "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@jridgewell/resolve-uri": "^3.1.0",
-                "@jridgewell/sourcemap-codec": "^1.4.14"
-            }
-        },
-        "node_modules/@microsoft/api-extractor": {
-            "version": "7.55.1",
-            "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.55.1.tgz",
-            "integrity": "sha512-l8Z+8qrLkZFM3HM95Dbpqs6G39fpCa7O5p8A7AkA6hSevxkgwsOlLrEuPv0ADOyj5dI1Af5WVDiwpKG/ya5G3w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@microsoft/api-extractor-model": "7.32.1",
-                "@microsoft/tsdoc": "~0.16.0",
-                "@microsoft/tsdoc-config": "~0.18.0",
-                "@rushstack/node-core-library": "5.19.0",
-                "@rushstack/rig-package": "0.6.0",
-                "@rushstack/terminal": "0.19.4",
-                "@rushstack/ts-command-line": "5.1.4",
-                "diff": "~8.0.2",
-                "lodash": "~4.17.15",
-                "minimatch": "10.0.3",
-                "resolve": "~1.22.1",
-                "semver": "~7.5.4",
-                "source-map": "~0.6.1",
-                "typescript": "5.8.2"
-            },
-            "bin": {
-                "api-extractor": "bin/api-extractor"
-            }
-        },
-        "node_modules/@microsoft/api-extractor-model": {
-            "version": "7.32.1",
-            "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.32.1.tgz",
-            "integrity": "sha512-u4yJytMYiUAnhcNQcZDTh/tVtlrzKlyKrQnLOV+4Qr/5gV+cpufWzCYAB1Q23URFqD6z2RoL2UYncM9xJVGNKA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@microsoft/tsdoc": "~0.16.0",
-                "@microsoft/tsdoc-config": "~0.18.0",
-                "@rushstack/node-core-library": "5.19.0"
-            }
-        },
-        "node_modules/@microsoft/api-extractor/node_modules/typescript": {
-            "version": "5.8.2",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz",
-            "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "bin": {
-                "tsc": "bin/tsc",
-                "tsserver": "bin/tsserver"
-            },
-            "engines": {
-                "node": ">=14.17"
-            }
-        },
-        "node_modules/@microsoft/tsdoc": {
-            "version": "0.16.0",
-            "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.16.0.tgz",
-            "integrity": "sha512-xgAyonlVVS+q7Vc7qLW0UrJU7rSFcETRWsqdXZtjzRU8dF+6CkozTK4V4y1LwOX7j8r/vHphjDeMeGI4tNGeGA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@microsoft/tsdoc-config": {
-            "version": "0.18.0",
-            "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.18.0.tgz",
-            "integrity": "sha512-8N/vClYyfOH+l4fLkkr9+myAoR6M7akc8ntBJ4DJdWH2b09uVfr71+LTMpNyG19fNqWDg8KEDZhx5wxuqHyGjw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@microsoft/tsdoc": "0.16.0",
-                "ajv": "~8.12.0",
-                "jju": "~1.4.0",
-                "resolve": "~1.22.2"
-            }
-        },
-        "node_modules/@nodelib/fs.scandir": {
-            "version": "2.1.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@nodelib/fs.stat": "2.0.5",
-                "run-parallel": "^1.1.9"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@nodelib/fs.stat": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@nodelib/fs.walk": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@nodelib/fs.scandir": "2.1.5",
-                "fastq": "^1.6.0"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@rollup/pluginutils": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz",
-            "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/estree": "^1.0.0",
-                "estree-walker": "^2.0.2",
-                "picomatch": "^4.0.2"
-            },
-            "engines": {
-                "node": ">=14.0.0"
-            },
-            "peerDependencies": {
-                "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
-            },
-            "peerDependenciesMeta": {
-                "rollup": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@rollup/pluginutils/node_modules/picomatch": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-            "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/jonschlinkert"
-            }
-        },
-        "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.53.3.tgz",
-            "integrity": "sha512-mRSi+4cBjrRLoaal2PnqH82Wqyb+d3HsPUN/W+WslCXsZsyHa9ZeQQX/pQsZaVIWDkPcpV6jJ+3KLbTbgnwv8w==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "android"
-            ]
-        },
-        "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.53.3.tgz",
-            "integrity": "sha512-CbDGaMpdE9sh7sCmTrTUyllhrg65t6SwhjlMJsLr+J8YjFuPmCEjbBSx4Z/e4SmDyH3aB5hGaJUP2ltV/vcs4w==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "android"
-            ]
-        },
-        "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.53.3.tgz",
-            "integrity": "sha512-Nr7SlQeqIBpOV6BHHGZgYBuSdanCXuw09hon14MGOLGmXAFYjx1wNvquVPmpZnl0tLjg25dEdr4IQ6GgyToCUA==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ]
-        },
-        "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.53.3.tgz",
-            "integrity": "sha512-DZ8N4CSNfl965CmPktJ8oBnfYr3F8dTTNBQkRlffnUarJ2ohudQD17sZBa097J8xhQ26AwhHJ5mvUyQW8ddTsQ==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ]
-        },
-        "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.53.3.tgz",
-            "integrity": "sha512-yMTrCrK92aGyi7GuDNtGn2sNW+Gdb4vErx4t3Gv/Tr+1zRb8ax4z8GWVRfr3Jw8zJWvpGHNpss3vVlbF58DZ4w==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "freebsd"
-            ]
-        },
-        "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.53.3.tgz",
-            "integrity": "sha512-lMfF8X7QhdQzseM6XaX0vbno2m3hlyZFhwcndRMw8fbAGUGL3WFMBdK0hbUBIUYcEcMhVLr1SIamDeuLBnXS+Q==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "freebsd"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.53.3.tgz",
-            "integrity": "sha512-k9oD15soC/Ln6d2Wv/JOFPzZXIAIFLp6B+i14KhxAfnq76ajt0EhYc5YPeX6W1xJkAdItcVT+JhKl1QZh44/qw==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.53.3.tgz",
-            "integrity": "sha512-vTNlKq+N6CK/8UktsrFuc+/7NlEYVxgaEgRXVUVK258Z5ymho29skzW1sutgYjqNnquGwVUObAaxae8rZ6YMhg==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.53.3.tgz",
-            "integrity": "sha512-RGrFLWgMhSxRs/EWJMIFM1O5Mzuz3Xy3/mnxJp/5cVhZ2XoCAxJnmNsEyeMJtpK+wu0FJFWz+QF4mjCA7AUQ3w==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.53.3.tgz",
-            "integrity": "sha512-kASyvfBEWYPEwe0Qv4nfu6pNkITLTb32p4yTgzFCocHnJLAHs+9LjUu9ONIhvfT/5lv4YS5muBHyuV84epBo/A==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-loong64-gnu": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.53.3.tgz",
-            "integrity": "sha512-JiuKcp2teLJwQ7vkJ95EwESWkNRFJD7TQgYmCnrPtlu50b4XvT5MOmurWNrCj3IFdyjBQ5p9vnrX4JM6I8OE7g==",
-            "cpu": [
-                "loong64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.53.3.tgz",
-            "integrity": "sha512-EoGSa8nd6d3T7zLuqdojxC20oBfNT8nexBbB/rkxgKj5T5vhpAQKKnD+h3UkoMuTyXkP5jTjK/ccNRmQrPNDuw==",
-            "cpu": [
-                "ppc64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.53.3.tgz",
-            "integrity": "sha512-4s+Wped2IHXHPnAEbIB0YWBv7SDohqxobiiPA1FIWZpX+w9o2i4LezzH/NkFUl8LRci/8udci6cLq+jJQlh+0g==",
-            "cpu": [
-                "riscv64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.53.3.tgz",
-            "integrity": "sha512-68k2g7+0vs2u9CxDt5ktXTngsxOQkSEV/xBbwlqYcUrAVh6P9EgMZvFsnHy4SEiUl46Xf0IObWVbMvPrr2gw8A==",
-            "cpu": [
-                "riscv64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.53.3.tgz",
-            "integrity": "sha512-VYsFMpULAz87ZW6BVYw3I6sWesGpsP9OPcyKe8ofdg9LHxSbRMd7zrVrr5xi/3kMZtpWL/wC+UIJWJYVX5uTKg==",
-            "cpu": [
-                "s390x"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.3.tgz",
-            "integrity": "sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.3.tgz",
-            "integrity": "sha512-eoROhjcc6HbZCJr+tvVT8X4fW3/5g/WkGvvmwz/88sDtSJzO7r/blvoBDgISDiCjDRZmHpwud7h+6Q9JxFwq1Q==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-openharmony-arm64": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.53.3.tgz",
-            "integrity": "sha512-OueLAWgrNSPGAdUdIjSWXw+u/02BRTcnfw9PN41D2vq/JSEPnJnVuBgw18VkN8wcd4fjUs+jFHVM4t9+kBSNLw==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "openharmony"
-            ]
-        },
-        "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.53.3.tgz",
-            "integrity": "sha512-GOFuKpsxR/whszbF/bzydebLiXIHSgsEUp6M0JI8dWvi+fFa1TD6YQa4aSZHtpmh2/uAlj/Dy+nmby3TJ3pkTw==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ]
-        },
-        "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.53.3.tgz",
-            "integrity": "sha512-iah+THLcBJdpfZ1TstDFbKNznlzoxa8fmnFYK4V67HvmuNYkVdAywJSoteUszvBQ9/HqN2+9AZghbajMsFT+oA==",
-            "cpu": [
-                "ia32"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ]
-        },
-        "node_modules/@rollup/rollup-win32-x64-gnu": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.53.3.tgz",
-            "integrity": "sha512-J9QDiOIZlZLdcot5NXEepDkstocktoVjkaKUtqzgzpt2yWjGlbYiKyp05rWwk4nypbYUNoFAztEgixoLaSETkg==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ]
-        },
-        "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.53.3.tgz",
-            "integrity": "sha512-UhTd8u31dXadv0MopwGgNOBpUVROFKWVQgAg5N1ESyCz8AuBcMqm4AuTjrwgQKGDfoFuz02EuMRHQIw/frmYKQ==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ]
-        },
-        "node_modules/@rushstack/node-core-library": {
-            "version": "5.19.0",
-            "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.19.0.tgz",
-            "integrity": "sha512-BxAopbeWBvNJ6VGiUL+5lbJXywTdsnMeOS8j57Cn/xY10r6sV/gbsTlfYKjzVCUBZATX2eRzJHSMCchsMTGN6A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ajv": "~8.13.0",
-                "ajv-draft-04": "~1.0.0",
-                "ajv-formats": "~3.0.1",
-                "fs-extra": "~11.3.0",
-                "import-lazy": "~4.0.0",
-                "jju": "~1.4.0",
-                "resolve": "~1.22.1",
-                "semver": "~7.5.4"
-            },
-            "peerDependencies": {
-                "@types/node": "*"
-            },
-            "peerDependenciesMeta": {
-                "@types/node": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@rushstack/node-core-library/node_modules/ajv": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz",
-            "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.4.1"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/@rushstack/problem-matcher": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/@rushstack/problem-matcher/-/problem-matcher-0.1.1.tgz",
-            "integrity": "sha512-Fm5XtS7+G8HLcJHCWpES5VmeMyjAKaWeyZU5qPzZC+22mPlJzAsOxymHiWIfuirtPckX3aptWws+K2d0BzniJA==",
-            "dev": true,
-            "license": "MIT",
-            "peerDependencies": {
-                "@types/node": "*"
-            },
-            "peerDependenciesMeta": {
-                "@types/node": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@rushstack/rig-package": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.6.0.tgz",
-            "integrity": "sha512-ZQmfzsLE2+Y91GF15c65L/slMRVhF6Hycq04D4TwtdGaUAbIXXg9c5pKA5KFU7M4QMaihoobp9JJYpYcaY3zOw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "resolve": "~1.22.1",
-                "strip-json-comments": "~3.1.1"
-            }
-        },
-        "node_modules/@rushstack/terminal": {
-            "version": "0.19.4",
-            "resolved": "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.19.4.tgz",
-            "integrity": "sha512-f4XQk02CrKfrMgyOfhYd3qWI944dLC21S4I/LUhrlAP23GTMDNG6EK5effQtFkISwUKCgD9vMBrJZaPSUquxWQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@rushstack/node-core-library": "5.19.0",
-                "@rushstack/problem-matcher": "0.1.1",
-                "supports-color": "~8.1.1"
-            },
-            "peerDependencies": {
-                "@types/node": "*"
-            },
-            "peerDependenciesMeta": {
-                "@types/node": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@rushstack/ts-command-line": {
-            "version": "5.1.4",
-            "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-5.1.4.tgz",
-            "integrity": "sha512-H0I6VdJ6sOUbktDFpP2VW5N29w8v4hRoNZOQz02vtEi6ZTYL1Ju8u+TcFiFawUDrUsx/5MQTUhd79uwZZVwVlA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@rushstack/terminal": "0.19.4",
-                "@types/argparse": "1.0.38",
-                "argparse": "~1.0.9",
-                "string-argv": "~0.3.1"
-            }
-        },
-        "node_modules/@swc/helpers": {
-            "version": "0.5.17",
-            "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.17.tgz",
-            "integrity": "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==",
-            "license": "Apache-2.0",
-            "peer": true,
-            "dependencies": {
-                "tslib": "^2.8.0"
-            }
-        },
-        "node_modules/@tanstack/virtual-core": {
-            "version": "3.13.12",
-            "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.12.tgz",
-            "integrity": "sha512-1YBOJfRHV4sXUmWsFSf5rQor4Ss82G8dQWLRbnk3GA4jeP8hQt1hxXh0tmflpC0dz3VgEv/1+qwPyLeWkQuPFA==",
-            "license": "MIT",
-            "peer": true,
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/tannerlinsley"
-            }
-        },
-        "node_modules/@tanstack/vue-virtual": {
-            "version": "3.13.12",
-            "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.12.tgz",
-            "integrity": "sha512-vhF7kEU9EXWXh+HdAwKJ2m3xaOnTTmgcdXcF2pim8g4GvI7eRrk2YRuV5nUlZnd/NbCIX4/Ja2OZu5EjJL06Ww==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@tanstack/virtual-core": "3.13.12"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/tannerlinsley"
-            },
-            "peerDependencies": {
-                "vue": "^2.7.0 || ^3.0.0"
-            }
-        },
-        "node_modules/@types/argparse": {
-            "version": "1.0.38",
-            "resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz",
-            "integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@types/estree": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-            "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@types/node": {
-            "version": "22.19.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.1.tgz",
-            "integrity": "sha512-LCCV0HdSZZZb34qifBsyWlUmok6W7ouER+oQIGBScS8EsZsQbrtFTUrDX4hOl+CS6p7cnNC4td+qrSVGSCTUfQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "undici-types": "~6.21.0"
-            }
-        },
-        "node_modules/@types/web-bluetooth": {
-            "version": "0.0.21",
-            "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
-            "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/@vitejs/plugin-vue": {
-            "version": "5.2.4",
-            "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz",
-            "integrity": "sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "^18.0.0 || >=20.0.0"
-            },
-            "peerDependencies": {
-                "vite": "^5.0.0 || ^6.0.0",
-                "vue": "^3.2.25"
-            }
-        },
-        "node_modules/@volar/language-core": {
-            "version": "2.4.26",
-            "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.26.tgz",
-            "integrity": "sha512-hH0SMitMxnB43OZpyF1IFPS9bgb2I3bpCh76m2WEK7BE0A0EzpYsRp0CCH2xNKshr7kacU5TQBLYn4zj7CG60A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@volar/source-map": "2.4.26"
-            }
-        },
-        "node_modules/@volar/source-map": {
-            "version": "2.4.26",
-            "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.26.tgz",
-            "integrity": "sha512-JJw0Tt/kSFsIRmgTQF4JSt81AUSI1aEye5Zl65EeZ8H35JHnTvFGmpDOBn5iOxd48fyGE+ZvZBp5FcgAy/1Qhw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@volar/typescript": {
-            "version": "2.4.26",
-            "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.26.tgz",
-            "integrity": "sha512-N87ecLD48Sp6zV9zID/5yuS1+5foj0DfuYGdQ6KHj/IbKvyKv1zNX6VCmnKYwtmHadEO6mFc2EKISiu3RDPAvA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@volar/language-core": "2.4.26",
-                "path-browserify": "^1.0.1",
-                "vscode-uri": "^3.0.8"
-            }
-        },
-        "node_modules/@vue/compiler-core": {
-            "version": "3.5.25",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.25.tgz",
-            "integrity": "sha512-vay5/oQJdsNHmliWoZfHPoVZZRmnSWhug0BYT34njkYTPqClh3DNWLkZNJBVSjsNMrg0CCrBfoKkjZQPM/QVUw==",
-            "license": "MIT",
-            "dependencies": {
-                "@babel/parser": "^7.28.5",
-                "@vue/shared": "3.5.25",
-                "entities": "^4.5.0",
-                "estree-walker": "^2.0.2",
-                "source-map-js": "^1.2.1"
-            }
-        },
-        "node_modules/@vue/compiler-dom": {
-            "version": "3.5.25",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.25.tgz",
-            "integrity": "sha512-4We0OAcMZsKgYoGlMjzYvaoErltdFI2/25wqanuTu+S4gismOTRTBPi4IASOjxWdzIwrYSjnqONfKvuqkXzE2Q==",
-            "license": "MIT",
-            "dependencies": {
-                "@vue/compiler-core": "3.5.25",
-                "@vue/shared": "3.5.25"
-            }
-        },
-        "node_modules/@vue/compiler-sfc": {
-            "version": "3.5.25",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.25.tgz",
-            "integrity": "sha512-PUgKp2rn8fFsI++lF2sO7gwO2d9Yj57Utr5yEsDf3GNaQcowCLKL7sf+LvVFvtJDXUp/03+dC6f2+LCv5aK1ag==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@babel/parser": "^7.28.5",
-                "@vue/compiler-core": "3.5.25",
-                "@vue/compiler-dom": "3.5.25",
-                "@vue/compiler-ssr": "3.5.25",
-                "@vue/shared": "3.5.25",
-                "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.21",
-                "postcss": "^8.5.6",
-                "source-map-js": "^1.2.1"
-            }
-        },
-        "node_modules/@vue/compiler-ssr": {
-            "version": "3.5.25",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.25.tgz",
-            "integrity": "sha512-ritPSKLBcParnsKYi+GNtbdbrIE1mtuFEJ4U1sWeuOMlIziK5GtOL85t5RhsNy4uWIXPgk+OUdpnXiTdzn8o3A==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@vue/compiler-dom": "3.5.25",
-                "@vue/shared": "3.5.25"
-            }
-        },
-        "node_modules/@vue/compiler-vue2": {
-            "version": "2.7.16",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz",
-            "integrity": "sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==",
-            "license": "MIT",
-            "dependencies": {
-                "de-indent": "^1.0.2",
-                "he": "^1.2.0"
-            }
-        },
-        "node_modules/@vue/language-core": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.2.0.tgz",
-            "integrity": "sha512-O1ZZFaaBGkKbsRfnVH1ifOK1/1BUkyK+3SQsfnh6PmMmD4qJcTU8godCeA96jjDRTL6zgnK7YzCHfaUlH2r0Mw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@volar/language-core": "~2.4.11",
-                "@vue/compiler-dom": "^3.5.0",
-                "@vue/compiler-vue2": "^2.7.16",
-                "@vue/shared": "^3.5.0",
-                "alien-signals": "^0.4.9",
-                "minimatch": "^9.0.3",
-                "muggle-string": "^0.4.1",
-                "path-browserify": "^1.0.1"
-            },
-            "peerDependencies": {
-                "typescript": "*"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@vue/language-core/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/@vue/reactivity": {
-            "version": "3.5.25",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.25.tgz",
-            "integrity": "sha512-5xfAypCQepv4Jog1U4zn8cZIcbKKFka3AgWHEFQeK65OW+Ys4XybP6z2kKgws4YB43KGpqp5D/K3go2UPPunLA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@vue/shared": "3.5.25"
-            }
-        },
-        "node_modules/@vue/runtime-core": {
-            "version": "3.5.25",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.25.tgz",
-            "integrity": "sha512-Z751v203YWwYzy460bzsYQISDfPjHTl+6Zzwo/a3CsAf+0ccEjQ8c+0CdX1WsumRTHeywvyUFtW6KvNukT/smA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@vue/reactivity": "3.5.25",
-                "@vue/shared": "3.5.25"
-            }
-        },
-        "node_modules/@vue/runtime-dom": {
-            "version": "3.5.25",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.25.tgz",
-            "integrity": "sha512-a4WrkYFbb19i9pjkz38zJBg8wa/rboNERq3+hRRb0dHiJh13c+6kAbgqCPfMaJ2gg4weWD3APZswASOfmKwamA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@vue/reactivity": "3.5.25",
-                "@vue/runtime-core": "3.5.25",
-                "@vue/shared": "3.5.25",
-                "csstype": "^3.1.3"
-            }
-        },
-        "node_modules/@vue/server-renderer": {
-            "version": "3.5.25",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.25.tgz",
-            "integrity": "sha512-UJaXR54vMG61i8XNIzTSf2Q7MOqZHpp8+x3XLGtE3+fL+nQd+k7O5+X3D/uWrnQXOdMw5VPih+Uremcw+u1woQ==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@vue/compiler-ssr": "3.5.25",
-                "@vue/shared": "3.5.25"
-            },
-            "peerDependencies": {
-                "vue": "3.5.25"
-            }
-        },
-        "node_modules/@vue/shared": {
-            "version": "3.5.25",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.25.tgz",
-            "integrity": "sha512-AbOPdQQnAnzs58H2FrrDxYj/TJfmeS2jdfEEhgiKINy+bnOANmVizIEgq1r+C5zsbs6l1CCQxtcj71rwNQ4jWg==",
-            "license": "MIT"
-        },
-        "node_modules/@vue/tsconfig": {
-            "version": "0.5.1",
-            "resolved": "https://registry.npmjs.org/@vue/tsconfig/-/tsconfig-0.5.1.tgz",
-            "integrity": "sha512-VcZK7MvpjuTPx2w6blwnwZAu5/LgBUtejFOi3pPGQFXQN5Ela03FUtd2Qtg4yWGGissVL0dr6Ro1LfOFh+PCuQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@vueuse/core": {
-            "version": "12.8.2",
-            "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-12.8.2.tgz",
-            "integrity": "sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@types/web-bluetooth": "^0.0.21",
-                "@vueuse/metadata": "12.8.2",
-                "@vueuse/shared": "12.8.2",
-                "vue": "^3.5.13"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            }
-        },
-        "node_modules/@vueuse/metadata": {
-            "version": "12.8.2",
-            "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-12.8.2.tgz",
-            "integrity": "sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==",
-            "license": "MIT",
-            "peer": true,
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            }
-        },
-        "node_modules/@vueuse/shared": {
-            "version": "12.8.2",
-            "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-12.8.2.tgz",
-            "integrity": "sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "vue": "^3.5.13"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            }
-        },
-        "node_modules/@zodios/core": {
-            "version": "10.9.6",
-            "resolved": "https://registry.npmjs.org/@zodios/core/-/core-10.9.6.tgz",
-            "integrity": "sha512-aH4rOdb3AcezN7ws8vDgBfGboZMk2JGGzEq/DtW65MhnRxyTGRuLJRWVQ/2KxDgWvV2F5oTkAS+5pnjKbl0n+A==",
-            "license": "MIT",
-            "peer": true,
-            "peerDependencies": {
-                "axios": "^0.x || ^1.0.0",
-                "zod": "^3.x"
-            }
-        },
-        "node_modules/acorn": {
-            "version": "8.15.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-            "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
-            "dev": true,
-            "license": "MIT",
-            "bin": {
-                "acorn": "bin/acorn"
-            },
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/ajv": {
-            "version": "8.12.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.2.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/ajv-draft-04": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz",
-            "integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==",
-            "dev": true,
-            "license": "MIT",
-            "peerDependencies": {
-                "ajv": "^8.5.0"
-            },
-            "peerDependenciesMeta": {
-                "ajv": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/ajv-formats": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
-            "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ajv": "^8.0.0"
-            },
-            "peerDependencies": {
-                "ajv": "^8.0.0"
-            },
-            "peerDependenciesMeta": {
-                "ajv": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/alien-signals": {
-            "version": "0.4.14",
-            "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-0.4.14.tgz",
-            "integrity": "sha512-itUAVzhczTmP2U5yX67xVpsbbOiquusbWVyA9N+sy6+r6YVbFkahXvNCeEPWEOMhwDYwbVbGHFkVL03N9I5g+Q==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/any-promise": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-            "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/anymatch": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-            "license": "ISC",
-            "peer": true,
-            "dependencies": {
-                "normalize-path": "^3.0.0",
-                "picomatch": "^2.0.4"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/arg": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
-            "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "sprintf-js": "~1.0.2"
-            }
-        },
-        "node_modules/aria-hidden": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz",
-            "integrity": "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "tslib": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/asynckit": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-            "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/autoprefixer": {
-            "version": "10.4.22",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.22.tgz",
-            "integrity": "sha512-ARe0v/t9gO28Bznv6GgqARmVqcWOV3mfgUPn9becPHMiD3o9BwlRgaeccZnwTpZ7Zwqrm+c1sUSsMxIzQzc8Xg==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/postcss/"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "browserslist": "^4.27.0",
-                "caniuse-lite": "^1.0.30001754",
-                "fraction.js": "^5.3.4",
-                "normalize-range": "^0.1.2",
-                "picocolors": "^1.1.1",
-                "postcss-value-parser": "^4.2.0"
-            },
-            "bin": {
-                "autoprefixer": "bin/autoprefixer"
-            },
-            "engines": {
-                "node": "^10 || ^12 || >=14"
-            },
-            "peerDependencies": {
-                "postcss": "^8.1.0"
-            }
-        },
-        "node_modules/axios": {
-            "version": "1.13.2",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz",
-            "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "follow-redirects": "^1.15.6",
-                "form-data": "^4.0.4",
-                "proxy-from-env": "^1.1.0"
-            }
-        },
-        "node_modules/balanced-match": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-            "license": "MIT"
-        },
-        "node_modules/baseline-browser-mapping": {
-            "version": "2.8.32",
-            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.32.tgz",
-            "integrity": "sha512-OPz5aBThlyLFgxyhdwf/s2+8ab3OvT7AdTNvKHBwpXomIYeXqpUUuT8LrdtxZSsWJ4R4CU1un4XGh5Ez3nlTpw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "bin": {
-                "baseline-browser-mapping": "dist/cli.js"
-            }
-        },
-        "node_modules/binary-extensions": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-            "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/brace-expansion": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-            "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^1.0.0"
-            }
-        },
-        "node_modules/braces": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "fill-range": "^7.1.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/browserslist": {
-            "version": "4.28.0",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.0.tgz",
-            "integrity": "sha512-tbydkR/CxfMwelN0vwdP/pLkDwyAASZ+VfWm4EOwlB6SWhx1sYnWLqo8N5j0rAzPfzfRaxt0mM/4wPU/Su84RQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/browserslist"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/browserslist"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "baseline-browser-mapping": "^2.8.25",
-                "caniuse-lite": "^1.0.30001754",
-                "electron-to-chromium": "^1.5.249",
-                "node-releases": "^2.0.27",
-                "update-browserslist-db": "^1.1.4"
-            },
-            "bin": {
-                "browserslist": "cli.js"
-            },
-            "engines": {
-                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-            }
-        },
-        "node_modules/call-bind-apply-helpers": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-            "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "es-errors": "^1.3.0",
-                "function-bind": "^1.1.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/camelcase-css": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
-            "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/caniuse-lite": {
-            "version": "1.0.30001757",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001757.tgz",
-            "integrity": "sha512-r0nnL/I28Zi/yjk1el6ilj27tKcdjLsNqAOZr0yVjWPrSQyHgKI2INaEWw21bAQSv2LXRt1XuCS/GomNpWOxsQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/browserslist"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "CC-BY-4.0"
-        },
-        "node_modules/chokidar": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-            "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "anymatch": "~3.1.2",
-                "braces": "~3.0.2",
-                "glob-parent": "~5.1.2",
-                "is-binary-path": "~2.1.0",
-                "is-glob": "~4.0.1",
-                "normalize-path": "~3.0.0",
-                "readdirp": "~3.6.0"
-            },
-            "engines": {
-                "node": ">= 8.10.0"
-            },
-            "funding": {
-                "url": "https://paulmillr.com/funding/"
-            },
-            "optionalDependencies": {
-                "fsevents": "~2.3.2"
-            }
-        },
-        "node_modules/chokidar/node_modules/glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-            "license": "ISC",
-            "peer": true,
-            "dependencies": {
-                "is-glob": "^4.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/class-variance-authority": {
-            "version": "0.7.1",
-            "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.1.tgz",
-            "integrity": "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==",
-            "license": "Apache-2.0",
-            "peer": true,
-            "dependencies": {
-                "clsx": "^2.1.1"
-            },
-            "funding": {
-                "url": "https://polar.sh/cva"
-            }
-        },
-        "node_modules/clsx": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
-            "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/combined-stream": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "delayed-stream": "~1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
-        "node_modules/commander": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-            "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/compare-versions": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz",
-            "integrity": "sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/confbox": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.2.tgz",
-            "integrity": "sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/cssesc": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-            "license": "MIT",
-            "bin": {
-                "cssesc": "bin/cssesc"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/csstype": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
-            "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/dayjs": {
-            "version": "1.11.19",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
-            "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/de-indent": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-            "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
-            "license": "MIT"
-        },
-        "node_modules/debug": {
-            "version": "4.4.3",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
-            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ms": "^2.1.3"
-            },
-            "engines": {
-                "node": ">=6.0"
-            },
-            "peerDependenciesMeta": {
-                "supports-color": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/defu": {
-            "version": "6.1.4",
-            "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz",
-            "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/delayed-stream": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/didyoumean": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-            "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
-            "license": "Apache-2.0",
-            "peer": true
-        },
-        "node_modules/diff": {
-            "version": "8.0.2",
-            "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.2.tgz",
-            "integrity": "sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "engines": {
-                "node": ">=0.3.1"
-            }
-        },
-        "node_modules/dlv": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-            "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/dunder-proto": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-            "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "call-bind-apply-helpers": "^1.0.1",
-                "es-errors": "^1.3.0",
-                "gopd": "^1.2.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/electron-to-chromium": {
-            "version": "1.5.263",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.263.tgz",
-            "integrity": "sha512-DrqJ11Knd+lo+dv+lltvfMDLU27g14LMdH2b0O3Pio4uk0x+z7OR+JrmyacTPN2M8w3BrZ7/RTwG3R9B7irPlg==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/entities": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-            "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-            "license": "BSD-2-Clause",
-            "engines": {
-                "node": ">=0.12"
-            },
-            "funding": {
-                "url": "https://github.com/fb55/entities?sponsor=1"
-            }
-        },
-        "node_modules/es-define-property": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-            "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/es-errors": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-            "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/es-object-atoms": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-            "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "es-errors": "^1.3.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/es-set-tostringtag": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-            "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "es-errors": "^1.3.0",
-                "get-intrinsic": "^1.2.6",
-                "has-tostringtag": "^1.0.2",
-                "hasown": "^2.0.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/esbuild": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-            "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-            "dev": true,
-            "hasInstallScript": true,
-            "license": "MIT",
-            "bin": {
-                "esbuild": "bin/esbuild"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.21.5",
-                "@esbuild/android-arm": "0.21.5",
-                "@esbuild/android-arm64": "0.21.5",
-                "@esbuild/android-x64": "0.21.5",
-                "@esbuild/darwin-arm64": "0.21.5",
-                "@esbuild/darwin-x64": "0.21.5",
-                "@esbuild/freebsd-arm64": "0.21.5",
-                "@esbuild/freebsd-x64": "0.21.5",
-                "@esbuild/linux-arm": "0.21.5",
-                "@esbuild/linux-arm64": "0.21.5",
-                "@esbuild/linux-ia32": "0.21.5",
-                "@esbuild/linux-loong64": "0.21.5",
-                "@esbuild/linux-mips64el": "0.21.5",
-                "@esbuild/linux-ppc64": "0.21.5",
-                "@esbuild/linux-riscv64": "0.21.5",
-                "@esbuild/linux-s390x": "0.21.5",
-                "@esbuild/linux-x64": "0.21.5",
-                "@esbuild/netbsd-x64": "0.21.5",
-                "@esbuild/openbsd-x64": "0.21.5",
-                "@esbuild/sunos-x64": "0.21.5",
-                "@esbuild/win32-arm64": "0.21.5",
-                "@esbuild/win32-ia32": "0.21.5",
-                "@esbuild/win32-x64": "0.21.5"
-            }
-        },
-        "node_modules/escalade": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/estree-walker": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-            "license": "MIT"
-        },
-        "node_modules/exsolve": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.8.tgz",
-            "integrity": "sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/fast-deep-equal": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/fast-glob": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-            "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@nodelib/fs.stat": "^2.0.2",
-                "@nodelib/fs.walk": "^1.2.3",
-                "glob-parent": "^5.1.2",
-                "merge2": "^1.3.0",
-                "micromatch": "^4.0.8"
-            },
-            "engines": {
-                "node": ">=8.6.0"
-            }
-        },
-        "node_modules/fast-glob/node_modules/glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-            "license": "ISC",
-            "peer": true,
-            "dependencies": {
-                "is-glob": "^4.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/fastq": {
-            "version": "1.19.1",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
-            "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
-            "license": "ISC",
-            "peer": true,
-            "dependencies": {
-                "reusify": "^1.0.4"
-            }
-        },
-        "node_modules/fill-range": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "to-regex-range": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/follow-redirects": {
-            "version": "1.15.11",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
-            "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://github.com/sponsors/RubenVerborgh"
-                }
-            ],
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">=4.0"
-            },
-            "peerDependenciesMeta": {
-                "debug": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/form-data": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-            "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "asynckit": "^0.4.0",
-                "combined-stream": "^1.0.8",
-                "es-set-tostringtag": "^2.1.0",
-                "hasown": "^2.0.2",
-                "mime-types": "^2.1.12"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/fraction.js": {
-            "version": "5.3.4",
-            "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz",
-            "integrity": "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "*"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/rawify"
-            }
-        },
-        "node_modules/fs-extra": {
-            "version": "11.3.2",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz",
-            "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=14.14"
-            }
-        },
-        "node_modules/fsevents": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-            "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.2",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-            "license": "MIT",
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/get-intrinsic": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-            "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "call-bind-apply-helpers": "^1.0.2",
-                "es-define-property": "^1.0.1",
-                "es-errors": "^1.3.0",
-                "es-object-atoms": "^1.1.1",
-                "function-bind": "^1.1.2",
-                "get-proto": "^1.0.1",
-                "gopd": "^1.2.0",
-                "has-symbols": "^1.1.0",
-                "hasown": "^2.0.2",
-                "math-intrinsics": "^1.1.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/get-proto": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-            "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "dunder-proto": "^1.0.1",
-                "es-object-atoms": "^1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/glob-parent": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-            "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-            "license": "ISC",
-            "peer": true,
-            "dependencies": {
-                "is-glob": "^4.0.3"
-            },
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
-        "node_modules/gopd": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-            "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/graceful-fs": {
-            "version": "4.2.11",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/has-symbols": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-            "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/has-tostringtag": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-            "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "has-symbols": "^1.0.3"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/hasown": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-            "license": "MIT",
-            "dependencies": {
-                "function-bind": "^1.1.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/he": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-            "license": "MIT",
-            "bin": {
-                "he": "bin/he"
-            }
-        },
-        "node_modules/import-lazy": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-            "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-binary-path": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "binary-extensions": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-core-module": {
-            "version": "2.16.1",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-            "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
-            "license": "MIT",
-            "dependencies": {
-                "hasown": "^2.0.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-extglob": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-glob": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "is-extglob": "^2.1.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-number": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">=0.12.0"
-            }
-        },
-        "node_modules/jiti": {
-            "version": "1.21.7",
-            "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
-            "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
-            "license": "MIT",
-            "peer": true,
-            "bin": {
-                "jiti": "bin/jiti.js"
-            }
-        },
-        "node_modules/jju": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
-            "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/jsonfile": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-            "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "universalify": "^2.0.0"
-            },
-            "optionalDependencies": {
-                "graceful-fs": "^4.1.6"
-            }
-        },
-        "node_modules/kolorist": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/kolorist/-/kolorist-1.8.0.tgz",
-            "integrity": "sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/lilconfig": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
-            "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antonk52"
-            }
-        },
-        "node_modules/lines-and-columns": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/local-pkg": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.1.2.tgz",
-            "integrity": "sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "mlly": "^1.7.4",
-                "pkg-types": "^2.3.0",
-                "quansync": "^0.2.11"
-            },
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            }
-        },
-        "node_modules/lodash": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/magic-string": {
-            "version": "0.30.21",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
-            "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
-            "license": "MIT",
-            "dependencies": {
-                "@jridgewell/sourcemap-codec": "^1.5.5"
-            }
-        },
-        "node_modules/math-intrinsics": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-            "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/merge2": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/micromatch": {
-            "version": "4.0.8",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "braces": "^3.0.3",
-                "picomatch": "^2.3.1"
-            },
-            "engines": {
-                "node": ">=8.6"
-            }
-        },
-        "node_modules/mime-db": {
-            "version": "1.52.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">= 0.6"
-            }
-        },
-        "node_modules/mime-types": {
-            "version": "2.1.35",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "mime-db": "1.52.0"
-            },
-            "engines": {
-                "node": ">= 0.6"
-            }
-        },
-        "node_modules/minimatch": {
-            "version": "10.0.3",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz",
-            "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "@isaacs/brace-expansion": "^5.0.0"
-            },
-            "engines": {
-                "node": "20 || >=22"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/mlly": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.8.0.tgz",
-            "integrity": "sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "acorn": "^8.15.0",
-                "pathe": "^2.0.3",
-                "pkg-types": "^1.3.1",
-                "ufo": "^1.6.1"
-            }
-        },
-        "node_modules/mlly/node_modules/confbox": {
-            "version": "0.1.8",
-            "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
-            "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/mlly/node_modules/pkg-types": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz",
-            "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "confbox": "^0.1.8",
-                "mlly": "^1.7.4",
-                "pathe": "^2.0.1"
-            }
-        },
-        "node_modules/ms": {
-            "version": "2.1.3",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/muggle-string": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz",
-            "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==",
-            "license": "MIT"
-        },
-        "node_modules/mz": {
-            "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-            "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "any-promise": "^1.0.0",
-                "object-assign": "^4.0.1",
-                "thenify-all": "^1.0.0"
-            }
-        },
-        "node_modules/nanoid": {
-            "version": "3.3.11",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-            "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "bin": {
-                "nanoid": "bin/nanoid.cjs"
-            },
-            "engines": {
-                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-            }
-        },
-        "node_modules/node-releases": {
-            "version": "2.0.27",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
-            "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/normalize-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/normalize-range": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-            "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/object-assign": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-            "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/object-hash": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-            "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/ohash": {
-            "version": "2.0.11",
-            "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz",
-            "integrity": "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/parse-duration": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-2.1.4.tgz",
-            "integrity": "sha512-b98m6MsCh+akxfyoz9w9dt0AlH2dfYLOBss5SdDsr9pkhKNvkWBXU/r8A4ahmIGByBOLV2+4YwfCuFxbDDaGyg==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/path-browserify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-            "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-            "license": "MIT"
-        },
-        "node_modules/path-parse": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "license": "MIT"
-        },
-        "node_modules/pathe": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
-            "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/picocolors": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-            "license": "ISC"
-        },
-        "node_modules/picomatch": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">=8.6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/jonschlinkert"
-            }
-        },
-        "node_modules/pify": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-            "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/pirates": {
-            "version": "4.0.7",
-            "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
-            "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/pkg-types": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.0.tgz",
-            "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "confbox": "^0.2.2",
-                "exsolve": "^1.0.7",
-                "pathe": "^2.0.3"
-            }
-        },
-        "node_modules/postcss": {
-            "version": "8.5.6",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
-            "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/postcss/"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/postcss"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "nanoid": "^3.3.11",
-                "picocolors": "^1.1.1",
-                "source-map-js": "^1.2.1"
-            },
-            "engines": {
-                "node": "^10 || ^12 || >=14"
-            }
-        },
-        "node_modules/postcss-import": {
-            "version": "15.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
-            "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
-            "license": "MIT",
-            "dependencies": {
-                "postcss-value-parser": "^4.0.0",
-                "read-cache": "^1.0.0",
-                "resolve": "^1.1.7"
-            },
-            "engines": {
-                "node": ">=14.0.0"
-            },
-            "peerDependencies": {
-                "postcss": "^8.0.0"
-            }
-        },
-        "node_modules/postcss-js": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.1.0.tgz",
-            "integrity": "sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==",
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/postcss/"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "camelcase-css": "^2.0.1"
-            },
-            "engines": {
-                "node": "^12 || ^14 || >= 16"
-            },
-            "peerDependencies": {
-                "postcss": "^8.4.21"
-            }
-        },
-        "node_modules/postcss-load-config": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-6.0.1.tgz",
-            "integrity": "sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==",
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/postcss/"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "lilconfig": "^3.1.1"
-            },
-            "engines": {
-                "node": ">= 18"
-            },
-            "peerDependencies": {
-                "jiti": ">=1.21.0",
-                "postcss": ">=8.0.9",
-                "tsx": "^4.8.1",
-                "yaml": "^2.4.2"
-            },
-            "peerDependenciesMeta": {
-                "jiti": {
-                    "optional": true
-                },
-                "postcss": {
-                    "optional": true
-                },
-                "tsx": {
-                    "optional": true
-                },
-                "yaml": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/postcss-nested": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
-            "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/postcss/"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "postcss-selector-parser": "^6.1.1"
-            },
-            "engines": {
-                "node": ">=12.0"
-            },
-            "peerDependencies": {
-                "postcss": "^8.2.14"
-            }
-        },
-        "node_modules/postcss-nesting": {
-            "version": "12.1.5",
-            "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-12.1.5.tgz",
-            "integrity": "sha512-N1NgI1PDCiAGWPTYrwqm8wpjv0bgDmkYHH72pNsqTCv9CObxjxftdYu6AKtGN+pnJa7FQjMm3v4sp8QJbFsYdQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/csstools"
-                },
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/csstools"
-                }
-            ],
-            "license": "MIT-0",
-            "dependencies": {
-                "@csstools/selector-resolve-nested": "^1.1.0",
-                "@csstools/selector-specificity": "^3.1.1",
-                "postcss-selector-parser": "^6.1.0"
-            },
-            "engines": {
-                "node": "^14 || ^16 || >=18"
-            },
-            "peerDependencies": {
-                "postcss": "^8.4"
-            }
-        },
-        "node_modules/postcss-selector-parser": {
-            "version": "6.1.2",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
-            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
-            "license": "MIT",
-            "dependencies": {
-                "cssesc": "^3.0.0",
-                "util-deprecate": "^1.0.2"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/postcss-value-parser": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-            "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-            "license": "MIT"
-        },
-        "node_modules/proxy-from-env": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/punycode": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-            "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/quansync": {
-            "version": "0.2.11",
-            "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.11.tgz",
-            "integrity": "sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://github.com/sponsors/antfu"
-                },
-                {
-                    "type": "individual",
-                    "url": "https://github.com/sponsors/sxzz"
-                }
-            ],
-            "license": "MIT"
-        },
-        "node_modules/queue-microtask": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/read-cache": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-            "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
-            "license": "MIT",
-            "dependencies": {
-                "pify": "^2.3.0"
-            }
-        },
-        "node_modules/readdirp": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "picomatch": "^2.2.1"
-            },
-            "engines": {
-                "node": ">=8.10.0"
-            }
-        },
-        "node_modules/reka-ui": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.6.1.tgz",
-            "integrity": "sha512-XK7cJDQoNuGXfCNzBBo/81Yg/OgjPwvbabnlzXG2VsdSgNsT6iIkuPBPr+C0Shs+3bb0x0lbPvgQAhMSCKm5Ww==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@floating-ui/dom": "^1.6.13",
-                "@floating-ui/vue": "^1.1.6",
-                "@internationalized/date": "^3.5.0",
-                "@internationalized/number": "^3.5.0",
-                "@tanstack/vue-virtual": "^3.12.0",
-                "@vueuse/core": "^12.5.0",
-                "@vueuse/shared": "^12.5.0",
-                "aria-hidden": "^1.2.4",
-                "defu": "^6.1.4",
-                "ohash": "^2.0.11"
-            },
-            "peerDependencies": {
-                "vue": ">= 3.2.0"
-            }
-        },
-        "node_modules/require-from-string": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/resolve": {
-            "version": "1.22.11",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
-            "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
-            "license": "MIT",
-            "dependencies": {
-                "is-core-module": "^2.16.1",
-                "path-parse": "^1.0.7",
-                "supports-preserve-symlinks-flag": "^1.0.0"
-            },
-            "bin": {
-                "resolve": "bin/resolve"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/reusify": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
-            "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "iojs": ">=1.0.0",
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/rollup": {
-            "version": "4.53.3",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.3.tgz",
-            "integrity": "sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/estree": "1.0.8"
-            },
-            "bin": {
-                "rollup": "dist/bin/rollup"
-            },
-            "engines": {
-                "node": ">=18.0.0",
-                "npm": ">=8.0.0"
-            },
-            "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.53.3",
-                "@rollup/rollup-android-arm64": "4.53.3",
-                "@rollup/rollup-darwin-arm64": "4.53.3",
-                "@rollup/rollup-darwin-x64": "4.53.3",
-                "@rollup/rollup-freebsd-arm64": "4.53.3",
-                "@rollup/rollup-freebsd-x64": "4.53.3",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.53.3",
-                "@rollup/rollup-linux-arm-musleabihf": "4.53.3",
-                "@rollup/rollup-linux-arm64-gnu": "4.53.3",
-                "@rollup/rollup-linux-arm64-musl": "4.53.3",
-                "@rollup/rollup-linux-loong64-gnu": "4.53.3",
-                "@rollup/rollup-linux-ppc64-gnu": "4.53.3",
-                "@rollup/rollup-linux-riscv64-gnu": "4.53.3",
-                "@rollup/rollup-linux-riscv64-musl": "4.53.3",
-                "@rollup/rollup-linux-s390x-gnu": "4.53.3",
-                "@rollup/rollup-linux-x64-gnu": "4.53.3",
-                "@rollup/rollup-linux-x64-musl": "4.53.3",
-                "@rollup/rollup-openharmony-arm64": "4.53.3",
-                "@rollup/rollup-win32-arm64-msvc": "4.53.3",
-                "@rollup/rollup-win32-ia32-msvc": "4.53.3",
-                "@rollup/rollup-win32-x64-gnu": "4.53.3",
-                "@rollup/rollup-win32-x64-msvc": "4.53.3",
-                "fsevents": "~2.3.2"
-            }
-        },
-        "node_modules/run-parallel": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "queue-microtask": "^1.2.2"
-            }
-        },
-        "node_modules/semver": {
-            "version": "7.5.4",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
-            "bin": {
-                "semver": "bin/semver.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/source-map-js": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-            "license": "BSD-3-Clause",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/sprintf-js": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-            "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-            "dev": true,
-            "license": "BSD-3-Clause"
-        },
-        "node_modules/string-argv": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
-            "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.6.19"
-            }
-        },
-        "node_modules/strip-json-comments": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/sucrase": {
-            "version": "3.35.1",
-            "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.1.tgz",
-            "integrity": "sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@jridgewell/gen-mapping": "^0.3.2",
-                "commander": "^4.0.0",
-                "lines-and-columns": "^1.1.6",
-                "mz": "^2.7.0",
-                "pirates": "^4.0.1",
-                "tinyglobby": "^0.2.11",
-                "ts-interface-checker": "^0.1.9"
-            },
-            "bin": {
-                "sucrase": "bin/sucrase",
-                "sucrase-node": "bin/sucrase-node"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            }
-        },
-        "node_modules/supports-color": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/supports-color?sponsor=1"
-            }
-        },
-        "node_modules/supports-preserve-symlinks-flag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/tailwind-merge": {
-            "version": "2.6.0",
-            "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
-            "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
-            "license": "MIT",
-            "peer": true,
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/dcastil"
-            }
-        },
-        "node_modules/tailwindcss": {
-            "version": "3.4.18",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.18.tgz",
-            "integrity": "sha512-6A2rnmW5xZMdw11LYjhcI5846rt9pbLSabY5XPxo+XWdxwZaFEn47Go4NzFiHu9sNNmr/kXivP1vStfvMaK1GQ==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@alloc/quick-lru": "^5.2.0",
-                "arg": "^5.0.2",
-                "chokidar": "^3.6.0",
-                "didyoumean": "^1.2.2",
-                "dlv": "^1.1.3",
-                "fast-glob": "^3.3.2",
-                "glob-parent": "^6.0.2",
-                "is-glob": "^4.0.3",
-                "jiti": "^1.21.7",
-                "lilconfig": "^3.1.3",
-                "micromatch": "^4.0.8",
-                "normalize-path": "^3.0.0",
-                "object-hash": "^3.0.0",
-                "picocolors": "^1.1.1",
-                "postcss": "^8.4.47",
-                "postcss-import": "^15.1.0",
-                "postcss-js": "^4.0.1",
-                "postcss-load-config": "^4.0.2 || ^5.0 || ^6.0",
-                "postcss-nested": "^6.2.0",
-                "postcss-selector-parser": "^6.1.2",
-                "resolve": "^1.22.8",
-                "sucrase": "^3.35.0"
-            },
-            "bin": {
-                "tailwind": "lib/cli.js",
-                "tailwindcss": "lib/cli.js"
-            },
-            "engines": {
-                "node": ">=14.0.0"
-            }
-        },
-        "node_modules/thenify": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
-            "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "any-promise": "^1.0.0"
-            }
-        },
-        "node_modules/thenify-all": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-            "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "thenify": ">= 3.1.0 < 4"
-            },
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
-        "node_modules/tinyglobby": {
-            "version": "0.2.15",
-            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-            "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "fdir": "^6.5.0",
-                "picomatch": "^4.0.3"
-            },
-            "engines": {
-                "node": ">=12.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/SuperchupuDev"
-            }
-        },
-        "node_modules/tinyglobby/node_modules/fdir": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
-            "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">=12.0.0"
-            },
-            "peerDependencies": {
-                "picomatch": "^3 || ^4"
-            },
-            "peerDependenciesMeta": {
-                "picomatch": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/tinyglobby/node_modules/picomatch": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-            "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-            "license": "MIT",
-            "peer": true,
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/jonschlinkert"
-            }
-        },
-        "node_modules/to-regex-range": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "is-number": "^7.0.0"
-            },
-            "engines": {
-                "node": ">=8.0"
-            }
-        },
-        "node_modules/ts-interface-checker": {
-            "version": "0.1.13",
-            "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
-            "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
-            "license": "Apache-2.0",
-            "peer": true
-        },
-        "node_modules/tslib": {
-            "version": "2.8.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-            "license": "0BSD",
-            "peer": true
-        },
-        "node_modules/typescript": {
-            "version": "5.9.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-            "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-            "license": "Apache-2.0",
-            "bin": {
-                "tsc": "bin/tsc",
-                "tsserver": "bin/tsserver"
-            },
-            "engines": {
-                "node": ">=14.17"
-            }
-        },
-        "node_modules/ufo": {
-            "version": "1.6.1",
-            "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.1.tgz",
-            "integrity": "sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/undici-types": {
-            "version": "6.21.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-            "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/universalify": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 10.0.0"
-            }
-        },
-        "node_modules/update-browserslist-db": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz",
-            "integrity": "sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/browserslist"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/browserslist"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "escalade": "^3.2.0",
-                "picocolors": "^1.1.1"
-            },
-            "bin": {
-                "update-browserslist-db": "cli.js"
-            },
-            "peerDependencies": {
-                "browserslist": ">= 4.21.0"
-            }
-        },
-        "node_modules/uri-js": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "dependencies": {
-                "punycode": "^2.1.0"
-            }
-        },
-        "node_modules/util-deprecate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-            "license": "MIT"
-        },
-        "node_modules/vite": {
-            "version": "5.4.21",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz",
-            "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "esbuild": "^0.21.3",
-                "postcss": "^8.4.43",
-                "rollup": "^4.20.0"
-            },
-            "bin": {
-                "vite": "bin/vite.js"
-            },
-            "engines": {
-                "node": "^18.0.0 || >=20.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/vitejs/vite?sponsor=1"
-            },
-            "optionalDependencies": {
-                "fsevents": "~2.3.3"
-            },
-            "peerDependencies": {
-                "@types/node": "^18.0.0 || >=20.0.0",
-                "less": "*",
-                "lightningcss": "^1.21.0",
-                "sass": "*",
-                "sass-embedded": "*",
-                "stylus": "*",
-                "sugarss": "*",
-                "terser": "^5.4.0"
-            },
-            "peerDependenciesMeta": {
-                "@types/node": {
-                    "optional": true
-                },
-                "less": {
-                    "optional": true
-                },
-                "lightningcss": {
-                    "optional": true
-                },
-                "sass": {
-                    "optional": true
-                },
-                "sass-embedded": {
-                    "optional": true
-                },
-                "stylus": {
-                    "optional": true
-                },
-                "sugarss": {
-                    "optional": true
-                },
-                "terser": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/vite-plugin-dts": {
-            "version": "4.5.4",
-            "resolved": "https://registry.npmjs.org/vite-plugin-dts/-/vite-plugin-dts-4.5.4.tgz",
-            "integrity": "sha512-d4sOM8M/8z7vRXHHq/ebbblfaxENjogAAekcfcDCCwAyvGqnPrc7f4NZbvItS+g4WTgerW0xDwSz5qz11JT3vg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@microsoft/api-extractor": "^7.50.1",
-                "@rollup/pluginutils": "^5.1.4",
-                "@volar/typescript": "^2.4.11",
-                "@vue/language-core": "2.2.0",
-                "compare-versions": "^6.1.1",
-                "debug": "^4.4.0",
-                "kolorist": "^1.8.0",
-                "local-pkg": "^1.0.0",
-                "magic-string": "^0.30.17"
-            },
-            "peerDependencies": {
-                "typescript": "*",
-                "vite": "*"
-            },
-            "peerDependenciesMeta": {
-                "vite": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/vscode-uri": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
-            "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
-            "license": "MIT"
-        },
-        "node_modules/vue": {
-            "version": "3.5.25",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.25.tgz",
-            "integrity": "sha512-YLVdgv2K13WJ6n+kD5owehKtEXwdwXuj2TTyJMsO7pSeKw2bfRNZGjhB7YzrpbMYj5b5QsUebHpOqR3R3ziy/g==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@vue/compiler-dom": "3.5.25",
-                "@vue/compiler-sfc": "3.5.25",
-                "@vue/runtime-dom": "3.5.25",
-                "@vue/server-renderer": "3.5.25",
-                "@vue/shared": "3.5.25"
-            },
-            "peerDependencies": {
-                "typescript": "*"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/vue-tsc": {
-            "version": "2.2.12",
-            "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.2.12.tgz",
-            "integrity": "sha512-P7OP77b2h/Pmk+lZdJ0YWs+5tJ6J2+uOQPo7tlBnY44QqQSPYvS0qVT4wqDJgwrZaLe47etJLLQRFia71GYITw==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@volar/typescript": "2.4.15",
-                "@vue/language-core": "2.2.12"
-            },
-            "bin": {
-                "vue-tsc": "bin/vue-tsc.js"
-            },
-            "peerDependencies": {
-                "typescript": ">=5.0.0"
-            }
-        },
-        "node_modules/vue-tsc/node_modules/@volar/language-core": {
-            "version": "2.4.15",
-            "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.15.tgz",
-            "integrity": "sha512-3VHw+QZU0ZG9IuQmzT68IyN4hZNd9GchGPhbD9+pa8CVv7rnoOZwo7T8weIbrRmihqy3ATpdfXFnqRrfPVK6CA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@volar/source-map": "2.4.15"
-            }
-        },
-        "node_modules/vue-tsc/node_modules/@volar/source-map": {
-            "version": "2.4.15",
-            "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.15.tgz",
-            "integrity": "sha512-CPbMWlUN6hVZJYGcU/GSoHu4EnCHiLaXI9n8c9la6RaI9W5JHX+NqG+GSQcB0JdC2FIBLdZJwGsfKyBB71VlTg==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/vue-tsc/node_modules/@volar/typescript": {
-            "version": "2.4.15",
-            "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.15.tgz",
-            "integrity": "sha512-2aZ8i0cqPGjXb4BhkMsPYDkkuc2ZQ6yOpqwAuNwUoncELqoy5fRgOQtLR9gB0g902iS0NAkvpIzs27geVyVdPg==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@volar/language-core": "2.4.15",
-                "path-browserify": "^1.0.1",
-                "vscode-uri": "^3.0.8"
-            }
-        },
-        "node_modules/vue-tsc/node_modules/@vue/language-core": {
-            "version": "2.2.12",
-            "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.2.12.tgz",
-            "integrity": "sha512-IsGljWbKGU1MZpBPN+BvPAdr55YPkj2nB/TBNGNC32Vy2qLG25DYu/NBN2vNtZqdRbTRjaoYrahLrToim2NanA==",
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@volar/language-core": "2.4.15",
-                "@vue/compiler-dom": "^3.5.0",
-                "@vue/compiler-vue2": "^2.7.16",
-                "@vue/shared": "^3.5.0",
-                "alien-signals": "^1.0.3",
-                "minimatch": "^9.0.3",
-                "muggle-string": "^0.4.1",
-                "path-browserify": "^1.0.1"
-            },
-            "peerDependencies": {
-                "typescript": "*"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/vue-tsc/node_modules/alien-signals": {
-            "version": "1.0.13",
-            "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-1.0.13.tgz",
-            "integrity": "sha512-OGj9yyTnJEttvzhTUWuscOvtqxq5vrhF7vL9oS0xJ2mK0ItPYP1/y+vCFebfxoEyAz0++1AIwJ5CMr+Fk3nDmg==",
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/vue-tsc/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-            "license": "ISC",
-            "peer": true,
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/zod": {
-            "version": "3.25.76",
-            "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
-            "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
-            "license": "MIT",
-            "peer": true,
-            "funding": {
-                "url": "https://github.com/sponsors/colinhacks"
-            }
-        }
-    }
-}
diff --git a/resources/js/packages/ui/package.json b/resources/js/packages/ui/package.json
index da80c08f..23e6638c 100644
--- a/resources/js/packages/ui/package.json
+++ b/resources/js/packages/ui/package.json
@@ -48,22 +48,13 @@
     "author": "solidtime",
     "license": "AGPL-3.0",
     "devDependencies": {
-        "@types/node": "^22.4.1",
-        "@vitejs/plugin-vue": "^5.1.2",
-        "@vue/tsconfig": "^0.5.1",
-        "autoprefixer": "^10.4.20",
-        "postcss": "^8.4.14",
-        "postcss-import": "^15.1.0",
-        "postcss-nesting": "^12.1.0",
-        "typescript": "^5.5.4",
-        "vite": "^5.4.1",
         "vite-plugin-dts": "^4.0.3"
     },
     "peerDependencies": {
         "@floating-ui/vue": "^1.1.4",
         "@heroicons/vue": "^2.1.5",
-        "@vueuse/core": "^12.5.0",
-        "@zodios/core": "^10.9.6",
+        "@vitejs/plugin-vue": "^5.1.2 || ^6.0.0",
+        "@vueuse/core": "^12.5.0 || ^14.0.0",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
         "dayjs": "^1.11.13",
@@ -71,7 +62,9 @@
         "reka-ui": "^2.2.0",
         "tailwind-merge": "^2.5.2",
         "tailwindcss": "^3.1.0",
+        "typescript": "^5.5.4",
+        "vite": "^5.4.1 || ^6.0.0 || ^7.0.0",
         "vue": "^3.5.0",
-        "vue-tsc": "^2.2.0"
+        "vue-tsc": "^2.2.0 || ^3.0.0"
     }
 }
diff --git a/resources/js/packages/ui/src/FullCalendar/idleStatusPlugin.ts b/resources/js/packages/ui/src/FullCalendar/idleStatusPlugin.ts
index d33721af..f5e7f36e 100644
--- a/resources/js/packages/ui/src/FullCalendar/idleStatusPlugin.ts
+++ b/resources/js/packages/ui/src/FullCalendar/idleStatusPlugin.ts
@@ -320,8 +320,8 @@ function getSlotDuration(calendarEl: HTMLElement): number {
     const secondTime = secondSlot.getAttribute('data-time');
 
     if (firstTime && secondTime) {
-        const [h1, m1] = firstTime.split(':').map(Number);
-        const [h2, m2] = secondTime.split(':').map(Number);
+        const [h1 = 0, m1 = 0] = firstTime.split(':').map(Number);
+        const [h2 = 0, m2 = 0] = secondTime.split(':').map(Number);
         const diff = h2 * 60 + m2 - (h1 * 60 + m1);
         if (diff > 0) return diff;
     }
diff --git a/resources/js/packages/ui/src/Input/DurationHumanInput.vue b/resources/js/packages/ui/src/Input/DurationHumanInput.vue
index 8224f076..7df9507e 100644
--- a/resources/js/packages/ui/src/Input/DurationHumanInput.vue
+++ b/resources/js/packages/ui/src/Input/DurationHumanInput.vue
@@ -41,8 +41,8 @@ function updateDuration() {
         const results = parseHHMM(temporaryCustomTimerEntry.value);
         if (results) {
             const newStartDate = getDayJsInstance()(end.value)
-                .subtract(parseInt(results[1]), 'h')
-                .subtract(parseInt(results[2]), 'm');
+                .subtract(parseInt(results[1]!), 'h')
+                .subtract(parseInt(results[2]!), 'm');
             start.value = newStartDate.utc().format();
         }
     }
diff --git a/resources/js/packages/ui/src/Input/TimePickerSimple.vue b/resources/js/packages/ui/src/Input/TimePickerSimple.vue
index 95e725b0..ca258f8b 100644
--- a/resources/js/packages/ui/src/Input/TimePickerSimple.vue
+++ b/resources/js/packages/ui/src/Input/TimePickerSimple.vue
@@ -25,7 +25,7 @@ function updateTime(event: Event) {
     const target = event.target as HTMLInputElement;
     const newValue = target.value.trim();
     if (newValue.split(':').length === 2) {
-        const [hours, minutes] = newValue.split(':');
+        const [hours, minutes] = newValue.split(':') as [string, string];
         if (!isNaN(parseInt(hours)) && !isNaN(parseInt(minutes))) {
             const currentTime = getLocalizedDayJs(model.value);
             const newHours = Math.min(parseInt(hours), 23);
diff --git a/resources/js/packages/ui/src/Input/TimeRangeSelector.vue b/resources/js/packages/ui/src/Input/TimeRangeSelector.vue
index 76a01095..545109f1 100644
--- a/resources/js/packages/ui/src/Input/TimeRangeSelector.vue
+++ b/resources/js/packages/ui/src/Input/TimeRangeSelector.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { defineProps, nextTick, ref, watch } from 'vue';
+import { nextTick, ref, watch } from 'vue';
 import DatePicker from '@/packages/ui/src/Input/DatePicker.vue';
 import { getDayJsInstance, getLocalizedDayJs } from '@/packages/ui/src/utils/time';
 import dayjs from 'dayjs';
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue
index 9a3f8457..76b117d7 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue
@@ -53,7 +53,7 @@ const groupedTimeEntries = computed(() => {
     }
     const groupedEntriesByDayAndType: Record<string, TimeEntriesGroupedByType[]> = {};
     for (const dailyEntriesKey in groupedEntriesByDay) {
-        const dailyEntries = groupedEntriesByDay[dailyEntriesKey];
+        const dailyEntries = groupedEntriesByDay[dailyEntriesKey]!;
         const newDailyEntries: TimeEntriesGroupedByType[] = [];
 
         for (const entry of dailyEntries) {
@@ -66,26 +66,22 @@ const groupedTimeEntries = computed(() => {
                     e.description === entry.description
             );
             if (oldEntriesIndex !== -1 && newDailyEntries[oldEntriesIndex]) {
-                newDailyEntries[oldEntriesIndex].timeEntries.push(entry);
+                const existingEntry = newDailyEntries[oldEntriesIndex]!;
+                existingEntry.timeEntries.push(entry);
 
                 // Add up durations for time entries of the same type
-                newDailyEntries[oldEntriesIndex].duration =
-                    (newDailyEntries[oldEntriesIndex].duration ?? 0) + (entry?.duration ?? 0);
+                existingEntry.duration = (existingEntry.duration ?? 0) + (entry?.duration ?? 0);
 
                 // adapt start end times so they show the earliest start and latest end time
                 if (
                     getDayJsInstance()(entry.start).isBefore(
-                        getDayJsInstance()(newDailyEntries[oldEntriesIndex].start)
+                        getDayJsInstance()(existingEntry.start)
                     )
                 ) {
-                    newDailyEntries[oldEntriesIndex].start = entry.start;
+                    existingEntry.start = entry.start;
                 }
-                if (
-                    getDayJsInstance()(entry.end).isAfter(
-                        getDayJsInstance()(newDailyEntries[oldEntriesIndex].end)
-                    )
-                ) {
-                    newDailyEntries[oldEntriesIndex].end = entry.end;
+                if (getDayJsInstance()(entry.end).isAfter(getDayJsInstance()(existingEntry.end))) {
+                    existingEntry.end = entry.end;
                 }
             } else {
                 newDailyEntries.push({ ...entry, timeEntries: [entry] });
@@ -204,7 +200,7 @@ function unselectAllTimeEntries(value: TimeEntriesGroupedByType[]) {
                     :delete-time-entry="() => deleteTimeEntries([entry])"
                     :duplicate-time-entry="() => createTimeEntry(entry)"
                     :currency="currency"
-                    :time-entry="entry.timeEntries[0]"
+                    :time-entry="entry.timeEntries[0]!"
                     @selected="selectedTimeEntries.push(entry)"
                     @unselected="
                         selectedTimeEntries = selectedTimeEntries.filter(
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryRangeSelector.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryRangeSelector.vue
index b347ddaf..4f5a76f3 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryRangeSelector.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryRangeSelector.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
-import { defineProps, ref, inject, type ComputedRef } from 'vue';
+import { ref, inject, type ComputedRef } from 'vue';
 import { formatDateLocalized, formatStartEnd } from '@/packages/ui/src/utils/time';
 import TimeRangeSelector from '@/packages/ui/src/Input/TimeRangeSelector.vue';
 import { twMerge } from 'tailwind-merge';
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryRowDurationInput.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryRowDurationInput.vue
index 68917d31..8a573dd8 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryRowDurationInput.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryRowDurationInput.vue
@@ -4,7 +4,7 @@ import {
     formatHumanReadableDuration,
     parseTimeInput,
 } from '@/packages/ui/src/utils/time';
-import { computed, defineProps, ref, inject, type ComputedRef } from 'vue';
+import { computed, ref, inject, type ComputedRef } from 'vue';
 import dayjs from 'dayjs';
 import type { Organization } from '@/packages/api/src';
 
diff --git a/resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue b/resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue
index d43af854..99cda9ed 100644
--- a/resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue
+++ b/resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue
@@ -92,7 +92,7 @@ function addProjectToFilterObject(
 
     if (projectClientIndex !== -1) {
         // client already exists in filter array
-        tempFilteredClients[projectClientIndex].projects.push({
+        tempFilteredClients[projectClientIndex]!.projects.push({
             ...project,
             expanded: expanded,
             tasks: filteredTasks,
@@ -119,7 +119,7 @@ function addProjectToFilterObject(
 
         if (noClientIndex !== -1) {
             // no client group already exists in filter array
-            tempFilteredClients[noClientIndex].projects.push({
+            tempFilteredClients[noClientIndex]!.projects.push({
                 ...project,
                 expanded: expanded,
                 tasks: filteredTasks,
@@ -253,7 +253,7 @@ function isProjectSelected(project: Project) {
 
 function initializeHighlightedItem() {
     if (filteredProjects.value.length > 0) {
-        highlightedItemId.value = filteredProjects.value[0].id;
+        highlightedItemId.value = filteredProjects.value[0]!.id;
     }
 }
 
@@ -312,27 +312,27 @@ function moveHighlightUp() {
                 highlightedItemId.value = currentProjectWithTasks.id;
                 return;
             }
-            highlightedItemId.value = currentProjectWithTasks.tasks[taskIndex - 1].id;
+            highlightedItemId.value = currentProjectWithTasks.tasks[taskIndex - 1]!.id;
         }
     }
     if (currentHighlightedIndex === 0) {
         // selected project is the first project in the list
         // highlight the last project or the last task of the last project
-        const lastProject = filteredProjects.value[filteredProjects.value.length - 1];
+        const lastProject = filteredProjects.value[filteredProjects.value.length - 1]!;
         if (lastProject.tasks.length > 0 && lastProject.expanded) {
             // highlight last task of last project
-            highlightedItemId.value = lastProject.tasks[lastProject.tasks.length - 1].id;
+            highlightedItemId.value = lastProject.tasks[lastProject.tasks.length - 1]!.id;
         } else {
-            highlightedItemId.value = filteredProjects.value[filteredProjects.value.length - 1].id;
+            highlightedItemId.value = filteredProjects.value[filteredProjects.value.length - 1]!.id;
         }
     } else {
         // selected item is a project that is not the first project in the list
-        const previousProject = filteredProjects.value[currentHighlightedIndex - 1];
+        const previousProject = filteredProjects.value[currentHighlightedIndex - 1]!;
         if (previousProject.tasks.length > 0 && previousProject.expanded) {
             // highlight last task of previous project
-            highlightedItemId.value = previousProject.tasks[previousProject.tasks.length - 1].id;
+            highlightedItemId.value = previousProject.tasks[previousProject.tasks.length - 1]!.id;
         } else {
-            highlightedItemId.value = filteredProjects.value[currentHighlightedIndex - 1].id;
+            highlightedItemId.value = filteredProjects.value[currentHighlightedIndex - 1]!.id;
         }
     }
 }
@@ -361,33 +361,33 @@ function moveHighlightDown() {
                 const projectIndex = filteredProjects.value.indexOf(currentProjectWithTasks);
                 if (projectIndex === filteredProjects.value.length - 1) {
                     // highlight the first project if it was the last project
-                    highlightedItemId.value = filteredProjects.value[0].id;
+                    highlightedItemId.value = filteredProjects.value[0]!.id;
                 } else {
-                    highlightedItemId.value = filteredProjects.value[projectIndex + 1].id;
+                    highlightedItemId.value = filteredProjects.value[projectIndex + 1]!.id;
                 }
                 return;
             }
-            highlightedItemId.value = currentProjectWithTasks.tasks[taskIndex + 1].id;
+            highlightedItemId.value = currentProjectWithTasks.tasks[taskIndex + 1]!.id;
         }
     }
     if (currentHighlightedIndex === filteredProjects.value.length - 1) {
         // selected project is the last project in the list
         // highlight the first project or the last project of the last project
-        const lastProject = filteredProjects.value[filteredProjects.value.length - 1];
+        const lastProject = filteredProjects.value[filteredProjects.value.length - 1]!;
         if (lastProject.tasks.length > 0 && lastProject.expanded) {
             // highlight last task of last project
-            highlightedItemId.value = lastProject.tasks[0].id;
+            highlightedItemId.value = lastProject.tasks[0]!.id;
         } else {
-            highlightedItemId.value = filteredProjects.value[0].id;
+            highlightedItemId.value = filteredProjects.value[0]!.id;
         }
     } else {
         // selected item is a project that is not the last project in the list
-        const currentProjectWithTasks = filteredProjects.value[currentHighlightedIndex];
+        const currentProjectWithTasks = filteredProjects.value[currentHighlightedIndex]!;
         if (currentProjectWithTasks.tasks.length > 0 && currentProjectWithTasks.expanded) {
             // highlight last task of previous project
-            highlightedItemId.value = currentProjectWithTasks.tasks[0].id;
+            highlightedItemId.value = currentProjectWithTasks.tasks[0]!.id;
         } else {
-            highlightedItemId.value = filteredProjects.value[currentHighlightedIndex + 1].id;
+            highlightedItemId.value = filteredProjects.value[currentHighlightedIndex + 1]!.id;
         }
     }
 }
@@ -423,7 +423,7 @@ function expandProject() {
     if (currentHighlightedIndex === -1) {
         return;
     }
-    const currentProject = filteredProjects.value[currentHighlightedIndex];
+    const currentProject = filteredProjects.value[currentHighlightedIndex]!;
     currentProject.expanded = true;
 }
 
@@ -434,7 +434,7 @@ function collapseProject() {
     if (currentHighlightedIndex === -1) {
         return;
     }
-    const currentProject = filteredProjects.value[currentHighlightedIndex];
+    const currentProject = filteredProjects.value[currentHighlightedIndex]!;
     currentProject.expanded = false;
 }
 
diff --git a/resources/js/packages/ui/src/utils/color.ts b/resources/js/packages/ui/src/utils/color.ts
index 74fc5fcd..e7058df2 100644
--- a/resources/js/packages/ui/src/utils/color.ts
+++ b/resources/js/packages/ui/src/utils/color.ts
@@ -23,11 +23,11 @@ export const colors = [
 ];
 
 export function getRandomColor() {
-    return colors[Math.floor(Math.random() * colors.length)];
+    return colors[Math.floor(Math.random() * colors.length)]!;
 }
 
 export function getRandomColorWithSeed(seed: string) {
     const pseudoRandom = new Prando(seed);
     const index = pseudoRandom.nextInt(0, colors.length - 1);
-    return colors[index];
+    return colors[index]!;
 }
diff --git a/resources/js/packages/ui/src/utils/number.ts b/resources/js/packages/ui/src/utils/number.ts
index 1b345d0b..f8d943f3 100644
--- a/resources/js/packages/ui/src/utils/number.ts
+++ b/resources/js/packages/ui/src/utils/number.ts
@@ -14,8 +14,8 @@ export type NumberFormat =
 export function formatNumber(value: number, format?: string): string {
     // Convert to fixed 2 decimal places first
     const parts = value.toFixed(2).split('.');
-    const wholePart = parts[0];
-    const decimalPart = parts[1];
+    const wholePart = parts[0] ?? '0';
+    const decimalPart = parts[1] ?? '00';
 
     // Format the whole number part based on the format
     let formattedWhole: string;
diff --git a/resources/js/packages/ui/src/utils/random.ts b/resources/js/packages/ui/src/utils/random.ts
index c1305e20..914ae628 100644
--- a/resources/js/packages/ui/src/utils/random.ts
+++ b/resources/js/packages/ui/src/utils/random.ts
@@ -107,7 +107,7 @@ export default class Prando {
      * @return An item from the array.
      */
     public nextArrayItem<T>(array: T[]): T {
-        return array[this.nextInt(0, array.length - 1)];
+        return array[this.nextInt(0, array.length - 1)] as T;
     }
 
     /**
diff --git a/resources/js/packages/ui/src/utils/select.ts b/resources/js/packages/ui/src/utils/select.ts
index 90fbfdf2..ad739333 100644
--- a/resources/js/packages/ui/src/utils/select.ts
+++ b/resources/js/packages/ui/src/utils/select.ts
@@ -12,16 +12,16 @@ export function useSelectEvents<Type>(
             const currentHightlightedIndex = filteredItems.value.indexOf(highlightedItem.value);
             if (currentHightlightedIndex === 0) {
                 highlightedItemId.value = getKeyFromItem(
-                    filteredItems.value[filteredItems.value.length - 1]
+                    filteredItems.value[filteredItems.value.length - 1]!
                 );
             } else {
                 highlightedItemId.value = getKeyFromItem(
-                    filteredItems.value[currentHightlightedIndex - 1]
+                    filteredItems.value[currentHightlightedIndex - 1]!
                 );
             }
         } else {
             highlightedItemId.value = getKeyFromItem(
-                filteredItems.value[filteredItems.value.length - 1]
+                filteredItems.value[filteredItems.value.length - 1]!
             );
         }
     }
@@ -30,14 +30,14 @@ export function useSelectEvents<Type>(
         if (highlightedItem.value) {
             const currentHightlightedIndex = filteredItems.value.indexOf(highlightedItem.value);
             if (currentHightlightedIndex === filteredItems.value.length - 1) {
-                highlightedItemId.value = getKeyFromItem(filteredItems.value[0]);
+                highlightedItemId.value = getKeyFromItem(filteredItems.value[0]!);
             } else {
                 highlightedItemId.value = getKeyFromItem(
-                    filteredItems.value[currentHightlightedIndex + 1]
+                    filteredItems.value[currentHightlightedIndex + 1]!
                 );
             }
         } else {
-            highlightedItemId.value = getKeyFromItem(filteredItems.value[0]);
+            highlightedItemId.value = getKeyFromItem(filteredItems.value[0]!);
         }
     }
 
diff --git a/resources/js/packages/ui/src/utils/time.ts b/resources/js/packages/ui/src/utils/time.ts
index 1565c100..2685a102 100644
--- a/resources/js/packages/ui/src/utils/time.ts
+++ b/resources/js/packages/ui/src/utils/time.ts
@@ -227,9 +227,9 @@ export function parseTimeInput(
     if (HHMMSStimeRegex.test(input)) {
         const match = input.match(HHMMSStimeRegex);
         if (match) {
-            const hours = parseInt(match[1]);
-            const minutes = parseInt(match[2]);
-            const seconds = parseInt(match[3]);
+            const hours = parseInt(match[1]!);
+            const minutes = parseInt(match[2]!);
+            const seconds = parseInt(match[3]!);
             return hours * 3600 + minutes * 60 + seconds;
         }
     }
@@ -239,8 +239,8 @@ export function parseTimeInput(
     if (HHMMtimeRegex.test(input)) {
         const match = input.match(HHMMtimeRegex);
         if (match) {
-            const hours = parseInt(match[1]);
-            const minutes = parseInt(match[2]);
+            const hours = parseInt(match[1]!);
+            const minutes = parseInt(match[2]!);
             return (hours * 60 + minutes) * 60;
         }
     }
diff --git a/resources/js/utils/prefetch.ts b/resources/js/utils/prefetch.ts
index 6ba3cb4c..a5467c65 100644
--- a/resources/js/utils/prefetch.ts
+++ b/resources/js/utils/prefetch.ts
@@ -264,17 +264,17 @@ function prefetchProjectMembers(queryClient: QueryClient, projectId: string) {
  */
 function findPrefetcher(url: string): ((queryClient: QueryClient) => void) | undefined {
     // Extract pathname from URL
-    const pathname = url.startsWith('http') ? new URL(url).pathname : url.split('?')[0];
+    const pathname = url.startsWith('http') ? new URL(url).pathname : url.split('?')[0]!;
 
     // Try exact match first
-    if (routePrefetchers[pathname]) {
+    if (pathname && routePrefetchers[pathname]) {
         return routePrefetchers[pathname];
     }
 
     // Try pattern matching for dynamic routes like /projects/{id}
-    const projectMatch = pathname.match(/^\/projects\/([^/]+)$/);
+    const projectMatch = pathname?.match(/^\/projects\/([^/]+)$/);
     if (projectMatch) {
-        const projectId = projectMatch[1];
+        const projectId = projectMatch[1]!;
         return (queryClient) => {
             prefetchProjects(queryClient);
             prefetchTasks(queryClient);
diff --git a/resources/js/utils/useCommandPalette.ts b/resources/js/utils/useCommandPalette.ts
index 5f496afb..d0fde023 100644
--- a/resources/js/utils/useCommandPalette.ts
+++ b/resources/js/utils/useCommandPalette.ts
@@ -349,8 +349,8 @@ export function useCommandPalette() {
             if (cmd.permission && !cmd.permission()) continue;
             if (cmd.condition && !cmd.condition()) continue;
 
-            if (grouped[cmd.group]) {
-                grouped[cmd.group].push(cmd);
+            if (grouped[cmd.group] !== undefined) {
+                grouped[cmd.group]!.push(cmd);
             }
         }
 
diff --git a/resources/js/utils/useTimeEntriesInfiniteQuery.ts b/resources/js/utils/useTimeEntriesInfiniteQuery.ts
index 1808da61..cca8c57b 100644
--- a/resources/js/utils/useTimeEntriesInfiniteQuery.ts
+++ b/resources/js/utils/useTimeEntriesInfiniteQuery.ts
@@ -41,7 +41,7 @@ export function useTimeEntriesInfiniteQuery() {
             if (!lastPage?.data || lastPage.data.length === 0) {
                 return undefined;
             }
-            const latestTimeEntry = lastPage.data[lastPage.data.length - 1];
+            const latestTimeEntry = lastPage.data[lastPage.data.length - 1]!;
             return dayjs(latestTimeEntry.start).utc().format();
         },
         enabled: computed(() => !!organizationId.value),

From 98634f4a1921869420c97299fe87a0e1dce8dafe Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Mon, 2 Feb 2026 14:55:09 +0100
Subject: [PATCH 18/28] fix Y-Label ui regression from echarts update

---
 .../Common/Reporting/ReportingChart.vue       | 11 ++-----
 .../Dashboard/DayOverviewCardChart.vue        | 30 ++-----------------
 .../Components/Dashboard/ThisWeekOverview.vue | 15 ++++------
 3 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/resources/js/Components/Common/Reporting/ReportingChart.vue b/resources/js/Components/Common/Reporting/ReportingChart.vue
index 241ed88b..4a735324 100644
--- a/resources/js/Components/Common/Reporting/ReportingChart.vue
+++ b/resources/js/Components/Common/Reporting/ReportingChart.vue
@@ -107,9 +107,7 @@ const option = computed(() => ({
             },
         },
         axisLine: {
-            lineStyle: {
-                color: 'transparent', // Set desired color here
-            },
+            show: false,
         },
         axisLabel: {
             fontSize: 12,
@@ -119,16 +117,13 @@ const option = computed(() => ({
             fontFamily: 'Inter, sans-serif',
         },
         axisTick: {
-            lineStyle: {
-                color: 'transparent', // Set desired color here
-            },
+            show: false,
         },
     },
     yAxis: {
         type: 'value',
         axisLabel: {
-            color: labelColor.value,
-            fontFamily: 'Inter, sans-serif',
+            show: false,
         },
         splitLine: {
             lineStyle: {
diff --git a/resources/js/Components/Dashboard/DayOverviewCardChart.vue b/resources/js/Components/Dashboard/DayOverviewCardChart.vue
index cdea77a5..ee868577 100644
--- a/resources/js/Components/Dashboard/DayOverviewCardChart.vue
+++ b/resources/js/Components/Dashboard/DayOverviewCardChart.vue
@@ -8,7 +8,6 @@ const props = defineProps<{
 }>();
 
 const accentColor = useCssVariable('--theme-color-chart');
-const markLineColor = useCssVariable('--color-border-secondary');
 
 const seriesData = computed(() =>
     props.history.map((el) => {
@@ -36,36 +35,11 @@ const option = computed(() => ({
     xAxis: {
         type: 'category',
         data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-        markLine: {
-            lineStyle: {
-                color: markLineColor.value,
-                type: 'dashed',
-            },
-        },
-        axisLine: {
-            lineStyle: {
-                color: 'transparent', // Set desired color here
-            },
-        },
-        axisLabel: {
-            fontSize: 16,
-            fontWeight: 600,
-            margin: 24,
-            fontFamily: 'Inter, sans-serif',
-        },
-        axisTick: {
-            lineStyle: {
-                color: 'transparent', // Set desired color here
-            },
-        },
+        show: false,
     },
     yAxis: {
         type: 'value',
-        splitLine: {
-            lineStyle: {
-                color: 'transparent', // Set desired color here
-            },
-        },
+        show: false,
     },
     series: [
         {
diff --git a/resources/js/Components/Dashboard/ThisWeekOverview.vue b/resources/js/Components/Dashboard/ThisWeekOverview.vue
index 6ca2316b..f886fa94 100644
--- a/resources/js/Components/Dashboard/ThisWeekOverview.vue
+++ b/resources/js/Components/Dashboard/ThisWeekOverview.vue
@@ -193,28 +193,23 @@ const option = computed(() => {
             type: 'category',
             data: weekdays.value,
             axisLine: {
-                lineStyle: {
-                    color: 'transparent', // Set desired color here
-                },
+                show: false,
             },
             axisLabel: {
-                fontSize: 16,
-                fontWeight: 600,
+                fontSize: 14,
+                fontWeight: 500,
                 margin: 24,
                 fontFamily: 'Inter, sans-serif',
                 color: labelColor.value,
             },
             axisTick: {
-                lineStyle: {
-                    color: 'transparent', // Set desired color here
-                },
+                show: false,
             },
         },
         yAxis: {
             type: 'value',
             axisLabel: {
-                color: labelColor.value,
-                fontFamily: 'Inter, sans-serif',
+                show: false,
             },
             splitLine: {
                 lineStyle: {

From 18989a9a8e62ae36e280d58f43779968a4f182e5 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Mon, 2 Feb 2026 16:06:33 +0100
Subject: [PATCH 19/28] Add Mailpit SMTP and refine Playwright tests

---
 .env.ci                          |   7 +-
 .github/workflows/playwright.yml |   4 ++
 docker-compose.yml               |   2 +-
 e2e/members.spec.ts              | 118 ++++++++++++++++++++++---------
 e2e/project-members.spec.ts      |   2 +-
 e2e/reporting.spec.ts            |   8 +--
 e2e/time.spec.ts                 |   3 +-
 e2e/utils/mailpit.ts             |  53 ++++++++++++++
 e2e/utils/members.ts             |  68 ++++++++++++++++++
 playwright/config.ts             |   1 +
 10 files changed, 226 insertions(+), 40 deletions(-)
 create mode 100644 e2e/utils/mailpit.ts
 create mode 100644 e2e/utils/members.ts

diff --git a/.env.ci b/.env.ci
index 40ce2768..e1039743 100644
--- a/.env.ci
+++ b/.env.ci
@@ -34,7 +34,12 @@ SESSION_DRIVER=database
 SESSION_LIFETIME=120
 
 # Mail
-MAIL_MAILER=log
+MAIL_MAILER=smtp
+MAIL_HOST=localhost
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS="no-reply@solidtime.test"
 MAIL_FROM_NAME="solidtime"
 MAIL_REPLY_TO_ADDRESS="hello@solidtime.test"
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index d0f9b805..98432491 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -10,6 +10,9 @@ jobs:
     services:
       mailpit:
         image: 'axllent/mailpit:latest'
+        ports:
+          - 1025:1025
+          - 8025:8025
       pgsql_test:
         image: postgres:15
         env:
@@ -67,6 +70,7 @@ jobs:
         run: npx playwright test
         env:
           PLAYWRIGHT_BASE_URL: 'http://127.0.0.1:8000'
+          MAILPIT_BASE_URL: 'http://localhost:8025'
 
       - name: "Upload test results"
         uses: actions/upload-artifact@v4
diff --git a/docker-compose.yml b/docker-compose.yml
index 53d73ed4..99148a2e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -107,7 +107,7 @@ services:
             - sail
             - reverse-proxy
     playwright:
-        image: mcr.microsoft.com/playwright:v1.51.1-jammy
+        image: mcr.microsoft.com/playwright:v1.58.1-jammy
         command: ['npx', 'playwright', 'test', '--ui-port=8080', '--ui-host=0.0.0.0']
         working_dir: /src
         extra_hosts:
diff --git a/e2e/members.spec.ts b/e2e/members.spec.ts
index 7f182811..0ccfd90d 100644
--- a/e2e/members.spec.ts
+++ b/e2e/members.spec.ts
@@ -7,6 +7,10 @@ import type { Page } from '@playwright/test';
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
+import { inviteAndAcceptMember } from './utils/members';
+
+// Tests that invite + accept members need more time
+test.describe.configure({ timeout: 60000 });
 
 async function goToMembersPage(page: Page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/members');
@@ -19,41 +23,45 @@ async function openInviteMemberModal(page: Page) {
     ]);
 }
 
-test('test that new manager can be invited', async ({ page }) => {
+test('test that new manager can be invited and accepted', async ({ page, browser }) => {
+    const memberId = Math.round(Math.random() * 100000);
+    const memberEmail = `manager+${memberId}@invite.test`;
+
+    await inviteAndAcceptMember(page, browser, 'Invited Mgr', memberEmail, 'Manager');
+
+    // Verify the member appears in the members table with the correct role
     await goToMembersPage(page);
-    await openInviteMemberModal(page);
-    const editorId = Math.round(Math.random() * 10000);
-    await page.getByLabel('Email').fill(`new+${editorId}@editor.test`);
-    await page.getByRole('button', { name: 'Manager' }).click();
-    await Promise.all([
-        page.getByRole('button', { name: 'Invite Member', exact: true }).click(),
-        expect(page.getByRole('main')).toContainText(`new+${editorId}@editor.test`),
-    ]);
+    const memberRow = page.getByRole('row').filter({ hasText: 'Invited Mgr' });
+    await expect(memberRow).toBeVisible();
+    await expect(memberRow.getByText('Manager', { exact: true })).toBeVisible();
 });
 
-test('test that new employee can be invited', async ({ page }) => {
+test('test that new employee can be invited and accepted', async ({ page, browser }) => {
+    const memberId = Math.round(Math.random() * 100000);
+    const memberEmail = `employee+${memberId}@invite.test`;
+
+    await inviteAndAcceptMember(page, browser, 'Invited Emp', memberEmail, 'Employee');
+
+    // Verify the member appears in the members table with the correct role
     await goToMembersPage(page);
-    await openInviteMemberModal(page);
-    const editorId = Math.round(Math.random() * 10000);
-    await page.getByLabel('Email').fill(`new+${editorId}@editor.test`);
-    await page.getByRole('button', { name: 'Employee' }).click();
-    await Promise.all([
-        page.getByRole('button', { name: 'Invite Member', exact: true }).click(),
-        expect(page.getByRole('main')).toContainText(`new+${editorId}@editor.test`),
-    ]);
+    const memberRow = page.getByRole('row').filter({ hasText: 'Invited Emp' });
+    await expect(memberRow).toBeVisible();
+    await expect(memberRow.getByText('Employee', { exact: true })).toBeVisible();
 });
 
-test('test that new admin can be invited', async ({ page }) => {
+test('test that new admin can be invited and accepted', async ({ page, browser }) => {
+    const memberId = Math.round(Math.random() * 100000);
+    const memberEmail = `admin+${memberId}@invite.test`;
+
+    await inviteAndAcceptMember(page, browser, 'Invited Adm', memberEmail, 'Administrator');
+
+    // Verify the member appears in the members table with the correct role
     await goToMembersPage(page);
-    await openInviteMemberModal(page);
-    const adminId = Math.round(Math.random() * 10000);
-    await page.getByLabel('Email').fill(`new+${adminId}@admin.test`);
-    await page.getByRole('button', { name: 'Administrator' }).click();
-    await Promise.all([
-        page.getByRole('button', { name: 'Invite Member', exact: true }).click(),
-        expect(page.getByRole('main')).toContainText(`new+${adminId}@admin.test`),
-    ]);
+    const memberRow = page.getByRole('row').filter({ hasText: 'Invited Adm' });
+    await expect(memberRow).toBeVisible();
+    await expect(memberRow.getByText('Admin', { exact: true })).toBeVisible();
 });
+
 test('test that error shows if no role is selected', async ({ page }) => {
     await goToMembersPage(page);
     await openInviteMemberModal(page);
@@ -131,7 +139,7 @@ async function createPlaceholderMemberViaImport(page: Page, placeholderName: str
     fs.unlinkSync(tmpFile);
 }
 
-test('test that changing member role updates the role in the member table', async ({ page }) => {
+test('test that changing role of placeholder member is rejected', async ({ page }) => {
     const placeholderName = 'RoleChange ' + Math.floor(Math.random() * 10000);
 
     // Create a placeholder member via import
@@ -141,7 +149,7 @@ test('test that changing member role updates the role in the member table', asyn
     await goToMembersPage(page);
     const memberRow = page.getByRole('row').filter({ hasText: placeholderName });
     await expect(memberRow).toBeVisible();
-    await expect(memberRow.getByText('Placeholder')).toBeVisible();
+    await expect(memberRow.getByText('Placeholder', { exact: true })).toBeVisible();
 
     // Open the edit modal for the placeholder member
     await memberRow.getByRole('button').click();
@@ -152,7 +160,53 @@ test('test that changing member role updates the role in the member table', asyn
     // Change role to Employee
     const roleSelect = page.getByRole('dialog').getByRole('combobox').first();
     await roleSelect.click();
+    await expect(page.getByRole('option', { name: 'Employee' })).toBeVisible();
     await page.getByRole('option', { name: 'Employee' }).click();
+    await expect(roleSelect).toContainText('Employee');
+
+    // Submit the change - the API should reject it with 400
+    await Promise.all([
+        page.getByRole('button', { name: 'Update Member' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/members/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 400
+        ),
+    ]);
+
+    // Verify error notification is shown
+    await expect(page.getByText('Failed to update member')).toBeVisible();
+});
+
+test('test that changing member role updates the role in the member table', async ({
+    page,
+    browser,
+}) => {
+    const memberId = Math.floor(Math.random() * 100000);
+    const memberEmail = `member+${memberId}@rolechange.test`;
+
+    // Invite and accept a new Employee member
+    await inviteAndAcceptMember(page, browser, 'Jane Smith', memberEmail, 'Employee');
+
+    // Verify the new member appears with the Employee role
+    await goToMembersPage(page);
+    const memberRow = page.getByRole('row').filter({ hasText: 'Jane Smith' });
+    await expect(memberRow).toBeVisible();
+    await expect(memberRow.getByText('Employee', { exact: true })).toBeVisible();
+
+    // Open the edit modal
+    await memberRow.getByRole('button').click();
+    await page.getByRole('menuitem').getByText('Edit').click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+    await expect(page.getByRole('heading', { name: 'Update Member' })).toBeVisible();
+
+    // Change role to Manager
+    const roleSelect = page.getByRole('dialog').getByRole('combobox').first();
+    await roleSelect.click();
+    await expect(page.getByRole('option', { name: 'Manager' })).toBeVisible();
+    await page.getByRole('option', { name: 'Manager' }).click();
+    await expect(roleSelect).toContainText('Manager');
 
     // Submit the change and verify the API call succeeds
     await Promise.all([
@@ -169,7 +223,7 @@ test('test that changing member role updates the role in the member table', asyn
     await expect(page.getByRole('dialog')).not.toBeVisible();
 
     // Verify the role updated in the table
-    await expect(memberRow.getByText('Employee')).toBeVisible();
+    await expect(memberRow.getByText('Manager', { exact: true })).toBeVisible();
 });
 
 test('test that merging a placeholder member works', async ({ page }) => {
@@ -192,8 +246,8 @@ test('test that merging a placeholder member works', async ({ page }) => {
     await expect(page.getByRole('heading', { name: 'Merge Member' })).toBeVisible();
 
     // Select the current user (the owner) as merge target via MemberCombobox
-    const combobox = page.getByRole('dialog').getByRole('combobox');
-    await combobox.click();
+    // The MemberCombobox renders a Button as trigger; clicking it opens the popover with the combobox input
+    await page.getByRole('dialog').getByRole('button', { name: 'Select a member...' }).click();
 
     // Wait for dropdown options to load
     const firstOption = page.getByRole('option').first();
diff --git a/e2e/project-members.spec.ts b/e2e/project-members.spec.ts
index 20fe201f..aff8ff81 100644
--- a/e2e/project-members.spec.ts
+++ b/e2e/project-members.spec.ts
@@ -32,7 +32,7 @@ test('test that updating project member billable rate works for existing time en
     await page.getByRole('button', { name: 'Add Member' }).click();
 
     await expect(page.getByText('Add Project Member').first()).toBeVisible();
-    await page.getByRole('combobox').filter({ hasText: 'Select a member' }).click();
+    await page.getByRole('button', { name: 'Select a member...' }).click();
     await page.getByRole('option').first().click();
     await page.getByRole('button', { name: 'Add Project Member' }).click();
 
diff --git a/e2e/reporting.spec.ts b/e2e/reporting.spec.ts
index 02a1825a..edf6e1fd 100644
--- a/e2e/reporting.spec.ts
+++ b/e2e/reporting.spec.ts
@@ -189,7 +189,7 @@ test('test that deselecting a project removes the filter', async ({ page }) => {
     // Deselect project
     await page.getByRole('button', { name: 'Projects' }).first().click();
     await page.getByRole('option').filter({ hasText: project1 }).click();
-    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+    await page.keyboard.press('Escape');
 
     // Verify badge count is gone (no count displayed when 0)
     await expect(
@@ -283,7 +283,7 @@ test('test that deselecting a client removes the filter', async ({ page }) => {
     // Deselect client
     await page.getByRole('button', { name: 'Clients' }).first().click();
     await page.getByRole('option').filter({ hasText: client1 }).click();
-    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+    await page.keyboard.press('Escape');
 
     await expect(
         page.getByRole('button', { name: 'Clients' }).first().getByText(/^\d+$/)
@@ -414,7 +414,7 @@ test('test that deselecting a member removes the filter', async ({ page }) => {
     // Deselect member
     await page.getByRole('button', { name: 'Members' }).first().click();
     await page.getByRole('option').filter({ hasText: 'John Doe' }).click();
-    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+    await page.keyboard.press('Escape');
 
     // Verify badge count is gone
     await expect(
@@ -506,7 +506,7 @@ test('test that deselecting a tag removes the filter', async ({ page }) => {
     // Deselect tag
     await page.getByRole('button', { name: 'Tags' }).click();
     await page.getByRole('option').filter({ hasText: tag1 }).click();
-    await Promise.all([page.keyboard.press('Escape'), waitForReportingUpdate(page)]);
+    await page.keyboard.press('Escape');
 
     await expect(page.getByRole('button', { name: 'Tags' }).getByText(/^\d+$/)).not.toBeVisible();
 });
diff --git a/e2e/time.spec.ts b/e2e/time.spec.ts
index a5ab5443..8d2cb027 100644
--- a/e2e/time.spec.ts
+++ b/e2e/time.spec.ts
@@ -392,7 +392,8 @@ test('test that mass update billable status works', async ({ page }) => {
         page.getByRole('button', { name: 'Update Time Entries' }).click(),
     ]);
     const massUpdateBody = await massUpdateResponse.json();
-    expect(massUpdateBody.data.billable).toBe(true);
+    expect(massUpdateBody.success.length).toBeGreaterThan(0);
+    expect(massUpdateBody.error.length).toBe(0);
 
     // Verify dialog closes
     await expect(page.getByRole('dialog')).not.toBeVisible();
diff --git a/e2e/utils/mailpit.ts b/e2e/utils/mailpit.ts
new file mode 100644
index 00000000..27d54d35
--- /dev/null
+++ b/e2e/utils/mailpit.ts
@@ -0,0 +1,53 @@
+import { expect } from '@playwright/test';
+import type { APIRequestContext } from '@playwright/test';
+import { MAILPIT_BASE_URL } from '../../playwright/config';
+
+/**
+ * Search for emails in Mailpit matching the given query.
+ */
+export async function searchEmails(
+    request: APIRequestContext,
+    query: string
+): Promise<{ messages: Array<{ ID: string; Subject: string }> }> {
+    const response = await request.get(`${MAILPIT_BASE_URL}/api/v1/search?query=${query}`);
+    return response.json();
+}
+
+/**
+ * Get the full email message from Mailpit by ID.
+ */
+export async function getMessage(
+    request: APIRequestContext,
+    messageId: string
+): Promise<{ HTML: string; Text: string }> {
+    const response = await request.get(`${MAILPIT_BASE_URL}/api/v1/message/${messageId}`);
+    return response.json();
+}
+
+/**
+ * Find the invitation acceptance URL from a Mailpit email sent to the given address.
+ * Retries a few times to allow for email delivery delay.
+ */
+export async function getInvitationAcceptUrl(
+    request: APIRequestContext,
+    recipientEmail: string
+): Promise<string> {
+    let searchResult: { messages: Array<{ ID: string }> } = { messages: [] };
+
+    // Retry up to 5 times with 500ms delay to allow for email delivery
+    for (let attempt = 0; attempt < 5; attempt++) {
+        searchResult = await searchEmails(
+            request,
+            `to:${encodeURIComponent(recipientEmail)} subject:"Organization Invitation"`
+        );
+        if (searchResult.messages.length > 0) break;
+        await new Promise((resolve) => setTimeout(resolve, 500));
+    }
+    expect(searchResult.messages.length).toBeGreaterThan(0);
+
+    const message = await getMessage(request, searchResult.messages[0].ID);
+    const acceptUrlMatch = message.HTML.match(/href="([^"]*team-invitations[^"]*)"/);
+    expect(acceptUrlMatch).toBeTruthy();
+
+    return acceptUrlMatch![1].replace(/&amp;/g, '&');
+}
diff --git a/e2e/utils/members.ts b/e2e/utils/members.ts
new file mode 100644
index 00000000..7effa8ef
--- /dev/null
+++ b/e2e/utils/members.ts
@@ -0,0 +1,68 @@
+import { expect } from '@playwright/test';
+import type { Browser, Page } from '@playwright/test';
+import { PLAYWRIGHT_BASE_URL } from '../../playwright/config';
+import { getInvitationAcceptUrl } from './mailpit';
+
+/**
+ * Register a new user in a fresh browser context and return the page + context.
+ */
+export async function registerUser(
+    browser: Browser,
+    name: string,
+    email: string
+): Promise<{ page: Page; close: () => Promise<void> }> {
+    const context = await browser.newContext();
+    const page = await context.newPage();
+
+    await page.goto(PLAYWRIGHT_BASE_URL + '/register');
+    await page.getByLabel('Name').fill(name);
+    await page.getByLabel('Email').fill(email);
+    await page.getByLabel('Password', { exact: true }).fill('amazingpassword123');
+    await page.getByLabel('Confirm Password').fill('amazingpassword123');
+    await page.getByLabel('I agree to the Terms of').click();
+    await page.getByRole('button', { name: 'Register' }).click();
+    await page.waitForURL(PLAYWRIGHT_BASE_URL + '/dashboard');
+
+    return { page, close: () => context.close() };
+}
+
+/**
+ * Invite a user by email from the members page and accept the invitation
+ * through a second browser session, returning the accepted member to the
+ * members table as a real (non-placeholder) member.
+ *
+ * @param ownerPage   – The page of the organization owner who sends the invite
+ * @param browser     – Browser instance used to create a second context
+ * @param memberName  – Display name for the new user
+ * @param memberEmail – Email address (must not be registered yet)
+ * @param role        – Role button label: 'Employee' | 'Manager' | 'Administrator'
+ */
+export async function inviteAndAcceptMember(
+    ownerPage: Page,
+    browser: Browser,
+    memberName: string,
+    memberEmail: string,
+    role: 'Employee' | 'Manager' | 'Administrator'
+): Promise<void> {
+    // 1. Register the second user
+    const secondUser = await registerUser(browser, memberName, memberEmail);
+
+    // 2. Send invitation from the owner
+    await ownerPage.goto(PLAYWRIGHT_BASE_URL + '/members');
+    await ownerPage.getByRole('button', { name: 'Invite Member' }).click();
+    await expect(ownerPage.getByPlaceholder('Member Email')).toBeVisible();
+    await ownerPage.getByLabel('Email').fill(memberEmail);
+    await ownerPage.getByRole('button', { name: role }).click();
+    await Promise.all([
+        ownerPage.getByRole('button', { name: 'Invite Member', exact: true }).click(),
+        expect(ownerPage.getByRole('main')).toContainText(memberEmail),
+    ]);
+
+    // 3. Retrieve the acceptance link from Mailpit and accept
+    const acceptUrl = await getInvitationAcceptUrl(secondUser.page.request, memberEmail);
+    await secondUser.page.goto(acceptUrl);
+    await secondUser.page.waitForURL(/dashboard/);
+
+    // 4. Clean up
+    await secondUser.close();
+}
diff --git a/playwright/config.ts b/playwright/config.ts
index 3d12852a..d2c0c280 100644
--- a/playwright/config.ts
+++ b/playwright/config.ts
@@ -1 +1,2 @@
 export const PLAYWRIGHT_BASE_URL = process.env.PLAYWRIGHT_BASE_URL ?? 'http://solidtime.test';
+export const MAILPIT_BASE_URL = process.env.MAILPIT_BASE_URL ?? 'http://mailpit:8025';

From 09c3205680db4ecc6485fb2de15f432a71813240 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Mon, 2 Feb 2026 20:42:07 +0100
Subject: [PATCH 20/28] Allow NONE filter value to shared reports and add
 shared-report tests

---
 .../Requests/V1/Report/ReportStoreRequest.php |  40 ++-
 app/Service/Dto/ReportPropertiesDto.php       |   3 +-
 e2e/shared-reports.spec.ts                    | 258 ++++++++++++++++++
 e2e/utils/reporting.ts                        |  28 ++
 .../packages/api/src/openapi.json.client.ts   |   8 +-
 .../V1/Public/PublicReportEndpointTest.php    | 241 ++++++++++++++++
 .../Endpoint/Api/V1/ReportEndpointTest.php    |  83 ++++++
 7 files changed, 651 insertions(+), 10 deletions(-)
 create mode 100644 e2e/shared-reports.spec.ts

diff --git a/app/Http/Requests/V1/Report/ReportStoreRequest.php b/app/Http/Requests/V1/Report/ReportStoreRequest.php
index da609ba1..443bf01c 100644
--- a/app/Http/Requests/V1/Report/ReportStoreRequest.php
+++ b/app/Http/Requests/V1/Report/ReportStoreRequest.php
@@ -10,9 +10,11 @@
 use App\Enums\Weekday;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
+use App\Service\TimeEntryFilter;
 use Illuminate\Contracts\Validation\Rule as LegacyValidationRule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
 
 /**
@@ -23,7 +25,7 @@ class ReportStoreRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|LegacyValidationRule>>
+     * @return array<string, array<string|ValidationRule|LegacyValidationRule|\Closure>>
      */
     public function rules(): array
     {
@@ -81,7 +83,14 @@ public function rules(): array
             ],
             'properties.client_ids.*' => [
                 'string',
-                'uuid',
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    if (! Str::isUuid($value)) {
+                        $fail('The '.$attribute.' must be a valid UUID.');
+                    }
+                },
             ],
             // Filter by project IDs, project IDs are OR combined
             'properties.project_ids' => [
@@ -90,7 +99,14 @@ public function rules(): array
             ],
             'properties.project_ids.*' => [
                 'string',
-                'uuid',
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    if (! Str::isUuid($value)) {
+                        $fail('The '.$attribute.' must be a valid UUID.');
+                    }
+                },
             ],
             // Filter by tag IDs, tag IDs are OR combined
             'properties.tag_ids' => [
@@ -99,7 +115,14 @@ public function rules(): array
             ],
             'properties.tag_ids.*' => [
                 'string',
-                'uuid',
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    if (! Str::isUuid($value)) {
+                        $fail('The '.$attribute.' must be a valid UUID.');
+                    }
+                },
             ],
             'properties.task_ids' => [
                 'nullable',
@@ -107,7 +130,14 @@ public function rules(): array
             ],
             'properties.task_ids.*' => [
                 'string',
-                'uuid',
+                function (string $attribute, mixed $value, \Closure $fail): void {
+                    if ($value === TimeEntryFilter::NONE_VALUE) {
+                        return;
+                    }
+                    if (! Str::isUuid($value)) {
+                        $fail('The '.$attribute.' must be a valid UUID.');
+                    }
+                },
             ],
             'properties.group' => [
                 'required',
diff --git a/app/Service/Dto/ReportPropertiesDto.php b/app/Service/Dto/ReportPropertiesDto.php
index ac056d0f..a3ff85db 100644
--- a/app/Service/Dto/ReportPropertiesDto.php
+++ b/app/Service/Dto/ReportPropertiesDto.php
@@ -8,6 +8,7 @@
 use App\Enums\TimeEntryAggregationTypeInterval;
 use App\Enums\TimeEntryRoundingType;
 use App\Enums\Weekday;
+use App\Service\TimeEntryFilter;
 use Illuminate\Contracts\Database\Eloquent\Castable;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Database\Eloquent\Model;
@@ -174,7 +175,7 @@ public static function idArrayToCollection(array $ids): Collection
             if (! is_string($id)) {
                 throw new \InvalidArgumentException('The given ID is not a string');
             }
-            if (! Str::isUuid($id)) {
+            if ($id !== TimeEntryFilter::NONE_VALUE && ! Str::isUuid($id)) {
                 throw new \InvalidArgumentException('The given ID is not a valid UUID');
             }
             $collection->push($id);
diff --git a/e2e/shared-reports.spec.ts b/e2e/shared-reports.spec.ts
new file mode 100644
index 00000000..db82235d
--- /dev/null
+++ b/e2e/shared-reports.spec.ts
@@ -0,0 +1,258 @@
+import { expect } from '@playwright/test';
+import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
+import { test } from '../playwright/fixtures';
+import {
+    goToReporting,
+    goToReportingShared,
+    createProject,
+    createClient,
+    createProjectWithClient,
+    createTask,
+    createTimeEntryWithProject,
+    createTimeEntryWithProjectAndTask,
+    createTimeEntryWithTag,
+    createBareTimeEntry,
+    waitForReportingUpdate,
+    saveAsSharedReport,
+} from './utils/reporting';
+
+// Each test registers a new user and creates test data, which needs more time
+test.describe.configure({ timeout: 60000 });
+
+// ──────────────────────────────────────────────────
+// Shared Report Lifecycle Tests
+// ──────────────────────────────────────────────────
+
+test('test that saving a report creates a shared report and its shareable link shows correct data', async ({
+    page,
+}) => {
+    const projectName = 'SharedProject ' + Math.floor(Math.random() * 10000);
+    const reportName = 'SharedReport ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+
+    await goToReporting(page);
+    await expect(page.getByTestId('reporting_view').getByText(projectName)).toBeVisible();
+
+    const { shareableLink } = await saveAsSharedReport(page, reportName);
+
+    // Verify report appears on shared tab
+    await goToReportingShared(page);
+    await expect(page.getByTestId('report_table')).toBeVisible();
+    await expect(page.getByText(reportName)).toBeVisible();
+    await expect(page.getByText('Public', { exact: true })).toBeVisible();
+    await expect(page.getByRole('button', { name: 'Copy URL' })).toBeVisible();
+
+    // Navigate to shareable link and verify report data
+    await page.goto(shareableLink);
+    await expect(page.getByText('Reporting')).toBeVisible();
+    await expect(page.getByText(projectName)).toBeVisible();
+    await expect(page.getByText('Total')).toBeVisible();
+});
+
+test('test that shared report with invalid secret shows no data', async ({ page }) => {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/shared-report#invalid-secret-value');
+    await expect(page.getByText('No time entries found').first()).toBeVisible();
+});
+
+test('test that a shared report can be edited to toggle public/private and then deleted', async ({
+    page,
+}) => {
+    const projectName = 'EditDelProject ' + Math.floor(Math.random() * 10000);
+    const reportName = 'EditDelReport ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+
+    await goToReporting(page);
+    await expect(page.getByTestId('reporting_view').getByText(projectName)).toBeVisible();
+
+    await saveAsSharedReport(page, reportName);
+
+    await goToReportingShared(page);
+    await expect(page.getByText(reportName)).toBeVisible();
+    await expect(page.getByText('Public', { exact: true })).toBeVisible();
+
+    // Click more options and edit
+    await page
+        .getByRole('button', { name: new RegExp('Actions for Project ' + reportName) })
+        .click();
+    await page.getByRole('menuitem', { name: /^Edit Report/ }).click();
+
+    // Uncheck public and save
+    await page.getByLabel('Public').click();
+    await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/reports/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+        page.getByRole('button', { name: 'Update Report' }).click(),
+    ]);
+
+    // Verify status changed to private
+    await expect(page.getByText('Private')).toBeVisible();
+    await expect(page.getByText('--')).toBeVisible();
+
+    // Delete the report
+    await page
+        .getByRole('button', { name: new RegExp('Actions for Project ' + reportName) })
+        .click();
+    await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/reports/') &&
+                response.request().method() === 'DELETE' &&
+                response.status() === 204
+        ),
+        page.getByRole('menuitem', { name: /^Delete Report/ }).click(),
+    ]);
+
+    await expect(page.getByText('No shared reports found')).toBeVisible();
+});
+
+// ──────────────────────────────────────────────────
+// Shared Report Filter Tests
+// ──────────────────────────────────────────────────
+
+test('test that shared report respects project filter', async ({ page }) => {
+    const projectA = 'FilterProjA ' + Math.floor(Math.random() * 10000);
+    const projectB = 'FilterProjB ' + Math.floor(Math.random() * 10000);
+    const reportName = 'FilterProjReport ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectA);
+    await createProject(page, projectB);
+    await createTimeEntryWithProject(page, projectA, '1h');
+    await createTimeEntryWithProject(page, projectB, '2h');
+
+    await goToReporting(page);
+    await expect(page.getByTestId('reporting_view').getByText(projectA)).toBeVisible();
+
+    // Filter by project A
+    await page.getByRole('button', { name: 'Projects' }).first().click();
+    await page.getByRole('option').filter({ hasText: projectA }).click();
+    await page.keyboard.press('Escape');
+    await waitForReportingUpdate(page);
+
+    const { shareableLink } = await saveAsSharedReport(page, reportName);
+
+    // View the shared report
+    await page.goto(shareableLink);
+    await expect(page.getByText('Reporting')).toBeVisible();
+    await expect(page.getByText(projectA)).toBeVisible();
+    await expect(page.getByText(projectB)).not.toBeVisible();
+});
+
+test('test that shared report with No Project filter shows entries without a project', async ({
+    page,
+}) => {
+    const projectName = 'NoProjFilter ' + Math.floor(Math.random() * 10000);
+    const reportName = 'NoProjReport ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+    await createBareTimeEntry(page, 'Bare entry no project', '2h');
+
+    await goToReporting(page);
+    await expect(page.getByTestId('reporting_view').getByText(projectName)).toBeVisible();
+
+    // Filter by "No Project"
+    await page.getByRole('button', { name: 'Projects' }).first().click();
+    await page.getByRole('option').filter({ hasText: 'No Project' }).click();
+    await page.keyboard.press('Escape');
+    await waitForReportingUpdate(page);
+
+    const { shareableLink } = await saveAsSharedReport(page, reportName);
+
+    // View the shared report
+    await page.goto(shareableLink);
+    await expect(page.getByText('Reporting')).toBeVisible();
+    // The "No Project" group should show, but the project name should not appear as a group
+    await expect(page.getByText('Total')).toBeVisible();
+    await expect(page.getByText(projectName)).not.toBeVisible();
+});
+
+test('test that shared report with No Task filter shows entries without a task', async ({
+    page,
+}) => {
+    const projectName = 'NoTaskProj ' + Math.floor(Math.random() * 10000);
+    const taskName = 'NoTaskFilter ' + Math.floor(Math.random() * 10000);
+    const reportName = 'NoTaskReport ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTask(page, projectName, taskName);
+    await createTimeEntryWithProjectAndTask(page, projectName, taskName, '1h');
+    await createTimeEntryWithProject(page, projectName, '2h');
+
+    await goToReporting(page);
+    await expect(page.getByTestId('reporting_view').getByText(projectName)).toBeVisible();
+
+    // Filter by "No Task"
+    await page.getByRole('button', { name: 'Tasks' }).first().click();
+    await page.getByRole('option').filter({ hasText: 'No Task' }).click();
+    await page.keyboard.press('Escape');
+    await waitForReportingUpdate(page);
+
+    const { shareableLink } = await saveAsSharedReport(page, reportName);
+
+    // View the shared report
+    await page.goto(shareableLink);
+    await expect(page.getByText('Reporting')).toBeVisible();
+    await expect(page.getByText('Total')).toBeVisible();
+});
+
+test('test that shared report with No Client filter shows entries without a client', async ({
+    page,
+}) => {
+    const clientName = 'NoClientCli ' + Math.floor(Math.random() * 10000);
+    const projectName = 'NoClientProj ' + Math.floor(Math.random() * 10000);
+    const reportName = 'NoClientReport ' + Math.floor(Math.random() * 10000);
+
+    await createClient(page, clientName);
+    await createProjectWithClient(page, projectName, clientName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+    await createBareTimeEntry(page, 'Entry without client', '2h');
+
+    await goToReporting(page);
+    await expect(page.getByTestId('reporting_view').getByText(projectName)).toBeVisible();
+
+    // Filter by "No Client"
+    await page.getByRole('button', { name: 'Clients' }).first().click();
+    await page.getByRole('option').filter({ hasText: 'No Client' }).click();
+    await page.keyboard.press('Escape');
+    await waitForReportingUpdate(page);
+
+    const { shareableLink } = await saveAsSharedReport(page, reportName);
+
+    // View the shared report
+    await page.goto(shareableLink);
+    await expect(page.getByText('Reporting')).toBeVisible();
+    await expect(page.getByText('Total')).toBeVisible();
+    await expect(page.getByText(projectName)).not.toBeVisible();
+});
+
+test('test that shared report with No Tag filter shows entries without tags', async ({ page }) => {
+    const tagName = 'NoTagFilter ' + Math.floor(Math.random() * 10000);
+    const reportName = 'NoTagReport ' + Math.floor(Math.random() * 10000);
+
+    await createTimeEntryWithTag(page, tagName, '1h');
+    await createBareTimeEntry(page, 'Entry without tags', '2h');
+
+    await goToReporting(page);
+    await expect(page.getByText('Total')).toBeVisible();
+
+    // Filter by "No Tag"
+    await page.getByRole('button', { name: 'Tags' }).first().click();
+    await page.getByRole('option').filter({ hasText: 'No Tag' }).click();
+    await page.keyboard.press('Escape');
+    await waitForReportingUpdate(page);
+
+    const { shareableLink } = await saveAsSharedReport(page, reportName);
+
+    // View the shared report
+    await page.goto(shareableLink);
+    await expect(page.getByText('Reporting')).toBeVisible();
+    await expect(page.getByText('Total')).toBeVisible();
+});
diff --git a/e2e/utils/reporting.ts b/e2e/utils/reporting.ts
index d48c793c..25bf4cc9 100644
--- a/e2e/utils/reporting.ts
+++ b/e2e/utils/reporting.ts
@@ -269,3 +269,31 @@ export async function waitForDetailedReportingUpdate(page: Page) {
             response.status() === 200
     );
 }
+
+// ──────────────────────────────────────────────────
+// Shared report helpers
+// ──────────────────────────────────────────────────
+
+export async function goToReportingShared(page: Page) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/reporting/shared');
+}
+
+export async function saveAsSharedReport(
+    page: Page,
+    reportName: string
+): Promise<{ shareableLink: string }> {
+    await page.getByRole('button', { name: 'Save Report' }).click();
+    await page.getByLabel('Name').fill(reportName);
+    // "Public" checkbox is checked by default
+    const [response] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/reports') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201
+        ),
+        page.getByRole('dialog').getByRole('button', { name: 'Create Report' }).click(),
+    ]);
+    const responseBody = await response.json();
+    return { shareableLink: responseBody.data.shareable_link };
+}
diff --git a/resources/js/packages/api/src/openapi.json.client.ts b/resources/js/packages/api/src/openapi.json.client.ts
index 4bbcd19a..ae8c288c 100644
--- a/resources/js/packages/api/src/openapi.json.client.ts
+++ b/resources/js/packages/api/src/openapi.json.client.ts
@@ -444,10 +444,10 @@ const ReportStoreRequest = z
                 active: z.union([z.boolean(), z.null()]).optional(),
                 member_ids: z.union([z.array(z.string().uuid()), z.null()]).optional(),
                 billable: z.union([z.boolean(), z.null()]).optional(),
-                client_ids: z.union([z.array(z.string().uuid()), z.null()]).optional(),
-                project_ids: z.union([z.array(z.string().uuid()), z.null()]).optional(),
-                tag_ids: z.union([z.array(z.string().uuid()), z.null()]).optional(),
-                task_ids: z.union([z.array(z.string().uuid()), z.null()]).optional(),
+                client_ids: z.union([z.array(z.string()), z.null()]).optional(),
+                project_ids: z.union([z.array(z.string()), z.null()]).optional(),
+                tag_ids: z.union([z.array(z.string()), z.null()]).optional(),
+                task_ids: z.union([z.array(z.string()), z.null()]).optional(),
                 group: TimeEntryAggregationType,
                 sub_group: TimeEntryAggregationType,
                 history_group: TimeEntryAggregationTypeInterval,
diff --git a/tests/Unit/Endpoint/Api/V1/Public/PublicReportEndpointTest.php b/tests/Unit/Endpoint/Api/V1/Public/PublicReportEndpointTest.php
index 7345792e..4a8db48b 100644
--- a/tests/Unit/Endpoint/Api/V1/Public/PublicReportEndpointTest.php
+++ b/tests/Unit/Endpoint/Api/V1/Public/PublicReportEndpointTest.php
@@ -16,6 +16,7 @@
 use App\Models\TimeEntry;
 use App\Service\CurrencyService;
 use App\Service\Dto\ReportPropertiesDto;
+use App\Service\TimeEntryFilter;
 use Illuminate\Support\Str;
 use Tests\Unit\Endpoint\Api\V1\ApiEndpointTestAbstract;
 
@@ -423,4 +424,244 @@ public function test_if_the_resources_behind_the_filters_no_longer_exist_the_rep
             ],
         ]);
     }
+
+    public function test_show_returns_only_entries_without_project_when_none_project_filter_is_set(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $project = Project::factory()->forOrganization($organization)->create();
+
+        // Entry with project (should be excluded)
+        TimeEntry::factory()->forOrganization($organization)
+            ->forProject($project)
+            ->startWithDuration(now()->subDay(), 100)
+            ->create();
+        // Entry without project (should be included)
+        TimeEntry::factory()->forOrganization($organization)
+            ->startWithDuration(now()->subDay(), 200)
+            ->create();
+
+        $reportDto = new ReportPropertiesDto;
+        $reportDto->start = now()->subDays(2);
+        $reportDto->end = now();
+        $reportDto->group = TimeEntryAggregationType::Project;
+        $reportDto->subGroup = TimeEntryAggregationType::Task;
+        $reportDto->historyGroup = TimeEntryAggregationTypeInterval::Day;
+        $reportDto->weekStart = Weekday::Monday;
+        $reportDto->timezone = 'Europe/Vienna';
+        $reportDto->setProjectIds([TimeEntryFilter::NONE_VALUE]);
+        $report = Report::factory()->forOrganization($organization)->public()->create([
+            'public_until' => null,
+            'properties' => $reportDto,
+        ]);
+
+        // Act
+        $response = $this->getJson(route('api.v1.public.reports.show'), [
+            'X-Api-Key' => $report->share_secret,
+        ]);
+
+        // Assert
+        $response->assertOk();
+        $response->assertJson([
+            'data' => [
+                'seconds' => 200,
+                'cost' => 0,
+                'grouped_type' => TimeEntryAggregationType::Project->value,
+            ],
+        ]);
+    }
+
+    public function test_show_returns_entries_with_and_without_project_when_none_and_real_id_combined(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $projectA = Project::factory()->forOrganization($organization)->create();
+        $projectB = Project::factory()->forOrganization($organization)->create();
+
+        // Entry with project A (should be included)
+        TimeEntry::factory()->forOrganization($organization)
+            ->forProject($projectA)
+            ->startWithDuration(now()->subDay(), 100)
+            ->create();
+        // Entry with project B (should be excluded)
+        TimeEntry::factory()->forOrganization($organization)
+            ->forProject($projectB)
+            ->startWithDuration(now()->subDay(), 100)
+            ->create();
+        // Entry without project (should be included)
+        TimeEntry::factory()->forOrganization($organization)
+            ->startWithDuration(now()->subDay(), 200)
+            ->create();
+
+        $reportDto = new ReportPropertiesDto;
+        $reportDto->start = now()->subDays(2);
+        $reportDto->end = now();
+        $reportDto->group = TimeEntryAggregationType::Project;
+        $reportDto->subGroup = TimeEntryAggregationType::Task;
+        $reportDto->historyGroup = TimeEntryAggregationTypeInterval::Day;
+        $reportDto->weekStart = Weekday::Monday;
+        $reportDto->timezone = 'Europe/Vienna';
+        $reportDto->setProjectIds([$projectA->getKey(), TimeEntryFilter::NONE_VALUE]);
+        $report = Report::factory()->forOrganization($organization)->public()->create([
+            'public_until' => null,
+            'properties' => $reportDto,
+        ]);
+
+        // Act
+        $response = $this->getJson(route('api.v1.public.reports.show'), [
+            'X-Api-Key' => $report->share_secret,
+        ]);
+
+        // Assert
+        $response->assertOk();
+        $response->assertJson([
+            'data' => [
+                'seconds' => 300,
+                'cost' => 0,
+                'grouped_type' => TimeEntryAggregationType::Project->value,
+            ],
+        ]);
+    }
+
+    public function test_show_returns_only_entries_without_task_when_none_task_filter_is_set(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $project = Project::factory()->forOrganization($organization)->create();
+        $task = Task::factory()->forOrganization($organization)->forProject($project)->create();
+
+        // Entry with task (should be excluded)
+        TimeEntry::factory()->forOrganization($organization)
+            ->forTask($task)
+            ->startWithDuration(now()->subDay(), 100)
+            ->create();
+        // Entry without task (should be included)
+        TimeEntry::factory()->forOrganization($organization)
+            ->forProject($project)
+            ->startWithDuration(now()->subDay(), 200)
+            ->create();
+
+        $reportDto = new ReportPropertiesDto;
+        $reportDto->start = now()->subDays(2);
+        $reportDto->end = now();
+        $reportDto->group = TimeEntryAggregationType::Project;
+        $reportDto->subGroup = TimeEntryAggregationType::Task;
+        $reportDto->historyGroup = TimeEntryAggregationTypeInterval::Day;
+        $reportDto->weekStart = Weekday::Monday;
+        $reportDto->timezone = 'Europe/Vienna';
+        $reportDto->setTaskIds([TimeEntryFilter::NONE_VALUE]);
+        $report = Report::factory()->forOrganization($organization)->public()->create([
+            'public_until' => null,
+            'properties' => $reportDto,
+        ]);
+
+        // Act
+        $response = $this->getJson(route('api.v1.public.reports.show'), [
+            'X-Api-Key' => $report->share_secret,
+        ]);
+
+        // Assert
+        $response->assertOk();
+        $response->assertJson([
+            'data' => [
+                'seconds' => 200,
+                'cost' => 0,
+                'grouped_type' => TimeEntryAggregationType::Project->value,
+            ],
+        ]);
+    }
+
+    public function test_show_returns_only_entries_without_client_when_none_client_filter_is_set(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $client = Client::factory()->forOrganization($organization)->create();
+        $projectWithClient = Project::factory()->forClient($client)->forOrganization($organization)->create();
+
+        // Entry with client (should be excluded)
+        TimeEntry::factory()->forOrganization($organization)
+            ->forProject($projectWithClient)
+            ->startWithDuration(now()->subDay(), 100)
+            ->create();
+        // Entry without client (should be included)
+        TimeEntry::factory()->forOrganization($organization)
+            ->startWithDuration(now()->subDay(), 200)
+            ->create();
+
+        $reportDto = new ReportPropertiesDto;
+        $reportDto->start = now()->subDays(2);
+        $reportDto->end = now();
+        $reportDto->group = TimeEntryAggregationType::Project;
+        $reportDto->subGroup = TimeEntryAggregationType::Task;
+        $reportDto->historyGroup = TimeEntryAggregationTypeInterval::Day;
+        $reportDto->weekStart = Weekday::Monday;
+        $reportDto->timezone = 'Europe/Vienna';
+        $reportDto->setClientIds([TimeEntryFilter::NONE_VALUE]);
+        $report = Report::factory()->forOrganization($organization)->public()->create([
+            'public_until' => null,
+            'properties' => $reportDto,
+        ]);
+
+        // Act
+        $response = $this->getJson(route('api.v1.public.reports.show'), [
+            'X-Api-Key' => $report->share_secret,
+        ]);
+
+        // Assert
+        $response->assertOk();
+        $response->assertJson([
+            'data' => [
+                'seconds' => 200,
+                'cost' => 0,
+                'grouped_type' => TimeEntryAggregationType::Project->value,
+            ],
+        ]);
+    }
+
+    public function test_show_returns_only_entries_without_tags_when_none_tag_filter_is_set(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $tag = Tag::factory()->forOrganization($organization)->create();
+
+        // Entry with tag (should be excluded)
+        TimeEntry::factory()->forOrganization($organization)
+            ->startWithDuration(now()->subDay(), 100)
+            ->create([
+                'tags' => [$tag->getKey()],
+            ]);
+        // Entry without tags (should be included)
+        TimeEntry::factory()->forOrganization($organization)
+            ->startWithDuration(now()->subDay(), 200)
+            ->create();
+
+        $reportDto = new ReportPropertiesDto;
+        $reportDto->start = now()->subDays(2);
+        $reportDto->end = now();
+        $reportDto->group = TimeEntryAggregationType::Project;
+        $reportDto->subGroup = TimeEntryAggregationType::Task;
+        $reportDto->historyGroup = TimeEntryAggregationTypeInterval::Day;
+        $reportDto->weekStart = Weekday::Monday;
+        $reportDto->timezone = 'Europe/Vienna';
+        $reportDto->setTagIds([TimeEntryFilter::NONE_VALUE]);
+        $report = Report::factory()->forOrganization($organization)->public()->create([
+            'public_until' => null,
+            'properties' => $reportDto,
+        ]);
+
+        // Act
+        $response = $this->getJson(route('api.v1.public.reports.show'), [
+            'X-Api-Key' => $report->share_secret,
+        ]);
+
+        // Assert
+        $response->assertOk();
+        $response->assertJson([
+            'data' => [
+                'seconds' => 200,
+                'cost' => 0,
+                'grouped_type' => TimeEntryAggregationType::Project->value,
+            ],
+        ]);
+    }
 }
diff --git a/tests/Unit/Endpoint/Api/V1/ReportEndpointTest.php b/tests/Unit/Endpoint/Api/V1/ReportEndpointTest.php
index ff821777..d8e7a563 100644
--- a/tests/Unit/Endpoint/Api/V1/ReportEndpointTest.php
+++ b/tests/Unit/Endpoint/Api/V1/ReportEndpointTest.php
@@ -8,7 +8,12 @@
 use App\Enums\TimeEntryRoundingType;
 use App\Enums\Weekday;
 use App\Http\Controllers\Api\V1\ReportController;
+use App\Models\Client;
+use App\Models\Project;
 use App\Models\Report;
+use App\Models\Tag;
+use App\Models\Task;
+use App\Service\TimeEntryFilter;
 use Illuminate\Support\Carbon;
 use Illuminate\Testing\Fluent\AssertableJson;
 use Laravel\Passport\Passport;
@@ -490,6 +495,84 @@ public function test_show_endpoint_returns_detailed_report(): void
         );
     }
 
+    public function test_store_endpoint_creates_report_with_none_filter_values(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'reports:create',
+        ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->withoutExceptionHandling()->postJson(route('api.v1.reports.store', [$data->organization->getKey()]), [
+            'name' => 'Test Report with None Filters',
+            'is_public' => false,
+            'properties' => [
+                'start' => Carbon::now()->subDays(30)->toIso8601ZuluString(),
+                'end' => Carbon::now()->toIso8601ZuluString(),
+                'group' => TimeEntryAggregationType::Project->value,
+                'sub_group' => TimeEntryAggregationType::Task->value,
+                'history_group' => TimeEntryAggregationType::Day->value,
+                'project_ids' => [TimeEntryFilter::NONE_VALUE],
+                'client_ids' => [TimeEntryFilter::NONE_VALUE],
+                'tag_ids' => [TimeEntryFilter::NONE_VALUE],
+                'task_ids' => [TimeEntryFilter::NONE_VALUE],
+            ],
+        ]);
+
+        // Assert
+        $response->assertStatus(201);
+        /** @var Report $report */
+        $report = Report::query()->findOrFail($response->json('data.id'));
+        $this->assertTrue($report->properties->projectIds->contains(TimeEntryFilter::NONE_VALUE));
+        $this->assertTrue($report->properties->clientIds->contains(TimeEntryFilter::NONE_VALUE));
+        $this->assertTrue($report->properties->tagIds->contains(TimeEntryFilter::NONE_VALUE));
+        $this->assertTrue($report->properties->taskIds->contains(TimeEntryFilter::NONE_VALUE));
+    }
+
+    public function test_store_endpoint_creates_report_with_none_combined_with_real_ids(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'reports:create',
+        ]);
+        $project = Project::factory()->forOrganization($data->organization)->create();
+        $client = Client::factory()->forOrganization($data->organization)->create();
+        $task = Task::factory()->forOrganization($data->organization)->forProject($project)->create();
+        $tag = Tag::factory()->forOrganization($data->organization)->create();
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->withoutExceptionHandling()->postJson(route('api.v1.reports.store', [$data->organization->getKey()]), [
+            'name' => 'Test Report with Combined Filters',
+            'is_public' => false,
+            'properties' => [
+                'start' => Carbon::now()->subDays(30)->toIso8601ZuluString(),
+                'end' => Carbon::now()->toIso8601ZuluString(),
+                'group' => TimeEntryAggregationType::Project->value,
+                'sub_group' => TimeEntryAggregationType::Task->value,
+                'history_group' => TimeEntryAggregationType::Day->value,
+                'project_ids' => [$project->getKey(), TimeEntryFilter::NONE_VALUE],
+                'client_ids' => [$client->getKey(), TimeEntryFilter::NONE_VALUE],
+                'tag_ids' => [$tag->getKey(), TimeEntryFilter::NONE_VALUE],
+                'task_ids' => [$task->getKey(), TimeEntryFilter::NONE_VALUE],
+            ],
+        ]);
+
+        // Assert
+        $response->assertStatus(201);
+        /** @var Report $report */
+        $report = Report::query()->findOrFail($response->json('data.id'));
+        $this->assertTrue($report->properties->projectIds->contains($project->getKey()));
+        $this->assertTrue($report->properties->projectIds->contains(TimeEntryFilter::NONE_VALUE));
+        $this->assertTrue($report->properties->clientIds->contains($client->getKey()));
+        $this->assertTrue($report->properties->clientIds->contains(TimeEntryFilter::NONE_VALUE));
+        $this->assertTrue($report->properties->tagIds->contains($tag->getKey()));
+        $this->assertTrue($report->properties->tagIds->contains(TimeEntryFilter::NONE_VALUE));
+        $this->assertTrue($report->properties->taskIds->contains($task->getKey()));
+        $this->assertTrue($report->properties->taskIds->contains(TimeEntryFilter::NONE_VALUE));
+    }
+
     public function test_destroy_endpoint_fails_if_user_has_no_permission_to_delete_report(): void
     {
         // Arrange

From a58becc2682a1988e690709e7019cd0c872da65e Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Tue, 3 Feb 2026 14:12:36 +0100
Subject: [PATCH 21/28] Add calendar query prefetch

---
 .../Common/Reporting/ReportingRow.vue         |   2 +-
 resources/js/utils/prefetch.ts                |  23 +++
 resources/js/utils/useOrganizationQuery.ts    |   1 +
 .../js/utils/useTimeEntriesCalendarQuery.ts   | 177 ++++++++++++------
 4 files changed, 149 insertions(+), 54 deletions(-)

diff --git a/resources/js/Components/Common/Reporting/ReportingRow.vue b/resources/js/Components/Common/Reporting/ReportingRow.vue
index 031be28f..450daf8d 100644
--- a/resources/js/Components/Common/Reporting/ReportingRow.vue
+++ b/resources/js/Components/Common/Reporting/ReportingRow.vue
@@ -66,7 +66,7 @@ const organization = inject<ComputedRef<Organization>>('organization');
     </div>
     <div
         v-if="expanded && entry.grouped_data"
-        class="col-span-3 grid bg-quaternary"
+        class="col-span-3 grid bg-tertiary"
         style="grid-template-columns: 1fr 150px 150px">
         <ReportingRow
             v-for="subEntry in entry.grouped_data"
diff --git a/resources/js/utils/prefetch.ts b/resources/js/utils/prefetch.ts
index a5467c65..17f8bf73 100644
--- a/resources/js/utils/prefetch.ts
+++ b/resources/js/utils/prefetch.ts
@@ -2,6 +2,12 @@ import type { QueryClient } from '@tanstack/vue-query';
 import { api } from '@/packages/api/src';
 import { getCurrentOrganizationId, getCurrentMembershipId } from '@/utils/useUser';
 import { canViewClients, canViewMembers } from '@/utils/permissions';
+import {
+    getInitialWeekRange,
+    getExpandedCalendarDateRange,
+    createCalendarQueryKey,
+    fetchAllCalendarEntries,
+} from '@/utils/useTimeEntriesCalendarQuery';
 
 /**
  * Route patterns mapped to their prefetch functions.
@@ -29,6 +35,7 @@ const routePrefetchers: Record<string, (queryClient: QueryClient) => void> = {
         prefetchTasks(queryClient);
         prefetchTags(queryClient);
         prefetchClients(queryClient);
+        prefetchCalendarTimeEntries(queryClient);
     },
 
     '/projects': (queryClient) => {
@@ -244,6 +251,22 @@ function prefetchTimeEntries(queryClient: QueryClient) {
     });
 }
 
+function prefetchCalendarTimeEntries(queryClient: QueryClient) {
+    const organizationId = getCurrentOrganizationId();
+    const memberId = getCurrentMembershipId();
+    if (!organizationId) return;
+
+    const { start, end } = getInitialWeekRange();
+    const { start: formattedStart, end: formattedEnd } = getExpandedCalendarDateRange(start, end);
+
+    queryClient.prefetchQuery({
+        queryKey: createCalendarQueryKey(formattedStart, formattedEnd, organizationId),
+        queryFn: () =>
+            fetchAllCalendarEntries(organizationId, memberId, formattedStart, formattedEnd),
+        staleTime: 30000,
+    });
+}
+
 function prefetchProjectMembers(queryClient: QueryClient, projectId: string) {
     const organizationId = getCurrentOrganizationId();
     if (!organizationId || !canViewMembers()) return;
diff --git a/resources/js/utils/useOrganizationQuery.ts b/resources/js/utils/useOrganizationQuery.ts
index bee5a693..aaad9d26 100644
--- a/resources/js/utils/useOrganizationQuery.ts
+++ b/resources/js/utils/useOrganizationQuery.ts
@@ -11,6 +11,7 @@ export function useOrganizationQuery(organizationId: string) {
                     organization: organizationId,
                 },
             }),
+        staleTime: 1000 * 30,
     });
 
     const organization = computed(() => query.data.value?.data);
diff --git a/resources/js/utils/useTimeEntriesCalendarQuery.ts b/resources/js/utils/useTimeEntriesCalendarQuery.ts
index 857ca842..215c555e 100644
--- a/resources/js/utils/useTimeEntriesCalendarQuery.ts
+++ b/resources/js/utils/useTimeEntriesCalendarQuery.ts
@@ -3,7 +3,116 @@ import { api, type TimeEntryResponse, type TimeEntry } from '@/packages/api/src'
 import { getCurrentMembershipId, getCurrentOrganizationId } from '@/utils/useUser';
 import { computed, type Ref } from 'vue';
 import { getDayJsInstance } from '@/packages/ui/src/utils/time';
-import { getUserTimezone } from '@/packages/ui/src/utils/settings';
+import { getUserTimezone, getWeekStart } from '@/packages/ui/src/utils/settings';
+
+const weekStartMap: Record<string, number> = {
+    sunday: 0,
+    monday: 1,
+    tuesday: 2,
+    wednesday: 3,
+    thursday: 4,
+    friday: 5,
+    saturday: 6,
+};
+
+/**
+ * Calculate expanded date range to include previous and next periods with timezone transformations.
+ * This allows smooth navigation between calendar views without loading delays.
+ */
+export function getExpandedCalendarDateRange(
+    calendarStart: Date,
+    calendarEnd: Date
+): { start: string; end: string } {
+    const dayjs = getDayJsInstance();
+    const duration = dayjs(calendarEnd).diff(dayjs(calendarStart), 'milliseconds');
+
+    // Calculate previous period
+    const previousStart = dayjs(calendarStart).subtract(duration, 'milliseconds');
+    // Calculate next period
+    const nextEnd = dayjs(calendarEnd).add(duration, 'milliseconds');
+
+    // Apply timezone transformations
+    const timezone = getUserTimezone();
+    const formattedStart = previousStart.utc().tz(timezone, true).utc().format();
+    const formattedEnd = nextEnd.utc().tz(timezone, true).utc().format();
+
+    return {
+        start: formattedStart,
+        end: formattedEnd,
+    };
+}
+
+/**
+ * Get the initial week view date range based on user's week start preference.
+ * Matches FullCalendar's timeGridWeek initial view.
+ */
+export function getInitialWeekRange(): { start: Date; end: Date } {
+    const dayjs = getDayJsInstance();
+    const weekStart = getWeekStart();
+    const firstDay = weekStartMap[weekStart] ?? 1;
+
+    const now = dayjs();
+    const currentDayOfWeek = now.day();
+    const daysFromWeekStart = (currentDayOfWeek - firstDay + 7) % 7;
+    const calendarStart = now.subtract(daysFromWeekStart, 'day').startOf('day');
+    const calendarEnd = calendarStart.add(7, 'day');
+
+    return {
+        start: calendarStart.toDate(),
+        end: calendarEnd.toDate(),
+    };
+}
+
+/**
+ * Create the query key for calendar time entries.
+ */
+export function createCalendarQueryKey(
+    start: string | null,
+    end: string | null,
+    organizationId: string | null
+): readonly [
+    'timeEntries',
+    'calendar',
+    { start: string | null; end: string | null; organization: string | null },
+] {
+    return ['timeEntries', 'calendar', { start, end, organization: organizationId }] as const;
+}
+
+/**
+ * Fetch all calendar entries with pagination.
+ */
+export async function fetchAllCalendarEntries(
+    organizationId: string,
+    memberId: string | undefined,
+    start: string,
+    end: string
+): Promise<TimeEntryResponse> {
+    const allEntries: TimeEntry[] = [];
+
+    while (true) {
+        const response = await api.getTimeEntries({
+            params: {
+                organization: organizationId,
+            },
+            queries: {
+                start,
+                end,
+                member_id: memberId,
+                offset: allEntries.length || undefined,
+            },
+        });
+
+        if (response.data.length === 0) {
+            return { data: allEntries, meta: response.meta };
+        }
+
+        allEntries.push(...response.data);
+
+        if (allEntries.length >= response.meta.total) {
+            return { data: allEntries, meta: response.meta };
+        }
+    }
+}
 
 export function useTimeEntriesCalendarQuery(
     calendarStart: Ref<Date | undefined>,
@@ -13,68 +122,30 @@ export function useTimeEntriesCalendarQuery(
         return !!getCurrentOrganizationId() && !!calendarStart.value && !!calendarEnd.value;
     });
 
-    // Calculate expanded date range to include previous and next periods with timezone transformations
     const expandedDateRange = computed(() => {
         if (!calendarStart.value || !calendarEnd.value) {
             return { start: null, end: null };
         }
-
-        const dayjs = getDayJsInstance();
-        const duration = dayjs(calendarEnd.value).diff(dayjs(calendarStart.value), 'milliseconds');
-
-        // Calculate previous period
-        const previousStart = dayjs(calendarStart.value).subtract(duration, 'milliseconds');
-        // Calculate next period
-        const nextEnd = dayjs(calendarEnd.value).add(duration, 'milliseconds');
-
-        // Apply timezone transformations
-        const formattedStart = previousStart.utc().tz(getUserTimezone(), true).utc().format();
-        const formattedEnd = nextEnd.utc().tz(getUserTimezone(), true).utc().format();
-
-        return {
-            start: formattedStart,
-            end: formattedEnd,
-        };
+        return getExpandedCalendarDateRange(calendarStart.value, calendarEnd.value);
     });
 
     return useQuery<TimeEntryResponse>({
-        queryKey: computed(() => [
-            'timeEntries',
-            'calendar',
-            {
-                start: expandedDateRange.value.start,
-                end: expandedDateRange.value.end,
-                organization: getCurrentOrganizationId(),
-            },
-        ]),
+        queryKey: computed(() =>
+            createCalendarQueryKey(
+                expandedDateRange.value.start,
+                expandedDateRange.value.end,
+                getCurrentOrganizationId()
+            )
+        ),
         enabled: enableCalendarQuery,
         placeholderData: (previousData) => previousData,
         queryFn: async () => {
-            const allEntries: TimeEntry[] = [];
-
-            while (true) {
-                const response = await api.getTimeEntries({
-                    params: {
-                        organization: getCurrentOrganizationId() || '',
-                    },
-                    queries: {
-                        start: expandedDateRange.value.start!,
-                        end: expandedDateRange.value.end!,
-                        member_id: getCurrentMembershipId(),
-                        offset: allEntries.length || undefined,
-                    },
-                });
-
-                if (response.data.length === 0) {
-                    return { data: allEntries, meta: response.meta };
-                }
-
-                allEntries.push(...response.data);
-
-                if (allEntries.length >= response.meta.total) {
-                    return { data: allEntries, meta: response.meta };
-                }
-            }
+            return fetchAllCalendarEntries(
+                getCurrentOrganizationId() || '',
+                getCurrentMembershipId(),
+                expandedDateRange.value.start!,
+                expandedDateRange.value.end!
+            );
         },
         staleTime: 1000 * 30, // 30 seconds
     });

From 03e0377101bbcb64a858942700b948309fa083c7 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Tue, 3 Feb 2026 14:30:56 +0100
Subject: [PATCH 22/28] fix responsive issues in timetracker recently tracked
 entries dropdown

---
 .../ui/src/TimeTracker/TimeTrackerControls.vue         |  4 ++--
 .../TimeTracker/TimeTrackerRecentlyTrackedEntry.vue    | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue b/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue
index 0c469c2b..4c6e1039 100644
--- a/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue
+++ b/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue
@@ -222,10 +222,10 @@ useSelectEvents(
                 <div
                     v-if="showDropdown && filteredRecentlyTrackedTimeEntries.length > 0"
                     ref="floating"
-                    class="z-50 w-full max-w-2xl"
+                    class="z-50 w-[min(500px,100vw-2rem)]"
                     :style="floatingStyles">
                     <div
-                        class="rounded-lg w-full fixed min-w-xl top-0 left-0 border border-card-border overflow-none shadow-dropdown bg-card-background">
+                        class="rounded-lg w-full border border-card-border overflow-hidden shadow-dropdown bg-card-background">
                         <div
                             class="text-text-tertiary text-xs font-semibold border-b border-border-tertiary px-2 py-1.5">
                             Recently Tracked Time Entries
diff --git a/resources/js/packages/ui/src/TimeTracker/TimeTrackerRecentlyTrackedEntry.vue b/resources/js/packages/ui/src/TimeTracker/TimeTrackerRecentlyTrackedEntry.vue
index d06ae821..a539c6cc 100644
--- a/resources/js/packages/ui/src/TimeTracker/TimeTrackerRecentlyTrackedEntry.vue
+++ b/resources/js/packages/ui/src/TimeTracker/TimeTrackerRecentlyTrackedEntry.vue
@@ -28,19 +28,21 @@ const task = computed(() => {
         :data-select-id="timeEntry.id"
         :class="
             twMerge(
-                'px-2 py-1.5 flex justify-between items-center space-x-2 w-full rounded',
+                'px-2 py-1.5 flex items-center space-x-2 w-full rounded text-left',
                 props.highlighted && 'bg-card-background-active'
             )
         ">
-        <span v-if="timeEntry.description !== ''" class="text-sm font-medium">
+        <span
+            v-if="timeEntry.description !== ''"
+            class="text-sm font-medium truncate min-w-0 flex-1">
             {{ timeEntry.description }}
         </span>
-        <span v-else class="text-sm text-text-tertiary font-medium"> No Description </span>
+        <span v-else class="text-sm text-text-tertiary font-medium flex-1"> No Description </span>
         <ProjectBadge
             ref="projectDropdownTrigger"
             :color="project?.color"
             :name="project?.name"
-            class="">
+            class="shrink-0">
             <div v-if="project" class="flex items-center lg:space-x-1 min-w-0">
                 <span class="whitespace-nowrap text-xs">
                     {{ project?.name }}

From 9be97a8f849dfa38d73ce8a58cb4740d8f3295c5 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Tue, 3 Feb 2026 19:21:57 +0100
Subject: [PATCH 23/28] Improve Time page responsiveness and compact tags,
 fixes #896

---
 resources/js/Pages/Time.vue                   |  2 +-
 resources/js/packages/ui/src/Badge.vue        |  2 +-
 .../js/packages/ui/src/MainContainer.vue      |  2 +-
 resources/js/packages/ui/src/Tag/TagBadge.vue |  4 +-
 .../js/packages/ui/src/Tag/TagDropdown.vue    |  5 +-
 .../src/TimeEntry/TimeEntryAggregateRow.vue   | 77 ++++++++++++++++++-
 .../TimeEntry/TimeEntryDescriptionInput.vue   |  6 +-
 .../src/TimeEntry/TimeEntryMassActionRow.vue  |  2 +-
 .../ui/src/TimeEntry/TimeEntryRow.vue         | 61 ++++++++++++++-
 .../ui/src/TimeEntry/TimeEntryRowHeading.vue  |  8 +-
 .../src/TimeEntry/TimeEntryRowTagDropdown.vue | 38 +++++++--
 .../src/TimeTracker/TimeTrackerControls.vue   |  2 +-
 .../TimeTrackerProjectTaskDropdown.vue        |  6 +-
 .../TimeTrackerRecentlyTrackedEntry.vue       |  6 +-
 14 files changed, 188 insertions(+), 33 deletions(-)

diff --git a/resources/js/Pages/Time.vue b/resources/js/Pages/Time.vue
index 60a7a23f..dc10b7a6 100644
--- a/resources/js/Pages/Time.vue
+++ b/resources/js/Pages/Time.vue
@@ -114,7 +114,7 @@ function deleteSelected() {
             :tags="tags"
             :currency="getOrganizationCurrencyString()"
             :clients="clients"
-            class="border-t border-default-background-separator"
+            class="border-t border-default-background-separator hidden sm:block"
             :update-time-entries="
                 (args) =>
                     updateTimeEntries(
diff --git a/resources/js/packages/ui/src/Badge.vue b/resources/js/packages/ui/src/Badge.vue
index a18910d9..0cc324b4 100644
--- a/resources/js/packages/ui/src/Badge.vue
+++ b/resources/js/packages/ui/src/Badge.vue
@@ -47,7 +47,7 @@ const tagClasses = computed(() => {
                 tagClasses,
                 badgeClasses[size],
                 borderClasses,
-                'rounded transition inline-flex items-center font-medium text-text-primary disabled:text-text-quaternary outline-0  focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
+                'rounded transition inline-flex items-center font-medium text-text-primary disabled:text-text-quaternary outline-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring min-w-0 overflow-hidden',
                 props.class
             )
         ">
diff --git a/resources/js/packages/ui/src/MainContainer.vue b/resources/js/packages/ui/src/MainContainer.vue
index 430683f3..d90042f0 100644
--- a/resources/js/packages/ui/src/MainContainer.vue
+++ b/resources/js/packages/ui/src/MainContainer.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts"></script>
 
 <template>
-    <div class="px-3 sm:px-4 lg:px-6 mx-auto">
+    <div class="px-2 sm:px-4 lg:px-6 mx-auto">
         <slot></slot>
     </div>
 </template>
diff --git a/resources/js/packages/ui/src/Tag/TagBadge.vue b/resources/js/packages/ui/src/Tag/TagBadge.vue
index 7f14e2ca..cfa60d12 100644
--- a/resources/js/packages/ui/src/Tag/TagBadge.vue
+++ b/resources/js/packages/ui/src/Tag/TagBadge.vue
@@ -11,12 +11,14 @@ const props = withDefaults(
         class?: string;
         color?: string;
         border?: boolean;
+        showIcon?: boolean;
     }>(),
     {
         size: 'base',
         tag: 'div',
         color: 'var(--theme-color-icon-default)',
         border: true,
+        showIcon: true,
     }
 );
 
@@ -28,7 +30,7 @@ const indicatorClasses = {
 
 <template>
     <Badge :name :size :tag :class="props.class" :color :border>
-        <TagIcon :class="twMerge(indicatorClasses[size])"></TagIcon>
+        <TagIcon v-if="showIcon" :class="twMerge(indicatorClasses[size])"></TagIcon>
         <span v-if="name">
             {{ name }}
         </span>
diff --git a/resources/js/packages/ui/src/Tag/TagDropdown.vue b/resources/js/packages/ui/src/Tag/TagDropdown.vue
index 4f7d6d54..7f26d61d 100644
--- a/resources/js/packages/ui/src/Tag/TagDropdown.vue
+++ b/resources/js/packages/ui/src/Tag/TagDropdown.vue
@@ -23,9 +23,11 @@ const props = withDefaults(
         tags: Tag[];
         createTag: (name: string) => Promise<Tag | undefined>;
         align?: 'center' | 'end' | 'start';
+        showNoTagOption?: boolean;
     }>(),
     {
         align: 'start',
+        showNoTagOption: true,
     }
 );
 
@@ -55,6 +57,7 @@ const filteredTags = computed(() => {
 });
 
 const showNoTag = computed(() => {
+    if (!props.showNoTagOption) return false;
     const search = searchValue.value.toLowerCase().trim();
     if (!search) return true;
     return NO_TAG_LABEL.toLowerCase().includes(search);
@@ -101,7 +104,7 @@ const showCreateTagModal = ref(false);
         <template #content>
             <ComboboxRoot
                 v-model:search-term="searchValue"
-                :open="open"
+                :open="true"
                 class="p-2"
                 :filter-function="(val: string[]) => val">
                 <ComboboxAnchor>
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue
index fcb61edb..bbb3cb1a 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue
@@ -94,7 +94,8 @@ function onSelectChange(checked: boolean) {
         data-testid="time_entry_row">
         <MainContainer class="min-w-0">
             <div class="@xl:flex py-2 items-center min-w-0 justify-between group">
-                <div class="flex space-x-3 items-center min-w-0">
+                <!-- Desktop layout -->
+                <div class="hidden @lg:flex space-x-3 items-center min-w-0">
                     <Checkbox
                         :checked="
                             timeEntry.timeEntries.every((aggregateTimeEntry: TimeEntry) =>
@@ -107,10 +108,11 @@ function onSelectChange(checked: boolean) {
                             {{ timeEntry?.timeEntries?.length }}
                         </GroupedItemsCountButton>
                         <TimeEntryDescriptionInput
-                            class="min-w-0 mr-4"
+                            class="min-w-0 mr-4 shrink"
                             :model-value="timeEntry.description"
                             @changed="updateTimeEntryDescription"></TimeEntryDescriptionInput>
                         <TimeTrackerProjectTaskDropdown
+                            class="min-w-0 shrink"
                             :clients
                             :create-project
                             :create-client
@@ -125,7 +127,8 @@ function onSelectChange(checked: boolean) {
                             @changed="updateProjectAndTask"></TimeTrackerProjectTaskDropdown>
                     </div>
                 </div>
-                <div class="flex items-center font-medium space-x-1 @lg:space-x-2">
+                <div
+                    class="hidden @lg:flex items-center font-medium space-x-1 @lg:space-x-2 shrink-0">
                     <TimeEntryRowTagDropdown
                         :create-tag
                         :tags="tags"
@@ -180,6 +183,74 @@ function onSelectChange(checked: boolean) {
                             deleteTimeEntries(timeEntry?.timeEntries ?? [])
                         "></TimeEntryMoreOptionsDropdown>
                 </div>
+                <!-- Mobile layout -->
+                <div class="@lg:hidden">
+                    <!-- First row: count + description + duration -->
+                    <div class="flex items-center justify-between min-w-0">
+                        <div class="flex items-center min-w-0 flex-1">
+                            <GroupedItemsCountButton
+                                :expanded="expanded"
+                                @click="expanded = !expanded">
+                                {{ timeEntry?.timeEntries?.length }}
+                            </GroupedItemsCountButton>
+                            <TimeEntryDescriptionInput
+                                class="min-w-0 flex-1"
+                                :model-value="timeEntry.description"
+                                @changed="updateTimeEntryDescription"></TimeEntryDescriptionInput>
+                        </div>
+                        <button
+                            class="text-text-primary min-w-[80px] px-1.5 py-1.5 bg-transparent text-right hover:bg-card-background rounded-lg border border-transparent hover:border-card-border text-sm font-medium focus-visible:outline-none focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:bg-tertiary"
+                            @click="expanded = !expanded">
+                            {{
+                                formatHumanReadableDuration(
+                                    timeEntry.duration ?? 0,
+                                    organization?.interval_format,
+                                    organization?.number_format
+                                )
+                            }}
+                        </button>
+                    </div>
+                    <!-- Second row: project/task - tags - billable - start - more -->
+                    <div class="flex items-center justify-between mt-1">
+                        <TimeTrackerProjectTaskDropdown
+                            class="min-w-0"
+                            :clients
+                            :create-project
+                            :create-client
+                            :can-create-project
+                            :projects="projects"
+                            :tasks="tasks"
+                            :show-badge-border="false"
+                            :project="timeEntry.project_id"
+                            :enable-estimated-time
+                            :currency="currency"
+                            :task="timeEntry.task_id"
+                            @changed="updateProjectAndTask"></TimeTrackerProjectTaskDropdown>
+                        <div class="flex items-center shrink-0">
+                            <TimeEntryRowTagDropdown
+                                :create-tag
+                                :tags="tags"
+                                :model-value="timeEntry.tags"
+                                compact
+                                @changed="updateTimeEntryTags"></TimeEntryRowTagDropdown>
+                            <BillableToggleButton
+                                :model-value="timeEntry.billable"
+                                size="small"
+                                @changed="updateTimeEntryBillable"></BillableToggleButton>
+                            <TimeTrackerStartStop
+                                :active="!!(timeEntry.start && !timeEntry.end)"
+                                variant="secondary"
+                                class="ml-2"
+                                @changed="onStartStopClick(timeEntry)"></TimeTrackerStartStop>
+                            <TimeEntryMoreOptionsDropdown
+                                :show-edit="false"
+                                :show-duplicate="false"
+                                @delete="
+                                    deleteTimeEntries(timeEntry?.timeEntries ?? [])
+                                "></TimeEntryMoreOptionsDropdown>
+                        </div>
+                    </div>
+                </div>
             </div>
         </MainContainer>
         <div
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryDescriptionInput.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryDescriptionInput.vue
index 740e8146..d536ab84 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryDescriptionInput.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryDescriptionInput.vue
@@ -31,11 +31,11 @@ const displaysPlaceholder = computed(() => {
 </script>
 
 <template>
-    <div class="relative min-w-0 flex-1 text-ellipsis whitespace-nowrap overflow-hidden">
+    <div class="relative min-w-0 text-ellipsis whitespace-nowrap overflow-hidden">
         <div class="relative text-sm font-medium min-w-0">
             <div
                 :class="[
-                    'opacity-0 h-4 text-sm whitespace-pre font-medium min-w-0 pl-3 pr-1',
+                    'opacity-0 h-4 text-sm whitespace-pre font-medium min-w-0 pl-1.5 @lg:pl-3 pr-1',
                     { 'min-w-[130px]': displaysPlaceholder },
                 ]">
                 {{ liveDataValue }}
@@ -44,7 +44,7 @@ const displaysPlaceholder = computed(() => {
                 data-testid="time_entry_description"
                 :value="liveDataValue"
                 placeholder="Add a description"
-                class="absolute px-0 h-full min-w-0 pl-3 pr-1 left-0 top-0 w-full text-sm text-text-primary font-medium bg-transparent focus-visible:ring-0 rounded-lg border-0"
+                class="absolute px-0 h-full min-w-0 pl-1.5 @lg:pl-3 pr-1 left-0 top-0 w-full text-sm text-text-primary font-medium bg-transparent focus-visible:ring-0 rounded-lg border-0"
                 @blur="onChange"
                 @input="onInput"
                 @keydown.enter="onChange" />
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryMassActionRow.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryMassActionRow.vue
index cce49054..54a76b28 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryMassActionRow.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryMassActionRow.vue
@@ -63,7 +63,7 @@ const showMassUpdateModal = ref(false);
         :class="
             twMerge(
                 props.class,
-                'text-sm py-1.5 font-medium flex border-b border-border-primary items-center space-x-3'
+                'text-sm py-1.5 font-medium hidden sm:flex border-b border-border-primary items-center space-x-3'
             )
         ">
         <Checkbox
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
index f85db7a2..d5c77784 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
@@ -113,14 +113,16 @@ async function handleDeleteTimeEntry() {
         data-testid="time_entry_row">
         <MainContainer class="min-w-0">
             <div class="@xl:flex py-2 min-w-0 items-center justify-between group">
-                <div class="flex items-center min-w-0">
+                <!-- Desktop layout -->
+                <div class="hidden @lg:flex items-center min-w-0">
                     <Checkbox :checked="selected" @update:checked="onSelectChange" />
                     <div v-if="indent === true" class="w-10 h-7"></div>
                     <TimeEntryDescriptionInput
-                        class="min-w-0 mr-4"
+                        class="min-w-0 mr-4 shrink"
                         :model-value="timeEntry.description"
                         @changed="updateTimeEntryDescription"></TimeEntryDescriptionInput>
                     <TimeTrackerProjectTaskDropdown
+                        class="min-w-0 shrink"
                         :create-project
                         :create-client
                         :can-create-project
@@ -134,7 +136,8 @@ async function handleDeleteTimeEntry() {
                         :task="timeEntry.task_id"
                         @changed="updateProjectAndTask"></TimeTrackerProjectTaskDropdown>
                 </div>
-                <div class="flex items-center font-medium space-x-1 @lg:space-x-2">
+                <div
+                    class="hidden @lg:flex items-center font-medium space-x-1 @lg:space-x-2 shrink-0">
                     <div v-if="showMember && members" class="text-sm px-2">
                         {{ memberName }}
                     </div>
@@ -171,6 +174,58 @@ async function handleDeleteTimeEntry() {
                         @duplicate="duplicateTimeEntry"
                         @delete="deleteTimeEntry"></TimeEntryMoreOptionsDropdown>
                 </div>
+                <!-- Mobile layout -->
+                <div class="@lg:hidden">
+                    <!-- First row: description + duration -->
+                    <div class="flex items-center justify-between min-w-0">
+                        <TimeEntryDescriptionInput
+                            class="min-w-0 flex-1"
+                            :model-value="timeEntry.description"
+                            @changed="updateTimeEntryDescription"></TimeEntryDescriptionInput>
+                        <TimeEntryRowDurationInput
+                            :start="timeEntry.start"
+                            :end="timeEntry.end"
+                            @changed="updateStartEndTime"></TimeEntryRowDurationInput>
+                    </div>
+                    <!-- Second row: project/task - tags - billable - start - more -->
+                    <div class="flex items-center justify-between mt-1">
+                        <TimeTrackerProjectTaskDropdown
+                            class="min-w-0"
+                            :create-project
+                            :create-client
+                            :can-create-project
+                            :clients
+                            :projects="projects"
+                            :tasks="tasks"
+                            :show-badge-border="false"
+                            :project="timeEntry.project_id"
+                            :currency="currency"
+                            :enable-estimated-time
+                            :task="timeEntry.task_id"
+                            @changed="updateProjectAndTask"></TimeTrackerProjectTaskDropdown>
+                        <div class="flex items-center shrink-0">
+                            <TimeEntryRowTagDropdown
+                                :create-tag
+                                :tags="tags"
+                                :model-value="timeEntry.tags"
+                                compact
+                                @changed="updateTimeEntryTags"></TimeEntryRowTagDropdown>
+                            <BillableToggleButton
+                                :model-value="timeEntry.billable"
+                                size="small"
+                                @changed="updateTimeEntryBillable"></BillableToggleButton>
+                            <TimeTrackerStartStop
+                                :active="!!(timeEntry.start && !timeEntry.end)"
+                                variant="secondary"
+                                class="ml-2"
+                                @changed="onStartStopClick"></TimeTrackerStartStop>
+                            <TimeEntryMoreOptionsDropdown
+                                @edit="handleEdit"
+                                @duplicate="duplicateTimeEntry"
+                                @delete="deleteTimeEntry"></TimeEntryMoreOptionsDropdown>
+                        </div>
+                    </div>
+                </div>
             </div>
         </MainContainer>
     </div>
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryRowHeading.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryRowHeading.vue
index 0e88d4c8..4dc7bdcb 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryRowHeading.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryRowHeading.vue
@@ -36,8 +36,8 @@ function selectUnselectAll(value: boolean) {
         class="bg-background dark:bg-secondary border-b border-border-primary py-1 text-xs @sm:text-sm">
         <MainContainer>
             <div class="flex group justify-between items-center">
-                <div class="flex items-center space-x-2">
-                    <div class="w-5">
+                <div class="flex items-center @lg:space-x-2 pl-1.5 @lg:pl-0">
+                    <div class="w-5 hidden @lg:block">
                         <CalendarIcon
                             class="w-3 @sm:w-4 text-icon-default group-hover:hidden block">
                         </CalendarIcon>
@@ -50,11 +50,11 @@ function selectUnselectAll(value: boolean) {
                     <span class="font-medium text-text-secondary">
                         {{ formatWeekday(date) }}
                     </span>
-                    <span class="text-text-tertiary">
+                    <span class="text-text-tertiary ml-2">
                         {{ formatDate(date, organization?.date_format) }}
                     </span>
                 </div>
-                <div class="text-text-secondary pr-[87px] @lg:pr-[92px]">
+                <div class="text-text-secondary pr-2 @lg:pr-[92px]">
                     <span class="font-medium">
                         {{
                             formatHumanReadableDuration(
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryRowTagDropdown.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryRowTagDropdown.vue
index 4ece5a60..46e91a93 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryRowTagDropdown.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryRowTagDropdown.vue
@@ -4,10 +4,16 @@ import { computed } from 'vue';
 import TagBadge from '@/packages/ui/src/Tag/TagBadge.vue';
 import type { Tag } from '@/packages/api/src';
 
-const props = defineProps<{
-    tags: Tag[];
-    createTag: (name: string) => Promise<Tag | undefined>;
-}>();
+const props = withDefaults(
+    defineProps<{
+        tags: Tag[];
+        createTag: (name: string) => Promise<Tag | undefined>;
+        compact?: boolean;
+    }>(),
+    {
+        compact: false,
+    }
+);
 
 const emit = defineEmits<{
     changed: [model: string[]];
@@ -20,23 +26,41 @@ const model = defineModel<string[]>({
 const timeEntryTags = computed<Tag[]>(() => {
     return props.tags.filter((tag) => model.value.includes(tag.id));
 });
+
+const displayName = computed(() => {
+    if (props.compact && timeEntryTags.value.length > 0) {
+        const count = timeEntryTags.value.length;
+        return count === 1 ? '1 tag' : `${count} tags`;
+    }
+    if (timeEntryTags.value.length >= 3) {
+        const firstTag = timeEntryTags.value[0]?.name || '';
+        const remaining = timeEntryTags.value.length - 1;
+        return `${firstTag} + ${remaining} more`;
+    }
+    return timeEntryTags.value.map((tag: Tag) => tag.name).join(', ');
+});
 </script>
 <template>
     <TagDropdown
         v-model="model"
         :tags="tags"
         align="end"
+        :show-no-tag-option="false"
         :create-tag
         @changed="emit('changed', model)">
         <template #trigger>
             <button
                 data-testid="time_entry_tag_dropdown"
-                class="opacity-50 group-hover:opacity-100 group/dropdown focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:opacity-100 transition focus:bg-card-background-separator hover:bg-card-background-separator rounded-full flex items-center justify-center">
+                :class="[
+                    'group/dropdown focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:opacity-100 transition focus:bg-card-background-separator hover:bg-card-background-separator rounded-full flex items-center justify-center',
+                    compact ? '' : 'opacity-50 group-hover:opacity-100',
+                ]">
                 <TagBadge
                     :border="false"
                     size="large"
-                    class="border-0 sm:px-1.5 text-icon-default group-focus-within/dropdown:text-text-primary"
-                    :name="timeEntryTags.map((tag: Tag) => tag.name).join(', ')"></TagBadge>
+                    :show-icon="!(compact && timeEntryTags.length > 0)"
+                    class="border-0 sm:px-1.5 text-icon-default group-focus-within/dropdown:text-text-primary whitespace-nowrap"
+                    :name="displayName"></TagBadge>
             </button>
         </template>
     </TagDropdown>
diff --git a/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue b/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue
index 4c6e1039..1b5727c4 100644
--- a/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue
+++ b/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue
@@ -222,7 +222,7 @@ useSelectEvents(
                 <div
                     v-if="showDropdown && filteredRecentlyTrackedTimeEntries.length > 0"
                     ref="floating"
-                    class="z-50 w-[min(500px,100vw-2rem)]"
+                    class="z-50 w-[min(640px,100vw-2rem)]"
                     :style="floatingStyles">
                     <div
                         class="rounded-lg w-full border border-card-border overflow-hidden shadow-dropdown bg-card-background">
diff --git a/resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue b/resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue
index 99cda9ed..ea0f7d67 100644
--- a/resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue
+++ b/resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue
@@ -515,14 +515,14 @@ const showCreateProject = ref(false);
                         props.class
                     )
                 ">
-                <div class="flex items-center lg:space-x-1 min-w-0">
-                    <span class="whitespace-nowrap text-xs lg:text-sm">
+                <div class="flex items-center lg:space-x-1 min-w-0 overflow-hidden">
+                    <span class="text-xs lg:text-sm shrink-0">
                         {{ selectedProjectName }}
                     </span>
                     <ChevronRightIcon
                         v-if="currentTask"
                         class="w-4 lg:w-5 text-text-secondary shrink-0"></ChevronRightIcon>
-                    <div v-if="currentTask" class="min-w-0 shrink text-xs lg:text-sm truncate">
+                    <div v-if="currentTask" class="min-w-0 text-xs lg:text-sm truncate shrink">
                         {{ currentTask.name }}
                     </div>
                 </div>
diff --git a/resources/js/packages/ui/src/TimeTracker/TimeTrackerRecentlyTrackedEntry.vue b/resources/js/packages/ui/src/TimeTracker/TimeTrackerRecentlyTrackedEntry.vue
index a539c6cc..586761df 100644
--- a/resources/js/packages/ui/src/TimeTracker/TimeTrackerRecentlyTrackedEntry.vue
+++ b/resources/js/packages/ui/src/TimeTracker/TimeTrackerRecentlyTrackedEntry.vue
@@ -42,15 +42,15 @@ const task = computed(() => {
             ref="projectDropdownTrigger"
             :color="project?.color"
             :name="project?.name"
-            class="shrink-0">
+            class="shrink min-w-0 max-w-[50%]">
             <div v-if="project" class="flex items-center lg:space-x-1 min-w-0">
-                <span class="whitespace-nowrap text-xs">
+                <span class="text-xs whitespace-nowrap shrink-0">
                     {{ project?.name }}
                 </span>
                 <ChevronRightIcon
                     v-if="task"
                     class="w-4 lg:w-5 text-text-secondary shrink-0"></ChevronRightIcon>
-                <div v-if="task" class="min-w-0 shrink text-xs truncate">
+                <div v-if="task" class="min-w-0 text-xs truncate">
                     {{ task.name }}
                 </div>
             </div>

From 7d068fecaeb37095d91c28f43d5e96e7c1777b3f Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Wed, 4 Feb 2026 14:32:56 +0100
Subject: [PATCH 24/28] fix admin panel time entry save and update, fixes #997

---
 app/Filament/Resources/TimeEntryResource.php  |  18 ++-
 .../Pages/CreateTimeEntry.php                 |  19 +++
 .../TimeEntryResource/Pages/EditTimeEntry.php |  19 +++
 .../Resources/TimeEntryResourceTest.php       | 147 ++++++++++++++++++
 4 files changed, 199 insertions(+), 4 deletions(-)

diff --git a/app/Filament/Resources/TimeEntryResource.php b/app/Filament/Resources/TimeEntryResource.php
index ffd133b3..c54a4678 100644
--- a/app/Filament/Resources/TimeEntryResource.php
+++ b/app/Filament/Resources/TimeEntryResource.php
@@ -5,6 +5,7 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\TimeEntryResource\Pages;
+use App\Models\Member;
 use App\Models\TimeEntry;
 use Filament\Forms\Components\DateTimePicker;
 use Filament\Forms\Components\Select;
@@ -16,6 +17,7 @@
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
 
 class TimeEntryResource extends Resource
 {
@@ -51,15 +53,23 @@ public static function form(Form $form): Form
                     ->rules([
                         'after_or_equal:start',
                     ]),
-                Select::make('user_id')
-                    ->relationship(name: 'user', titleAttribute: 'email')
-                    ->searchable(['name', 'email'])
+                Select::make('member_id')
+                    ->relationship(
+                        name: 'member',
+                        titleAttribute: 'id',
+                        modifyQueryUsing: fn (Builder $query) => $query->with(['user', 'organization'])
+                    )
+                    ->getOptionLabelFromRecordUsing(fn (Member $record): string => $record->user->email.' ('.$record->organization->name.')')
+                    ->searchable()
                     ->required(),
                 Select::make('project_id')
                     ->relationship(name: 'project', titleAttribute: 'name')
                     ->searchable(['name'])
                     ->nullable(),
-                // TODO
+                Select::make('task_id')
+                    ->relationship(name: 'task', titleAttribute: 'name')
+                    ->searchable(['name'])
+                    ->nullable(),
             ]);
     }
 
diff --git a/app/Filament/Resources/TimeEntryResource/Pages/CreateTimeEntry.php b/app/Filament/Resources/TimeEntryResource/Pages/CreateTimeEntry.php
index 35a85daf..a8bb9498 100644
--- a/app/Filament/Resources/TimeEntryResource/Pages/CreateTimeEntry.php
+++ b/app/Filament/Resources/TimeEntryResource/Pages/CreateTimeEntry.php
@@ -5,9 +5,28 @@
 namespace App\Filament\Resources\TimeEntryResource\Pages;
 
 use App\Filament\Resources\TimeEntryResource;
+use App\Models\Member;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateTimeEntry extends CreateRecord
 {
     protected static string $resource = TimeEntryResource::class;
+
+    /**
+     * @param  array<string, mixed>  $data
+     * @return array<string, mixed>
+     */
+    protected function mutateFormDataBeforeCreate(array $data): array
+    {
+        if (isset($data['member_id'])) {
+            /** @var Member|null $member */
+            $member = Member::query()->find($data['member_id']);
+            if ($member !== null) {
+                $data['user_id'] = $member->user_id;
+                $data['organization_id'] = $member->organization_id;
+            }
+        }
+
+        return $data;
+    }
 }
diff --git a/app/Filament/Resources/TimeEntryResource/Pages/EditTimeEntry.php b/app/Filament/Resources/TimeEntryResource/Pages/EditTimeEntry.php
index 96105ecd..f8ef533f 100644
--- a/app/Filament/Resources/TimeEntryResource/Pages/EditTimeEntry.php
+++ b/app/Filament/Resources/TimeEntryResource/Pages/EditTimeEntry.php
@@ -5,6 +5,7 @@
 namespace App\Filament\Resources\TimeEntryResource\Pages;
 
 use App\Filament\Resources\TimeEntryResource;
+use App\Models\Member;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
@@ -19,4 +20,22 @@ protected function getHeaderActions(): array
                 ->icon('heroicon-m-trash'),
         ];
     }
+
+    /**
+     * @param  array<string, mixed>  $data
+     * @return array<string, mixed>
+     */
+    protected function mutateFormDataBeforeSave(array $data): array
+    {
+        if (isset($data['member_id'])) {
+            /** @var Member|null $member */
+            $member = Member::query()->find($data['member_id']);
+            if ($member !== null) {
+                $data['user_id'] = $member->user_id;
+                $data['organization_id'] = $member->organization_id;
+            }
+        }
+
+        return $data;
+    }
 }
diff --git a/tests/Unit/Filament/Resources/TimeEntryResourceTest.php b/tests/Unit/Filament/Resources/TimeEntryResourceTest.php
index 86d2f9e1..d4cdec04 100644
--- a/tests/Unit/Filament/Resources/TimeEntryResourceTest.php
+++ b/tests/Unit/Filament/Resources/TimeEntryResourceTest.php
@@ -5,6 +5,8 @@
 namespace Tests\Unit\Filament\Resources;
 
 use App\Filament\Resources\TimeEntryResource;
+use App\Models\Member;
+use App\Models\Organization;
 use App\Models\TimeEntry;
 use App\Models\User;
 use Illuminate\Support\Facades\Config;
@@ -50,4 +52,149 @@ public function test_can_see_edit_page_of_time_entry(): void
         // Assert
         $response->assertSuccessful();
     }
+
+    public function test_can_see_create_page_of_time_entry(): void
+    {
+        // Act
+        $response = Livewire::test(TimeEntryResource\Pages\CreateTimeEntry::class);
+
+        // Assert
+        $response->assertSuccessful();
+    }
+
+    public function test_can_create_time_entry(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $user = User::factory()->create();
+        $member = Member::factory()
+            ->forOrganization($organization)
+            ->forUser($user)
+            ->create();
+
+        // Act
+        $response = Livewire::test(TimeEntryResource\Pages\CreateTimeEntry::class)
+            ->fillForm([
+                'description' => 'Test time entry',
+                'billable' => true,
+                'start' => '2024-01-01 08:00:00',
+                'end' => '2024-01-01 10:00:00',
+                'member_id' => $member->getKey(),
+            ])
+            ->call('create')
+            ->assertHasNoFormErrors();
+
+        // Assert
+        $response->assertSuccessful();
+        $timeEntry = TimeEntry::where('description', 'Test time entry')->first();
+        $this->assertNotNull($timeEntry);
+        $this->assertSame($member->getKey(), $timeEntry->member_id);
+        $this->assertSame($user->getKey(), $timeEntry->user_id);
+        $this->assertSame($organization->getKey(), $timeEntry->organization_id);
+        $this->assertTrue($timeEntry->billable);
+    }
+
+    public function test_can_create_time_entry_and_derives_user_and_organization_from_member(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $user = User::factory()->create();
+        $member = Member::factory()
+            ->forOrganization($organization)
+            ->forUser($user)
+            ->create();
+        $otherUser = User::factory()->create();
+        $otherOrganization = Organization::factory()->create();
+
+        // Act
+        $response = Livewire::test(TimeEntryResource\Pages\CreateTimeEntry::class)
+            ->fillForm([
+                'description' => 'Derived fields test',
+                'billable' => false,
+                'start' => '2024-03-01 09:00:00',
+                'end' => '2024-03-01 11:00:00',
+                'member_id' => $member->getKey(),
+                'user_id' => $otherUser->getKey(),
+                'organization_id' => $otherOrganization->getKey(),
+            ])
+            ->call('create')
+            ->assertHasNoFormErrors();
+
+        // Assert
+        $response->assertSuccessful();
+        $timeEntry = TimeEntry::where('description', 'Derived fields test')->first();
+        $this->assertNotNull($timeEntry);
+        $this->assertSame($user->getKey(), $timeEntry->user_id);
+        $this->assertSame($organization->getKey(), $timeEntry->organization_id);
+    }
+
+    public function test_can_update_time_entry(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $user = User::factory()->create();
+        $member = Member::factory()
+            ->forOrganization($organization)
+            ->forUser($user)
+            ->create();
+        $timeEntry = TimeEntry::factory()->forMember($member)->create();
+
+        // Act
+        $response = Livewire::test(TimeEntryResource\Pages\EditTimeEntry::class, ['record' => $timeEntry->getKey()])
+            ->fillForm([
+                'description' => 'Updated description',
+                'billable' => true,
+                'start' => '2024-02-01 08:00:00',
+                'end' => '2024-02-01 12:00:00',
+                'member_id' => $member->getKey(),
+            ])
+            ->call('save')
+            ->assertHasNoFormErrors();
+
+        // Assert
+        $response->assertSuccessful();
+        $timeEntry->refresh();
+        $this->assertSame('Updated description', $timeEntry->description);
+        $this->assertTrue($timeEntry->billable);
+        $this->assertSame($user->getKey(), $timeEntry->user_id);
+        $this->assertSame($organization->getKey(), $timeEntry->organization_id);
+    }
+
+    public function test_update_time_entry_derives_user_and_organization_from_new_member(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $user = User::factory()->create();
+        $member = Member::factory()
+            ->forOrganization($organization)
+            ->forUser($user)
+            ->create();
+        $timeEntry = TimeEntry::factory()->create();
+
+        $newOrganization = Organization::factory()->create();
+        $newUser = User::factory()->create();
+        $newMember = Member::factory()
+            ->forOrganization($newOrganization)
+            ->forUser($newUser)
+            ->create();
+
+        // Act
+        $response = Livewire::test(TimeEntryResource\Pages\EditTimeEntry::class, ['record' => $timeEntry->getKey()])
+            ->fillForm([
+                'description' => 'Reassigned entry',
+                'billable' => false,
+                'start' => '2024-02-01 08:00:00',
+                'end' => '2024-02-01 12:00:00',
+                'member_id' => $newMember->getKey(),
+            ])
+            ->call('save')
+            ->assertHasNoFormErrors();
+
+        // Assert
+        $response->assertSuccessful();
+        $timeEntry->refresh();
+        $this->assertSame($newMember->getKey(), $timeEntry->member_id);
+        $this->assertSame($newUser->getKey(), $timeEntry->user_id);
+        $this->assertSame($newOrganization->getKey(), $timeEntry->organization_id);
+    }
 }

From 22f3af2b79b3646af57677d390e81204bb85006d Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Wed, 4 Feb 2026 17:07:46 +0100
Subject: [PATCH 25/28] Make sure that time entry billable status updates when
 project changes, fixes #981

---
 e2e/calendar.spec.ts                          | 188 +++++++++++++
 e2e/time.spec.ts                              | 252 ++++++++++++++++++
 e2e/utils/reporting.ts                        |  19 ++
 .../ui/src/TimeEntry/TimeEntryEditModal.vue   |  12 +
 .../ui/src/TimeEntry/TimeEntryRow.vue         |   2 +
 5 files changed, 473 insertions(+)
 create mode 100644 e2e/calendar.spec.ts

diff --git a/e2e/calendar.spec.ts b/e2e/calendar.spec.ts
new file mode 100644
index 00000000..71971169
--- /dev/null
+++ b/e2e/calendar.spec.ts
@@ -0,0 +1,188 @@
+import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
+import { test } from '../playwright/fixtures';
+import { expect } from '@playwright/test';
+import type { Page } from '@playwright/test';
+import { createProject, createBillableProject, createBareTimeEntry } from './utils/reporting';
+
+async function goToCalendar(page: Page) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/calendar');
+}
+
+/**
+ * These tests verify that changing the project on a time entry via the calendar
+ * updates the billable status to match the new project's is_billable setting.
+ *
+ * Issue: https://github.com/solidtime-io/solidtime/issues/981
+ */
+
+test('test that changing project in calendar edit modal from non-billable to billable updates billable status', async ({
+    page,
+}) => {
+    const billableProjectName = 'Billable Cal Project ' + Math.floor(1 + Math.random() * 10000);
+
+    await createBillableProject(page, billableProjectName);
+    await createBareTimeEntry(page, 'Test billable calendar', '1h');
+
+    await goToCalendar(page);
+
+    // Click on the time entry event in the calendar
+    await page.locator('.fc-event').filter({ hasText: 'Test billable calendar' }).first().click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+
+    // Verify initially non-billable
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Non-Billable' })
+    ).toBeVisible();
+
+    // Select the billable project
+    await page.getByRole('dialog').getByRole('button', { name: 'No Project' }).click();
+    await page.getByRole('option', { name: billableProjectName }).click();
+
+    // Verify the billable dropdown updated to Billable
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Billable' })
+    ).toBeVisible();
+
+    // Save and verify
+    const [updateResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/time-entries/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+        page.getByRole('button', { name: 'Update Time Entry' }).click(),
+    ]);
+    const responseBody = await updateResponse.json();
+    expect(responseBody.data.billable).toBe(true);
+});
+
+test('test that changing project in calendar edit modal from billable to non-billable updates billable status', async ({
+    page,
+}) => {
+    const billableProjectName = 'Billable Cal Rev Project ' + Math.floor(1 + Math.random() * 10000);
+    const nonBillableProjectName =
+        'NonBillable Cal Rev Project ' + Math.floor(1 + Math.random() * 10000);
+
+    await createBillableProject(page, billableProjectName);
+    await createProject(page, nonBillableProjectName);
+    await createBareTimeEntry(page, 'Test billable cal reverse', '1h');
+
+    await goToCalendar(page);
+
+    // Click on the time entry event in the calendar
+    await page
+        .locator('.fc-event')
+        .filter({ hasText: 'Test billable cal reverse' })
+        .first()
+        .click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+
+    // First assign the billable project
+    await page.getByRole('dialog').getByRole('button', { name: 'No Project' }).click();
+    await page.getByRole('option', { name: billableProjectName }).click();
+
+    // Verify billable status flipped to Billable
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Billable' })
+    ).toBeVisible();
+
+    // Now switch to the non-billable project
+    await page.getByRole('dialog').getByRole('button', { name: billableProjectName }).click();
+    await page.getByRole('option', { name: nonBillableProjectName }).click();
+
+    // Verify billable status reverted to Non-Billable
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Non-Billable' })
+    ).toBeVisible();
+
+    // Save and verify
+    const [updateResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/time-entries/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+        page.getByRole('button', { name: 'Update Time Entry' }).click(),
+    ]);
+    const responseBody = await updateResponse.json();
+    expect(responseBody.data.billable).toBe(false);
+});
+
+test('test that opening calendar edit modal for a time entry with manually overridden billable status preserves that status', async ({
+    page,
+}) => {
+    const billableProjectName =
+        'Billable Cal Persist Project ' + Math.floor(1 + Math.random() * 10000);
+
+    await createBillableProject(page, billableProjectName);
+    await createBareTimeEntry(page, 'Test cal persist override', '1h');
+
+    await goToCalendar(page);
+
+    // Click on the time entry event in the calendar
+    await page
+        .locator('.fc-event')
+        .filter({ hasText: 'Test cal persist override' })
+        .first()
+        .click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+
+    // Assign the billable project
+    await page.getByRole('dialog').getByRole('button', { name: 'No Project' }).click();
+    await page.getByRole('option', { name: billableProjectName }).click();
+
+    // Verify it auto-set to Billable
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Billable' })
+    ).toBeVisible();
+
+    // Now manually override billable to Non-Billable via the dropdown
+    await page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Billable' }).click();
+    await page.getByRole('option', { name: 'Non Billable' }).click();
+
+    // Verify it shows Non-Billable now
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Non-Billable' })
+    ).toBeVisible();
+
+    // Save
+    const [firstSaveResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/time-entries/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+        page.getByRole('button', { name: 'Update Time Entry' }).click(),
+    ]);
+    const firstBody = await firstSaveResponse.json();
+    expect(firstBody.data.billable).toBe(false);
+
+    // Re-open the edit modal from the calendar — the project_id watcher should NOT override billable
+    await page
+        .locator('.fc-event')
+        .filter({ hasText: 'Test cal persist override' })
+        .first()
+        .click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+
+    // The billable dropdown should still show Non-Billable
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Non-Billable' })
+    ).toBeVisible();
+
+    // Save without changes and verify the response still has billable=false
+    const [updateResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/time-entries/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+        page.getByRole('button', { name: 'Update Time Entry' }).click(),
+    ]);
+    const responseBody = await updateResponse.json();
+    expect(responseBody.data.billable).toBe(false);
+});
diff --git a/e2e/time.spec.ts b/e2e/time.spec.ts
index 8d2cb027..0776790c 100644
--- a/e2e/time.spec.ts
+++ b/e2e/time.spec.ts
@@ -9,6 +9,7 @@ import {
     startOrStopTimerWithButton,
     stoppedTimeEntryResponse,
 } from './utils/currentTimeEntry';
+import { createProject, createBillableProject, createBareTimeEntry } from './utils/reporting';
 
 async function goToTimeOverview(page: Page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/time');
@@ -448,3 +449,254 @@ test('test that setting billable status via the create modal works', async ({ pa
         ),
     ]);
 });
+
+/**
+ * The following tests verify that changing the project on a time entry
+ * updates the billable status to match the new project's is_billable setting.
+ *
+ * Issue: https://github.com/solidtime-io/solidtime/issues/981
+ */
+
+test('test that changing project on a time entry row from non-billable to billable updates billable status', async ({
+    page,
+}) => {
+    const billableProjectName = 'Billable Row Project ' + Math.floor(1 + Math.random() * 10000);
+    const nonBillableProjectName =
+        'NonBillable Row Project ' + Math.floor(1 + Math.random() * 10000);
+
+    await createProject(page, nonBillableProjectName);
+    await createBillableProject(page, billableProjectName);
+    await createBareTimeEntry(page, 'Test billable row', '1h');
+
+    await goToTimeOverview(page);
+    const timeEntryRow = page.locator('[data-testid="time_entry_row"]').first();
+
+    // Assign the non-billable project first
+    await timeEntryRow.getByRole('button', { name: 'No Project' }).click();
+    await page.getByRole('option', { name: nonBillableProjectName }).click();
+    await page.waitForResponse(
+        (response) =>
+            response.url().includes('/time-entries/') &&
+            response.request().method() === 'PUT' &&
+            response.status() === 200
+    );
+
+    // Now switch to the billable project
+    await timeEntryRow.getByRole('button', { name: nonBillableProjectName }).click();
+    await page.getByRole('option', { name: billableProjectName }).click();
+
+    const updateResponse = await page.waitForResponse(
+        (response) =>
+            response.url().includes('/time-entries/') &&
+            response.request().method() === 'PUT' &&
+            response.status() === 200
+    );
+    const responseBody = await updateResponse.json();
+    expect(responseBody.data.billable).toBe(true);
+});
+
+test('test that changing project on a time entry row from billable to non-billable updates billable status', async ({
+    page,
+}) => {
+    const billableProjectName = 'Billable Row Rev Project ' + Math.floor(1 + Math.random() * 10000);
+    const nonBillableProjectName =
+        'NonBillable Row Rev Project ' + Math.floor(1 + Math.random() * 10000);
+
+    await createBillableProject(page, billableProjectName);
+    await createProject(page, nonBillableProjectName);
+    await createBareTimeEntry(page, 'Test billable row reverse', '1h');
+
+    await goToTimeOverview(page);
+    const timeEntryRow = page.locator('[data-testid="time_entry_row"]').first();
+
+    // Assign the billable project first
+    await timeEntryRow.getByRole('button', { name: 'No Project' }).click();
+    await page.getByRole('option', { name: billableProjectName }).click();
+    const firstResponse = await page.waitForResponse(
+        (response) =>
+            response.url().includes('/time-entries/') &&
+            response.request().method() === 'PUT' &&
+            response.status() === 200
+    );
+    const firstBody = await firstResponse.json();
+    expect(firstBody.data.billable).toBe(true);
+
+    // Now switch to the non-billable project
+    await timeEntryRow.getByRole('button', { name: billableProjectName }).click();
+    await page.getByRole('option', { name: nonBillableProjectName }).click();
+
+    const updateResponse = await page.waitForResponse(
+        (response) =>
+            response.url().includes('/time-entries/') &&
+            response.request().method() === 'PUT' &&
+            response.status() === 200
+    );
+    const responseBody = await updateResponse.json();
+    expect(responseBody.data.billable).toBe(false);
+});
+
+test('test that changing project in edit modal from non-billable to billable updates billable status', async ({
+    page,
+}) => {
+    const billableProjectName = 'Billable Modal Project ' + Math.floor(1 + Math.random() * 10000);
+
+    await createBillableProject(page, billableProjectName);
+    await createBareTimeEntry(page, 'Test billable modal', '1h');
+
+    await goToTimeOverview(page);
+    const timeEntryRow = page.locator('[data-testid="time_entry_row"]').first();
+
+    // Open edit modal
+    await timeEntryRow.getByRole('button', { name: 'Actions for the time entry' }).first().click();
+    await page.getByRole('menuitem', { name: 'Edit' }).click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+
+    // Verify initially non-billable
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Non-Billable' })
+    ).toBeVisible();
+
+    // Select the billable project
+    await page.getByRole('dialog').getByRole('button', { name: 'No Project' }).click();
+    await page.getByRole('option', { name: billableProjectName }).click();
+
+    // Verify the billable dropdown updated to Billable
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Billable' })
+    ).toBeVisible();
+
+    // Save and verify
+    const [updateResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/time-entries/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+        page.getByRole('button', { name: 'Update Time Entry' }).click(),
+    ]);
+    const responseBody = await updateResponse.json();
+    expect(responseBody.data.billable).toBe(true);
+});
+
+test('test that opening edit modal for a time entry with manually overridden billable status preserves that status', async ({
+    page,
+}) => {
+    const billableProjectName = 'Billable Persist Project ' + Math.floor(1 + Math.random() * 10000);
+
+    await createBillableProject(page, billableProjectName);
+    await createBareTimeEntry(page, 'Test persist billable override', '1h');
+
+    await goToTimeOverview(page);
+    const timeEntryRow = page.locator('[data-testid="time_entry_row"]').first();
+
+    // Open edit modal and assign the billable project
+    await timeEntryRow.getByRole('button', { name: 'Actions for the time entry' }).first().click();
+    await page.getByRole('menuitem', { name: 'Edit' }).click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+
+    await page.getByRole('dialog').getByRole('button', { name: 'No Project' }).click();
+    await page.getByRole('option', { name: billableProjectName }).click();
+
+    // Verify it auto-set to Billable
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Billable' })
+    ).toBeVisible();
+
+    // Now manually override billable to Non-Billable via the dropdown
+    await page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Billable' }).click();
+    await page.getByRole('option', { name: 'Non Billable' }).click();
+
+    // Verify it shows Non-Billable now
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Non-Billable' })
+    ).toBeVisible();
+
+    // Save
+    const [firstSaveResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/time-entries/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+        page.getByRole('button', { name: 'Update Time Entry' }).click(),
+    ]);
+    const firstBody = await firstSaveResponse.json();
+    expect(firstBody.data.billable).toBe(false);
+
+    // Re-open the edit modal — the project_id watcher should NOT override billable back to true
+    await timeEntryRow.getByRole('button', { name: 'Actions for the time entry' }).first().click();
+    await page.getByRole('menuitem', { name: 'Edit' }).click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+
+    // The billable dropdown should still show Non-Billable
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Non-Billable' })
+    ).toBeVisible();
+
+    // Save without changes and verify the response still has billable=false
+    const [updateResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/time-entries/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+        page.getByRole('button', { name: 'Update Time Entry' }).click(),
+    ]);
+    const responseBody = await updateResponse.json();
+    expect(responseBody.data.billable).toBe(false);
+});
+
+test('test that changing project in edit modal from billable to non-billable updates billable status', async ({
+    page,
+}) => {
+    const billableProjectName =
+        'Billable Modal Rev Project ' + Math.floor(1 + Math.random() * 10000);
+    const nonBillableProjectName =
+        'NonBillable Modal Rev Project ' + Math.floor(1 + Math.random() * 10000);
+
+    await createBillableProject(page, billableProjectName);
+    await createProject(page, nonBillableProjectName);
+    await createBareTimeEntry(page, 'Test billable modal reverse', '1h');
+
+    await goToTimeOverview(page);
+    const timeEntryRow = page.locator('[data-testid="time_entry_row"]').first();
+
+    // Open edit modal
+    await timeEntryRow.getByRole('button', { name: 'Actions for the time entry' }).first().click();
+    await page.getByRole('menuitem', { name: 'Edit' }).click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+
+    // First assign the billable project
+    await page.getByRole('dialog').getByRole('button', { name: 'No Project' }).click();
+    await page.getByRole('option', { name: billableProjectName }).click();
+
+    // Verify billable status flipped to Billable
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Billable' })
+    ).toBeVisible();
+
+    // Now switch to the non-billable project
+    await page.getByRole('dialog').getByRole('button', { name: billableProjectName }).click();
+    await page.getByRole('option', { name: nonBillableProjectName }).click();
+
+    // Verify billable status reverted to Non-Billable
+    await expect(
+        page.getByRole('dialog').getByRole('combobox').filter({ hasText: 'Non-Billable' })
+    ).toBeVisible();
+
+    // Save and verify
+    const [updateResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/time-entries/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+        page.getByRole('button', { name: 'Update Time Entry' }).click(),
+    ]);
+    const responseBody = await updateResponse.json();
+    expect(responseBody.data.billable).toBe(false);
+});
diff --git a/e2e/utils/reporting.ts b/e2e/utils/reporting.ts
index 25bf4cc9..acf80ae1 100644
--- a/e2e/utils/reporting.ts
+++ b/e2e/utils/reporting.ts
@@ -35,6 +35,25 @@ export async function createProject(page: Page, projectName: string) {
     await expect(page.getByText(projectName)).toBeVisible();
 }
 
+export async function createBillableProject(page: Page, projectName: string) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/projects');
+    await expect(page.getByRole('button', { name: 'Create Project' })).toBeVisible();
+    await page.getByRole('button', { name: 'Create Project' }).click();
+    await page.getByLabel('Project name').fill(projectName);
+    await page.getByText('Non-Billable').click();
+    await page.getByText('Default Rate').click();
+    await Promise.all([
+        page.getByRole('dialog').getByRole('button', { name: 'Create Project' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/projects') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201
+        ),
+    ]);
+    await expect(page.getByText(projectName)).toBeVisible();
+}
+
 export async function createClient(page: Page, clientName: string) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/clients');
     await expect(page.getByRole('button', { name: 'Create Client' })).toBeVisible();
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
index 91e9dd18..b148e25b 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
@@ -74,6 +74,18 @@ watch(
     { immediate: true }
 );
 
+watch(
+    () => editableTimeEntry.value?.project_id,
+    (value, oldValue) => {
+        if (oldValue !== undefined && value !== oldValue && editableTimeEntry.value) {
+            const project = props.projects.find((p) => p.id === value);
+            if (project) {
+                editableTimeEntry.value.billable = project.is_billable;
+            }
+        }
+    }
+);
+
 const localStart = computed({
     get: () =>
         editableTimeEntry.value ? getLocalizedDayJs(editableTimeEntry.value.start).format() : '',
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
index d5c77784..17a32d99 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
@@ -67,10 +67,12 @@ function updateStartEndTime(start: string, end: string | null) {
 }
 
 function updateProjectAndTask(projectId: string, taskId: string) {
+    const project = props.projects.find((p) => p.id === projectId);
     props.updateTimeEntry({
         ...props.timeEntry,
         project_id: projectId,
         task_id: taskId,
+        billable: project ? project.is_billable : props.timeEntry.billable,
     });
 }
 

From f82f5e780c9609f0352913cf9b28474b514d1d34 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Wed, 4 Feb 2026 17:22:08 +0100
Subject: [PATCH 26/28]  fix desync of checkboxes on the reporting detailed
 page, fixes #892

---
 resources/js/Pages/ReportingDetailed.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Pages/ReportingDetailed.vue b/resources/js/Pages/ReportingDetailed.vue
index 269ae894..414551be 100644
--- a/resources/js/Pages/ReportingDetailed.vue
+++ b/resources/js/Pages/ReportingDetailed.vue
@@ -286,7 +286,7 @@ async function downloadExport(format: ExportFormat) {
         <div class="w-full relative @container">
             <div v-for="entry in timeEntries" :key="entry.id">
                 <TimeEntryRow
-                    :selected="selectedTimeEntries.includes(entry)"
+                    :selected="selectedTimeEntries.some((item) => item.id === entry.id)"
                     :can-create-project="canCreateProjects()"
                     :create-client
                     :create-project

From 66681066bc7cee894f91afad1df7a583a7ff72fb Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Thu, 5 Feb 2026 15:02:01 +0100
Subject: [PATCH 27/28] migrate datepickers to shadcn, Fixes #877, #807

---
 e2e/shared-reports.spec.ts                    | 126 ++++++++
 e2e/time.spec.ts                              | 284 +++++++++++++++++-
 e2e/timetracker.spec.ts                       |  60 ++++
 e2e/utils/reporting.ts                        |   2 +
 .../Common/Report/ReportCreateModal.vue       |   9 +-
 .../Common/Report/ReportEditModal.vue         |  17 +-
 .../ui/calendar/CalendarCellTrigger.vue       |   2 +-
 .../js/packages/ui/src/Input/DatePicker.vue   | 115 +++----
 .../packages/ui/src/Input/DateRangePicker.vue |  12 +-
 .../ui/src/Input/TimeRangeSelector.vue        |  27 +-
 .../ui/src/TimeEntry/TimeEntryCreateModal.vue |  20 +-
 .../ui/src/TimeEntry/TimeEntryEditModal.vue   |  21 +-
 .../RangeCalendarCellTrigger.vue              |   4 +-
 resources/js/packages/ui/src/utils/time.ts    |   3 +
 14 files changed, 611 insertions(+), 91 deletions(-)

diff --git a/e2e/shared-reports.spec.ts b/e2e/shared-reports.spec.ts
index db82235d..27605619 100644
--- a/e2e/shared-reports.spec.ts
+++ b/e2e/shared-reports.spec.ts
@@ -19,6 +19,10 @@ import {
 // Each test registers a new user and creates test data, which needs more time
 test.describe.configure({ timeout: 60000 });
 
+// Date picker button name patterns for different date formats
+const DATE_PICKER_BUTTON_PATTERN =
+    /^Pick a date$|^\d{4}-\d{2}-\d{2}$|^\d{2}\/\d{2}\/\d{4}$|^\d{2}\.\d{2}\.\d{4}$/;
+
 // ──────────────────────────────────────────────────
 // Shared Report Lifecycle Tests
 // ──────────────────────────────────────────────────
@@ -203,6 +207,128 @@ test('test that shared report with No Task filter shows entries without a task',
     await expect(page.getByText('Total')).toBeVisible();
 });
 
+// ──────────────────────────────────────────────────
+// Report Date Picker Tests
+// ──────────────────────────────────────────────────
+
+test('test that creating a report with an expiration date works', async ({ page }) => {
+    const projectName = 'DatePickerProj ' + Math.floor(Math.random() * 10000);
+    const reportName = 'DatePickerReport ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+
+    await goToReporting(page);
+    await expect(page.getByTestId('reporting_view').getByText(projectName)).toBeVisible();
+
+    // Open the save report modal
+    await page.getByRole('button', { name: 'Save Report' }).click();
+    await page.getByLabel('Name').fill(reportName);
+
+    // The "Public" checkbox should be checked by default, showing the date picker
+    const datePicker = page
+        .getByRole('dialog')
+        .getByRole('button', { name: DATE_PICKER_BUTTON_PATTERN });
+    await expect(datePicker).toBeVisible();
+    await datePicker.click();
+
+    // Select a date in the next month
+    const calendarGrid = page.getByRole('grid');
+    await expect(calendarGrid).toBeVisible({ timeout: 5000 });
+    await page.getByRole('button', { name: /Next/i }).click();
+    await page.getByRole('gridcell').filter({ hasText: /^15$/ }).first().click();
+
+    // Wait for the calendar to close
+    await expect(calendarGrid).not.toBeVisible();
+
+    // Create the report and verify it includes the public_until date
+    const [response] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/reports') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201
+        ),
+        page.getByRole('dialog').getByRole('button', { name: 'Create Report' }).click(),
+    ]);
+    const responseBody = await response.json();
+    expect(responseBody.data.public_until).toBeTruthy();
+});
+
+test('test that editing a report to make it public with expiration date works', async ({
+    page,
+}) => {
+    const projectName = 'EditDateProj ' + Math.floor(Math.random() * 10000);
+    const reportName = 'EditDateReport ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+
+    await goToReporting(page);
+    await expect(page.getByTestId('reporting_view').getByText(projectName)).toBeVisible();
+
+    // Open the save report modal and create a private report
+    await page.getByRole('button', { name: 'Save Report' }).click();
+    await page.getByLabel('Name').fill(reportName);
+
+    // Uncheck "Public" to create a private report
+    await page.getByLabel('Public').click();
+
+    await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/reports') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201
+        ),
+        page.getByRole('dialog').getByRole('button', { name: 'Create Report' }).click(),
+    ]);
+
+    // Go to shared reports and edit
+    await goToReportingShared(page);
+    await expect(page.getByText(reportName)).toBeVisible();
+    await expect(page.getByText('Private')).toBeVisible();
+
+    // Click more options and edit
+    await page
+        .getByRole('button', { name: new RegExp('Actions for Project ' + reportName) })
+        .click();
+    await page.getByRole('menuitem', { name: /^Edit Report/ }).click();
+
+    // Check "Public" to make it public - this should show the date picker
+    await page.getByLabel('Public').click();
+
+    // The date picker should now be visible
+    const datePicker = page
+        .getByRole('dialog')
+        .getByRole('button', { name: DATE_PICKER_BUTTON_PATTERN });
+    await expect(datePicker).toBeVisible();
+    await datePicker.click();
+
+    // Select a date in the next month
+    const calendarGrid = page.getByRole('grid');
+    await expect(calendarGrid).toBeVisible({ timeout: 5000 });
+    await page.getByRole('button', { name: /Next/i }).click();
+    await page.getByRole('gridcell').filter({ hasText: /^20$/ }).first().click();
+
+    // Wait for the calendar to close
+    await expect(calendarGrid).not.toBeVisible();
+
+    // Update the report and verify it includes the public_until date
+    const [response] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/reports/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+        page.getByRole('button', { name: 'Update Report' }).click(),
+    ]);
+    const responseBody = await response.json();
+    expect(responseBody.data.public_until).toBeTruthy();
+    expect(responseBody.data.is_public).toBe(true);
+});
+
 test('test that shared report with No Client filter shows entries without a client', async ({
     page,
 }) => {
diff --git a/e2e/time.spec.ts b/e2e/time.spec.ts
index 0776790c..06c7f2eb 100644
--- a/e2e/time.spec.ts
+++ b/e2e/time.spec.ts
@@ -11,10 +11,37 @@ import {
 } from './utils/currentTimeEntry';
 import { createProject, createBillableProject, createBareTimeEntry } from './utils/reporting';
 
+// Date picker button name patterns for different date formats
+// Matches: "Pick a date", "YYYY-MM-DD", "DD/MM/YYYY", "DD.MM.YYYY", "MM/DD/YYYY", "DD-MM-YYYY", "MM-DD-YYYY"
+const DATE_PICKER_BUTTON_PATTERN =
+    /^Pick a date$|^\d{4}-\d{2}-\d{2}$|^\d{2}\/\d{2}\/\d{4}$|^\d{2}\.\d{2}\.\d{4}$/;
+// Same pattern but without "Pick a date" - for when we expect an actual date to be displayed
+const DATE_DISPLAY_PATTERN = /^\d{4}-\d{2}-\d{2}$|^\d{2}\/\d{2}\/\d{4}$|^\d{2}\.\d{2}\.\d{4}$/;
+
+/**
+ * Extracts day of month from an ISO timestamp string
+ */
+function getDayFromTimestamp(timestamp: string): number {
+    return new Date(timestamp).getUTCDate();
+}
+
+/**
+ * Extracts month (1-indexed) from an ISO timestamp string
+ */
+function getMonthFromTimestamp(timestamp: string): number {
+    return new Date(timestamp).getUTCMonth() + 1;
+}
+
 async function goToTimeOverview(page: Page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/time');
 }
 
+async function goToOrganizationSettings(page: Page) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
+    await page.locator('[data-testid="organization_switcher"]:visible').click();
+    await page.getByText('Organization Settings').click();
+}
+
 async function createEmptyTimeEntry(page: Page) {
     await Promise.all([
         newTimeEntryResponse(page),
@@ -310,7 +337,262 @@ test.skip('test that load more works when the end of page is reached', async ({
 
 // TODO: Test Grouped time entries by description/project
 
-// TODO: Add Test for Date Update
+// Date Update Tests
+
+test('test that updating the start date of a time entry via the edit modal works', async ({
+    page,
+}) => {
+    await createBareTimeEntry(page, 'Date edit test', '1h');
+    await goToTimeOverview(page);
+
+    const timeEntryRows = page.locator('[data-testid="time_entry_row"]');
+    const newTimeEntry = timeEntryRows.first();
+
+    // Open edit modal via the actions dropdown
+    const actionsDropdown = newTimeEntry
+        .getByRole('button', { name: 'Actions for the time entry' })
+        .first();
+    await actionsDropdown.click();
+    await page.getByTestId('time_entry_edit').click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+
+    // Click the start date picker (first date picker button in the Start section)
+    const startDatePicker = page
+        .getByRole('dialog')
+        .getByRole('button', { name: DATE_PICKER_BUTTON_PATTERN })
+        .first();
+    await startDatePicker.click();
+
+    // Navigate to the previous month and select the 15th
+    await page.getByRole('button', { name: /Previous/i }).click();
+    await page.getByRole('gridcell').filter({ hasText: /^15$/ }).first().click();
+
+    // Get current month to calculate expected month after going to previous
+    const now = new Date();
+    const expectedMonth = now.getMonth() === 0 ? 12 : now.getMonth(); // Previous month (1-indexed)
+
+    // Submit the update and verify the response has correct date
+    const [updateResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/time-entries') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+        page.getByRole('button', { name: 'Update Time Entry' }).click(),
+    ]);
+    const updateBody = await updateResponse.json();
+    expect(updateBody.data.start).toBeTruthy();
+    expect(updateBody.data.end).toBeTruthy();
+    // Verify the day was changed to 15th
+    expect(getDayFromTimestamp(updateBody.data.start)).toBe(15);
+    // Verify the month is the previous month
+    expect(getMonthFromTimestamp(updateBody.data.start)).toBe(expectedMonth);
+});
+
+test('test that setting a date in the create modal works', async ({ page }) => {
+    await goToTimeOverview(page);
+
+    // Get today's date to compare later
+    const today = new Date();
+
+    // Open create modal
+    await page.getByRole('button', { name: 'Time entry actions' }).click();
+    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+
+    // Set description
+    await page
+        .getByRole('dialog')
+        .getByRole('textbox', { name: 'Description' })
+        .fill('Date picker test entry');
+
+    // Set duration first (to ensure the form is valid)
+    await page.locator('[role="dialog"] input[name="Duration"]').fill('1h');
+    await page.locator('[role="dialog"] input[name="Duration"]').press('Tab');
+
+    // Click the start date picker
+    const startDatePicker = page
+        .getByRole('dialog')
+        .getByRole('button', { name: DATE_PICKER_BUTTON_PATTERN })
+        .first();
+    await startDatePicker.click();
+
+    // Wait for calendar to appear
+    const calendarGrid = page.getByRole('grid');
+    await expect(calendarGrid).toBeVisible({ timeout: 5000 });
+
+    // Navigate to previous month and select the 15th (a day that's always in the middle of the month)
+    await page.getByRole('button', { name: /Previous/i }).click();
+    await page.getByRole('gridcell', { name: '15' }).getByRole('button').click();
+
+    // Wait for calendar to close
+    await expect(calendarGrid).not.toBeVisible();
+
+    // Get current month to calculate expected month after going to previous
+    const expectedMonth = today.getMonth() === 0 ? 12 : today.getMonth(); // Previous month (1-indexed)
+
+    // Submit and verify creation succeeds with correct date
+    const [createResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) => response.url().includes('/time-entries') && response.status() === 201
+        ),
+        page.getByRole('button', { name: 'Create Time Entry' }).click(),
+    ]);
+    const createBody = await createResponse.json();
+    expect(createBody.data.start).toBeTruthy();
+    // Verify the day was set to 15th
+    expect(getDayFromTimestamp(createBody.data.start)).toBe(15);
+    // Verify the month is the previous month
+    expect(getMonthFromTimestamp(createBody.data.start)).toBe(expectedMonth);
+});
+
+test('test that updating the date via the time entry row range selector works', async ({
+    page,
+}) => {
+    await createBareTimeEntry(page, 'Date range test', '1h');
+    await goToTimeOverview(page);
+
+    const timeEntryRows = page.locator('[data-testid="time_entry_row"]');
+    const newTimeEntry = timeEntryRows.first();
+    await expect(newTimeEntry).toBeVisible();
+
+    // Open the time range popover
+    const timeEntryRangeElement = newTimeEntry.getByTestId('time_entry_range_selector');
+    await timeEntryRangeElement.click();
+
+    // Verify the range selector dropdown is open
+    const rangeStart = page.getByTestId('time_entry_range_start');
+    await expect(rangeStart).toBeVisible();
+
+    // Click the start date picker button within the range selector
+    const startDatePicker = page.getByRole('button', { name: DATE_DISPLAY_PATTERN }).first();
+    await expect(startDatePicker).toBeVisible();
+    await startDatePicker.click();
+
+    // Wait for the calendar to appear and select a day
+    const calendarGrid = page.getByRole('grid');
+    await expect(calendarGrid).toBeVisible({ timeout: 5000 });
+
+    // Navigate to previous month and select the 5th
+    await page.getByRole('button', { name: /Previous/i }).click();
+    await page.getByRole('gridcell').filter({ hasText: /^5$/ }).first().click();
+
+    // Get current month to calculate expected month after going to previous
+    const now = new Date();
+    const expectedMonth = now.getMonth() === 0 ? 12 : now.getMonth(); // Previous month (1-indexed)
+
+    // Verify the time entry update API call succeeds with correct date
+    const updateResponse = await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 200 &&
+            response.request().method() === 'PUT' &&
+            (await response.headerValue('Content-Type')) === 'application/json'
+        );
+    });
+    const updateBody = await updateResponse.json();
+    expect(updateBody.data.start).toBeTruthy();
+    // Verify the day was changed to 5th
+    expect(getDayFromTimestamp(updateBody.data.start)).toBe(5);
+    // Verify the month is the previous month
+    expect(getMonthFromTimestamp(updateBody.data.start)).toBe(expectedMonth);
+});
+
+test('test that updating the end date via the time entry row range selector works', async ({
+    page,
+}) => {
+    await createBareTimeEntry(page, 'End date range test', '1h');
+    await goToTimeOverview(page);
+
+    const timeEntryRows = page.locator('[data-testid="time_entry_row"]');
+    const newTimeEntry = timeEntryRows.first();
+    await expect(newTimeEntry).toBeVisible();
+
+    // Open the time range popover
+    const timeEntryRangeElement = newTimeEntry.getByTestId('time_entry_range_selector');
+    await timeEntryRangeElement.click();
+
+    // Verify the range selector dropdown is open
+    const rangeEnd = page.getByTestId('time_entry_range_end');
+    await expect(rangeEnd).toBeVisible();
+
+    // Click the end date picker button (second date picker)
+    const datePickers = page.getByRole('button', { name: DATE_DISPLAY_PATTERN });
+    const endDatePicker = datePickers.nth(1);
+    await expect(endDatePicker).toBeVisible();
+    await endDatePicker.click();
+
+    // Wait for the calendar to appear
+    const calendarGrid = page.getByRole('grid');
+    await expect(calendarGrid).toBeVisible({ timeout: 5000 });
+
+    // Navigate to next month and select the 20th (to ensure end > start)
+    await page.getByRole('button', { name: /Next/i }).click();
+    await page.getByRole('gridcell').filter({ hasText: /^20$/ }).first().click();
+
+    // Get current month to calculate expected month after going to next
+    const now = new Date();
+    const expectedMonth = now.getMonth() === 11 ? 1 : now.getMonth() + 2; // Next month (1-indexed)
+
+    // Verify the time entry update API call succeeds with correct date
+    const updateResponse = await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 200 &&
+            response.request().method() === 'PUT' &&
+            (await response.headerValue('Content-Type')) === 'application/json'
+        );
+    });
+    const updateBody = await updateResponse.json();
+    expect(updateBody.data.end).toBeTruthy();
+    // Verify the day was changed to 20th
+    expect(getDayFromTimestamp(updateBody.data.end)).toBe(20);
+    // Verify the month is the next month
+    expect(getMonthFromTimestamp(updateBody.data.end)).toBe(expectedMonth);
+});
+
+test('test that date picker displays date in organization date format', async ({ page }) => {
+    // First change the organization date format to DD/MM/YYYY
+    await goToOrganizationSettings(page);
+    await page.getByLabel('Date Format').click();
+    await page.getByRole('option', { name: 'DD/MM/YYYY' }).click();
+    await Promise.all([
+        page
+            .locator('form')
+            .filter({ hasText: 'Date Format' })
+            .getByRole('button', { name: 'Save' })
+            .click(),
+        page.waitForResponse(
+            async (response) =>
+                response.url().includes('/organizations/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200 &&
+                (await response.json()).data.date_format === 'slash-separated-dd-mm-yyyy'
+        ),
+    ]);
+
+    // Create a time entry and open the edit modal
+    await createBareTimeEntry(page, 'Date format test', '1h');
+    await goToTimeOverview(page);
+
+    const timeEntryRows = page.locator('[data-testid="time_entry_row"]');
+    const newTimeEntry = timeEntryRows.first();
+    await expect(newTimeEntry).toBeVisible();
+
+    // Open edit modal
+    const actionsDropdown = newTimeEntry
+        .getByRole('button', { name: 'Actions for the time entry' })
+        .first();
+    await actionsDropdown.click();
+    await page.getByTestId('time_entry_edit').click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+
+    // Verify the date picker shows the date in DD/MM/YYYY format
+    const datePicker = page
+        .getByRole('dialog')
+        .getByRole('button', { name: /^\d{2}\/\d{2}\/\d{4}$/ })
+        .first();
+    await expect(datePicker).toBeVisible();
+});
 
 // TODO: Test that project can be created in the time entry row
 
diff --git a/e2e/timetracker.spec.ts b/e2e/timetracker.spec.ts
index ef4063d2..7b35ce65 100644
--- a/e2e/timetracker.spec.ts
+++ b/e2e/timetracker.spec.ts
@@ -10,6 +10,9 @@ import {
 import type { Page } from '@playwright/test';
 import { newTagResponse } from './utils/tags';
 
+// Date picker button name patterns for different date formats
+const DATE_DISPLAY_PATTERN = /^\d{4}-\d{2}-\d{2}$|^\d{2}\/\d{2}\/\d{4}$|^\d{2}\.\d{2}\.\d{4}$/;
+
 async function goToDashboard(page: Page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
 }
@@ -254,6 +257,63 @@ test('test that adding a new tag when the timer is running', async ({ page }) =>
     await assertThatTimerIsStopped(page);
 });
 
+test('test that setting an end time with a different date via the timetracker range selector works', async ({
+    page,
+}) => {
+    await goToDashboard(page);
+
+    // Start a timer
+    await Promise.all([newTimeEntryResponse(page), startOrStopTimerWithButton(page)]);
+    await assertThatTimerHasStarted(page);
+
+    // Open the time range dropdown by clicking on the time display
+    await page.getByTestId('time_entry_time').click();
+    const rangeStart = page.getByTestId('time_entry_range_start');
+    await expect(rangeStart).toBeVisible();
+
+    // Click "Set End Time" button
+    await page.getByRole('button', { name: 'Set End Time' }).click();
+
+    // The end time picker should now be visible with a Confirm button
+    const rangeEnd = page.getByTestId('time_entry_range_end');
+    await expect(rangeEnd).toBeVisible();
+    const confirmButton = page.getByRole('button', { name: 'Confirm' });
+    await expect(confirmButton).toBeVisible();
+
+    // Click the end date picker to change the date
+    const endDatePickers = page.getByRole('button', { name: DATE_DISPLAY_PATTERN });
+    // The second date picker is the end date (first is the start date)
+    const endDatePicker = endDatePickers.nth(1);
+    await expect(endDatePicker).toBeVisible();
+    await endDatePicker.click();
+
+    // Calendar should appear
+    const calendarGrid = page.getByRole('grid');
+    await expect(calendarGrid).toBeVisible({ timeout: 5000 });
+
+    // Navigate to the next month and select a day to ensure end > start
+    await page.getByRole('button', { name: /Next/i }).click();
+    await page.getByRole('gridcell').filter({ hasText: /^15$/ }).first().click();
+
+    // The dropdown should still be open after selecting a date (not auto-closed)
+    await expect(rangeEnd).toBeVisible();
+    await expect(confirmButton).toBeVisible();
+
+    // Click Confirm to finalize and verify the API call
+    const [updateResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/time-entries') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+        confirmButton.click(),
+    ]);
+    const updateBody = await updateResponse.json();
+    expect(updateBody.data.start).toBeTruthy();
+    expect(updateBody.data.end).toBeTruthy();
+});
+
 // test that search is working
 
 // test that adding a tag and project and starting the timer afterwards works and sets the project and tag correctly
diff --git a/e2e/utils/reporting.ts b/e2e/utils/reporting.ts
index acf80ae1..7e7bf973 100644
--- a/e2e/utils/reporting.ts
+++ b/e2e/utils/reporting.ts
@@ -314,5 +314,7 @@ export async function saveAsSharedReport(
         page.getByRole('dialog').getByRole('button', { name: 'Create Report' }).click(),
     ]);
     const responseBody = await response.json();
+    // Wait for navigation to shared reports page
+    await page.waitForURL('**/reporting/shared');
     return { shareableLink: responseBody.data.shareable_link };
 }
diff --git a/resources/js/Components/Common/Report/ReportCreateModal.vue b/resources/js/Components/Common/Report/ReportCreateModal.vue
index dd08f03c..62cfa345 100644
--- a/resources/js/Components/Common/Report/ReportCreateModal.vue
+++ b/resources/js/Components/Common/Report/ReportCreateModal.vue
@@ -12,6 +12,8 @@ import { api } from '@/packages/api/src';
 import { Checkbox } from '@/packages/ui/src';
 import DatePicker from '@/packages/ui/src/Input/DatePicker.vue';
 import { useNotificationsStore } from '@/utils/notification';
+import { getDayJsInstance } from '@/packages/ui/src/utils/time';
+import { router } from '@inertiajs/vue3';
 
 const show = defineModel('show', { default: false });
 const saving = ref(false);
@@ -44,10 +46,14 @@ const report = ref({
 const { handleApiRequestNotifications } = useNotificationsStore();
 
 async function submit() {
+    const publicUntil = report.value.public_until
+        ? getDayJsInstance()(report.value.public_until).utc().format()
+        : null;
     await handleApiRequestNotifications(
         () =>
             createReportMutation.mutateAsync({
                 ...report.value,
+                public_until: publicUntil,
                 properties: { ...props.properties },
             }),
         'Success',
@@ -60,6 +66,7 @@ async function submit() {
                 public_until: null,
             };
             show.value = false;
+            router.visit(route('reporting.shared'));
         }
     );
 }
@@ -97,7 +104,7 @@ async function submit() {
                             <InputLabel for="public_until" value="Expires at" />
                             <div class="text-text-tertiary font-medium">(optional)</div>
                         </div>
-                        <DatePicker id="public_until"></DatePicker>
+                        <DatePicker v-model="report.public_until"></DatePicker>
                     </div>
                 </div>
             </div>
diff --git a/resources/js/Components/Common/Report/ReportEditModal.vue b/resources/js/Components/Common/Report/ReportEditModal.vue
index 49348825..7801f885 100644
--- a/resources/js/Components/Common/Report/ReportEditModal.vue
+++ b/resources/js/Components/Common/Report/ReportEditModal.vue
@@ -2,7 +2,7 @@
 import TextInput from '../../../packages/ui/src/Input/TextInput.vue';
 import SecondaryButton from '../../../packages/ui/src/Buttons/SecondaryButton.vue';
 import DialogModal from '@/packages/ui/src/DialogModal.vue';
-import { ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import PrimaryButton from '../../../packages/ui/src/Buttons/PrimaryButton.vue';
 import InputLabel from '../../../packages/ui/src/Input/InputLabel.vue';
 import type { UpdateReportBody } from '@/packages/api/src';
@@ -13,6 +13,7 @@ import { Checkbox } from '@/packages/ui/src';
 import DatePicker from '@/packages/ui/src/Input/DatePicker.vue';
 import { useNotificationsStore } from '@/utils/notification';
 import type { Report } from '@/packages/api/src';
+import { getDayJsInstance, getLocalizedDayJs } from '@/packages/ui/src/utils/time';
 
 const show = defineModel('show', { default: false });
 const saving = ref(false);
@@ -61,9 +62,21 @@ watch(
     }
 );
 
+// Intermediate local variable for DatePicker (converts between UTC and localized)
+const localPublicUntil = computed({
+    get: () => {
+        if (!report.value.public_until) return null;
+        return getLocalizedDayJs(report.value.public_until).format();
+    },
+    set: (value: string | null) => {
+        report.value.public_until = value ? getDayJsInstance()(value).utc().format() : null;
+    },
+});
+
 const { handleApiRequestNotifications } = useNotificationsStore();
 
 async function submit() {
+    // public_until is already in UTC format from the computed setter
     await handleApiRequestNotifications(
         () => updateReportMutation.mutateAsync(report.value),
         'Success',
@@ -111,7 +124,7 @@ async function submit() {
                     </div>
                     <div v-if="report.is_public" class="flex items-center space-x-4">
                         <InputLabel for="public_until" value="Expires at" />
-                        <DatePicker id="public_until"></DatePicker>
+                        <DatePicker v-model="localPublicUntil"></DatePicker>
                     </div>
                 </div>
             </div>
diff --git a/resources/js/Components/ui/calendar/CalendarCellTrigger.vue b/resources/js/Components/ui/calendar/CalendarCellTrigger.vue
index 9df66f0e..163906c1 100644
--- a/resources/js/Components/ui/calendar/CalendarCellTrigger.vue
+++ b/resources/js/Components/ui/calendar/CalendarCellTrigger.vue
@@ -22,7 +22,7 @@ const forwardedProps = useForwardProps(delegatedProps);
                 'h-8 w-8 p-0 font-normal',
                 '[&[data-today]:not([data-selected])]:border-accent [&[data-today]:not([data-selected])]:border [&[data-today]:not([data-selected])]:text-accent-foreground',
                 // Selected
-                'data-[selected]:bg-primary data-[selected]:text-primary-foreground data-[selected]:opacity-100 data-[selected]:hover:bg-primary data-[selected]:hover:text-primary-foreground data-[selected]:focus:bg-primary data-[selected]:focus:text-primary-foreground',
+                'data-[selected]:bg-quaternary data-[selected]:text-primary-foreground data-[selected]:opacity-100 data-[selected]:hover:bg-quaternary data-[selected]:hover:text-primary-foreground data-[selected]:focus:bg-primary data-[selected]:focus:text-primary-foreground',
                 // Disabled
                 'data-[disabled]:text-muted-foreground data-[disabled]:opacity-50',
                 // Unavailable
diff --git a/resources/js/packages/ui/src/Input/DatePicker.vue b/resources/js/packages/ui/src/Input/DatePicker.vue
index 747ec8f9..58701709 100644
--- a/resources/js/packages/ui/src/Input/DatePicker.vue
+++ b/resources/js/packages/ui/src/Input/DatePicker.vue
@@ -1,11 +1,21 @@
 <script setup lang="ts">
-import { ref, watch } from 'vue';
-import { getDayJsInstance, getLocalizedDayJs } from '@/packages/ui/src/utils/time';
-import { twMerge } from 'tailwind-merge';
+import { computed, inject, ref, type ComputedRef } from 'vue';
+import {
+    getLocalizedDayJs,
+    formatDate,
+    firstDayIndex,
+    type WeekStartDay,
+} from '@/packages/ui/src/utils/time';
+import { Popover, PopoverContent, PopoverTrigger } from '@/packages/ui/src/popover';
+import { Calendar } from '@/Components/ui/calendar';
+import { Button } from '@/Components/ui/button';
+import { CalendarIcon } from 'lucide-vue-next';
+import { parseDate, type DateValue } from '@internationalized/date';
+import type { Organization } from '@/packages/api/src';
 
 const props = defineProps<{
-    class?: string;
     tabindex?: string;
+    class?: string;
 }>();
 
 // This has to be a localized timestamp, not UTC
@@ -13,61 +23,64 @@ const model = defineModel<string | null>({
     default: null,
 });
 
-const tempDate = ref(getLocalizedDayJs(model.value).format('YYYY-MM-DD'));
+const emit = defineEmits(['changed']);
+
+const open = ref(false);
 
-watch(model, (value) => {
-    tempDate.value = getLocalizedDayJs(value).format('YYYY-MM-DD');
+const organization = inject<ComputedRef<Organization>>('organization');
+
+const weekStartsOn = computed((): WeekStartDay => firstDayIndex.value as WeekStartDay);
+
+const dateString = computed(() => {
+    if (!model.value) return null;
+    return getLocalizedDayJs(model.value).format('YYYY-MM-DD');
 });
 
-function updateDate(event: Event) {
-    const target = event.target as HTMLInputElement;
-    const newValue = target.value;
-    const newDate = getDayJsInstance()(newValue);
-    if (newDate.isValid()) {
-        model.value = getLocalizedDayJs(model.value)
-            .set('year', newDate.year())
-            .set('month', newDate.month())
-            .set('date', newDate.date())
-            .format();
-        emit('changed', model.value);
-    }
-}
+const calendarDate = computed(() => {
+    if (!dateString.value) return undefined;
+    return parseDate(dateString.value);
+});
 
-const datePicker = ref<HTMLInputElement | null>(null);
+const displayDate = computed(() => {
+    if (!dateString.value) return '';
+    return formatDate(dateString.value, organization?.value?.date_format);
+});
 
-function updateTempValue(event: Event) {
-    const target = event.target as HTMLInputElement;
-    tempDate.value = target.value;
+function handleDateSelect(newDate: DateValue | undefined) {
+    if (!newDate) return;
+    // If model.value is null, start from current date/time
+    const baseDate = model.value ? getLocalizedDayJs(model.value) : getLocalizedDayJs();
+    const newValue = baseDate
+        .set('year', newDate.year)
+        .set('month', newDate.month - 1) // CalendarDate months are 1-indexed, dayjs is 0-indexed
+        .set('date', newDate.day)
+        .format();
+    model.value = newValue;
+    emit('changed', newValue);
+    open.value = false;
 }
-
-const emit = defineEmits(['changed']);
 </script>
 
 <template>
-    <div class="flex items-center text-text-secondary">
-        <input
-            id="start"
-            ref="datePicker"
-            :tabindex="tabindex"
-            :class="
-                twMerge(
-                    'bg-input-background border text-text-primary border-input-border focus-visible:outline-0 focus-visible:border-input-border-active focus-visible:ring-0 rounded-md',
-                    props.class
-                )
-            "
-            type="date"
-            name="trip-start"
-            :value="tempDate"
-            @change="updateTempValue"
-            @blur="updateDate"
-            @keydown.enter="updateDate" />
+    <div class="w-full">
+        <Popover v-model:open="open">
+            <PopoverTrigger as-child>
+                <Button
+                    variant="input"
+                    size="sm"
+                    :tabindex="tabindex"
+                    :class="['w-full px-2 gap-1.5', props.class]">
+                    <CalendarIcon class="!size-3 text-muted-foreground" />
+                    <span>{{ displayDate || 'Pick a date' }}</span>
+                </Button>
+            </PopoverTrigger>
+            <PopoverContent class="w-auto p-0" align="center">
+                <Calendar
+                    mode="single"
+                    :model-value="calendarDate"
+                    :week-starts-on="weekStartsOn"
+                    @update:model-value="handleDateSelect" />
+            </PopoverContent>
+        </Popover>
     </div>
 </template>
-
-<style scoped>
-input::-webkit-calendar-picker-indicator {
-    filter: invert(1);
-
-    opacity: 0.2;
-}
-</style>
diff --git a/resources/js/packages/ui/src/Input/DateRangePicker.vue b/resources/js/packages/ui/src/Input/DateRangePicker.vue
index 5c607056..f3abba85 100644
--- a/resources/js/packages/ui/src/Input/DateRangePicker.vue
+++ b/resources/js/packages/ui/src/Input/DateRangePicker.vue
@@ -6,11 +6,18 @@ import { CalendarDate } from '@internationalized/date';
 import { CalendarIcon } from 'lucide-vue-next';
 import { computed, ref, inject, type ComputedRef, watch } from 'vue';
 import { twMerge } from 'tailwind-merge';
-import { getDayJsInstance, getLocalizedDayJs } from '@/packages/ui/src/utils/time';
+import {
+    getDayJsInstance,
+    getLocalizedDayJs,
+    firstDayIndex,
+    type WeekStartDay,
+} from '@/packages/ui/src/utils/time';
 import { type Organization } from '@/packages/api/src';
 import { getUserTimezone } from '@/packages/ui/src/utils/settings';
 import { formatDate } from '@/packages/ui/src/utils/time';
 
+const weekStartsOn = computed((): WeekStartDay => firstDayIndex.value as WeekStartDay);
+
 const props = defineProps<{
     start: string;
     end: string;
@@ -207,7 +214,8 @@ watch(open, (value) => {
                         v-model="modelValue"
                         initial-focus
                         :number-of-months="2"
-                        :max-value="today" />
+                        :max-value="today"
+                        :week-starts-on="weekStartsOn" />
                 </div>
             </div>
         </PopoverContent>
diff --git a/resources/js/packages/ui/src/Input/TimeRangeSelector.vue b/resources/js/packages/ui/src/Input/TimeRangeSelector.vue
index 545109f1..9a4861a4 100644
--- a/resources/js/packages/ui/src/Input/TimeRangeSelector.vue
+++ b/resources/js/packages/ui/src/Input/TimeRangeSelector.vue
@@ -4,7 +4,7 @@ import DatePicker from '@/packages/ui/src/Input/DatePicker.vue';
 import { getDayJsInstance, getLocalizedDayJs } from '@/packages/ui/src/utils/time';
 import dayjs from 'dayjs';
 import TimePickerSimple from '@/packages/ui/src/Input/TimePickerSimple.vue';
-import Button from '../Buttons/Button.vue';
+import { Button } from '@/Components/ui/button';
 
 const props = defineProps<{
     start: string;
@@ -61,9 +61,10 @@ const dropdownContent = ref();
         class="grid grid-cols-2 divide-x divide-card-background-separator text-center py-2">
         <div class="px-2" @keydown.enter.prevent="nextTick(() => emit('close'))">
             <div class="font-semibold text-text-primary text-sm pb-2">Start</div>
-            <div class="space-y-2">
+            <div class="flex flex-col items-center space-y-2 w-28 mx-auto">
                 <TimePickerSimple
                     v-model="tempStart"
+                    class="w-full"
                     data-testid="time_entry_range_start"
                     tabindex="0"
                     :focus
@@ -71,35 +72,37 @@ const dropdownContent = ref();
                     @changed="updateTimeEntry"></TimePickerSimple>
                 <DatePicker
                     v-model="tempStart"
-                    class="text-xs text-text-tertiary max-w-24 px-1.5 py-1.5"
-                    @changed="updateTimeEntry"
-                    @blur.stop.prevent="emit('close')"></DatePicker>
+                    class="w-full"
+                    @changed="updateTimeEntry"></DatePicker>
             </div>
         </div>
         <div class="px-2">
             <div class="font-semibold text-text-primary text-sm pb-2">End</div>
-            <div v-if="end !== null && tempEnd !== null" class="space-y-2">
+            <div
+                v-if="end !== null && tempEnd !== null"
+                class="flex flex-col items-center space-y-2 w-28 mx-auto">
                 <TimePickerSimple
                     v-model="tempEnd"
+                    class="w-full"
                     data-testid="time_entry_range_end"
                     @changed="updateTimeEntry"></TimePickerSimple>
                 <DatePicker
                     v-model="tempEnd"
-                    class="text-xs text-text-tertiary max-w-24 px-1.5 py-1.5"
+                    class="w-full"
                     @changed="updateTimeEntry"></DatePicker>
             </div>
             <div v-else-if="end === null && !showEndTimePicker">
                 <Button variant="outline" size="sm" @click="setEndTime"> Set End Time </Button>
             </div>
-            <div v-else-if="showEndTimePicker && tempEnd !== null" class="space-y-2">
+            <div
+                v-else-if="showEndTimePicker && tempEnd !== null"
+                class="flex flex-col items-center space-y-2 w-28 mx-auto">
                 <TimePickerSimple
                     v-model="tempEnd"
+                    class="w-full"
                     data-testid="time_entry_range_end"
                     @keydown.enter.prevent.stop="confirmEndTime"></TimePickerSimple>
-                <DatePicker
-                    v-model="tempEnd"
-                    class="text-xs text-text-tertiary max-w-24 px-1.5 py-1.5"
-                    @keydown.enter.prevent="confirmEndTime"></DatePicker>
+                <DatePicker v-model="tempEnd" class="w-full"></DatePicker>
                 <Button variant="outline" size="sm" class="w-full" @click="confirmEndTime">
                     Confirm
                 </Button>
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
index f229716e..30d8757d 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
@@ -235,22 +235,22 @@ const billableProxy = computed({
                 </div>
                 <div class="">
                     <InputLabel>Start</InputLabel>
-                    <div class="flex flex-col items-center space-y-2 mt-1">
-                        <TimePickerSimple v-model="localStart" size="large"></TimePickerSimple>
-                        <DatePicker
+                    <div class="flex flex-col items-center space-y-2 mt-1 w-28 mx-auto">
+                        <TimePickerSimple
                             v-model="localStart"
-                            tabindex="1"
-                            class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"></DatePicker>
+                            class="w-full"
+                            size="large"></TimePickerSimple>
+                        <DatePicker v-model="localStart" class="w-full" tabindex="1"></DatePicker>
                     </div>
                 </div>
                 <div class="">
                     <InputLabel>End</InputLabel>
-                    <div class="flex flex-col items-center space-y-2 mt-1">
-                        <TimePickerSimple v-model="localEnd" size="large"></TimePickerSimple>
-                        <DatePicker
+                    <div class="flex flex-col items-center space-y-2 mt-1 w-28 mx-auto">
+                        <TimePickerSimple
                             v-model="localEnd"
-                            tabindex="1"
-                            class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"></DatePicker>
+                            class="w-full"
+                            size="large"></TimePickerSimple>
+                        <DatePicker v-model="localEnd" class="w-full" tabindex="1"></DatePicker>
                     </div>
                 </div>
             </div>
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
index b148e25b..35e7aed7 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
@@ -251,22 +251,25 @@ const billableProxy = computed({
                     </div>
                     <div class="">
                         <InputLabel>Start</InputLabel>
-                        <div class="flex flex-col items-center space-y-2 mt-1">
-                            <TimePickerSimple v-model="localStart" size="large"></TimePickerSimple>
+                        <div class="flex flex-col items-center space-y-2 mt-1 w-28 mx-auto">
+                            <TimePickerSimple
+                                v-model="localStart"
+                                class="w-full"
+                                size="large"></TimePickerSimple>
                             <DatePicker
                                 v-model="localStart"
-                                tabindex="1"
-                                class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"></DatePicker>
+                                class="w-full"
+                                tabindex="1"></DatePicker>
                         </div>
                     </div>
                     <div class="">
                         <InputLabel>End</InputLabel>
-                        <div class="flex flex-col items-center space-y-2 mt-1">
-                            <TimePickerSimple v-model="localEnd" size="large"></TimePickerSimple>
-                            <DatePicker
+                        <div class="flex flex-col items-center space-y-2 mt-1 w-28 mx-auto">
+                            <TimePickerSimple
                                 v-model="localEnd"
-                                tabindex="1"
-                                class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"></DatePicker>
+                                class="w-full"
+                                size="large"></TimePickerSimple>
+                            <DatePicker v-model="localEnd" class="w-full" tabindex="1"></DatePicker>
                         </div>
                     </div>
                 </div>
diff --git a/resources/js/packages/ui/src/range-calendar/RangeCalendarCellTrigger.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendarCellTrigger.vue
index 286f7944..9a637dda 100644
--- a/resources/js/packages/ui/src/range-calendar/RangeCalendarCellTrigger.vue
+++ b/resources/js/packages/ui/src/range-calendar/RangeCalendarCellTrigger.vue
@@ -26,9 +26,9 @@ const forwardedProps = useForwardProps(delegatedProps);
                 'h-8 w-8 p-0 font-normal data-[selected]:opacity-100',
                 '[&[data-today]:not([data-selected])]:border-accent [&[data-today]:not([data-selected])]:border [&[data-today]:not([data-selected])]:text-accent-foreground',
                 // Selection Start
-                'data-[selection-start]:bg-primary data-[selection-start]:text-primary-foreground data-[selection-start]:hover:bg-primary data-[selection-start]:hover:text-primary-foreground data-[selection-start]:focus:bg-primary data-[selection-start]:focus:text-primary-foreground',
+                'data-[selection-start]:bg-quaternary data-[selection-start]:text-primary-foreground data-[selection-start]:hover:bg-quaternary data-[selection-start]:hover:text-primary-foreground data-[selection-start]:focus:bg-primary data-[selection-start]:focus:text-primary-foreground',
                 // Selection End
-                'data-[selection-end]:bg-primary data-[selection-end]:text-primary-foreground data-[selection-end]:hover:bg-primary data-[selection-end]:hover:text-primary-foreground data-[selection-end]:focus:bg-primary data-[selection-end]:focus:text-primary-foreground',
+                'data-[selection-end]:bg-quaternary data-[selection-end]:text-primary-foreground data-[selection-end]:hover:bg-quaternary data-[selection-end]:hover:text-primary-foreground data-[selection-end]:focus:bg-primary data-[selection-end]:focus:text-primary-foreground',
                 // Outside months
                 'data-[outside-view]:text-muted-foreground data-[outside-view]:opacity-50 [&[data-outside-view][data-selected]]:text-muted-foreground [&[data-outside-view][data-selected]]:opacity-30',
                 // Disabled
diff --git a/resources/js/packages/ui/src/utils/time.ts b/resources/js/packages/ui/src/utils/time.ts
index 2685a102..e55883f9 100644
--- a/resources/js/packages/ui/src/utils/time.ts
+++ b/resources/js/packages/ui/src/utils/time.ts
@@ -21,6 +21,9 @@ export type DateFormat =
     | 'hyphen-separated-mm-dd-yyyy'
     | 'hyphen-separated-yyyy-mm-dd';
 
+// Day of week index type for calendar components (0 = Sunday, 6 = Saturday)
+export type WeekStartDay = 0 | 1 | 2 | 3 | 4 | 5 | 6;
+
 const dateFormatMap: Record<DateFormat, string> = {
     'point-separated-d-m-yyyy': 'D.M.YYYY',
     'slash-separated-mm-dd-yyyy': 'MM/DD/YYYY',

From d2644112c5ca014c3ec48e2f710935e461780d28 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Thu, 5 Feb 2026 15:48:06 +0100
Subject: [PATCH 28/28] Allow updating public_until on already-public reports

---
 .../Controllers/Api/V1/ReportController.php   |  3 +
 e2e/shared-reports.spec.ts                    | 61 +++++++++++++++++++
 .../Components/Common/Report/ReportTable.vue  |  4 +-
 .../Common/Report/ReportTableHeading.vue      |  2 +
 .../Common/Report/ReportTableRow.vue          | 22 ++++++-
 .../Endpoint/Api/V1/ReportEndpointTest.php    | 49 +++++++++++++++
 6 files changed, 136 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Api/V1/ReportController.php b/app/Http/Controllers/Api/V1/ReportController.php
index b8f2fd21..5a8ca312 100644
--- a/app/Http/Controllers/Api/V1/ReportController.php
+++ b/app/Http/Controllers/Api/V1/ReportController.php
@@ -150,6 +150,9 @@ public function update(Organization $organization, Report $report, ReportUpdateR
                 $report->share_secret = null;
                 $report->public_until = null;
             }
+        } elseif ($report->is_public && $request->has('public_until')) {
+            // Allow updating expiration date on already-public reports
+            $report->public_until = $request->getPublicUntil();
         }
         $report->save();
 
diff --git a/e2e/shared-reports.spec.ts b/e2e/shared-reports.spec.ts
index 27605619..46f1d0e5 100644
--- a/e2e/shared-reports.spec.ts
+++ b/e2e/shared-reports.spec.ts
@@ -382,3 +382,64 @@ test('test that shared report with No Tag filter shows entries without tags', as
     await expect(page.getByText('Reporting')).toBeVisible();
     await expect(page.getByText('Total')).toBeVisible();
 });
+
+test('test that updating expiration date on already-public report works', async ({ page }) => {
+    const projectName = 'UpdateExpDateProj ' + Math.floor(Math.random() * 10000);
+    const reportName = 'UpdateExpDateReport ' + Math.floor(Math.random() * 10000);
+
+    await createProject(page, projectName);
+    await createTimeEntryWithProject(page, projectName, '1h');
+
+    await goToReporting(page);
+    await expect(page.getByTestId('reporting_view').getByText(projectName)).toBeVisible();
+
+    // Create a public report (already public by default)
+    await saveAsSharedReport(page, reportName);
+
+    // Go to shared reports and edit
+    await goToReportingShared(page);
+    await expect(page.getByText(reportName)).toBeVisible();
+
+    // Click more options and edit
+    await page
+        .getByRole('button', { name: new RegExp('Actions for Project ' + reportName) })
+        .click();
+    await page.getByRole('menuitem', { name: /^Edit Report/ }).click();
+
+    // The date picker should be visible (report is already public)
+    const datePicker = page
+        .getByRole('dialog')
+        .getByRole('button', { name: DATE_PICKER_BUTTON_PATTERN });
+    await expect(datePicker).toBeVisible();
+    await datePicker.click();
+
+    // Select the 25th of next month
+    const calendarGrid = page.getByRole('grid');
+    await expect(calendarGrid).toBeVisible({ timeout: 5000 });
+    await page.getByRole('button', { name: /Next/i }).click();
+    await page.getByRole('gridcell').filter({ hasText: /^25$/ }).first().click();
+
+    // Wait for the calendar to close
+    await expect(calendarGrid).not.toBeVisible();
+
+    // Update the report and verify it includes the correct public_until date
+    const [response] = await Promise.all([
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/reports/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+        page.getByRole('button', { name: 'Update Report' }).click(),
+    ]);
+    const responseBody = await response.json();
+    expect(responseBody.data.public_until).toBeTruthy();
+
+    // Verify the date is the 25th of a future month
+    const returnedDate = new Date(responseBody.data.public_until);
+    expect(returnedDate.getUTCDate()).toBe(25);
+
+    // The returned date should be in the future
+    const now = new Date();
+    expect(returnedDate.getTime()).toBeGreaterThan(now.getTime());
+});
diff --git a/resources/js/Components/Common/Report/ReportTable.vue b/resources/js/Components/Common/Report/ReportTable.vue
index f8077471..b688fd40 100644
--- a/resources/js/Components/Common/Report/ReportTable.vue
+++ b/resources/js/Components/Common/Report/ReportTable.vue
@@ -14,7 +14,7 @@ defineProps<{
 }>();
 
 const gridTemplate = computed(() => {
-    return `grid-template-columns: minmax(150px, auto) minmax(250px, 1fr) minmax(140px, auto) minmax(130px, auto) 80px;`;
+    return `grid-template-columns: minmax(150px, auto) minmax(200px, 1fr) minmax(100px, 120px) minmax(80px, 100px) minmax(100px, 120px) minmax(130px, auto) 80px;`;
 });
 </script>
 
@@ -23,7 +23,7 @@ const gridTemplate = computed(() => {
         <div class="inline-block min-w-full align-middle">
             <div data-testid="report_table" class="grid min-w-full" :style="gridTemplate">
                 <ReportTableHeading></ReportTableHeading>
-                <div v-if="reports.length === 0" class="col-span-5 py-24 text-center">
+                <div v-if="reports.length === 0" class="col-span-7 py-24 text-center">
                     <FolderPlusIcon class="w-8 text-icon-default inline pb-2"></FolderPlusIcon>
                     <h3 class="text-text-primary font-semibold">No shared reports found</h3>
                     <p v-if="canCreateProjects()" class="pb-5">
diff --git a/resources/js/Components/Common/Report/ReportTableHeading.vue b/resources/js/Components/Common/Report/ReportTableHeading.vue
index 2d5f63b6..958b84a8 100644
--- a/resources/js/Components/Common/Report/ReportTableHeading.vue
+++ b/resources/js/Components/Common/Report/ReportTableHeading.vue
@@ -8,7 +8,9 @@ import TableHeading from '@/Components/Common/TableHeading.vue';
             Name
         </div>
         <div class="px-3 py-1.5 text-left text-text-tertiary">Description</div>
+        <div class="px-3 py-1.5 text-left text-text-tertiary">Created At</div>
         <div class="px-3 py-1.5 text-left text-text-tertiary">Visibility</div>
+        <div class="px-3 py-1.5 text-left text-text-tertiary">Expires At</div>
         <div class="px-3 py-1.5 text-left text-text-tertiary">Public URL</div>
         <div class="relative py-1.5 pl-3 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
             <span class="sr-only">Edit</span>
diff --git a/resources/js/Components/Common/Report/ReportTableRow.vue b/resources/js/Components/Common/Report/ReportTableRow.vue
index cb167ca6..1b2238eb 100644
--- a/resources/js/Components/Common/Report/ReportTableRow.vue
+++ b/resources/js/Components/Common/Report/ReportTableRow.vue
@@ -1,15 +1,17 @@
 <script setup lang="ts">
-import { ref } from 'vue';
+import { type ComputedRef, computed, inject, ref } from 'vue';
 import TableRow from '@/Components/TableRow.vue';
-import { api, type Report } from '@/packages/api/src';
+import { api, type Report, type Organization } from '@/packages/api/src';
 import ReportMoreOptionsDropdown from '@/Components/Common/Report/ReportMoreOptionsDropdown.vue';
 import ReportEditModal from '@/Components/Common/Report/ReportEditModal.vue';
 import { SecondaryButton } from '@/packages/ui/src';
 import { useClipboard } from '@vueuse/core';
 import { ArrowTopRightOnSquareIcon } from '@heroicons/vue/24/solid';
+import { GlobeAltIcon, LockClosedIcon } from '@heroicons/vue/24/outline';
 import { useMutation, useQueryClient } from '@tanstack/vue-query';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { useNotificationsStore } from '@/utils/notification';
+import { formatDateLocalized } from '@/packages/ui/src/utils/time';
 
 const props = defineProps<{
     report: Report;
@@ -19,6 +21,8 @@ const showEditReportModal = ref(false);
 
 const { copy, copied, isSupported } = useClipboard({ legacy: true });
 const { handleApiRequestNotifications } = useNotificationsStore();
+const organization = inject<ComputedRef<Organization | undefined>>('organization');
+const dateFormat = computed(() => organization?.value?.date_format);
 
 function openSharableLink() {
     const link = props.report.shareable_link;
@@ -71,7 +75,19 @@ async function deleteReport() {
             </span>
         </div>
         <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
-            {{ report.is_public ? 'Public' : 'Private' }}
+            {{ formatDateLocalized(report.created_at, dateFormat) }}
+        </div>
+        <div
+            class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary flex items-center gap-1.5">
+            <GlobeAltIcon v-if="report.is_public" class="w-4 h-4 shrink-0 text-text-tertiary" />
+            <LockClosedIcon v-else class="w-4 h-4 shrink-0 text-text-tertiary" />
+            <span>{{ report.is_public ? 'Public' : 'Private' }}</span>
+        </div>
+        <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
+            <span v-if="report.public_until">
+                {{ formatDateLocalized(report.public_until, dateFormat) }}
+            </span>
+            <span v-else>Never</span>
         </div>
         <div class="whitespace-nowrap px-3 flex items-center text-sm text-text-secondary">
             <div v-if="report.shareable_link" class="space-x-2 flex items-center">
diff --git a/tests/Unit/Endpoint/Api/V1/ReportEndpointTest.php b/tests/Unit/Endpoint/Api/V1/ReportEndpointTest.php
index d8e7a563..de8eb90b 100644
--- a/tests/Unit/Endpoint/Api/V1/ReportEndpointTest.php
+++ b/tests/Unit/Endpoint/Api/V1/ReportEndpointTest.php
@@ -425,11 +425,60 @@ public function test_update_endpoint_can_update_the_report_all_properties_set():
             ->where('data.name', 'Updated Report')
             ->where('data.description', 'Updated description')
             ->where('data.is_public', true)
+            ->whereType('data.public_until', 'string')
             ->where('data.properties.group', TimeEntryAggregationType::Project->value)
             ->where('data.properties.sub_group', TimeEntryAggregationType::Task->value)
         );
     }
 
+    public function test_update_endpoint_can_update_public_until_on_already_public_report(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'reports:update',
+        ]);
+        $report = Report::factory()->public()->forOrganization($data->organization)->create([
+            'public_until' => null,
+        ]);
+        Passport::actingAs($data->user);
+        $newPublicUntil = Carbon::now()->addDays(30);
+
+        // Act
+        $response = $this->putJson(route('api.v1.reports.update', [$data->organization->getKey(), $report->getKey()]), [
+            'public_until' => $newPublicUntil->toIso8601ZuluString(),
+        ]);
+
+        // Assert
+        $response->assertStatus(200);
+        $report->refresh();
+        $this->assertTrue($report->is_public);
+        $this->assertNotNull($report->public_until);
+        $this->assertTrue($newPublicUntil->isSameDay($report->public_until));
+    }
+
+    public function test_update_endpoint_can_clear_public_until_on_already_public_report(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'reports:update',
+        ]);
+        $report = Report::factory()->public()->forOrganization($data->organization)->create([
+            'public_until' => Carbon::now()->addDays(30),
+        ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->putJson(route('api.v1.reports.update', [$data->organization->getKey(), $report->getKey()]), [
+            'public_until' => null,
+        ]);
+
+        // Assert
+        $response->assertStatus(200);
+        $report->refresh();
+        $this->assertTrue($report->is_public);
+        $this->assertNull($report->public_until);
+    }
+
     public function test_show_endpoint_fails_if_user_has_no_permission_to_view_report(): void
     {
         // Arrange