only use xsrf token for organization requests

.env.ci

@@ -60,7 +60,7 @@ AUDITING_ENABLED=true
 TELESCOPE_ENABLED=false
 
 # Services
-GOTENBERG_URL=http://localhost:3000
+GOTENBERG_URL=http://0.0.0.0:3000
 
 # Octane
 OCTANE_SERVER=frankenphp

.env.example

@@ -77,9 +77,6 @@ TELESCOPE_ENABLED=false
 # Services
 GOTENBERG_URL=http://gotenberg:3000
 
-# Octane
-OCTANE_SERVER=frankenphp
-
 # Local setup
 NGINX_HOST_NAME=solidtime.test
 NETWORK_NAME=reverse-proxy-docker-traefik_routing

app/Http/Controllers/Api/V1/ProjectController.php

@@ -78,7 +78,7 @@ class ProjectController extends Controller
      */
     public function show(Organization $organization, Project $project): JsonResource
     {
-        $this->checkPermission($organization, 'projects:view:all', $project);
+        $this->checkPermission($organization, 'projects:view', $project);
 
         // Note: There is currently no need to check if a user is a member of the project,
         // since this is only relevant for users with the role "employee" and they can not access this endpoint.

app/Http/Controllers/Api/V1/TimeEntryController.php

@@ -53,7 +53,6 @@ use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 use Spatie\TemporaryDirectory\TemporaryDirectory;
 
@@ -247,7 +246,7 @@ class TimeEntryController extends Controller
             'user',
             'tagsRelation',
         ]);
-        $filename = 'time-entries-export-'.now()->format('Y-m-d_H-i-s').'-'.Str::uuid().'.'.$format->getFileExtension();
+        $filename = 'time-entries-export-'.now()->format('Y-m-d_H-i-s').'.'.$format->getFileExtension();
         $folderPath = 'exports';
         $path = $folderPath.'/'.$filename;
         $localizationService = LocalizationService::forOrganization($organization);
@@ -470,7 +469,7 @@ class TimeEntryController extends Controller
         $timezone = app(TimezoneService::class)->getTimezoneFromUser($this->user());
         $localizationService = LocalizationService::forOrganization($organization);
 
-        $filename = 'time-entries-report-'.now()->format('Y-m-d_H-i-s').'-'.Str::uuid().'.'.$format->getFileExtension();
+        $filename = 'time-entries-report-'.now()->format('Y-m-d_H-i-s').'.'.$format->getFileExtension();
         $folderPath = 'exports';
         $path = $folderPath.'/'.$filename;
 

app/Service/LocalizationService.php

@@ -96,30 +96,6 @@ class LocalizationService
         }
     }
 
-    /**
-     * Format a duration for reporting contexts (PDF reports, places that display duration
-     * directly next to cost). Promotes the verbose `Hh Mm` format to the compact `HH:MM:SS`
-     * so totals stay narrow and reconcile with cost, which is always computed to the second.
-     */
-    public function formatIntervalForReporting(CarbonInterval $interval): string
-    {
-        $promoted = [
-            IntervalFormat::HoursMinutes,
-            IntervalFormat::HoursMinutesColonSeparated,
-        ];
-        if (! in_array($this->intervalFormat, $promoted, true)) {
-            return $this->formatInterval($interval);
-        }
-
-        $previous = $this->intervalFormat;
-        $this->intervalFormat = IntervalFormat::HoursMinutesSecondsColonSeparated;
-        try {
-            return $this->formatInterval($interval);
-        } finally {
-            $this->intervalFormat = $previous;
-        }
-    }
-
     public function formatCurrency(Money $money): string
     {
         $currencyService = app(CurrencyService::class);

e2e/calendar-settings.spec.ts

@@ -1,12 +1,11 @@
-import type { Page } from '@playwright/test';
-import { expect } from '@playwright/test';
 import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 import { test } from '../playwright/fixtures';
-import { createBareTimeEntryViaApi, createTimeEntryWithTimestampsViaApi } from './utils/api';
+import { expect } from '@playwright/test';
+import type { Page } from '@playwright/test';
 
 async function goToCalendar(page: Page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/calendar');
-    await expect(page.locator('.fc')).toBeVisible({ timeout: 10000 });
+    await expect(page.locator('.fc')).toBeVisible();
 }
 
 async function openSettingsPopover(page: Page) {
@@ -18,29 +17,6 @@ async function clearCalendarSettings(page: Page) {
     await page.evaluate(() => localStorage.removeItem('solidtime:calendar-settings'));
 }
 
-function getCalendarTitle(page: Page) {
-    return page.getByTestId('calendar-title');
-}
-
-async function scrollCalendarToTime(page: Page, time: string) {
-    await page.evaluate((t) => {
-        const slot = document.querySelector(`.fc-timegrid-slot-lane[data-time="${t}"]`);
-        if (slot) slot.scrollIntoView({ block: 'start' });
-    }, time);
-    await page.waitForTimeout(300);
-}
-
-async function getSlotHeight(page: Page): Promise<number> {
-    return await page.evaluate(() => {
-        const slots = Array.from(document.querySelectorAll('.fc-timegrid-slot-lane'));
-        for (let i = 0; i < slots.length; i++) {
-            const h = slots[i].getBoundingClientRect().height;
-            if (h > 0) return h;
-        }
-        return 20;
-    });
-}
-
 test.describe('Calendar Settings', () => {
     test.beforeEach(async ({ page }) => {
         await clearCalendarSettings(page);
@@ -63,9 +39,7 @@ test.describe('Calendar Settings', () => {
         // Change snap interval to 30 min
         await page.getByLabel('Snap Interval').click();
         await page.getByRole('option', { name: '30 min' }).click();
-
-        // Close the popover by pressing Escape
-        await page.keyboard.press('Escape');
+        await page.locator('.fc-toolbar-title').click();
 
         // Verify localStorage was updated
         const stored = await page.evaluate(() =>
@@ -80,7 +54,7 @@ test.describe('Calendar Settings', () => {
         await expect(page.getByLabel('Snap Interval')).toContainText('30 min');
     });
 
-    test('start time change is applied to calendar and rejects invalid values', async ({
+    test('start time change is applied to calendar and rejects values >= end time', async ({
         page,
     }) => {
         await goToCalendar(page);
@@ -97,23 +71,24 @@ test.describe('Calendar Settings', () => {
         // Change start time to 8 AM (valid)
         await page.getByLabel('Start Time').click();
         await page.getByRole('option', { name: '8:00 AM' }).click();
+        await page.locator('.fc-toolbar-title').click();
 
-        // Try to set start time to 6 PM (invalid: equals end time) — should be rejected
+        // Calendar should no longer show hours before 8 AM
+        await expect(page.locator('.fc-timegrid-slot[data-time="07:00:00"]')).toHaveCount(0);
+        await expect(page.locator('.fc-timegrid-slot[data-time="08:00:00"]')).not.toHaveCount(0);
+
+        // Try to set start time to 6 PM (invalid: equals end time)
+        await openSettingsPopover(page);
         await page.getByLabel('Start Time').click();
         await page.getByRole('option', { name: '6:00 PM' }).click();
 
         // Should be rejected — start time stays at 8 AM
         await expect(page.getByLabel('Start Time')).toContainText('8:00 AM');
-
-        // Close the popover
-        await page.keyboard.press('Escape');
-
-        // Calendar should no longer show hours before 8 AM
-        await expect(page.locator('.fc-timegrid-slot[data-time="07:00:00"]')).toHaveCount(0);
-        await expect(page.locator('.fc-timegrid-slot[data-time="08:00:00"]')).not.toHaveCount(0);
     });
 
-    test('end time change is applied to calendar and rejects invalid values', async ({ page }) => {
+    test('end time change is applied to calendar and rejects values <= start time', async ({
+        page,
+    }) => {
         await goToCalendar(page);
 
         // Verify 19:00 slot exists with default end (24:00)
@@ -128,20 +103,19 @@ test.describe('Calendar Settings', () => {
         // Change end time to 6 PM (valid)
         await page.getByLabel('End Time').click();
         await page.getByRole('option', { name: '6:00 PM' }).click();
+        await page.locator('.fc-toolbar-title').click();
 
-        // Try to set end time to 8 AM (invalid: equals start time) — should be rejected
+        // Calendar should no longer show hours at or after 6 PM
+        await expect(page.locator('.fc-timegrid-slot[data-time="18:00:00"]')).toHaveCount(0);
+        await expect(page.locator('.fc-timegrid-slot[data-time="17:00:00"]')).not.toHaveCount(0);
+
+        // Try to set end time to 8 AM (invalid: equals start time)
+        await openSettingsPopover(page);
         await page.getByLabel('End Time').click();
         await page.getByRole('option', { name: '8:00 AM' }).click();
 
         // Should be rejected — end time stays at 6 PM
         await expect(page.getByLabel('End Time')).toContainText('6:00 PM');
-
-        // Close the popover
-        await page.keyboard.press('Escape');
-
-        // Calendar should no longer show hours at or after 6 PM
-        await expect(page.locator('.fc-timegrid-slot[data-time="18:00:00"]')).toHaveCount(0);
-        await expect(page.locator('.fc-timegrid-slot[data-time="17:00:00"]')).not.toHaveCount(0);
     });
 
     test('grid scale affects number of calendar slots', async ({ page }) => {
@@ -154,31 +128,19 @@ test.describe('Calendar Settings', () => {
         await openSettingsPopover(page);
         await page.getByLabel('Grid Scale').click();
         await page.getByRole('option', { name: '30 min' }).click();
-        await page.keyboard.press('Escape');
-
-        // Wait for FullCalendar to re-render with new slot count
-        await expect(async () => {
-            const count = await page.locator('.fc-timegrid-slot').count();
-            expect(count).toBeLessThan(defaultSlotCount);
-        }).toPass({ timeout: 5000 });
+        await page.locator('.fc-toolbar-title').click();
 
         const largerSlotCount = await page.locator('.fc-timegrid-slot').count();
+        expect(largerSlotCount).toBeLessThan(defaultSlotCount);
 
-        // Navigate away and back to get a clean calendar mount
-        await page.goto(PLAYWRIGHT_BASE_URL + '/time');
-        await goToCalendar(page);
-
-        // Change to 5 min scale (many more slots)
+        // Change to 5 min scale (should have many more slots)
         await openSettingsPopover(page);
         await page.getByLabel('Grid Scale').click();
         await page.getByRole('option', { name: '5 min', exact: true }).click();
-        await page.keyboard.press('Escape');
+        await page.locator('.fc-toolbar-title').click();
 
-        // Wait for FullCalendar to re-render with new slot count
-        await expect(async () => {
-            const count = await page.locator('.fc-timegrid-slot').count();
-            expect(count).toBeGreaterThan(largerSlotCount);
-        }).toPass({ timeout: 5000 });
+        const smallerSlotCount = await page.locator('.fc-timegrid-slot').count();
+        expect(smallerSlotCount).toBeGreaterThan(defaultSlotCount);
     });
 
     test('all settings persist across navigation', async ({ page }) => {
@@ -194,9 +156,7 @@ test.describe('Calendar Settings', () => {
         await page.getByRole('option', { name: '10:00 PM' }).click();
         await page.getByLabel('Grid Scale').click();
         await page.getByRole('option', { name: '30 min' }).click();
-
-        // Close the popover
-        await page.keyboard.press('Escape');
+        await page.locator('.fc-toolbar-title').click();
 
         // Navigate away and back
         await page.goto(PLAYWRIGHT_BASE_URL + '/time');
@@ -210,480 +170,3 @@ test.describe('Calendar Settings', () => {
         await expect(page.getByLabel('Grid Scale')).toContainText('30 min');
     });
 });
-
-test.describe('Calendar Toolbar', () => {
-    test('prev and next buttons navigate the calendar', async ({ page }) => {
-        await goToCalendar(page);
-
-        // Use column headers to detect navigation (title only shows month which may not change)
-        const getHeaderTexts = async () => {
-            const headers = page.locator('.fc-col-header-cell');
-            return headers.allTextContents();
-        };
-
-        const initialHeaders = await getHeaderTexts();
-
-        // Click next
-        await page.getByRole('button', { name: 'Next', exact: true }).click();
-        await expect(page.locator('.fc')).toBeVisible();
-
-        const nextHeaders = await getHeaderTexts();
-        expect(nextHeaders).not.toEqual(initialHeaders);
-
-        // Click prev — should go back to original
-        await page.getByRole('button', { name: 'Previous', exact: true }).click();
-        await expect(page.locator('.fc')).toBeVisible();
-
-        const backHeaders = await getHeaderTexts();
-        expect(backHeaders).toEqual(initialHeaders);
-    });
-
-    test('today button returns to current week', async ({ page }) => {
-        await goToCalendar(page);
-
-        // Use column headers to detect navigation (title only shows month which may not change)
-        const getHeaderTexts = async () => {
-            const headers = page.locator('.fc-col-header-cell');
-            return headers.allTextContents();
-        };
-
-        const initialHeaders = await getHeaderTexts();
-
-        // Navigate away
-        await page.getByRole('button', { name: 'Next', exact: true }).click();
-        await page.getByRole('button', { name: 'Next', exact: true }).click();
-
-        const awayHeaders = await getHeaderTexts();
-        expect(awayHeaders).not.toEqual(initialHeaders);
-
-        // Click today
-        await page.getByRole('button', { name: 'today', exact: true }).click();
-        await expect(page.locator('.fc')).toBeVisible();
-
-        const todayHeaders = await getHeaderTexts();
-        expect(todayHeaders).toEqual(initialHeaders);
-    });
-
-    test('view switcher toggles between week and day views', async ({ page }) => {
-        await goToCalendar(page);
-
-        // Default should be week view — verify multiple day columns exist
-        await expect(page.locator('.fc-col-header-cell')).not.toHaveCount(1);
-
-        // Switch to day view
-        await page.getByRole('tab', { name: 'day', exact: true }).click();
-        await expect(page.locator('.fc')).toBeVisible();
-
-        // Day view should show exactly 1 day column
-        await expect(page.locator('.fc-col-header-cell')).toHaveCount(1);
-
-        // Switch back to week view
-        await page.getByRole('tab', { name: 'week', exact: true }).click();
-        await expect(page.locator('.fc')).toBeVisible();
-
-        // Week view should show multiple day columns again
-        await expect(page.locator('.fc-col-header-cell')).not.toHaveCount(1);
-    });
-});
-
-test.describe('Visual Snapping', () => {
-    test.beforeEach(async ({ page }) => {
-        await clearCalendarSettings(page);
-    });
-
-    test('snap interval of 1 minute allows fine-grained positioning', async ({ page, ctx }) => {
-        await goToCalendar(page);
-        await openSettingsPopover(page);
-
-        // Set snap interval to 1 min
-        await page.getByLabel('Snap Interval').click();
-        await page.getByRole('option', { name: '1 min' }).click();
-        await page.keyboard.press('Escape');
-
-        // Create a 1h time entry
-        await createBareTimeEntryViaApi(ctx, 'Snap 1min test', '1h');
-        await goToCalendar(page);
-
-        // Scroll the calendar so the 14:00 target area is visible
-        await scrollCalendarToTime(page, '13:00:00');
-
-        const event = page.locator('.fc-event').first();
-        await expect(event).toBeVisible();
-
-        // Get target slot at a non-15-min boundary time
-        const targetSlot = page.locator('.fc-timegrid-slot-lane[data-time="14:00:00"]').first();
-        const targetBox = await targetSlot.boundingBox();
-        expect(targetBox).not.toBeNull();
-
-        // Drag event to a position offset from the 15-min boundary
-        const putResponsePromise = page.waitForResponse(
-            (resp) => resp.url().includes('/time-entries/') && resp.request().method() === 'PUT'
-        );
-
-        await event.hover();
-        await page.mouse.down();
-        await page.mouse.move(targetBox!.x + targetBox!.width / 2, targetBox!.y + 5, { steps: 10 });
-        await page.mouse.up();
-
-        const putResponse = await putResponsePromise;
-        expect(putResponse.status()).toBe(200);
-
-        const body = await putResponse.json();
-        const startDate = new Date(body.data.start);
-        const minutes = startDate.getMinutes();
-
-        // With 1-min snap, any minute value is valid (0-59)
-        expect(minutes).toBeGreaterThanOrEqual(0);
-        expect(minutes).toBeLessThanOrEqual(59);
-    });
-
-    test('snap interval of 60 minutes creates hour-aligned entries', async ({ page, ctx }) => {
-        await goToCalendar(page);
-        await openSettingsPopover(page);
-
-        // Set snap interval to 60 min
-        await page.getByLabel('Snap Interval').click();
-        await page.getByRole('option', { name: '1 hour' }).click();
-        await page.keyboard.press('Escape');
-
-        // Create a 1h time entry
-        await createBareTimeEntryViaApi(ctx, 'Snap 60min test', '1h');
-        await goToCalendar(page);
-
-        // Scroll the calendar so the 14:00 target area is visible
-        await scrollCalendarToTime(page, '13:00:00');
-
-        const event = page.locator('.fc-event').first();
-        await expect(event).toBeVisible();
-
-        // Get target slot
-        const targetSlot = page.locator('.fc-timegrid-slot-lane[data-time="14:00:00"]').first();
-        const targetBox = await targetSlot.boundingBox();
-        expect(targetBox).not.toBeNull();
-
-        // Drag event
-        const putResponsePromise = page.waitForResponse(
-            (resp) => resp.url().includes('/time-entries/') && resp.request().method() === 'PUT'
-        );
-
-        await event.hover();
-        await page.mouse.down();
-        await page.mouse.move(targetBox!.x + targetBox!.width / 2, targetBox!.y + 5, { steps: 10 });
-        await page.mouse.up();
-
-        const putResponse = await putResponsePromise;
-        expect(putResponse.status()).toBe(200);
-
-        const body = await putResponse.json();
-        const startDate = new Date(body.data.start);
-        const minutes = startDate.getMinutes();
-
-        // With 60-min snap, minutes should be 0 (on the hour)
-        expect(minutes).toBe(0);
-    });
-
-    test('changing snap interval mid-session affects next drag', async ({ page, ctx }) => {
-        // Create a 1h time entry
-        await createBareTimeEntryViaApi(ctx, 'Snap change test', '1h');
-        await goToCalendar(page);
-
-        // Set snap to 15 min
-        await openSettingsPopover(page);
-        await page.getByLabel('Snap Interval').click();
-        await page.getByRole('option', { name: '15 min' }).click();
-        await page.keyboard.press('Escape');
-
-        // Scroll the calendar so the 14:00 target area is visible
-        await scrollCalendarToTime(page, '13:00:00');
-
-        const event = page.locator('.fc-event').first();
-        await expect(event).toBeVisible();
-
-        // Drag event to 14:00 area
-        const targetSlot14 = page.locator('.fc-timegrid-slot-lane[data-time="14:00:00"]').first();
-        const targetBox14 = await targetSlot14.boundingBox();
-        expect(targetBox14).not.toBeNull();
-
-        const putResponsePromise1 = page.waitForResponse(
-            (resp) => resp.url().includes('/time-entries/') && resp.request().method() === 'PUT'
-        );
-
-        await event.hover();
-        await page.mouse.down();
-        await page.mouse.move(targetBox14!.x + targetBox14!.width / 2, targetBox14!.y + 5, {
-            steps: 10,
-        });
-        await page.mouse.up();
-
-        const putResponse1 = await putResponsePromise1;
-        expect(putResponse1.status()).toBe(200);
-
-        const body1 = await putResponse1.json();
-        const startDate1 = new Date(body1.data.start);
-        expect(startDate1.getMinutes() % 15).toBe(0);
-
-        // Wait for query re-fetch/re-renders to fully settle after drag
-        await page.waitForTimeout(1500);
-
-        // Change snap to 30 min
-        // Use Escape first to ensure no stale popover is open, then re-open
-        await page.keyboard.press('Escape');
-        await page.waitForTimeout(300);
-        await openSettingsPopover(page);
-        await page.waitForTimeout(300);
-        await page.getByLabel('Snap Interval').click({ force: true });
-        await page.getByRole('option', { name: '30 min' }).click();
-        await page.keyboard.press('Escape');
-
-        // Scroll the calendar so the 10:00 target area is visible
-        await scrollCalendarToTime(page, '09:00:00');
-
-        // Drag event to 10:00 area
-        const targetSlot10 = page.locator('.fc-timegrid-slot-lane[data-time="10:00:00"]').first();
-        const targetBox10 = await targetSlot10.boundingBox();
-        expect(targetBox10).not.toBeNull();
-
-        const putResponsePromise2 = page.waitForResponse(
-            (resp) => resp.url().includes('/time-entries/') && resp.request().method() === 'PUT'
-        );
-
-        await event.hover();
-        await page.mouse.down();
-        await page.mouse.move(targetBox10!.x + targetBox10!.width / 2, targetBox10!.y + 5, {
-            steps: 10,
-        });
-        await page.mouse.up();
-
-        const putResponse2 = await putResponsePromise2;
-        expect(putResponse2.status()).toBe(200);
-
-        const body2 = await putResponse2.json();
-        const startDate2 = new Date(body2.data.start);
-        expect(startDate2.getMinutes() % 30).toBe(0);
-    });
-
-    test('snap with different grid scale (slot != snap)', async ({ page, ctx }) => {
-        await goToCalendar(page);
-        await openSettingsPopover(page);
-
-        // Set grid scale to 30 min, snap to 5 min
-        await page.getByLabel('Grid Scale').click();
-        await page.getByRole('option', { name: '30 min' }).click();
-        await page.getByLabel('Snap Interval').click();
-        await page.getByRole('option', { name: '5 min', exact: true }).click();
-        await page.keyboard.press('Escape');
-
-        // Wait for re-render with 30-min grid
-        await expect(async () => {
-            const slotCount = await page.locator('.fc-timegrid-slot-lane').count();
-            // 24 hours * 2 slots/hour = 48 slots for 30-min grid
-            expect(slotCount).toBeLessThanOrEqual(48);
-        }).toPass({ timeout: 5000 });
-
-        // Verify grid is 30-min (fewer slots than default 15-min)
-        const slotCount = await page.locator('.fc-timegrid-slot-lane').count();
-        // Default 15-min grid has 96 slots; 30-min grid should have 48
-        expect(slotCount).toBeLessThanOrEqual(48);
-
-        // Create a 1h time entry and go to calendar
-        await createBareTimeEntryViaApi(ctx, 'Grid snap test', '1h');
-        await goToCalendar(page);
-
-        // Re-apply settings since goToCalendar navigates
-        await openSettingsPopover(page);
-        await page.getByLabel('Grid Scale').click();
-        await page.getByRole('option', { name: '30 min' }).click();
-        await page.getByLabel('Snap Interval').click();
-        await page.getByRole('option', { name: '5 min', exact: true }).click();
-        await page.keyboard.press('Escape');
-
-        // Scroll so both the event (9:00) and target (14:00) are in viewport
-        await scrollCalendarToTime(page, '08:00:00');
-
-        const event = page.locator('.fc-event').first();
-        await expect(event).toBeVisible();
-
-        // Capture target coordinates after scroll is settled
-        const targetSlot = page.locator('.fc-timegrid-slot-lane[data-time="14:00:00"]').first();
-        const targetBox = await targetSlot.boundingBox();
-        expect(targetBox).not.toBeNull();
-
-        const putResponsePromise = page.waitForResponse(
-            (resp) => resp.url().includes('/time-entries/') && resp.request().method() === 'PUT'
-        );
-
-        await event.hover();
-        await page.mouse.down();
-        await page.mouse.move(targetBox!.x + targetBox!.width / 2, targetBox!.y + 5, { steps: 10 });
-        await page.mouse.up();
-
-        const putResponse = await putResponsePromise;
-        expect(putResponse.status()).toBe(200);
-
-        const body = await putResponse.json();
-        const startDate = new Date(body.data.start);
-        // Snap is 5 min, so minutes should be divisible by 5
-        expect(startDate.getMinutes() % 5).toBe(0);
-    });
-});
-
-test.describe('Calendar Settings Effects', () => {
-    test.beforeEach(async ({ page }) => {
-        await clearCalendarSettings(page);
-    });
-
-    test('start/end time hides slots outside visible range', async ({ page, ctx }) => {
-        // Create a time entry at 6 AM today
-        const now = new Date();
-        const start = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 6, 0, 0);
-        const end = new Date(start.getTime() + 3600 * 1000); // 7 AM
-        await createTimeEntryWithTimestampsViaApi(ctx, {
-            description: 'Early morning entry',
-            start: start.toISOString().replace(/\.\d{3}Z$/, 'Z'),
-            end: end.toISOString().replace(/\.\d{3}Z$/, 'Z'),
-        });
-
-        await goToCalendar(page);
-
-        // Verify 6 AM slot is visible with default settings
-        await expect(page.locator('.fc-timegrid-slot[data-time="06:00:00"]')).not.toHaveCount(0);
-
-        // Set start time to 8 AM
-        await openSettingsPopover(page);
-        await page.getByLabel('Start Time').click();
-        await page.getByRole('option', { name: '8:00 AM' }).click();
-        await page.keyboard.press('Escape');
-
-        // 6 AM slot should be hidden
-        await expect(page.locator('.fc-timegrid-slot[data-time="06:00:00"]')).toHaveCount(0);
-
-        // 8 AM slot should be visible
-        await expect(page.locator('.fc-timegrid-slot[data-time="08:00:00"]')).not.toHaveCount(0);
-    });
-
-    test('grid scale affects event visual height proportionally', async ({ page, ctx }) => {
-        // Create a 1h time entry
-        await createBareTimeEntryViaApi(ctx, 'Height test', '1h');
-        await goToCalendar(page);
-
-        const event = page.locator('.fc-event').first();
-        await expect(event).toBeVisible();
-        await event.scrollIntoViewIfNeeded();
-
-        // Get event height with default 15-min grid scale
-        const box15 = await event.boundingBox();
-        expect(box15).not.toBeNull();
-        const height15 = box15!.height;
-
-        // Change grid scale to 60 min
-        await openSettingsPopover(page);
-        await page.getByLabel('Grid Scale').click();
-        await page.getByRole('option', { name: '1 hour' }).click();
-        await page.keyboard.press('Escape');
-
-        // Wait for re-render and scroll event into view
-        await event.scrollIntoViewIfNeeded();
-        await expect(async () => {
-            const box = await event.boundingBox();
-            expect(box).not.toBeNull();
-            expect(box!.height).not.toBe(height15);
-        }).toPass({ timeout: 5000 });
-
-        const box60 = await event.boundingBox();
-        expect(box60).not.toBeNull();
-        const height60 = box60!.height;
-
-        // Event should appear smaller with larger grid scale
-        expect(height15).toBeGreaterThan(height60);
-    });
-
-    test('snap interval affects drag granularity', async ({ page, ctx }) => {
-        await goToCalendar(page);
-        await openSettingsPopover(page);
-
-        // Set snap to 30 min
-        await page.getByLabel('Snap Interval').click();
-        await page.getByRole('option', { name: '30 min' }).click();
-        await page.keyboard.press('Escape');
-
-        // Create a 1h time entry
-        await createBareTimeEntryViaApi(ctx, 'Drag granularity test', '1h');
-        await goToCalendar(page);
-
-        // Scroll the calendar so the 14:00 target area is visible
-        await scrollCalendarToTime(page, '13:00:00');
-
-        const event = page.locator('.fc-event').first();
-        await expect(event).toBeVisible();
-
-        // Get target slot
-        const targetSlot = page.locator('.fc-timegrid-slot-lane[data-time="14:00:00"]').first();
-        const targetBox = await targetSlot.boundingBox();
-        expect(targetBox).not.toBeNull();
-
-        // Drag event
-        const putResponsePromise = page.waitForResponse(
-            (resp) => resp.url().includes('/time-entries/') && resp.request().method() === 'PUT'
-        );
-
-        await event.hover();
-        await page.mouse.down();
-        await page.mouse.move(targetBox!.x + targetBox!.width / 2, targetBox!.y + 5, { steps: 10 });
-        await page.mouse.up();
-
-        const putResponse = await putResponsePromise;
-        expect(putResponse.status()).toBe(200);
-
-        const body = await putResponse.json();
-        const startDate = new Date(body.data.start);
-        const minutes = startDate.getMinutes();
-
-        // With 30-min snap, minutes should be 0 or 30
-        expect(minutes % 30).toBe(0);
-    });
-
-    test('settings apply immediately without page reload', async ({ page }) => {
-        await goToCalendar(page);
-
-        // Count slots with default grid scale (15 min)
-        const defaultSlotCount = await page.locator('.fc-timegrid-slot').count();
-
-        // Change grid scale to 30 min
-        await openSettingsPopover(page);
-        await page.getByLabel('Grid Scale').click();
-        await page.getByRole('option', { name: '30 min' }).click();
-        await page.keyboard.press('Escape');
-
-        // Verify slot count changed without navigation
-        await expect(async () => {
-            const count = await page.locator('.fc-timegrid-slot').count();
-            expect(count).toBeLessThan(defaultSlotCount);
-        }).toPass({ timeout: 5000 });
-
-        // Wait for FullCalendar to fully stabilize after re-render
-        await page.waitForTimeout(2000);
-        await expect(page.locator('.fc')).toBeVisible();
-
-        // Change start time to 8 AM
-        // FullCalendar re-render from grid scale change can make popover elements unstable.
-        // Retry the open+click sequence if it fails.
-        await expect(async () => {
-            await page.keyboard.press('Escape');
-            await page.waitForTimeout(300);
-            await page.getByRole('button', { name: 'Calendar settings' }).click();
-            await expect(page.getByText('Calendar Settings')).toBeVisible();
-            const startTimeBtn = page.getByLabel('Start Time');
-            await expect(startTimeBtn).toBeVisible();
-            await startTimeBtn.click({ timeout: 3000 });
-        }).toPass({ timeout: 10000 });
-
-        await page.getByRole('option', { name: '8:00 AM' }).click();
-        await page.keyboard.press('Escape');
-
-        // Verify 7 AM slot is hidden without reload
-        await expect(async () => {
-            const count = await page.locator('.fc-timegrid-slot[data-time="07:00:00"]').count();
-            expect(count).toBe(0);
-        }).toPass({ timeout: 5000 });
-    });
-});

e2e/clients.spec.ts

@@ -132,80 +132,6 @@ test('test that deleting a client via actions menu works', async ({ page, ctx })
     await expect(page.getByTestId('client_table')).not.toContainText(clientName);
 });
 
-// =============================================
-// Context Menu Tests
-// =============================================
-
-test('test that client context menu edit updates the client', async ({ page, ctx }) => {
-    const clientName = 'CtxEditClient ' + Math.floor(1 + Math.random() * 10000);
-    const updatedName = 'CtxUpdatedClient ' + Math.floor(1 + Math.random() * 10000);
-    await createClientViaApi(ctx, { name: clientName });
-    await goToClientsOverview(page);
-
-    const row = page.getByRole('row').filter({ hasText: clientName }).first();
-    await expect(row).toBeVisible();
-    await row.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await page.getByRole('menuitem', { name: 'Edit' }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-
-    await page.getByPlaceholder('Client Name').fill(updatedName);
-    await Promise.all([
-        page.getByRole('button', { name: 'Update Client' }).click(),
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/clients') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200
-        ),
-    ]);
-
-    await expect(page.getByTestId('client_table')).toContainText(updatedName);
-    await expect(page.getByTestId('client_table')).not.toContainText(clientName);
-});
-
-test('test that client context menu archive archives the client', async ({ page, ctx }) => {
-    const clientName = 'CtxArchiveClient ' + Math.floor(1 + Math.random() * 10000);
-    await createClientViaApi(ctx, { name: clientName });
-    await goToClientsOverview(page);
-
-    const row = page.getByRole('row').filter({ hasText: clientName }).first();
-    await expect(row).toBeVisible();
-    await row.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/clients') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200
-        ),
-        page.getByRole('menuitem', { name: 'Archive' }).click(),
-    ]);
-    await expect(page.getByTestId('client_table')).not.toContainText(clientName);
-});
-
-test('test that client context menu delete deletes the client', async ({ page, ctx }) => {
-    const clientName = 'CtxDeleteClient ' + Math.floor(1 + Math.random() * 10000);
-    await createClientViaApi(ctx, { name: clientName });
-    await goToClientsOverview(page);
-
-    const row = page.getByRole('row').filter({ hasText: clientName }).first();
-    await expect(row).toBeVisible();
-    await row.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/clients') &&
-                response.request().method() === 'DELETE' &&
-                response.status() === 204
-        ),
-        page.getByRole('menuitem', { name: 'Delete' }).click(),
-    ]);
-    await expect(page.getByTestId('client_table')).not.toContainText(clientName);
-});
-
 // =============================================
 // Sorting Tests
 // =============================================

e2e/members.spec.ts

@@ -496,158 +496,6 @@ test('test that organization owner cannot be deleted', async ({ page }) => {
     await expect(page.getByRole('row').filter({ hasText: 'Owner' })).toBeVisible();
 });
 
-// =============================================
-// Context Menu Tests
-// =============================================
-
-test('test that member context menu edit updates the member billable rate', async ({
-    page,
-    ctx,
-}) => {
-    const memberName = 'CtxEditMember ' + Math.floor(1 + Math.random() * 10000);
-    await createPlaceholderMemberViaImportApi(ctx, memberName);
-    await goToMembersPage(page);
-
-    const row = page.getByRole('row').filter({ hasText: memberName }).first();
-    await expect(row).toBeVisible();
-    await row.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await page.getByRole('menuitem', { name: 'Edit' }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-    await expect(page.getByRole('heading', { name: 'Update Member' })).toBeVisible();
-
-    // Change billable rate from default to custom
-    const billableRateSelect = page.getByRole('dialog').getByRole('combobox').last();
-    await billableRateSelect.click();
-    await page.getByRole('option', { name: 'Custom Rate' }).click();
-
-    // Set a custom billable rate
-    await page.getByPlaceholder('Billable Rate').fill('150');
-
-    // Click Update Member — confirmation dialog should appear
-    await page.getByRole('button', { name: 'Update Member' }).click();
-    await expect(page.getByRole('heading', { name: 'Update Member Billable Rate' })).toBeVisible();
-
-    // Confirm the billable rate change
-    await Promise.all([
-        page.getByRole('button', { name: 'Yes, update existing time entries' }).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();
-});
-
-test('test that member context menu merge merges the member', async ({ page, ctx }) => {
-    const memberName = 'CtxMergeMember ' + Math.floor(1 + Math.random() * 10000);
-    await createPlaceholderMemberViaImportApi(ctx, memberName);
-    await goToMembersPage(page);
-
-    const row = page.getByRole('row').filter({ hasText: memberName }).first();
-    await expect(row).toBeVisible();
-    await row.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await page.getByRole('menuitem', { name: 'Merge' }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-    await expect(page.getByRole('heading', { name: 'Merge Member' })).toBeVisible();
-
-    // Select the first available member as merge target
-    await page.getByRole('dialog').getByRole('button', { name: 'Select a member...' }).click();
-    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()
-        ),
-    ]);
-
-    // Verify placeholder member is no longer visible
-    await expect(page.getByRole('dialog').filter({ hasText: 'Merge Member' })).not.toBeVisible();
-    await expect(page.getByRole('main').getByText(memberName)).not.toBeVisible();
-});
-
-test('test that member context menu deactivate deactivates the member', async ({
-    page,
-    browser,
-}) => {
-    const memberId = Math.floor(Math.random() * 100000);
-    const memberEmail = `member+${memberId}@deactivate.test`;
-    const memberName = 'Deactivate Target';
-
-    // Invite and accept a new Employee member
-    await inviteAndAcceptMember(page, browser, memberName, memberEmail, 'Employee');
-
-    await goToMembersPage(page);
-    const row = page.getByRole('row').filter({ hasText: memberName }).first();
-    await expect(row).toBeVisible();
-
-    // Open context menu and click Deactivate
-    await row.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await page.getByRole('menuitem', { name: 'Deactivate' }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-    await expect(page.getByRole('heading', { name: 'Deactivate User' })).toBeVisible();
-
-    // Confirm deactivation
-    await Promise.all([
-        page.getByRole('button', { name: 'Deactivate' }).click(),
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/make-placeholder') &&
-                response.request().method() === 'POST' &&
-                response.ok()
-        ),
-    ]);
-
-    // Verify dialog closed and member role changed to Placeholder
-    await expect(page.getByRole('dialog')).not.toBeVisible();
-    await expect(row.getByText('Placeholder', { exact: true })).toBeVisible();
-});
-
-test('test that member context menu delete deletes the member', async ({ page, ctx }) => {
-    const memberName = 'CtxDeleteMember ' + Math.floor(1 + Math.random() * 10000);
-    await createPlaceholderMemberViaImportApi(ctx, memberName);
-    await goToMembersPage(page);
-
-    const row = page.getByRole('row').filter({ hasText: memberName }).first();
-    await expect(row).toBeVisible();
-    await row.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await page.getByRole('menuitem', { name: 'Delete' }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-    await expect(page.getByRole('heading', { name: 'Delete Member' })).toBeVisible();
-
-    // Check the confirmation checkbox
-    await page.getByRole('checkbox').click();
-
-    // Click Delete Member button and wait for API response
-    await Promise.all([
-        page.getByRole('button', { name: 'Delete Member' }).click(),
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/members/') &&
-                response.request().method() === 'DELETE' &&
-                response.ok()
-        ),
-    ]);
-
-    // Verify modal closed and member removed from table
-    await expect(page.getByRole('dialog')).not.toBeVisible();
-    await expect(page.getByRole('main').getByText(memberName)).not.toBeVisible();
-});
-
 // =============================================
 // Invitations Tab Tests
 // =============================================

e2e/profile.spec.ts

@@ -230,37 +230,6 @@ test('test that theme can be changed to dark and light', async ({ page }) => {
     await expect(page.getByText('System default:')).toBeVisible();
 });
 
-// =============================================
-// Group similar time entries
-// =============================================
-
-test('test that group similar time entries setting can be toggled', async ({ page }) => {
-    await goToProfilePage(page);
-
-    // Get the checkbox
-    const checkbox = page.getByLabel('Group similar time entries');
-
-    // Get initial value and verify it is checked (default is true)
-    const initialValue = await checkbox.isChecked();
-    await expect(checkbox).toBeChecked();
-
-    // Toggle the checkbox
-    await checkbox.click();
-
-    // Reload
-    await page.reload();
-
-    // Verify the value is toggled
-    const afterValue = await page.getByLabel('Group similar time entries').isChecked();
-    expect(afterValue).toBe(!initialValue);
-
-    // Verify localStorage persists the setting
-    const storedValue = await page.evaluate(() =>
-        localStorage.getItem('group-similar-time-entries')
-    );
-    expect(storedValue).toBe(String(!initialValue));
-});
-
 // =============================================
 // Two Factor Authentication Tests
 // =============================================

e2e/projects.spec.ts

@@ -800,81 +800,6 @@ test('test that editing a task name on the project detail page works', async ({
     await expect(page.getByTestId('task_table')).not.toContainText(originalTaskName);
 });
 
-// =============================================
-// Context Menu Tests
-// =============================================
-
-test('test that project context menu edit updates the project', async ({ page, ctx }) => {
-    const projectName = 'CtxEditProject ' + Math.floor(1 + Math.random() * 10000);
-    const updatedName = 'CtxUpdatedProject ' + Math.floor(1 + Math.random() * 10000);
-    await createProjectViaApi(ctx, { name: projectName });
-    await goToProjectsOverview(page);
-
-    const row = page.getByRole('row').filter({ hasText: projectName }).first();
-    await expect(row).toBeVisible();
-    await row.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await page.getByRole('menuitem', { name: 'Edit' }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-
-    await page.getByPlaceholder('Project Name').fill(updatedName);
-    await Promise.all([
-        page.getByRole('button', { name: 'Update Project' }).click(),
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/projects/') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200
-        ),
-    ]);
-
-    await expect(page.getByTestId('project_table')).toContainText(updatedName);
-    await expect(page.getByTestId('project_table')).not.toContainText(projectName);
-});
-
-test('test that project context menu archive archives the project', async ({ page, ctx }) => {
-    const projectName = 'CtxArchiveProject ' + Math.floor(1 + Math.random() * 10000);
-    await createProjectViaApi(ctx, { name: projectName });
-    await goToProjectsOverview(page);
-
-    const row = page.getByRole('row').filter({ hasText: projectName }).first();
-    await expect(row).toBeVisible();
-    await row.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/projects') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200
-        ),
-        page.getByRole('menuitem', { name: 'Archive' }).click(),
-    ]);
-    // After archiving, the project stays visible (default filter is 'all') but status changes to 'Archived'
-    await expect(row).toContainText('Archived');
-});
-
-test('test that project context menu delete deletes the project', async ({ page, ctx }) => {
-    const projectName = 'CtxDeleteProject ' + Math.floor(1 + Math.random() * 10000);
-    await createProjectViaApi(ctx, { name: projectName });
-    await goToProjectsOverview(page);
-
-    const row = page.getByRole('row').filter({ hasText: projectName }).first();
-    await expect(row).toBeVisible();
-    await row.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/projects') &&
-                response.request().method() === 'DELETE' &&
-                response.status() === 204
-        ),
-        page.getByRole('menuitem', { name: 'Delete' }).click(),
-    ]);
-    await expect(page.getByTestId('project_table')).not.toContainText(projectName);
-});
-
 // =============================================
 // Employee Permission Tests
 // =============================================

e2e/reporting-detailed.spec.ts

@@ -32,7 +32,7 @@ test('test that detailed view shows time entries correctly', async ({ page, ctx
 
     // Verify the time entry is shown with all details
     await expect(page.getByText(projectName, { exact: true }).first()).toBeVisible();
-    await expect(page.locator('input[name="Duration"]').first()).toHaveValue('1:00:00');
+    await expect(page.locator('input[name="Duration"]').first()).toHaveValue('1h 00min');
     await expect(page.getByText('Entry for ' + projectName, { exact: true }).first()).toBeVisible();
 });
 
@@ -62,8 +62,8 @@ test('test that updating duration in detailed view works correctly', async ({ pa
         ),
     ]);
 
-    // Verify the new duration is displayed (reporting views promote to HH:MM:SS format)
-    await expect(durationInput).toHaveValue('2:30:00');
+    // Verify the new duration is displayed
+    await expect(durationInput).toHaveValue(updatedDuration);
 });
 
 // ──────────────────────────────────────────────────

e2e/reporting.spec.ts

@@ -333,7 +333,7 @@ test('test that task filtering works in reporting', async ({ page, ctx }) => {
     await page.keyboard.press('Escape');
 
     // Verify the report only shows 1h (task1's duration)
-    await expect(page.getByTestId('reporting_view').getByText('1:00:00').first()).toBeVisible();
+    await expect(page.getByTestId('reporting_view').getByText('1h 00min').first()).toBeVisible();
 });
 
 test('test that task multiselect search filters the option list', async ({ page, ctx }) => {
@@ -474,7 +474,7 @@ test('test that tag filtering works in reporting', async ({ page, ctx }) => {
     await page.keyboard.press('Escape');
 
     // Verify only time entries with tag1 are shown
-    await expect(page.getByTestId('reporting_view').getByText('1:00:00').first()).toBeVisible();
+    await expect(page.getByTestId('reporting_view').getByText('1h 00min').first()).toBeVisible();
 });
 
 test('test that tag dropdown search filters the option list', async ({ page, ctx }) => {
@@ -594,7 +594,7 @@ test('test that billable status filtering works in reporting', async ({ page, ct
         waitForReportingUpdate(page),
     ]);
 
-    await expect(page.getByTestId('reporting_view').getByText('1:00:00').first()).toBeVisible();
+    await expect(page.getByTestId('reporting_view').getByText('1h 00min').first()).toBeVisible();
 });
 
 test('test that billable filter can switch between all three states', async ({ page }) => {
@@ -885,7 +885,7 @@ test.describe('Employee Reporting Restrictions', () => {
 
         // Employee's data should be visible (1h)
         await expect(
-            employee.page.getByTestId('reporting_view').getByText('1:00:00').first()
+            employee.page.getByTestId('reporting_view').getByText('1h 00min').first()
         ).toBeVisible();
     });
 

e2e/shared-reports.spec.ts

@@ -1,10 +1,6 @@
 import { expect } from '@playwright/test';
-import dayjs from 'dayjs';
-import utc from 'dayjs/plugin/utc.js';
 import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 import { test } from '../playwright/fixtures';
-
-dayjs.extend(utc);
 import {
     createProjectViaApi,
     createClientViaApi,
@@ -15,7 +11,6 @@ import {
     createBillableProjectViaApi,
     createTimeEntryWithBillableStatusViaApi,
     createTagViaApi,
-    createReportViaApi,
 } from './utils/api';
 import {
     goToReporting,
@@ -292,8 +287,8 @@ test('test that shared report respects task filter', async ({ page, ctx }) => {
     await page.goto(shareableLink);
     await expect(page.getByText('Reporting')).toBeVisible();
     await expect(page.getByText('Total')).toBeVisible();
-    await expect(page.getByText('1:00:00').first()).toBeVisible();
-    await expect(page.getByText('3:00:00')).not.toBeVisible();
+    await expect(page.getByText('1h 00min').first()).toBeVisible();
+    await expect(page.getByText('3h 00min')).not.toBeVisible();
 });
 
 test('test that shared report respects client filter', async ({ page, ctx }) => {
@@ -369,8 +364,8 @@ test('test that shared report respects tag filter', async ({ page, ctx }) => {
     await page.goto(shareableLink);
     await expect(page.getByText('Reporting')).toBeVisible();
     await expect(page.getByText('Total')).toBeVisible();
-    await expect(page.getByText('1:00:00').first()).toBeVisible();
-    await expect(page.getByText('3:00:00')).not.toBeVisible();
+    await expect(page.getByText('1h 00min').first()).toBeVisible();
+    await expect(page.getByText('3h 00min')).not.toBeVisible();
 });
 
 test('test that shared report respects member filter', async ({ page, ctx }) => {
@@ -425,7 +420,7 @@ test('test that shared report with billable filter only shows billable entries',
     ]);
 
     // Verify only 1h shows before saving
-    await expect(page.getByTestId('reporting_view').getByText('1:00:00').first()).toBeVisible();
+    await expect(page.getByTestId('reporting_view').getByText('1h 00min').first()).toBeVisible();
 
     const { shareableLink } = await saveAsSharedReport(page, reportName);
 
@@ -435,8 +430,8 @@ test('test that shared report with billable filter only shows billable entries',
     await expect(page.getByText('Total')).toBeVisible();
 
     // Shared report should only show the 1h billable entry, not the 2h non-billable
-    await expect(page.getByText('1:00:00').first()).toBeVisible();
-    await expect(page.getByText('3:00:00')).not.toBeVisible();
+    await expect(page.getByText('1h 00min').first()).toBeVisible();
+    await expect(page.getByText('3h 00min')).not.toBeVisible();
 });
 
 // ──────────────────────────────────────────────────
@@ -771,97 +766,6 @@ test('test that updating expiration date on already-public report works', async
     expect(returnedDate.getTime()).toBeGreaterThan(now.getTime());
 });
 
-test('test that clearing the expiration date on a report works', async ({ page, ctx }) => {
-    const reportName = 'ClearExpReport ' + Math.floor(Math.random() * 10000);
-
-    // Create a public report with an expiration date via API
-    await createReportViaApi(ctx, {
-        name: reportName,
-        is_public: true,
-        public_until: dayjs().add(1, 'month').utc().format('YYYY-MM-DDTHH:mm:ss[Z]'),
-    });
-
-    // Go to shared reports and edit the report
-    await goToReportingShared(page);
-    await expect(page.getByText(reportName)).toBeVisible();
-
-    await page
-        .getByRole('button', { name: new RegExp('Actions for Project ' + reportName) })
-        .click();
-    await page.getByRole('menuitem', { name: /^Edit Report/ }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-
-    // The date picker should show a date (not "Pick a date")
-    await expect(
-        page.getByRole('dialog').getByRole('button', { name: 'Pick a date' })
-    ).not.toBeVisible();
-
-    // Click the clear button (X icon) to remove the expiration date
-    const clearButton = page
-        .getByRole('dialog')
-        .locator('[role="button"]')
-        .filter({ has: page.locator('svg.lucide-x') });
-    await expect(clearButton).toBeVisible();
-    await clearButton.click();
-
-    // The date picker should now show "Pick a date"
-    await expect(
-        page.getByRole('dialog').getByRole('button', { name: 'Pick a date' })
-    ).toBeVisible();
-
-    // The clear button should no longer be visible
-    await expect(clearButton).not.toBeVisible();
-
-    // Update the report and verify public_until is null
-    const [updateResponse] = 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 updateBody = await updateResponse.json();
-    expect(updateBody.data.public_until).toBeNull();
-});
-
-test('test that date picker clear button is not visible when no date is set', async ({
-    page,
-    ctx,
-}) => {
-    const reportName = 'NoClearReport ' + Math.floor(Math.random() * 10000);
-
-    // Create a public report without an expiration date via API
-    await createReportViaApi(ctx, {
-        name: reportName,
-        is_public: true,
-        public_until: null,
-    });
-
-    // Go to shared reports and edit the report
-    await goToReportingShared(page);
-    await expect(page.getByText(reportName)).toBeVisible();
-
-    await page
-        .getByRole('button', { name: new RegExp('Actions for Project ' + reportName) })
-        .click();
-    await page.getByRole('menuitem', { name: /^Edit Report/ }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-
-    // The date picker should show "Pick a date"
-    await expect(
-        page.getByRole('dialog').getByRole('button', { name: 'Pick a date' })
-    ).toBeVisible();
-
-    // The clear button should NOT be visible
-    const clearButton = page
-        .getByRole('dialog')
-        .locator('[role="button"]')
-        .filter({ has: page.locator('svg.lucide-x') });
-    await expect(clearButton).not.toBeVisible();
-});
-
 // ──────────────────────────────────────────────────
 // Shared Report Cost Column Tests
 // ──────────────────────────────────────────────────

e2e/tags.spec.ts

@@ -90,59 +90,6 @@ test('test that multiple tags can be created via API and displayed in the table'
     await expect(page.getByTestId('tag_table')).toContainText(tagName2);
 });
 
-// =============================================
-// Context Menu Tests
-// =============================================
-
-test('test that tag context menu edit updates the tag', async ({ page, ctx }) => {
-    const tagName = 'CtxEditTag ' + Math.floor(1 + Math.random() * 10000);
-    const updatedName = 'CtxUpdatedTag ' + Math.floor(1 + Math.random() * 10000);
-    await createTagViaApi(ctx, { name: tagName });
-    await goToTagsOverview(page);
-
-    const row = page.getByRole('row').filter({ hasText: tagName }).first();
-    await expect(row).toBeVisible();
-    await row.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await page.getByRole('menuitem', { name: 'Edit' }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-
-    await page.getByPlaceholder('Tag Name').fill(updatedName);
-    await Promise.all([
-        page.getByRole('button', { name: 'Update Tag' }).click(),
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/tags') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200
-        ),
-    ]);
-
-    await expect(page.getByTestId('tag_table')).toContainText(updatedName);
-    await expect(page.getByTestId('tag_table')).not.toContainText(tagName);
-});
-
-test('test that tag context menu delete deletes the tag', async ({ page, ctx }) => {
-    const tagName = 'CtxDeleteTag ' + Math.floor(1 + Math.random() * 10000);
-    await createTagViaApi(ctx, { name: tagName });
-    await goToTagsOverview(page);
-
-    const row = page.getByRole('row').filter({ hasText: tagName }).first();
-    await expect(row).toBeVisible();
-    await row.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/tags') &&
-                response.request().method() === 'DELETE' &&
-                response.status() === 204
-        ),
-        page.getByRole('menuitem', { name: 'Delete' }).click(),
-    ]);
-    await expect(page.getByTestId('tag_table')).not.toContainText(tagName);
-});
-
 // =============================================
 // Sorting Tests
 // =============================================

e2e/time.spec.ts

@@ -15,7 +15,6 @@ import {
     createBareTimeEntryViaApi,
     createTimeEntryViaApi,
     updateOrganizationCurrencyViaWeb,
-    updateOrganizationSettingViaApi,
 } from './utils/api';
 
 // Date picker button name patterns for different date formats
@@ -39,10 +38,6 @@ function getMonthFromTimestamp(timestamp: string): number {
     return new Date(timestamp).getUTCMonth() + 1;
 }
 
-async function goToProfilePage(page: Page) {
-    await page.goto(PLAYWRIGHT_BASE_URL + '/user/profile');
-}
-
 async function goToTimeOverview(page: Page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/time');
 }
@@ -71,14 +66,6 @@ async function createEmptyTimeEntry(page: Page) {
     ]);
 }
 
-async function setTimeEntriesGrouping(page: Page, enabled: boolean) {
-    await goToProfilePage(page);
-    const checkbox = page.getByLabel('Group similar time entries');
-    const isChecked = await checkbox.isChecked();
-    if (isChecked !== enabled) await checkbox.click();
-    await goToTimeOverview(page);
-}
-
 test('test that starting and stopping an empty time entry shows a new time entry in the overview', async ({
     page,
 }) => {
@@ -345,30 +332,6 @@ test.skip('test that load more works when the end of page is reached', async ({
     await expect(page.locator('body')).toHaveText(/All time entries are loaded!/);
 });
 
-test('test that Group similar time entries option is affected', async ({ page }) => {
-    // Enable grouping
-    await setTimeEntriesGrouping(page, true);
-
-    // Create 2 similar time entries
-    await createEmptyTimeEntry(page);
-    await page.waitForSelector('[data-testid="time_entry_row"]', { timeout: 1000 });
-    await createEmptyTimeEntry(page);
-
-    // Verify similar time entries are grouped
-    await expect(page.getByTestId('grouped_items_count_button').first()).toBeVisible({
-        timeout: 1000,
-    });
-
-    // Disable grouping
-    await setTimeEntriesGrouping(page, false);
-
-    // Verify similar time entries are not grouped
-    await expect(page.locator('[data-testid="time_entry_row"]')).toHaveCount(2, { timeout: 1000 });
-    await expect(page.locator('[data-testid="grouped_items_count_button"]')).toHaveCount(0, {
-        timeout: 1000,
-    });
-});
-
 // TODO: Test that updating the time entry start / end times works while it is running
 
 // TODO: Test for project update
@@ -1000,12 +963,7 @@ test('test that natural language duration input works in create modal', async ({
     expect(createBody.data.duration).toBe(9000);
 });
 
-test('test that decimal duration input works in create modal', async ({ page, ctx }) => {
-    // Ensure comma-point format so "1.5h" uses period as decimal
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'hours-minutes',
-        number_format: 'comma-point',
-    });
+test('test that decimal duration input works in create modal', async ({ page }) => {
     await goToTimeOverview(page);
 
     // Open the create modal
@@ -1020,6 +978,7 @@ test('test that decimal duration input works in create modal', async ({ page, ct
         .fill('Decimal duration test');
 
     // Test decimal duration input "1.5h" (should be interpreted as 1.5 hours = 90 minutes)
+    // Note: parse-duration library requires a unit suffix for decimal values
     const durationInput = page.locator('[role="dialog"] input[name="Duration"]');
     await durationInput.fill('1.5h');
     await durationInput.press('Tab');
@@ -1038,508 +997,6 @@ test('test that decimal duration input works in create modal', async ({ page, ct
     expect(createBody.data.duration).toBe(5400);
 });
 
-test('test that decimal duration with comma number format does not corrupt on blur in edit modal', async ({
-    page,
-    ctx,
-}) => {
-    // Set organization to decimal interval format with European number format (comma as decimal separator)
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'decimal',
-        number_format: 'point-comma',
-    });
-
-    // Create a 1-hour time entry
-    await createBareTimeEntryViaApi(ctx, 'Decimal blur 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();
-
-    // The duration input should show "1,00 h" (decimal format with comma)
-    const durationInput = page.locator('[role="dialog"] input[name="Duration"]');
-    await expect(durationInput).toHaveValue('1,00 h');
-
-    // Click on the duration input and blur it without changing the value
-    await durationInput.click();
-    await durationInput.press('Tab');
-
-    // After blur, the value should remain "1,00 h" and NOT become "100,00 h"
-    await expect(durationInput).toHaveValue('1,00 h');
-
-    // Submit and verify the duration is still 3600 seconds (1 hour)
-    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.duration).toBe(3600);
-
-    // Reset organization settings
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'hours-minutes',
-        number_format: 'comma-point',
-    });
-});
-
-test('test that typing bare decimal 1,5 in edit modal is interpreted as 1.5 hours', async ({
-    page,
-    ctx,
-}) => {
-    // Set organization to decimal interval format with European number format
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'decimal',
-        number_format: 'point-comma',
-    });
-
-    // Create a 1-hour time entry
-    await createBareTimeEntryViaApi(ctx, 'Bare decimal test', '1h');
-    await goToTimeOverview(page);
-
-    const timeEntryRows = page.locator('[data-testid="time_entry_row"]');
-    const newTimeEntry = timeEntryRows.first();
-
-    // 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();
-
-    // Type "1,5" (bare decimal without "h" suffix) — should be interpreted as 1.5 hours
-    const durationInput = page.locator('[role="dialog"] input[name="Duration"]');
-    await durationInput.fill('1,5');
-    await durationInput.press('Tab');
-
-    // Should display as "1,50 h" (1.5 hours formatted in point-comma locale)
-    await expect(durationInput).toHaveValue('1,50 h');
-
-    // Submit and verify the duration is 5400 seconds (1.5 hours)
-    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.duration).toBe(5400);
-
-    // Reset organization settings
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'hours-minutes',
-        number_format: 'comma-point',
-    });
-});
-
-test('test that typing bare decimal 1.5 in edit modal is interpreted as 1.5 hours', async ({
-    page,
-    ctx,
-}) => {
-    // Set organization to decimal interval format with default number format
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'decimal',
-        number_format: 'comma-point',
-    });
-
-    // Create a 1-hour time entry
-    await createBareTimeEntryViaApi(ctx, 'Bare decimal dot test', '1h');
-    await goToTimeOverview(page);
-
-    const timeEntryRows = page.locator('[data-testid="time_entry_row"]');
-    const newTimeEntry = timeEntryRows.first();
-
-    // 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();
-
-    // Type "1.5" (bare decimal with period) — should be interpreted as 1.5 hours
-    const durationInput = page.locator('[role="dialog"] input[name="Duration"]');
-    await durationInput.fill('1.5');
-    await durationInput.press('Tab');
-
-    // Should display as "1.50 h" (1.5 hours formatted in comma-point locale)
-    await expect(durationInput).toHaveValue('1.50 h');
-
-    // Submit and verify the duration is 5400 seconds (1.5 hours)
-    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.duration).toBe(5400);
-
-    // Reset organization settings
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'hours-minutes',
-        number_format: 'comma-point',
-    });
-});
-
-test('test that decimal duration with space-comma number format does not corrupt on blur in edit modal', async ({
-    page,
-    ctx,
-}) => {
-    // Set organization to decimal interval format with space-comma number format
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'decimal',
-        number_format: 'space-comma',
-    });
-
-    // Create a 1-hour time entry
-    await createBareTimeEntryViaApi(ctx, 'Space-comma blur test', '1h');
-    await goToTimeOverview(page);
-
-    const timeEntryRows = page.locator('[data-testid="time_entry_row"]');
-    const newTimeEntry = timeEntryRows.first();
-
-    // 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();
-
-    // The duration input should show "1,00 h" (space-comma uses comma as decimal)
-    const durationInput = page.locator('[role="dialog"] input[name="Duration"]');
-    await expect(durationInput).toHaveValue('1,00 h');
-
-    // Blur without changing the value
-    await durationInput.click();
-    await durationInput.press('Tab');
-
-    // Should remain "1,00 h"
-    await expect(durationInput).toHaveValue('1,00 h');
-
-    // Submit and verify the duration is still 3600 seconds
-    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.duration).toBe(3600);
-
-    // Reset organization settings
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'hours-minutes',
-        number_format: 'comma-point',
-    });
-});
-
-test('test that bare integer in edit modal is interpreted as minutes', async ({ page, ctx }) => {
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'hours-minutes',
-        number_format: 'comma-point',
-    });
-
-    await createBareTimeEntryViaApi(ctx, 'Bare integer test', '1h');
-    await goToTimeOverview(page);
-
-    const timeEntryRows = page.locator('[data-testid="time_entry_row"]');
-    const newTimeEntry = timeEntryRows.first();
-
-    // 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();
-
-    // Type "30" — should be interpreted as 30 minutes
-    const durationInput = page.locator('[role="dialog"] input[name="Duration"]');
-    await durationInput.fill('30');
-    await durationInput.press('Tab');
-
-    // Should display as "0h 30min"
-    await expect(durationInput).toHaveValue('0h 30min');
-
-    // Submit and verify the duration is 1800 seconds (30 minutes)
-    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.duration).toBe(1800);
-});
-
-test('test that bare integer in edit modal with decimal format is interpreted as hours', async ({
-    page,
-    ctx,
-}) => {
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'decimal',
-        number_format: 'comma-point',
-    });
-
-    await createBareTimeEntryViaApi(ctx, 'Bare integer decimal test', '1h');
-    await goToTimeOverview(page);
-
-    const timeEntryRows = page.locator('[data-testid="time_entry_row"]');
-    const newTimeEntry = timeEntryRows.first();
-
-    // 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();
-
-    // Type "2" — with decimal format, should be interpreted as 2 hours
-    const durationInput = page.locator('[role="dialog"] input[name="Duration"]');
-    await durationInput.fill('2');
-    await durationInput.press('Tab');
-
-    // Should display as "2.00 h"
-    await expect(durationInput).toHaveValue('2.00 h');
-
-    // Submit and verify the duration is 7200 seconds (2 hours)
-    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.duration).toBe(7200);
-
-    // Reset organization settings
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'hours-minutes',
-        number_format: 'comma-point',
-    });
-});
-
-test('test that HH:MM input in edit modal works', async ({ page, ctx }) => {
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'hours-minutes',
-        number_format: 'comma-point',
-    });
-
-    await createBareTimeEntryViaApi(ctx, 'HH:MM test', '1h');
-    await goToTimeOverview(page);
-
-    const timeEntryRows = page.locator('[data-testid="time_entry_row"]');
-    const newTimeEntry = timeEntryRows.first();
-
-    // 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();
-
-    // Type "1:30" — should be interpreted as 1 hour 30 minutes
-    const durationInput = page.locator('[role="dialog"] input[name="Duration"]');
-    await durationInput.fill('1:30');
-    await durationInput.press('Tab');
-
-    // Should display as "1h 30min"
-    await expect(durationInput).toHaveValue('1h 30min');
-
-    // Submit and verify the duration is 5400 seconds (1.5 hours)
-    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.duration).toBe(5400);
-});
-
-test('test that bare integer in inline duration input is interpreted as minutes', async ({
-    page,
-    ctx,
-}) => {
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'hours-minutes',
-        number_format: 'comma-point',
-    });
-
-    await createBareTimeEntryViaApi(ctx, 'Inline bare integer test', '1h');
-    await goToTimeOverview(page);
-
-    const timeEntryRows = page.locator('[data-testid="time_entry_row"]');
-    const newTimeEntry = timeEntryRows.first();
-
-    // Type "45" in the inline duration input — should be 45 minutes
-    const durationInput = newTimeEntry.getByTestId('time_entry_duration_input').first();
-    await durationInput.click();
-    await durationInput.fill('45');
-
-    const [updateResponse] = await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/time-entries') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200
-        ),
-        durationInput.press('Tab'),
-    ]);
-    const updateBody = await updateResponse.json();
-    expect(updateBody.data.duration).toBe(2700);
-});
-
-test('test that bare integer in inline duration input with decimal format is interpreted as hours', async ({
-    page,
-    ctx,
-}) => {
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'decimal',
-        number_format: 'comma-point',
-    });
-
-    await createBareTimeEntryViaApi(ctx, 'Inline bare integer decimal test', '1h');
-    await goToTimeOverview(page);
-
-    const timeEntryRows = page.locator('[data-testid="time_entry_row"]');
-    const newTimeEntry = timeEntryRows.first();
-
-    // Type "3" in the inline duration input — with decimal format, should be 3 hours
-    const durationInput = newTimeEntry.getByTestId('time_entry_duration_input').first();
-    await durationInput.click();
-    await durationInput.fill('3');
-
-    const [updateResponse] = await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/time-entries') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200
-        ),
-        durationInput.press('Tab'),
-    ]);
-    const updateBody = await updateResponse.json();
-    expect(updateBody.data.duration).toBe(10800);
-
-    // Reset organization settings
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'hours-minutes',
-        number_format: 'comma-point',
-    });
-});
-
-test('test that bare integer in create modal is interpreted as minutes', async ({ page, ctx }) => {
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'hours-minutes',
-        number_format: 'comma-point',
-    });
-    await goToTimeOverview(page);
-
-    // Open the 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();
-
-    await page
-        .getByRole('dialog')
-        .getByRole('textbox', { name: 'Description' })
-        .fill('Bare integer create test');
-
-    // Type "30" — should be interpreted as 30 minutes
-    const durationInput = page.locator('[role="dialog"] input[name="Duration"]');
-    await durationInput.fill('30');
-    await durationInput.press('Tab');
-
-    await expect(durationInput).toHaveValue('0h 30min');
-
-    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.duration).toBe(1800);
-});
-
-test('test that bare integer in create modal with decimal format is interpreted as hours', async ({
-    page,
-    ctx,
-}) => {
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'decimal',
-        number_format: 'comma-point',
-    });
-    await goToTimeOverview(page);
-
-    // Open the 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();
-
-    await page
-        .getByRole('dialog')
-        .getByRole('textbox', { name: 'Description' })
-        .fill('Bare integer decimal create test');
-
-    // Type "2" — with decimal format, should be interpreted as 2 hours
-    const durationInput = page.locator('[role="dialog"] input[name="Duration"]');
-    await durationInput.fill('2');
-    await durationInput.press('Tab');
-
-    await expect(durationInput).toHaveValue('2.00 h');
-
-    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.duration).toBe(7200);
-
-    // Reset organization settings
-    await updateOrganizationSettingViaApi(ctx, {
-        interval_format: 'hours-minutes',
-        number_format: 'comma-point',
-    });
-});
-
 test('test that project selection works in create modal', async ({ page, ctx }) => {
     const projectName = 'Create Modal Project ' + Math.floor(1 + Math.random() * 10000);
     await createProjectViaApi(ctx, { name: projectName });
@@ -2078,228 +1535,3 @@ test.describe('Employee Time Entry Isolation', () => {
         await expect(timeEntryRow).not.toBeVisible();
     });
 });
-
-// =============================================
-// Context Menu Tests
-// =============================================
-
-async function openTimeEntryContextMenu(page: Page, description: string) {
-    const row = page
-        .locator('[data-testid="time_entry_row"]')
-        .filter({ hasText: description })
-        .first();
-    await row.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-}
-
-test('test that context menu appears with correct items on time entry row', async ({
-    page,
-    ctx,
-}) => {
-    const description = 'Context menu items test ' + Math.floor(1 + Math.random() * 10000);
-    await createBareTimeEntryViaApi(ctx, description, '1h');
-
-    await goToTimeOverview(page);
-    await openTimeEntryContextMenu(page, description);
-
-    await expect(page.getByRole('menuitem', { name: 'Continue' })).toBeVisible();
-    await expect(page.getByRole('menuitem', { name: 'Edit' })).toBeVisible();
-    await expect(page.getByRole('menuitem', { name: 'Duplicate' })).toBeVisible();
-    await expect(page.getByRole('menuitem', { name: 'Delete' })).toBeVisible();
-});
-
-test('test that context menu edit opens the edit modal', async ({ page, ctx }) => {
-    const description = 'Context edit test ' + Math.floor(1 + Math.random() * 10000);
-    await createBareTimeEntryViaApi(ctx, description, '1h');
-
-    await goToTimeOverview(page);
-    await openTimeEntryContextMenu(page, description);
-
-    await page.getByRole('menuitem', { name: 'Edit' }).click();
-    await expect(page.getByRole('dialog')).toBeVisible();
-    await expect(page.getByRole('dialog').getByPlaceholder('What did you work on?')).toHaveValue(
-        description
-    );
-});
-
-test('test that context menu duplicate creates a copy', async ({ page, ctx }) => {
-    const description = 'Context dup test ' + Math.floor(1 + Math.random() * 10000);
-    const project = await createProjectViaApi(ctx, {
-        name: 'Dup Project ' + Math.floor(1 + Math.random() * 10000),
-        is_billable: true,
-    });
-    await createTimeEntryViaApi(ctx, {
-        description,
-        duration: '1h',
-        projectId: project.id,
-        billable: true,
-    });
-
-    await goToTimeOverview(page);
-    await openTimeEntryContextMenu(page, description);
-
-    const [createResponse] = await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/time-entries') &&
-                response.request().method() === 'POST' &&
-                response.status() === 201
-        ),
-        page.getByRole('menuitem', { name: 'Duplicate' }).click(),
-    ]);
-
-    const body = await createResponse.json();
-    expect(body.data.description).toBe(description);
-    expect(body.data.project_id).toBe(project.id);
-    expect(body.data.billable).toBe(true);
-});
-
-test('test that context menu continue starts a new time entry', async ({ page, ctx }) => {
-    const description = 'Context continue test ' + Math.floor(1 + Math.random() * 10000);
-    const project = await createProjectViaApi(ctx, {
-        name: 'Continue Project ' + Math.floor(1 + Math.random() * 10000),
-        is_billable: false,
-    });
-    await createTimeEntryViaApi(ctx, {
-        description,
-        duration: '1h',
-        projectId: project.id,
-    });
-
-    await goToTimeOverview(page);
-    await openTimeEntryContextMenu(page, description);
-
-    const [createResponse] = await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/time-entries') &&
-                response.request().method() === 'POST' &&
-                response.status() === 201
-        ),
-        page.getByRole('menuitem', { name: 'Continue' }).click(),
-    ]);
-
-    const body = await createResponse.json();
-    expect(body.data.description).toBe(description);
-    expect(body.data.project_id).toBe(project.id);
-    expect(body.data.end).toBeNull();
-});
-
-test('test that context menu delete removes the time entry', async ({ page, ctx }) => {
-    const description = 'Context delete test ' + Math.floor(1 + Math.random() * 10000);
-    await createBareTimeEntryViaApi(ctx, description, '1h');
-
-    await goToTimeOverview(page);
-    await openTimeEntryContextMenu(page, description);
-
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/time-entries') && response.request().method() === 'DELETE'
-        ),
-        page.getByRole('menuitem', { name: 'Delete' }).click(),
-    ]);
-
-    await expect(
-        page.locator('[data-testid="time_entry_row"]').filter({ hasText: description })
-    ).not.toBeVisible();
-});
-
-test('test that aggregate row context menu shows only Continue and Delete', async ({
-    page,
-    ctx,
-}) => {
-    const description = 'Context agg items ' + Math.floor(1 + Math.random() * 10000);
-    await createBareTimeEntryViaApi(ctx, description, '1h');
-    await createBareTimeEntryViaApi(ctx, description, '30min');
-
-    await goToTimeOverview(page);
-
-    const aggregateRow = page
-        .locator('[data-testid="time_entry_row"]')
-        .filter({ hasText: description })
-        .first();
-    await aggregateRow.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-
-    await expect(page.getByRole('menuitem', { name: 'Continue' })).toBeVisible();
-    await expect(page.getByRole('menuitem', { name: 'Delete' })).toBeVisible();
-    await expect(page.getByRole('menuitem', { name: 'Edit' })).not.toBeVisible();
-    await expect(page.getByRole('menuitem', { name: 'Duplicate' })).not.toBeVisible();
-});
-
-test('test that aggregate row context menu continue starts a new time entry', async ({
-    page,
-    ctx,
-}) => {
-    const description = 'Context agg continue ' + Math.floor(1 + Math.random() * 10000);
-    const project = await createProjectViaApi(ctx, {
-        name: 'Agg Continue Project ' + Math.floor(1 + Math.random() * 10000),
-        is_billable: false,
-    });
-    await createTimeEntryViaApi(ctx, {
-        description,
-        duration: '1h',
-        projectId: project.id,
-    });
-    await createTimeEntryViaApi(ctx, {
-        description,
-        duration: '30min',
-        projectId: project.id,
-    });
-
-    await goToTimeOverview(page);
-
-    const aggregateRow = page
-        .locator('[data-testid="time_entry_row"]')
-        .filter({ hasText: description })
-        .first();
-    await aggregateRow.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-
-    const [createResponse] = await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/time-entries') &&
-                response.request().method() === 'POST' &&
-                response.status() === 201
-        ),
-        page.getByRole('menuitem', { name: 'Continue' }).click(),
-    ]);
-
-    const body = await createResponse.json();
-    expect(body.data.description).toBe(description);
-    expect(body.data.project_id).toBe(project.id);
-    expect(body.data.end).toBeNull();
-});
-
-test('test that aggregate row context menu delete removes all grouped entries', async ({
-    page,
-    ctx,
-}) => {
-    const description = 'Context agg delete ' + Math.floor(1 + Math.random() * 10000);
-    await createBareTimeEntryViaApi(ctx, description, '1h');
-    await createBareTimeEntryViaApi(ctx, description, '30min');
-
-    await goToTimeOverview(page);
-
-    // The aggregate row groups entries with same description
-    const aggregateRow = page
-        .locator('[data-testid="time_entry_row"]')
-        .filter({ hasText: description })
-        .first();
-    await aggregateRow.click({ button: 'right' });
-    await expect(page.getByRole('menu')).toBeVisible();
-
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/time-entries') && response.request().method() === 'DELETE'
-        ),
-        page.getByRole('menuitem', { name: 'Delete' }).click(),
-    ]);
-
-    await expect(
-        page.locator('[data-testid="time_entry_row"]').filter({ hasText: description })
-    ).not.toBeVisible();
-});

e2e/timetracker.spec.ts

@@ -9,7 +9,7 @@ import {
 } from './utils/currentTimeEntry';
 import type { Page } from '@playwright/test';
 import { newTagResponse } from './utils/tags';
-import { createProjectViaApi, updateOrganizationCurrencyViaWeb } from './utils/api';
+import { updateOrganizationCurrencyViaWeb } from './utils/api';
 
 // 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}$/;
@@ -368,45 +368,6 @@ test('test that timer started on dashboard is visible on time page', async ({ pa
     await assertThatTimerIsStopped(page);
 });
 
-test('test that creating a new project from the time tracker dropdown prefills the search text', async ({
-    page,
-    ctx,
-}) => {
-    const existingProjectName = 'Existing Project ' + Math.floor(Math.random() * 10000);
-    const searchText = 'PrefillProject ' + Math.floor(Math.random() * 10000);
-
-    // Create a project so the dropdown renders (not the "Add new project" button)
-    await createProjectViaApi(ctx, { name: existingProjectName });
-    await goToDashboard(page);
-
-    // Open the project dropdown
-    await page.getByRole('button', { name: 'No Project' }).click();
-
-    // Type a search term that won't match any existing project
-    await page.getByTestId('client_dropdown_search').fill(searchText);
-
-    // Click "Create new Project"
-    await page.getByText('Create new Project').click();
-
-    // Verify the project name input is pre-filled with the search text
-    await expect(page.getByLabel('Project name')).toHaveValue(searchText);
-
-    // Complete project creation to verify full flow works
-    await Promise.all([
-        page.waitForResponse(
-            async (response) =>
-                response.url().includes('/projects') &&
-                response.request().method() === 'POST' &&
-                response.status() === 201 &&
-                (await response.json()).data.name === searchText
-        ),
-        page.getByRole('button', { name: 'Create Project' }).click(),
-    ]);
-
-    // The project dropdown should now show the newly created project
-    await expect(page.getByRole('button', { name: searchText })).toBeVisible();
-});
-
 test('test that adding a project and tag before starting timer works', async ({ page }) => {
     const newTagName = 'TimerTag ' + Math.floor(Math.random() * 10000);
     await goToDashboard(page);

e2e/utils/api.ts

@@ -473,25 +473,6 @@ export async function createTimeEntryWithTagViaApi(
     return { tag, entry };
 }
 
-export async function createRunningTimeEntryViaApi(ctx: TestContext, description: string) {
-    const start = new Date();
-    start.setMinutes(start.getMinutes() - 10);
-    const response = await ctx.request.post(
-        `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}/time-entries`,
-        {
-            data: {
-                member_id: ctx.memberId,
-                start: formatTimestamp(start),
-                description,
-                billable: false,
-            },
-        }
-    );
-    expect(response.status()).toBe(201);
-    const body = await response.json();
-    return body.data as { id: string; start: string; end: null; description: string };
-}
-
 export async function createBareTimeEntryViaApi(
     ctx: TestContext,
     description: string,
@@ -603,164 +584,7 @@ export async function getInvitationsViaApi(ctx: TestContext) {
     const response = await ctx.request.get(
         `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}/invitations`
     );
-
     expect(response.status()).toBe(200);
     const body = await response.json();
     return body.data as Array<{ id: string; email: string; role: string }>;
 }
-
-// ──────────────────────────────────────────────────
-// Timestamp-based time entry helpers
-// ──────────────────────────────────────────────────
-
-export async function createTimeEntryWithTimestampsViaApi(
-    ctx: TestContext,
-    data: {
-        description?: string;
-        start: string;
-        end: string;
-        projectId?: string | null;
-        taskId?: string | null;
-        tags?: string[];
-        billable?: boolean;
-    }
-) {
-    const response = await ctx.request.post(
-        `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}/time-entries`,
-        {
-            data: {
-                member_id: ctx.memberId,
-                start: data.start,
-                end: data.end,
-                description: data.description ?? '',
-                project_id: data.projectId ?? null,
-                task_id: data.taskId ?? null,
-                tags: data.tags ?? [],
-                billable: data.billable ?? false,
-            },
-        }
-    );
-    expect(response.status()).toBe(201);
-    const body = await response.json();
-    return body.data as { id: string; start: string; end: string; description: string };
-}
-
-// ──────────────────────────────────────────────────
-// User profile helpers
-// ──────────────────────────────────────────────────
-
-export async function updateUserProfileViaWeb(
-    page: Page,
-    settings: { timezone?: string; week_start?: string }
-) {
-    // Read user info from Inertia's data-page attribute on the root element
-    const userInfo = await page.evaluate(() => {
-        // Try Inertia's data-page attribute (stores initial page props as JSON)
-        const appEl = document.getElementById('app');
-        if (appEl) {
-            const dataPage = appEl.getAttribute('data-page');
-            if (dataPage) {
-                try {
-                    const parsed = JSON.parse(dataPage);
-                    const user = parsed?.props?.auth?.user;
-                    if (user) {
-                        return {
-                            name: user.name,
-                            email: user.email,
-                            timezone: user.timezone,
-                            week_start: user.week_start,
-                        };
-                    }
-                } catch {
-                    // JSON parse failed
-                }
-            }
-        }
-        return null;
-    });
-    if (!userInfo) throw new Error('Could not read user info from Inertia data-page attribute');
-
-    const cookies = await page.context().cookies();
-    const xsrfCookie = cookies.find((c) => c.name === 'XSRF-TOKEN');
-    const xsrfToken = xsrfCookie ? decodeURIComponent(xsrfCookie.value) : '';
-
-    const response = await page.request.put(`${PLAYWRIGHT_BASE_URL}/user/profile-information`, {
-        headers: {
-            'X-XSRF-TOKEN': xsrfToken,
-            'Content-Type': 'application/json',
-            Accept: 'application/json',
-        },
-        data: {
-            name: userInfo.name,
-            email: userInfo.email,
-            timezone: settings.timezone ?? userInfo.timezone,
-            week_start: settings.week_start ?? userInfo.week_start,
-        },
-    });
-    expect(response.status()).toBe(200);
-}
-
-// ──────────────────────────────────────────────────
-// Running time entry with specific start
-// ──────────────────────────────────────────────────
-
-export async function createRunningTimeEntryWithStartViaApi(
-    ctx: TestContext,
-    description: string,
-    start: string
-) {
-    const response = await ctx.request.post(
-        `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}/time-entries`,
-        {
-            data: {
-                member_id: ctx.memberId,
-                start,
-                description,
-                billable: false,
-            },
-        }
-    );
-    expect(response.status()).toBe(201);
-    const body = await response.json();
-    return body.data as { id: string; start: string; end: null; description: string };
-}
-
-// ──────────────────────────────────────────────────
-// Reports
-// ──────────────────────────────────────────────────
-
-export async function createReportViaApi(
-    ctx: TestContext,
-    data: {
-        name: string;
-        is_public?: boolean;
-        public_until?: string | null;
-    }
-) {
-    const response = await ctx.request.post(
-        `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}/reports`,
-        {
-            data: {
-                name: data.name,
-                description: '',
-                is_public: data.is_public ?? true,
-                public_until: data.public_until ?? null,
-                properties: {
-                    start: '2024-01-01T00:00:00Z',
-                    end: '2030-12-31T23:59:59Z',
-                    group: 'project',
-                    sub_group: 'project',
-                    history_group: 'day',
-                },
-            },
-        }
-    );
-    expect(response.status()).toBe(201);
-    const body = await response.json();
-    return body.data as {
-        id: string;
-        name: string;
-        is_public: boolean;
-        public_until: string | null;
-    };
-}

package-lock.json

@@ -4,7 +4,6 @@
     "requires": true,
     "packages": {
         "": {
-            "name": "solidtime",
             "workspaces": [
                 "resources/js/packages/ui",
                 "resources/js/packages/api"
@@ -12,6 +11,11 @@
             "dependencies": {
                 "@floating-ui/core": "^1.6.0",
                 "@floating-ui/vue": "^1.0.6",
+                "@fullcalendar/core": "^6.1.18",
+                "@fullcalendar/daygrid": "^6.1.18",
+                "@fullcalendar/interaction": "^6.1.18",
+                "@fullcalendar/timegrid": "^6.1.18",
+                "@fullcalendar/vue3": "^6.1.18",
                 "@heroicons/vue": "^2.1.1",
                 "@rushstack/eslint-patch": "^1.10.5",
                 "@tailwindcss/container-queries": "^0.1.1",
@@ -21,7 +25,7 @@
                 "@tanstack/vue-table": "^8.21.2",
                 "@vue/eslint-config-prettier": "^10.2.0",
                 "@vue/eslint-config-typescript": "^14.3.0",
-                "@vueuse/core": "^14.2.1",
+                "@vueuse/core": "^14.2.0",
                 "@vueuse/integrations": "^14.0.0",
                 "@zodios/core": "^10.9.6",
                 "chroma-js": "3.1.2",
@@ -34,7 +38,7 @@
                 "parse-duration": "^2.0.1",
                 "pinia": "^3.0.0",
                 "radix-vue": "^1.9.6",
-                "reka-ui": "^2.8.2",
+                "reka-ui": "^2.8.0",
                 "tailwind-merge": "^2.6.0",
                 "tailwindcss-animate": "^1.0.7",
                 "vue-echarts": "^8.0.0",
@@ -134,9 +138,9 @@
             }
         },
         "node_modules/@apidevtools/swagger-parser/node_modules/ajv": {
-            "version": "8.18.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-            "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+            "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",
             "dependencies": {
@@ -1033,6 +1037,55 @@
                 }
             }
         },
+        "node_modules/@fullcalendar/core": {
+            "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.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.20"
+            }
+        },
+        "node_modules/@fullcalendar/interaction": {
+            "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.20"
+            }
+        },
+        "node_modules/@fullcalendar/timegrid": {
+            "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.20"
+            },
+            "peerDependencies": {
+                "@fullcalendar/core": "~6.1.20"
+            }
+        },
+        "node_modules/@fullcalendar/vue3": {
+            "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.20",
+                "vue": "^3.0.11"
+            }
+        },
         "node_modules/@heroicons/vue": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/@heroicons/vue/-/vue-2.2.0.tgz",
@@ -1142,6 +1195,29 @@
                 "@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",
@@ -1207,22 +1283,22 @@
             }
         },
         "node_modules/@microsoft/api-extractor": {
-            "version": "7.57.6",
-            "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.57.6.tgz",
-            "integrity": "sha512-0rFv/D8Grzw1Mjs2+8NGUR+o4h9LVm5zKRtMeWnpdB5IMJF4TeHCL1zR5LMCIudkOvyvjbhMG5Wjs0B5nqsrRQ==",
+            "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.33.4",
+                "@microsoft/api-extractor-model": "7.32.2",
                 "@microsoft/tsdoc": "~0.16.0",
-                "@microsoft/tsdoc-config": "~0.18.1",
-                "@rushstack/node-core-library": "5.20.3",
-                "@rushstack/rig-package": "0.7.2",
-                "@rushstack/terminal": "0.22.3",
-                "@rushstack/ts-command-line": "5.3.3",
+                "@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.23",
-                "minimatch": "10.2.1",
+                "lodash": "~4.17.15",
+                "minimatch": "10.0.3",
                 "resolve": "~1.22.1",
                 "semver": "~7.5.4",
                 "source-map": "~0.6.1",
@@ -1233,38 +1309,15 @@
             }
         },
         "node_modules/@microsoft/api-extractor-model": {
-            "version": "7.33.4",
-            "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.33.4.tgz",
-            "integrity": "sha512-u1LTaNTikZAQ9uK6KG1Ms7nvNedsnODnspq/gH2dcyETWvH4hVNGNDvRAEutH66kAmxA4/necElqGNs1FggC8w==",
+            "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.1",
-                "@rushstack/node-core-library": "5.20.3"
-            }
-        },
-        "node_modules/@microsoft/api-extractor/node_modules/balanced-match": {
-            "version": "4.0.4",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
-            "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "18 || 20 || >=22"
-            }
-        },
-        "node_modules/@microsoft/api-extractor/node_modules/brace-expansion": {
-            "version": "5.0.4",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
-            "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^4.0.2"
-            },
-            "engines": {
-                "node": "18 || 20 || >=22"
+                "@microsoft/tsdoc-config": "~0.18.0",
+                "@rushstack/node-core-library": "5.19.1"
             }
         },
         "node_modules/@microsoft/api-extractor/node_modules/lru-cache": {
@@ -1281,13 +1334,13 @@
             }
         },
         "node_modules/@microsoft/api-extractor/node_modules/minimatch": {
-            "version": "10.2.1",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.1.tgz",
-            "integrity": "sha512-MClCe8IL5nRRmawL6ib/eT4oLyeKMGCghibcDWK+J0hh0Q8kqSdia6BvbRMVk6mPa6WqUa5uR2oxt6C5jd533A==",
+            "version": "10.0.3",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz",
+            "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==",
             "dev": true,
-            "license": "BlueOak-1.0.0",
+            "license": "ISC",
             "dependencies": {
-                "brace-expansion": "^5.0.2"
+                "@isaacs/brace-expansion": "^5.0.0"
             },
             "engines": {
                 "node": "20 || >=22"
@@ -1341,29 +1394,29 @@
             "license": "MIT"
         },
         "node_modules/@microsoft/tsdoc-config": {
-            "version": "0.18.1",
-            "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.18.1.tgz",
-            "integrity": "sha512-9brPoVdfN9k9g0dcWkFeA7IH9bbcttzDJlXvkf8b2OBzd5MueR1V2wkKBL0abn0otvmkHJC6aapBOTJDDeMCZg==",
+            "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.18.0",
+                "ajv": "~8.12.0",
                 "jju": "~1.4.0",
                 "resolve": "~1.22.2"
             }
         },
         "node_modules/@microsoft/tsdoc-config/node_modules/ajv": {
-            "version": "8.18.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-            "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+            "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.3",
-                "fast-uri": "^3.0.1",
+                "fast-deep-equal": "^3.1.1",
                 "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2"
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.2.2"
             },
             "funding": {
                 "type": "github",
@@ -1483,9 +1536,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.59.0.tgz",
-            "integrity": "sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==",
+            "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"
             ],
@@ -1496,9 +1549,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.59.0.tgz",
-            "integrity": "sha512-hZ+Zxj3SySm4A/DylsDKZAeVg0mvi++0PYVceVyX7hemkw7OreKdCvW2oQ3T1FMZvCaQXqOTHb8qmBShoqk69Q==",
+            "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"
             ],
@@ -1509,9 +1562,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.59.0.tgz",
-            "integrity": "sha512-W2Psnbh1J8ZJw0xKAd8zdNgF9HRLkdWwwdWqubSVk0pUuQkoHnv7rx4GiF9rT4t5DIZGAsConRE3AxCdJ4m8rg==",
+            "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"
             ],
@@ -1522,9 +1575,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.59.0.tgz",
-            "integrity": "sha512-ZW2KkwlS4lwTv7ZVsYDiARfFCnSGhzYPdiOU4IM2fDbL+QGlyAbjgSFuqNRbSthybLbIJ915UtZBtmuLrQAT/w==",
+            "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"
             ],
@@ -1535,9 +1588,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.59.0.tgz",
-            "integrity": "sha512-EsKaJ5ytAu9jI3lonzn3BgG8iRBjV4LxZexygcQbpiU0wU0ATxhNVEpXKfUa0pS05gTcSDMKpn3Sx+QB9RlTTA==",
+            "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"
             ],
@@ -1548,9 +1601,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.59.0.tgz",
-            "integrity": "sha512-d3DuZi2KzTMjImrxoHIAODUZYoUUMsuUiY4SRRcJy6NJoZ6iIqWnJu9IScV9jXysyGMVuW+KNzZvBLOcpdl3Vg==",
+            "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"
             ],
@@ -1561,9 +1614,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.59.0.tgz",
-            "integrity": "sha512-t4ONHboXi/3E0rT6OZl1pKbl2Vgxf9vJfWgmUoCEVQVxhW6Cw/c8I6hbbu7DAvgp82RKiH7TpLwxnJeKv2pbsw==",
+            "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"
             ],
@@ -1574,9 +1627,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.59.0.tgz",
-            "integrity": "sha512-CikFT7aYPA2ufMD086cVORBYGHffBo4K8MQ4uPS/ZnY54GKj36i196u8U+aDVT2LX4eSMbyHtyOh7D7Zvk2VvA==",
+            "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"
             ],
@@ -1587,9 +1640,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.59.0.tgz",
-            "integrity": "sha512-jYgUGk5aLd1nUb1CtQ8E+t5JhLc9x5WdBKew9ZgAXg7DBk0ZHErLHdXM24rfX+bKrFe+Xp5YuJo54I5HFjGDAA==",
+            "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"
             ],
@@ -1600,9 +1653,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.59.0.tgz",
-            "integrity": "sha512-peZRVEdnFWZ5Bh2KeumKG9ty7aCXzzEsHShOZEFiCQlDEepP1dpUl/SrUNXNg13UmZl+gzVDPsiCwnV1uI0RUA==",
+            "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"
             ],
@@ -1613,9 +1666,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loong64-gnu": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.59.0.tgz",
-            "integrity": "sha512-gbUSW/97f7+r4gHy3Jlup8zDG190AuodsWnNiXErp9mT90iCy9NKKU0Xwx5k8VlRAIV2uU9CsMnEFg/xXaOfXg==",
+            "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"
             ],
@@ -1626,9 +1679,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loong64-musl": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.59.0.tgz",
-            "integrity": "sha512-yTRONe79E+o0FWFijasoTjtzG9EBedFXJMl888NBEDCDV9I2wGbFFfJQQe63OijbFCUZqxpHz1GzpbtSFikJ4Q==",
+            "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"
             ],
@@ -1639,9 +1692,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.59.0.tgz",
-            "integrity": "sha512-sw1o3tfyk12k3OEpRddF68a1unZ5VCN7zoTNtSn2KndUE+ea3m3ROOKRCZxEpmT9nsGnogpFP9x6mnLTCaoLkA==",
+            "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"
             ],
@@ -1652,9 +1705,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-ppc64-musl": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.59.0.tgz",
-            "integrity": "sha512-+2kLtQ4xT3AiIxkzFVFXfsmlZiG5FXYW7ZyIIvGA7Bdeuh9Z0aN4hVyXS/G1E9bTP/vqszNIN/pUKCk/BTHsKA==",
+            "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"
             ],
@@ -1665,9 +1718,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.59.0.tgz",
-            "integrity": "sha512-NDYMpsXYJJaj+I7UdwIuHHNxXZ/b/N2hR15NyH3m2qAtb/hHPA4g4SuuvrdxetTdndfj9b1WOmy73kcPRoERUg==",
+            "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"
             ],
@@ -1678,9 +1731,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.59.0.tgz",
-            "integrity": "sha512-nLckB8WOqHIf1bhymk+oHxvM9D3tyPndZH8i8+35p/1YiVoVswPid2yLzgX7ZJP0KQvnkhM4H6QZ5m0LzbyIAg==",
+            "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"
             ],
@@ -1691,9 +1744,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.59.0.tgz",
-            "integrity": "sha512-oF87Ie3uAIvORFBpwnCvUzdeYUqi2wY6jRFWJAy1qus/udHFYIkplYRW+wo+GRUP4sKzYdmE1Y3+rY5Gc4ZO+w==",
+            "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"
             ],
@@ -1704,9 +1757,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.59.0.tgz",
-            "integrity": "sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==",
+            "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"
             ],
@@ -1717,9 +1770,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.59.0.tgz",
-            "integrity": "sha512-2UdiwS/9cTAx7qIUZB/fWtToJwvt0Vbo0zmnYt7ED35KPg13Q0ym1g442THLC7VyI6JfYTP4PiSOWyoMdV2/xg==",
+            "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"
             ],
@@ -1730,9 +1783,9 @@
             ]
         },
         "node_modules/@rollup/rollup-openbsd-x64": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.59.0.tgz",
-            "integrity": "sha512-M3bLRAVk6GOwFlPTIxVBSYKUaqfLrn8l0psKinkCFxl4lQvOSz8ZrKDz2gxcBwHFpci0B6rttydI4IpS4IS/jQ==",
+            "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"
             ],
@@ -1743,9 +1796,9 @@
             ]
         },
         "node_modules/@rollup/rollup-openharmony-arm64": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.59.0.tgz",
-            "integrity": "sha512-tt9KBJqaqp5i5HUZzoafHZX8b5Q2Fe7UjYERADll83O4fGqJ49O1FsL6LpdzVFQcpwvnyd0i+K/VSwu/o/nWlA==",
+            "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"
             ],
@@ -1756,9 +1809,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.59.0.tgz",
-            "integrity": "sha512-V5B6mG7OrGTwnxaNUzZTDTjDS7F75PO1ae6MJYdiMu60sq0CqN5CVeVsbhPxalupvTX8gXVSU9gq+Rx1/hvu6A==",
+            "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"
             ],
@@ -1769,9 +1822,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.59.0.tgz",
-            "integrity": "sha512-UKFMHPuM9R0iBegwzKF4y0C4J9u8C6MEJgFuXTBerMk7EJ92GFVFYBfOZaSGLu6COf7FxpQNqhNS4c4icUPqxA==",
+            "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"
             ],
@@ -1782,9 +1835,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-gnu": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.59.0.tgz",
-            "integrity": "sha512-laBkYlSS1n2L8fSo1thDNGrCTQMmxjYY5G0WFWjFFYZkKPjsMBsgJfGf4TLxXrF6RyhI60L8TMOjBMvXiTcxeA==",
+            "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"
             ],
@@ -1795,9 +1848,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.59.0.tgz",
-            "integrity": "sha512-2HRCml6OztYXyJXAvdDXPKcawukWY2GpR5/nxKp4iBgiO3wcoEGkAaqctIbZcNB6KlUQBIqt8VYkNSj2397EfA==",
+            "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"
             ],
@@ -1814,13 +1867,13 @@
             "license": "MIT"
         },
         "node_modules/@rushstack/node-core-library": {
-            "version": "5.20.3",
-            "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.20.3.tgz",
-            "integrity": "sha512-95JgEPq2k7tHxhF9/OJnnyHDXfC9cLhhta0An/6MlkDsX2A6dTzDrTUG18vx4vjc280V0fi0xDH9iQczpSuWsw==",
+            "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.18.0",
+                "ajv": "~8.13.0",
                 "ajv-draft-04": "~1.0.0",
                 "ajv-formats": "~3.0.1",
                 "fs-extra": "~11.3.0",
@@ -1839,16 +1892,16 @@
             }
         },
         "node_modules/@rushstack/node-core-library/node_modules/ajv": {
-            "version": "8.18.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-            "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+            "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",
-                "fast-uri": "^3.0.1",
                 "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2"
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.4.1"
             },
             "funding": {
                 "type": "github",
@@ -1929,9 +1982,9 @@
             "license": "ISC"
         },
         "node_modules/@rushstack/problem-matcher": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/@rushstack/problem-matcher/-/problem-matcher-0.2.1.tgz",
-            "integrity": "sha512-gulfhBs6n+I5b7DvjKRfhMGyUejtSgOHTclF/eONr8hcgF1APEDjhxIsfdUYYMzC3rvLwGluqLjbwCFZ8nxrog==",
+            "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": {
@@ -1944,9 +1997,9 @@
             }
         },
         "node_modules/@rushstack/rig-package": {
-            "version": "0.7.2",
-            "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.7.2.tgz",
-            "integrity": "sha512-9XbFWuqMYcHUso4mnETfhGVUSaADBRj6HUAAEYk50nMPn8WRICmBuCphycQGNB3duIR6EEZX3Xj3SYc2XiP+9A==",
+            "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": {
@@ -1955,14 +2008,14 @@
             }
         },
         "node_modules/@rushstack/terminal": {
-            "version": "0.22.3",
-            "resolved": "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.22.3.tgz",
-            "integrity": "sha512-gHC9pIMrUPzAbBiI4VZMU7Q+rsCzb8hJl36lFIulIzoceKotyKL3Rd76AZ2CryCTKEg+0bnTj406HE5YY5OQvw==",
+            "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.20.3",
-                "@rushstack/problem-matcher": "0.2.1",
+                "@rushstack/node-core-library": "5.19.1",
+                "@rushstack/problem-matcher": "0.1.1",
                 "supports-color": "~8.1.1"
             },
             "peerDependencies": {
@@ -1991,13 +2044,13 @@
             }
         },
         "node_modules/@rushstack/ts-command-line": {
-            "version": "5.3.3",
-            "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-5.3.3.tgz",
-            "integrity": "sha512-c+ltdcvC7ym+10lhwR/vWiOhsrm/bP3By2VsFcs5qTKv+6tTmxgbVrtJ5NdNjANiV5TcmOZgUN+5KYQ4llsvEw==",
+            "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.22.3",
+                "@rushstack/terminal": "0.21.0",
                 "@types/argparse": "1.0.38",
                 "argparse": "~1.0.9",
                 "string-argv": "~0.3.1"
@@ -2608,12 +2661,12 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-            "version": "9.0.9",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
-            "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+            "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.2"
+                "brace-expansion": "^2.0.1"
             },
             "engines": {
                 "node": ">=16 || 14 >=14.17"
@@ -2943,14 +2996,14 @@
             }
         },
         "node_modules/@vueuse/core": {
-            "version": "14.2.1",
-            "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-14.2.1.tgz",
-            "integrity": "sha512-3vwDzV+GDUNpdegRY6kzpLm4Igptq+GA0QkJ3W61Iv27YWwW/ufSlOfgQIpN6FZRMG0mkaz4gglJRtq5SeJyIQ==",
+            "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": "14.2.1",
-                "@vueuse/shared": "14.2.1"
+                "@vueuse/metadata": "14.2.0",
+                "@vueuse/shared": "14.2.0"
             },
             "funding": {
                 "url": "https://github.com/sponsors/antfu"
@@ -2959,18 +3012,6 @@
                 "vue": "^3.5.0"
             }
         },
-        "node_modules/@vueuse/core/node_modules/@vueuse/shared": {
-            "version": "14.2.1",
-            "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-14.2.1.tgz",
-            "integrity": "sha512-shTJncjV9JTI4oVNyF1FQonetYAiTBd+Qj7cY89SWbXSkx7gyhrgtEdF2ZAVWS1S3SHlaROO6F2IesJxQEkZBw==",
-            "license": "MIT",
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            },
-            "peerDependencies": {
-                "vue": "^3.5.0"
-            }
-        },
         "node_modules/@vueuse/integrations": {
             "version": "14.2.0",
             "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-14.2.0.tgz",
@@ -3037,24 +3078,7 @@
                 }
             }
         },
-        "node_modules/@vueuse/integrations/node_modules/@vueuse/core": {
-            "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": "14.2.0",
-                "@vueuse/shared": "14.2.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            },
-            "peerDependencies": {
-                "vue": "^3.5.0"
-            }
-        },
-        "node_modules/@vueuse/integrations/node_modules/@vueuse/metadata": {
+        "node_modules/@vueuse/metadata": {
             "version": "14.2.0",
             "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-14.2.0.tgz",
             "integrity": "sha512-i3axTGjU8b13FtyR4Keeama+43iD+BwX9C2TmzBVKqjSHArF03hjkp2SBZ1m72Jk2UtrX0aYCugBq2R1fhkuAQ==",
@@ -3063,15 +3087,6 @@
                 "url": "https://github.com/sponsors/antfu"
             }
         },
-        "node_modules/@vueuse/metadata": {
-            "version": "14.2.1",
-            "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-14.2.1.tgz",
-            "integrity": "sha512-1ButlVtj5Sb/HDtIy1HFr1VqCP4G6Ypqt5MAo0lCgjokrk2mvQKsK2uuy0vqu/Ks+sHfuHo0B9Y9jn9xKdjZsw==",
-            "license": "MIT",
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            }
-        },
         "node_modules/@vueuse/shared": {
             "version": "14.2.0",
             "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-14.2.0.tgz",
@@ -3116,9 +3131,9 @@
             }
         },
         "node_modules/ajv": {
-            "version": "6.14.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
-            "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+            "version": "6.12.6",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
             "license": "MIT",
             "dependencies": {
                 "fast-deep-equal": "^3.1.1",
@@ -3150,9 +3165,9 @@
             }
         },
         "node_modules/ajv-formats/node_modules/ajv": {
-            "version": "8.18.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-            "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+            "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",
             "dependencies": {
@@ -3282,13 +3297,13 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.13.6",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.6.tgz",
-            "integrity": "sha512-ChTCHMouEe2kn713WHbQGcuYrr6fXTBiu460OTwWrWob16g1bXn4vtz07Ope7ewMozJAnEquLk5lWQWtBig9DQ==",
+            "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.11",
-                "form-data": "^4.0.5",
+                "follow-redirects": "^1.15.6",
+                "form-data": "^4.0.4",
                 "proxy-from-env": "^1.1.0"
             }
         },
@@ -5056,9 +5071,9 @@
             }
         },
         "node_modules/minimatch": {
-            "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
             "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^1.1.7"
@@ -5831,6 +5846,16 @@
             "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
             "license": "MIT"
         },
+        "node_modules/preact": {
+            "version": "10.12.1",
+            "resolved": "https://registry.npmjs.org/preact/-/preact-10.12.1.tgz",
+            "integrity": "sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==",
+            "license": "MIT",
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/preact"
+            }
+        },
         "node_modules/prelude-ls": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -5885,9 +5910,9 @@
             }
         },
         "node_modules/qs": {
-            "version": "6.15.0",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz",
-            "integrity": "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==",
+            "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": {
@@ -6093,9 +6118,9 @@
             }
         },
         "node_modules/reka-ui": {
-            "version": "2.8.2",
-            "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.8.2.tgz",
-            "integrity": "sha512-8lTKcJhmG+D3UyJxhBnNnW/720sLzm0pbA9AC1MWazmJ5YchJAyTSl+O00xP/kxBmEN0fw5JqWVHguiFmsGjzA==",
+            "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",
@@ -6109,10 +6134,6 @@
                 "defu": "^6.1.4",
                 "ohash": "^2.0.11"
             },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/zernonia"
-            },
             "peerDependencies": {
                 "vue": ">= 3.2.0"
             }
@@ -6179,9 +6200,9 @@
             "license": "MIT"
         },
         "node_modules/rollup": {
-            "version": "4.59.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz",
-            "integrity": "sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==",
+            "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.8"
@@ -6194,31 +6215,31 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.59.0",
-                "@rollup/rollup-android-arm64": "4.59.0",
-                "@rollup/rollup-darwin-arm64": "4.59.0",
-                "@rollup/rollup-darwin-x64": "4.59.0",
-                "@rollup/rollup-freebsd-arm64": "4.59.0",
-                "@rollup/rollup-freebsd-x64": "4.59.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.59.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.59.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.59.0",
-                "@rollup/rollup-linux-arm64-musl": "4.59.0",
-                "@rollup/rollup-linux-loong64-gnu": "4.59.0",
-                "@rollup/rollup-linux-loong64-musl": "4.59.0",
-                "@rollup/rollup-linux-ppc64-gnu": "4.59.0",
-                "@rollup/rollup-linux-ppc64-musl": "4.59.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.59.0",
-                "@rollup/rollup-linux-riscv64-musl": "4.59.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.59.0",
-                "@rollup/rollup-linux-x64-gnu": "4.59.0",
-                "@rollup/rollup-linux-x64-musl": "4.59.0",
-                "@rollup/rollup-openbsd-x64": "4.59.0",
-                "@rollup/rollup-openharmony-arm64": "4.59.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.59.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.59.0",
-                "@rollup/rollup-win32-x64-gnu": "4.59.0",
-                "@rollup/rollup-win32-x64-msvc": "4.59.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"
             }
         },
@@ -7128,13 +7149,13 @@
             }
         },
         "node_modules/vite-plugin-dts/node_modules/minimatch": {
-            "version": "9.0.9",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
-            "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+            "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.2"
+                "brace-expansion": "^2.0.1"
             },
             "engines": {
                 "node": ">=16 || 14 >=14.17"
@@ -7413,29 +7434,20 @@
         },
         "resources/js/packages/ui": {
             "name": "@solidtime/ui",
-            "version": "0.0.17",
+            "version": "0.0.15",
             "license": "AGPL-3.0",
             "devDependencies": {
-                "@types/chroma-js": "^3.1.0",
-                "@zodios/core": "^10.9.6",
-                "vite-plugin-dts": "^4.0.3",
-                "zod": "^3.23.8"
+                "vite-plugin-dts": "^4.0.3"
             },
             "peerDependencies": {
                 "@floating-ui/vue": "^1.1.4",
                 "@heroicons/vue": "^2.1.5",
-                "@internationalized/date": "^3.0.0",
                 "@vitejs/plugin-vue": "^5.1.2 || ^6.0.0",
                 "@vueuse/core": "^12.5.0 || ^14.0.0",
-                "@vueuse/integrations": "^12.5.0 || ^14.0.0",
-                "chroma-js": "^3.1.0",
                 "class-variance-authority": "^0.7.1",
                 "clsx": "^2.1.1",
                 "dayjs": "^1.11.13",
-                "focus-trap": "^7.0.0 || ^8.0.0",
-                "lucide-vue-next": ">=0.453.0",
                 "parse-duration": "^2.0.1",
-                "radix-vue": "^1.9.0",
                 "reka-ui": "^2.2.0",
                 "tailwind-merge": "^2.5.2",
                 "tailwindcss": "^3.1.0",

package.json

@@ -1,5 +1,4 @@
 {
-    "name": "solidtime",
     "private": true,
     "type": "module",
     "workspaces": [
@@ -46,6 +45,11 @@
     "dependencies": {
         "@floating-ui/core": "^1.6.0",
         "@floating-ui/vue": "^1.0.6",
+        "@fullcalendar/core": "^6.1.18",
+        "@fullcalendar/daygrid": "^6.1.18",
+        "@fullcalendar/interaction": "^6.1.18",
+        "@fullcalendar/timegrid": "^6.1.18",
+        "@fullcalendar/vue3": "^6.1.18",
         "@heroicons/vue": "^2.1.1",
         "@rushstack/eslint-patch": "^1.10.5",
         "@tailwindcss/container-queries": "^0.1.1",
@@ -55,7 +59,7 @@
         "@tanstack/vue-table": "^8.21.2",
         "@vue/eslint-config-prettier": "^10.2.0",
         "@vue/eslint-config-typescript": "^14.3.0",
-        "@vueuse/core": "^14.2.1",
+        "@vueuse/core": "^14.2.0",
         "@vueuse/integrations": "^14.0.0",
         "@zodios/core": "^10.9.6",
         "chroma-js": "3.1.2",
@@ -68,7 +72,7 @@
         "parse-duration": "^2.0.1",
         "pinia": "^3.0.0",
         "radix-vue": "^1.9.6",
-        "reka-ui": "^2.8.2",
+        "reka-ui": "^2.8.0",
         "tailwind-merge": "^2.6.0",
         "tailwindcss-animate": "^1.0.7",
         "vue-echarts": "^8.0.0",

resources/js/Components/CommandPalette/CommandPaletteProvider.vue

@@ -9,8 +9,6 @@ import { useTagsStore } from '@/utils/useTags';
 import { useTimeEntriesMutations } from '@/utils/useTimeEntriesMutations';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
-import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
-import { getCurrentOrganizationId } from '@/utils/useUser';
 import { canCreateProjects } from '@/utils/permissions';
 import type {
     CreateClientBody,
@@ -39,8 +37,6 @@ import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
 import DialogModal from '@/packages/ui/src/DialogModal.vue';
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
 
-const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
-
 const {
     isOpen,
     searchTerm,
@@ -166,7 +162,6 @@ const firstProjectId = computed(() => projects.value[0]?.id ?? '');
         :create-client="createClient"
         :clients="activeClients"
         :currency="getOrganizationCurrencyString()"
-        :organization-billable-rate="organization?.billable_rate ?? null"
         :enable-estimated-time="isAllowedToPerformPremiumAction()" />
 
     <!-- Client Create Modal -->
@@ -197,8 +192,7 @@ const firstProjectId = computed(() => projects.value[0]?.id ?? '');
         :clients="activeClients"
         :currency="getOrganizationCurrencyString()"
         :enable-estimated-time="isAllowedToPerformPremiumAction()"
-        :can-create-project="canCreateProjects()"
-        :organization-billable-rate="organization?.billable_rate ?? null" />
+        :can-create-project="canCreateProjects()" />
 
     <!-- Project Selector Dialog for Active Timer -->
     <DialogModal :show="showProjectSelector" closeable @close="showProjectSelector = false">
@@ -216,7 +210,6 @@ const firstProjectId = computed(() => projects.value[0]?.id ?? '');
                 :can-create-project="canCreateProjects()"
                 :currency="getOrganizationCurrencyString()"
                 :enable-estimated-time="isAllowedToPerformPremiumAction()"
-                :organization-billable-rate="organization?.billable_rate ?? null"
                 class="w-full" />
         </template>
         <template #footer>
@@ -241,7 +234,6 @@ const firstProjectId = computed(() => projects.value[0]?.id ?? '');
                 :can-create-project="canCreateProjects()"
                 :currency="getOrganizationCurrencyString()"
                 :enable-estimated-time="isAllowedToPerformPremiumAction()"
-                :organization-billable-rate="organization?.billable_rate ?? null"
                 class="w-full" />
         </template>
         <template #footer>

resources/js/Components/Common/Client/ClientMoreOptionsDropdown.vue

@@ -7,7 +7,7 @@ import {
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger,
-} from '@/packages/ui/src';
+} from '@/Components/ui/dropdown-menu';
 
 const emit = defineEmits<{
     delete: [];

resources/js/Components/Common/Client/ClientTableRow.vue

@@ -2,24 +2,11 @@
 import type { Client } from '@/packages/api/src';
 import { computed, ref } from 'vue';
 import { CheckCircleIcon, ArchiveBoxIcon } from '@heroicons/vue/24/outline';
-import {
-    PencilSquareIcon,
-    ArchiveBoxIcon as ArchiveBoxIconSolid,
-    TrashIcon,
-} from '@heroicons/vue/20/solid';
 import { useClientsStore } from '@/utils/useClients';
 import ClientMoreOptionsDropdown from '@/Components/Common/Client/ClientMoreOptionsDropdown.vue';
 import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import TableRow from '@/Components/TableRow.vue';
 import ClientEditModal from '@/Components/Common/Client/ClientEditModal.vue';
-import { canUpdateClients, canDeleteClients } from '@/utils/permissions';
-import {
-    ContextMenu,
-    ContextMenuContent,
-    ContextMenuItem,
-    ContextMenuSeparator,
-    ContextMenuTrigger,
-} from '@/packages/ui/src';
 
 const { projects } = useProjectsQuery();
 
@@ -46,63 +33,38 @@ const showEditModal = ref(false);
 </script>
 
 <template>
-    <ContextMenu>
-        <ContextMenuTrigger as-child>
-            <TableRow>
-                <ClientEditModal v-model:show="showEditModal" :client="client"></ClientEditModal>
-                <div
-                    class="whitespace-nowrap flex items-center space-x-5 py-4 pr-3 text-sm font-medium text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
-                    <span>
-                        {{ client.name }}
-                    </span>
-                </div>
-                <div
-                    class="whitespace-nowrap flex items-center px-3 py-4 text-sm text-text-primary">
-                    <span> {{ projectCount }} Projects </span>
-                </div>
-                <div
-                    class="whitespace-nowrap px-3 py-4 text-sm text-text-primary flex space-x-1.5 items-center">
-                    <template v-if="client.is_archived">
-                        <ArchiveBoxIcon class="w-4 text-icon-default"></ArchiveBoxIcon>
-                        <span>Archived</span>
-                    </template>
-                    <template v-else>
-                        <CheckCircleIcon class="w-4 text-icon-default"></CheckCircleIcon>
-                        <span>Active</span>
-                    </template>
-                </div>
-                <div
-                    class="relative whitespace-nowrap flex items-center pl-3 text-right text-sm font-medium sm:pr-0 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
-                    <ClientMoreOptionsDropdown
-                        :client="client"
-                        @edit="showEditModal = true"
-                        @archive="archiveClient"
-                        @delete="deleteClient"></ClientMoreOptionsDropdown>
-                </div>
-            </TableRow>
-        </ContextMenuTrigger>
-        <ContextMenuContent class="min-w-[160px]">
-            <ContextMenuItem
-                v-if="canUpdateClients()"
-                class="space-x-3"
-                @select="showEditModal = true">
-                <PencilSquareIcon class="w-4 h-4 text-icon-default" />
-                <span>Edit</span>
-            </ContextMenuItem>
-            <ContextMenuItem v-if="canUpdateClients()" class="space-x-3" @select="archiveClient()">
-                <ArchiveBoxIconSolid class="w-4 h-4 text-icon-default" />
-                <span>{{ client.is_archived ? 'Unarchive' : 'Archive' }}</span>
-            </ContextMenuItem>
-            <ContextMenuSeparator v-if="canDeleteClients()" />
-            <ContextMenuItem
-                v-if="canDeleteClients()"
-                class="space-x-3 text-destructive"
-                @select="deleteClient()">
-                <TrashIcon class="w-4 h-4 text-icon-default" />
-                <span>Delete</span>
-            </ContextMenuItem>
-        </ContextMenuContent>
-    </ContextMenu>
+    <TableRow>
+        <ClientEditModal v-model:show="showEditModal" :client="client"></ClientEditModal>
+        <div
+            class="whitespace-nowrap flex items-center space-x-5 py-4 pr-3 text-sm font-medium text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            <span>
+                {{ client.name }}
+            </span>
+        </div>
+        <div
+            class="whitespace-nowrap flex items-center px-3 py-4 text-sm font-medium text-text-primary">
+            <span class="text-text-secondary"> {{ projectCount }} Projects </span>
+        </div>
+        <div
+            class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary flex space-x-1.5 items-center font-medium">
+            <template v-if="client.is_archived">
+                <ArchiveBoxIcon class="w-4 text-icon-default"></ArchiveBoxIcon>
+                <span>Archived</span>
+            </template>
+            <template v-else>
+                <CheckCircleIcon class="w-4 text-icon-default"></CheckCircleIcon>
+                <span>Active</span>
+            </template>
+        </div>
+        <div
+            class="relative whitespace-nowrap flex items-center pl-3 text-right text-sm font-medium sm:pr-0 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
+            <ClientMoreOptionsDropdown
+                :client="client"
+                @edit="showEditModal = true"
+                @archive="archiveClient"
+                @delete="deleteClient"></ClientMoreOptionsDropdown>
+        </div>
+    </TableRow>
 </template>
 
 <style scoped></style>

resources/js/Components/Common/Invitation/InvitationMoreOptionsDropdown.vue

@@ -5,7 +5,7 @@ import {
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger,
-} from '@/packages/ui/src';
+} from '@/Components/ui/dropdown-menu';
 
 const emit = defineEmits<{
     delete: [];

resources/js/Components/Common/Member/MemberBillableSelect.vue

@@ -1,5 +1,11 @@
 <script setup lang="ts">
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
 import type { BillableKey } from '@/types/projects';
 
 const model = defineModel<BillableKey>({

resources/js/Components/Common/Member/MemberEditModal.vue

@@ -7,7 +7,13 @@ import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
 import { type MemberBillableKey, useMembersStore } from '@/utils/useMembers';
 import BillableRateInput from '@/packages/ui/src/Input/BillableRateInput.vue';
 import { Field, FieldLabel, FieldDescription } from '@/packages/ui/src/field';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
 import {
     Tooltip,
     TooltipContent,

resources/js/Components/Common/Member/MemberMoreOptionsDropdown.vue

@@ -17,7 +17,7 @@ import {
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger,
-} from '@/packages/ui/src';
+} from '@/Components/ui/dropdown-menu';
 
 const emit = defineEmits<{
     delete: [];

resources/js/Components/Common/Member/MemberRoleSelect.vue

@@ -1,5 +1,11 @@
 <script setup lang="ts">
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
 import type { Role } from '@/types/jetstream';
 import { usePage } from '@inertiajs/vue3';
 

resources/js/Components/Common/Member/MemberTableRow.vue

@@ -2,24 +2,12 @@
 import type { Member, Organization } from '@/packages/api/src';
 import { api } from '@/packages/api/src';
 import { CheckCircleIcon, UserCircleIcon } from '@heroicons/vue/24/outline';
-import {
-    PencilSquareIcon,
-    TrashIcon,
-    ArrowDownOnSquareStackIcon,
-    UserCircleIcon as UserCircleIconSolid,
-} from '@heroicons/vue/20/solid';
 import MemberMoreOptionsDropdown from '@/Components/Common/Member/MemberMoreOptionsDropdown.vue';
 import TableRow from '@/Components/TableRow.vue';
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { useNotificationsStore } from '@/utils/notification';
-import {
-    canInvitePlaceholderMembers,
-    canUpdateMembers,
-    canDeleteMembers,
-    canMergeMembers,
-    canMakeMembersPlaceholders,
-} from '@/utils/permissions';
+import { canInvitePlaceholderMembers } from '@/utils/permissions';
 import { computed, type ComputedRef, inject, ref } from 'vue';
 import MemberEditModal from '@/Components/Common/Member/MemberEditModal.vue';
 import MemberMergeModal from '@/Components/Common/Member/MemberMergeModal.vue';
@@ -27,13 +15,6 @@ 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 {
-    ContextMenu,
-    ContextMenuContent,
-    ContextMenuItem,
-    ContextMenuSeparator,
-    ContextMenuTrigger,
-} from '@/packages/ui/src';
 
 const props = defineProps<{
     member: Member;
@@ -74,113 +55,73 @@ const userHasValidMailAddress = computed(() => {
 </script>
 
 <template>
-    <ContextMenu>
-        <ContextMenuTrigger as-child>
-            <TableRow>
-                <div
-                    class="whitespace-nowrap flex items-center space-x-5 py-4 pr-3 text-sm font-medium text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
-                    <span>
-                        {{ member.name }}
-                    </span>
-                </div>
-                <div class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
-                    {{ member.email }}
-                </div>
-                <div class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
-                    {{ capitalizeFirstLetter(member.role) }}
-                </div>
-                <div class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
-                    <span v-if="member.billable_rate">
-                        {{
-                            formatCents(
-                                member.billable_rate,
-                                organization?.currency,
-                                organization?.currency_format,
-                                organization?.currency_symbol,
-                                organization?.number_format
-                            )
-                        }}
-                    </span>
-                    <span v-else class="text-text-tertiary"> -- </span>
-                </div>
-                <div
-                    class="whitespace-nowrap px-3 py-4 text-sm text-text-primary flex space-x-1.5 items-center">
-                    <template v-if="member.is_placeholder === false">
-                        <CheckCircleIcon class="w-4 text-icon-default"></CheckCircleIcon>
-                        <span>Active</span>
-                    </template>
-                    <template v-else>
-                        <UserCircleIcon class="w-4 text-icon-default"></UserCircleIcon>
-                        <span>Inactive</span>
-                    </template>
-                </div>
-                <div
-                    class="relative whitespace-nowrap flex items-center pl-3 text-right text-sm font-medium sm:pr-0 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
-                    <SecondaryButton
-                        v-if="
-                            member.is_placeholder === true &&
-                            canInvitePlaceholderMembers() &&
-                            userHasValidMailAddress
-                        "
-                        size="small"
-                        @click="invitePlaceholder(member.id)"
-                        >Invite
-                    </SecondaryButton>
-                    <MemberMoreOptionsDropdown
-                        :member="member"
-                        @edit="showEditMemberModal = true"
-                        @delete="removeMember"
-                        @merge="showMergeMemberModal = true"
-                        @make-placeholder="
-                            showMakeMemberPlaceholderModal = true
-                        "></MemberMoreOptionsDropdown>
-                </div>
-                <MemberEditModal
-                    v-model:show="showEditMemberModal"
-                    :member="member"></MemberEditModal>
-                <MemberMergeModal
-                    v-model:show="showMergeMemberModal"
-                    :member="member"></MemberMergeModal>
-                <MemberMakePlaceholderModal
-                    v-model:show="showMakeMemberPlaceholderModal"
-                    :member="member"></MemberMakePlaceholderModal>
-                <MemberDeleteModal
-                    v-model:show="showDeleteMemberModal"
-                    :member="member"></MemberDeleteModal>
-            </TableRow>
-        </ContextMenuTrigger>
-        <ContextMenuContent class="min-w-[160px]">
-            <ContextMenuItem
-                v-if="canUpdateMembers()"
-                class="space-x-3"
-                @select="showEditMemberModal = true">
-                <PencilSquareIcon class="w-4 h-4 text-icon-default" />
-                <span>Edit</span>
-            </ContextMenuItem>
-            <ContextMenuItem
-                v-if="member.role === 'placeholder' && canMergeMembers()"
-                class="space-x-3"
-                @select="showMergeMemberModal = true">
-                <ArrowDownOnSquareStackIcon class="w-4 h-4 text-icon-default" />
-                <span>Merge</span>
-            </ContextMenuItem>
-            <ContextMenuItem
-                v-if="member.role !== 'placeholder' && canMakeMembersPlaceholders()"
-                class="space-x-3"
-                @select="showMakeMemberPlaceholderModal = true">
-                <UserCircleIconSolid class="w-4 h-4 text-icon-default" />
-                <span>Deactivate</span>
-            </ContextMenuItem>
-            <ContextMenuSeparator v-if="canDeleteMembers()" />
-            <ContextMenuItem
-                v-if="canDeleteMembers()"
-                class="space-x-3 text-destructive"
-                @select="showDeleteMemberModal = true">
-                <TrashIcon class="w-4 h-4 text-icon-default" />
-                <span>Delete</span>
-            </ContextMenuItem>
-        </ContextMenuContent>
-    </ContextMenu>
+    <TableRow>
+        <div
+            class="whitespace-nowrap flex items-center space-x-5 py-4 pr-3 text-sm font-medium text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            <span>
+                {{ member.name }}
+            </span>
+        </div>
+        <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
+            {{ member.email }}
+        </div>
+        <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
+            {{ capitalizeFirstLetter(member.role) }}
+        </div>
+        <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
+            {{
+                member.billable_rate
+                    ? formatCents(
+                          member.billable_rate,
+                          organization?.currency,
+                          organization?.currency_format,
+                          organization?.currency_symbol,
+                          organization?.number_format
+                      )
+                    : '--'
+            }}
+        </div>
+        <div
+            class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary flex space-x-1.5 items-center font-medium">
+            <template v-if="member.is_placeholder === false">
+                <CheckCircleIcon class="w-4 text-icon-default"></CheckCircleIcon>
+                <span>Active</span>
+            </template>
+            <template v-else>
+                <UserCircleIcon class="w-4 text-icon-default"></UserCircleIcon>
+                <span>Inactive</span>
+            </template>
+        </div>
+        <div
+            class="relative whitespace-nowrap flex items-center pl-3 text-right text-sm font-medium sm:pr-0 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
+            <SecondaryButton
+                v-if="
+                    member.is_placeholder === true &&
+                    canInvitePlaceholderMembers() &&
+                    userHasValidMailAddress
+                "
+                size="small"
+                @click="invitePlaceholder(member.id)"
+                >Invite
+            </SecondaryButton>
+            <MemberMoreOptionsDropdown
+                :member="member"
+                @edit="showEditMemberModal = true"
+                @delete="removeMember"
+                @merge="showMergeMemberModal = true"
+                @make-placeholder="
+                    showMakeMemberPlaceholderModal = true
+                "></MemberMoreOptionsDropdown>
+        </div>
+        <MemberEditModal v-model:show="showEditMemberModal" :member="member"></MemberEditModal>
+        <MemberMergeModal v-model:show="showMergeMemberModal" :member="member"></MemberMergeModal>
+        <MemberMakePlaceholderModal
+            v-model:show="showMakeMemberPlaceholderModal"
+            :member="member"></MemberMakePlaceholderModal>
+        <MemberDeleteModal
+            v-model:show="showDeleteMemberModal"
+            :member="member"></MemberDeleteModal>
+    </TableRow>
 </template>
 
 <style scoped></style>

resources/js/Components/Common/Project/BaseFilterBadge.vue

@@ -1,7 +1,11 @@
 <script setup lang="ts">
 import { XMarkIcon, ChevronDownIcon } from '@heroicons/vue/16/solid';
 import type { Component } from 'vue';
-import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from '@/packages/ui/src';
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuTrigger,
+} from '@/Components/ui/dropdown-menu';
 
 defineProps<{
     icon: Component;

resources/js/Components/Common/Project/ProjectClientFilterBadge.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import { UserGroupIcon } from '@heroicons/vue/16/solid';
-import { DropdownMenuCheckboxItem, DropdownMenuSeparator } from '@/packages/ui/src';
+import { DropdownMenuCheckboxItem, DropdownMenuSeparator } from '@/Components/ui/dropdown-menu';
 import BaseFilterBadge from './BaseFilterBadge.vue';
 import type { Client } from '@/packages/api/src';
 import { NO_CLIENT_ID } from './constants';

resources/js/Components/Common/Project/ProjectDropdown.vue

@@ -20,10 +20,7 @@ import { useClientsQuery } from '@/utils/useClientsQuery';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import { canCreateProjects } from '@/utils/permissions';
-import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
-import { getCurrentOrganizationId } from '@/utils/useUser';
 
-const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
 const searchValue = ref('');
 const searchInput = ref<HTMLElement | null>(null);
 const model = defineModel<string | null>({
@@ -159,7 +156,6 @@ function updateValue(project: Project) {
         :create-client="handleCreateClient"
         :clients="activeClients"
         :currency="getOrganizationCurrencyString()"
-        :organization-billable-rate="organization?.billable_rate ?? null"
         :enable-estimated-time="isAllowedToPerformPremiumAction()" />
 </template>
 

resources/js/Components/Common/Project/ProjectEditModal.vue

@@ -20,12 +20,9 @@ import ProjectBillableRateModal from '@/packages/ui/src/Project/ProjectBillableR
 import { getOrganizationCurrencyString } from '@/utils/money';
 import ProjectEditBillableSection from '@/packages/ui/src/Project/ProjectEditBillableSection.vue';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
-import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
-import { getCurrentOrganizationId } from '@/utils/useUser';
 
 const { updateProject } = useProjectsStore();
 const { clients } = useClientsQuery();
-const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
 const show = defineModel('show', { default: false });
 const saving = ref(false);
 const showBillableRateModal = ref(false);
@@ -120,7 +117,6 @@ async function submitBillableRate() {
                     v-model:is-billable="project.is_billable"
                     v-model:billable-rate="project.billable_rate"
                     :currency="getOrganizationCurrencyString()"
-                    :organization-billable-rate="organization?.billable_rate ?? null"
                     @submit="submit"></ProjectEditBillableSection>
                 <EstimatedTimeSection
                     v-if="isAllowedToPerformPremiumAction()"

resources/js/Components/Common/Project/ProjectMoreOptionsDropdown.vue

@@ -7,7 +7,7 @@ import {
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger,
-} from '@/packages/ui/src';
+} from '@/Components/ui/dropdown-menu';
 
 const emit = defineEmits<{
     delete: [];

resources/js/Components/Common/Project/ProjectStatusFilterBadge.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import { CircleStackIcon } from '@heroicons/vue/16/solid';
-import { DropdownMenuItem } from '@/packages/ui/src';
+import { DropdownMenuItem } from '@/Components/ui/dropdown-menu';
 import BaseFilterBadge from './BaseFilterBadge.vue';
 
 type StatusValue = 'active' | 'archived' | 'all';

resources/js/Components/Common/Project/ProjectTable.vue

@@ -22,8 +22,6 @@ import { useClientsStore } from '@/utils/useClients';
 import { useClientsQuery } from '@/utils/useClientsQuery';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
-import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
-import { getCurrentOrganizationId } from '@/utils/useUser';
 import {
     useVueTable,
     getCoreRowModel,
@@ -31,8 +29,6 @@ import {
     type SortingState,
 } from '@tanstack/vue-table';
 
-const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
-
 const props = defineProps<{
     projects: Project[];
     showBillableRate: boolean;
@@ -159,7 +155,6 @@ const gridTemplate = computed(() => {
         :create-project
         :create-client
         :currency="getOrganizationCurrencyString()"
-        :organization-billable-rate="organization?.billable_rate ?? null"
         :clients="clients"
         :enable-estimated-time="isAllowedToPerformPremiumAction()"></ProjectCreateModal>
     <div class="flow-root max-w-[100vw] overflow-x-auto">

resources/js/Components/Common/Project/ProjectTableRow.vue

@@ -3,11 +3,6 @@ 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 {
-    PencilSquareIcon,
-    ArchiveBoxIcon as ArchiveBoxIconSolid,
-    TrashIcon,
-} from '@heroicons/vue/20/solid';
 import { useClientsQuery } from '@/utils/useClientsQuery';
 import { useTasksQuery } from '@/utils/useTasksQuery';
 import { useProjectsStore } from '@/utils/useProjects';
@@ -19,15 +14,7 @@ import EstimatedTimeProgress from '@/packages/ui/src/EstimatedTimeProgress.vue';
 import UpgradeBadge from '@/Components/Common/UpgradeBadge.vue';
 import { formatHumanReadableDuration } from '../../../packages/ui/src/utils/time';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
-import { canUpdateProjects, canDeleteProjects } from '@/utils/permissions';
 import type { Organization } from '@/packages/api/src';
-import {
-    ContextMenu,
-    ContextMenuContent,
-    ContextMenuItem,
-    ContextMenuSeparator,
-    ContextMenuTrigger,
-} from '@/packages/ui/src';
 
 const { clients } = useClientsQuery();
 const { tasks } = useTasksQuery();
@@ -72,7 +59,7 @@ const billableRateInfo = computed(() => {
             return 'Default Rate';
         }
     }
-    return null;
+    return '--';
 });
 
 const showEditProjectModal = ref(false);
@@ -82,100 +69,71 @@ const showEditProjectModal = ref(false);
     <ProjectEditModal
         v-model:show="showEditProjectModal"
         :original-project="project"></ProjectEditModal>
-    <ContextMenu>
-        <ContextMenuTrigger as-child>
-            <TableRow :href="route('projects.show', { project: project.id })">
-                <div
-                    class="whitespace-nowrap min-w-0 flex items-center space-x-5 3xl:pl-12 py-4 pr-3 text-sm font-medium text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
-                    <div
-                        :style="{
-                            backgroundColor: project.color,
-                            boxShadow: `var(--tw-ring-inset) 0 0 0 calc(4px + var(--tw-ring-offset-width)) ${project.color}30`,
-                        }"
-                        class="w-3 h-3 rounded-full"></div>
-                    <span class="overflow-ellipsis overflow-hidden">
-                        {{ project.name }}
-                    </span>
-                    <span class="text-text-secondary"> {{ projectTasksCount }} Tasks </span>
-                </div>
-                <div class="whitespace-nowrap min-w-0 px-3 py-4 text-sm text-text-primary">
-                    <div v-if="project.client_id" class="overflow-ellipsis overflow-hidden">
-                        {{ client?.name }}
-                    </div>
-                    <div v-else class="text-text-tertiary">No client</div>
-                </div>
-                <div class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
-                    <div v-if="project.spent_time">
-                        {{
-                            formatHumanReadableDuration(
-                                project.spent_time,
-                                organization?.interval_format,
-                                organization?.number_format
-                            )
-                        }}
-                    </div>
-                    <div v-else class="text-text-tertiary">--</div>
-                </div>
-                <div class="whitespace-nowrap px-3 flex items-center text-sm text-text-primary">
-                    <UpgradeBadge v-if="!isAllowedToPerformPremiumAction()"></UpgradeBadge>
-                    <EstimatedTimeProgress
-                        v-else-if="project.estimated_time"
-                        :estimated="project.estimated_time"
-                        :current="project.spent_time"></EstimatedTimeProgress>
-                    <span v-else class="text-text-tertiary"> -- </span>
-                </div>
-                <div
-                    v-if="showBillableRate"
-                    class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
-                    <span v-if="billableRateInfo">{{ billableRateInfo }}</span>
-                    <span v-else class="text-text-tertiary">--</span>
-                </div>
-                <div
-                    class="whitespace-nowrap px-3 py-4 text-sm text-text-primary flex space-x-1.5 items-center font-medium">
-                    <template v-if="project.is_archived">
-                        <ArchiveBoxIcon class="w-4 text-icon-default"></ArchiveBoxIcon>
-                        <span>Archived</span>
-                    </template>
-                    <template v-else>
-                        <CheckCircleIcon class="w-4 text-icon-default"></CheckCircleIcon>
-                        <span>Active</span>
-                    </template>
-                </div>
-                <div
-                    class="relative whitespace-nowrap flex items-center pl-3 text-right text-sm font-medium pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
-                    <ProjectMoreOptionsDropdown
-                        :project="project"
-                        @edit="showEditProjectModal = true"
-                        @archive="archiveProject"
-                        @delete="deleteProject"></ProjectMoreOptionsDropdown>
-                </div>
-            </TableRow>
-        </ContextMenuTrigger>
-        <ContextMenuContent class="min-w-[160px]">
-            <ContextMenuItem
-                v-if="canUpdateProjects()"
-                class="space-x-3"
-                @select="showEditProjectModal = true">
-                <PencilSquareIcon class="w-4 h-4 text-icon-default" />
-                <span>Edit</span>
-            </ContextMenuItem>
-            <ContextMenuItem
-                v-if="canUpdateProjects()"
-                class="space-x-3"
-                @select="archiveProject()">
-                <ArchiveBoxIconSolid class="w-4 h-4 text-icon-default" />
-                <span>{{ project.is_archived ? 'Unarchive' : 'Archive' }}</span>
-            </ContextMenuItem>
-            <ContextMenuSeparator v-if="canDeleteProjects()" />
-            <ContextMenuItem
-                v-if="canDeleteProjects()"
-                class="space-x-3 text-destructive"
-                @select="deleteProject()">
-                <TrashIcon class="w-4 h-4 text-icon-default" />
-                <span>Delete</span>
-            </ContextMenuItem>
-        </ContextMenuContent>
-    </ContextMenu>
+    <TableRow :href="route('projects.show', { project: project.id })">
+        <div
+            class="whitespace-nowrap min-w-0 flex items-center space-x-5 3xl:pl-12 py-4 pr-3 text-sm font-medium text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            <div
+                :style="{
+                    backgroundColor: project.color,
+                    boxShadow: `var(--tw-ring-inset) 0 0 0 calc(4px + var(--tw-ring-offset-width)) ${project.color}30`,
+                }"
+                class="w-3 h-3 rounded-full"></div>
+            <span class="overflow-ellipsis overflow-hidden">
+                {{ project.name }}
+            </span>
+            <span class="text-text-secondary"> {{ projectTasksCount }} Tasks </span>
+        </div>
+        <div class="whitespace-nowrap min-w-0 px-3 py-4 text-sm text-text-secondary">
+            <div v-if="project.client_id" class="overflow-ellipsis overflow-hidden">
+                {{ client?.name }}
+            </div>
+            <div v-else>No client</div>
+        </div>
+        <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
+            <div v-if="project.spent_time">
+                {{
+                    formatHumanReadableDuration(
+                        project.spent_time,
+                        organization?.interval_format,
+                        organization?.number_format
+                    )
+                }}
+            </div>
+            <div v-else>--</div>
+        </div>
+        <div class="whitespace-nowrap px-3 flex items-center text-sm text-text-secondary">
+            <UpgradeBadge v-if="!isAllowedToPerformPremiumAction()"></UpgradeBadge>
+            <EstimatedTimeProgress
+                v-else-if="project.estimated_time"
+                :estimated="project.estimated_time"
+                :current="project.spent_time"></EstimatedTimeProgress>
+            <span v-else> -- </span>
+        </div>
+        <div
+            v-if="showBillableRate"
+            class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
+            {{ billableRateInfo }}
+        </div>
+        <div
+            class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary flex space-x-1.5 items-center font-medium">
+            <template v-if="project.is_archived">
+                <ArchiveBoxIcon class="w-4 text-icon-default"></ArchiveBoxIcon>
+                <span>Archived</span>
+            </template>
+            <template v-else>
+                <CheckCircleIcon class="w-4 text-icon-default"></CheckCircleIcon>
+                <span>Active</span>
+            </template>
+        </div>
+        <div
+            class="relative whitespace-nowrap flex items-center pl-3 text-right text-sm font-medium pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
+            <ProjectMoreOptionsDropdown
+                :project="project"
+                @edit="showEditProjectModal = true"
+                @archive="archiveProject"
+                @delete="deleteProject"></ProjectMoreOptionsDropdown>
+        </div>
+    </TableRow>
 </template>
 
 <style scoped></style>

resources/js/Components/Common/Project/ProjectsFilterDropdown.vue

@@ -12,7 +12,7 @@ import {
     DropdownMenuSubContent,
     DropdownMenuCheckboxItem,
     DropdownMenuSeparator,
-} from '@/packages/ui/src';
+} from '@/Components/ui/dropdown-menu';
 import { Button } from '@/packages/ui/src';
 import type { Client } from '@/packages/api/src';
 import { NO_CLIENT_ID } from './constants';

resources/js/Components/Common/ProjectMember/ProjectMemberMoreOptionsDropdown.vue

@@ -8,7 +8,7 @@ import {
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger,
-} from '@/packages/ui/src';
+} from '@/Components/ui/dropdown-menu';
 
 const emit = defineEmits<{
     delete: [];

resources/js/Components/Common/Report/ReportCreateModal.vue

@@ -111,7 +111,7 @@ async function submit() {
                                 <FieldLabel for="public_until">Expires at</FieldLabel>
                                 <div class="text-text-tertiary font-medium">(optional)</div>
                             </div>
-                            <DatePicker v-model="report.public_until" clearable></DatePicker>
+                            <DatePicker v-model="report.public_until"></DatePicker>
                         </Field>
                     </div>
                 </Field>

resources/js/Components/Common/Report/ReportEditModal.vue

@@ -125,7 +125,7 @@ async function submit() {
                         </Field>
                         <Field v-if="report.is_public" orientation="horizontal">
                             <FieldLabel for="public_until">Expires at</FieldLabel>
-                            <DatePicker v-model="localPublicUntil" clearable></DatePicker>
+                            <DatePicker v-model="localPublicUntil"></DatePicker>
                         </Field>
                     </div>
                 </Field>

resources/js/Components/Common/Report/ReportMoreOptionsDropdown.vue

@@ -6,7 +6,7 @@ import {
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger,
-} from '@/packages/ui/src';
+} from '@/Components/ui/dropdown-menu';
 import { canDeleteReport, canUpdateReport } from '@/utils/permissions';
 
 const emit = defineEmits<{

resources/js/Components/Common/Reporting/ReportingChart.vue

@@ -2,7 +2,7 @@
 import VChart, { THEME_KEY } from 'vue-echarts';
 import { computed, provide, inject, shallowRef, type ComputedRef } from 'vue';
 import LinearGradient from 'zrender/lib/graphic/LinearGradient';
-import { formatDate, formatReportingDuration, formatWeek } from '@/packages/ui/src/utils/time';
+import { formatDate, formatHumanReadableDuration, formatWeek } from '@/packages/ui/src/utils/time';
 import { use } from 'echarts/core';
 import { CanvasRenderer } from 'echarts/renderers';
 import { BarChart } from 'echarts/charts';
@@ -13,7 +13,7 @@ import {
     TooltipComponent,
 } from 'echarts/components';
 import type { AggregatedTimeEntries, Organization } from '@/packages/api/src';
-import { useCssVariable } from '@/packages/ui/src';
+import { useCssVariable } from '@/utils/useCssVariable';
 
 use([CanvasRenderer, BarChart, TitleComponent, GridComponent, TooltipComponent, LegendComponent]);
 
@@ -137,7 +137,7 @@ const option = computed(() => ({
             type: 'bar',
             tooltip: {
                 valueFormatter: (value: number) => {
-                    return formatReportingDuration(
+                    return formatHumanReadableDuration(
                         value,
                         organization?.value?.interval_format,
                         organization?.value?.number_format

resources/js/Components/Common/Reporting/ReportingExportButton.vue

@@ -6,7 +6,7 @@ import {
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger,
-} from '@/packages/ui/src';
+} from '@/Components/ui/dropdown-menu';
 import type { ExportFormat } from '@/types/reporting';
 import { ref } from 'vue';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';

resources/js/Components/Common/Reporting/ReportingFilterBar.vue

@@ -8,7 +8,13 @@ import ClientMultiselectDropdown from '@/Components/Common/Client/ClientMultisel
 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 '@/packages/ui/src';
+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';

resources/js/Components/Common/Reporting/ReportingGroupBySelect.vue

@@ -1,5 +1,11 @@
 <script setup lang="ts">
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
 import { type Component, computed } from 'vue';
 
 const model = defineModel<string | null>({ default: null });

resources/js/Components/Common/Reporting/ReportingOverview.vue

@@ -8,7 +8,7 @@ import {
 import { SaveIcon } from 'lucide-vue-next';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import {
-    formatReportingDuration,
+    formatHumanReadableDuration,
     getDayJsInstance,
     getLocalizedDayJs,
 } from '@/packages/ui/src/utils/time';
@@ -28,7 +28,7 @@ import {
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger,
-} from '@/packages/ui/src';
+} from '@/Components/ui/dropdown-menu';
 import ReportCreateModal from '@/Components/Common/Report/ReportCreateModal.vue';
 import UpgradeModal from '@/Components/Common/UpgradeModal.vue';
 import { canCreateReports } from '@/utils/permissions';
@@ -426,7 +426,7 @@ const tableData = computed(() => {
                                 class="justify-end flex items-center font-medium"
                                 :class="!showBillableRate ? 'pr-6' : ''">
                                 {{
-                                    formatReportingDuration(
+                                    formatHumanReadableDuration(
                                         aggregatedTableTimeEntries.seconds,
                                         organization?.interval_format,
                                         organization?.number_format

resources/js/Components/Common/Reporting/ReportingPieChart.vue

@@ -10,8 +10,8 @@ import {
     TitleComponent,
     TooltipComponent,
 } from 'echarts/components';
-import { formatReportingDuration } from '@/packages/ui/src/utils/time';
-import { useCssVariable } from '@/packages/ui/src';
+import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
+import { useCssVariable } from '@/utils/useCssVariable';
 import type { Organization } from '@/packages/api/src';
 
 use([CanvasRenderer, PieChart, TitleComponent, GridComponent, TooltipComponent, LegendComponent]);
@@ -67,7 +67,7 @@ const option = computed(() => ({
             },
             tooltip: {
                 valueFormatter: (value: number) => {
-                    return formatReportingDuration(
+                    return formatHumanReadableDuration(
                         value,
                         organization?.value?.interval_format,
                         organization?.value?.number_format

resources/js/Components/Common/Reporting/ReportingRoundingControls.vue

@@ -2,7 +2,13 @@
 import { Switch } from '@/Components/ui/switch';
 import { Popover, PopoverContent, PopoverTrigger } from '@/packages/ui/src';
 import { Button } from '@/packages/ui/src';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
 import { Field, FieldLabel } from '@/packages/ui/src/field';
 import {
     NumberField,
@@ -10,7 +16,7 @@ import {
     NumberFieldContent,
     NumberFieldIncrement,
     NumberFieldDecrement,
-} from '@/packages/ui/src';
+} from '@/Components/ui/number-field';
 import { ArrowsUpDownIcon } from '@heroicons/vue/20/solid';
 import { computed, ref, watch } from 'vue';
 import { twMerge } from 'tailwind-merge';

resources/js/Components/Common/Reporting/ReportingRow.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { formatReportingDuration } from '@/packages/ui/src/utils/time';
+import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
 import { formatCents } from '@/packages/ui/src/utils/money';
 import GroupedItemsCountButton from '@/packages/ui/src/GroupedItemsCountButton.vue';
 import { ref, inject, type ComputedRef } from 'vue';
@@ -44,7 +44,7 @@ const organization = inject<ComputedRef<Organization>>('organization');
         </div>
         <div class="justify-end flex items-center" :class="!showCost ? 'pr-6' : ''">
             {{
-                formatReportingDuration(
+                formatHumanReadableDuration(
                     entry.seconds,
                     organization?.interval_format,
                     organization?.number_format

resources/js/Components/Common/Reporting/ReportingTabNavbar.vue

@@ -2,7 +2,8 @@
 import { router } from '@inertiajs/vue3';
 import { canViewReport } from '@/utils/permissions';
 import { computed } from 'vue';
-import { TabBar, TabBarItem } from '@/packages/ui/src';
+import TabBar from '@/Components/Common/TabBar/TabBar.vue';
+import TabBarItem from '@/Components/Common/TabBar/TabBarItem.vue';
 
 const props = defineProps<{
     active: 'reporting' | 'detailed' | 'shared';

resources/js/Components/Common/StatCard.vue

@@ -7,8 +7,8 @@ defineProps<{
 
 <template>
     <div class="rounded-lg bg-card-background border-card-border shadow-card border px-3.5 py-2.5">
-        <dt class="font-medium text-sm text-text-secondary">{{ title }}</dt>
-        <dd class="text-xl text-text-primary pt-1 font-medium">
+        <dt class="font-semibold text-sm text-text-secondary">{{ title }}</dt>
+        <dd class="text-2xl text-text-primary pt-1 font-semibold">
             {{ value ?? '--' }}
         </dd>
     </div>

resources/js/Components/Common/TabBar/TabBar.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Tabs, TabsList } from '../tabs';
+import { Tabs, TabsList } from '@/Components/ui/tabs';
 
 defineProps<{
     defaultValue?: string;

resources/js/Components/Common/TabBar/TabBarItem.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { TabsTrigger } from '../tabs';
+import { TabsTrigger } from '@/Components/ui/tabs';
 import { twMerge } from 'tailwind-merge';
 import type { Component } from 'vue';
 

resources/js/Components/Common/Tag/TagMoreOptionsDropdown.vue

@@ -7,7 +7,7 @@ import {
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger,
-} from '@/packages/ui/src';
+} from '@/Components/ui/dropdown-menu';
 
 const emit = defineEmits<{
     edit: [];

resources/js/Components/Common/Tag/TagTableRow.vue

@@ -6,14 +6,6 @@ import TagEditModal from '@/Components/Common/Tag/TagEditModal.vue';
 import TableRow from '@/Components/TableRow.vue';
 import { canDeleteTags, canUpdateTags } from '@/utils/permissions';
 import { ref } from 'vue';
-import { PencilSquareIcon, TrashIcon } from '@heroicons/vue/20/solid';
-import {
-    ContextMenu,
-    ContextMenuContent,
-    ContextMenuItem,
-    ContextMenuSeparator,
-    ContextMenuTrigger,
-} from '@/packages/ui/src';
 
 const props = defineProps<{
     tag: Tag;
@@ -27,44 +19,23 @@ function deleteTag() {
 </script>
 
 <template>
-    <ContextMenu>
-        <ContextMenuTrigger as-child>
-            <TableRow>
-                <div
-                    class="whitespace-nowrap flex items-center space-x-5 3xl:pl-12 py-4 pr-3 text-sm font-medium text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
-                    <span>
-                        {{ tag.name }}
-                    </span>
-                </div>
-                <div
-                    class="relative whitespace-nowrap flex items-center pl-3 text-right text-sm font-medium sm:pr-0 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
-                    <TagMoreOptionsDropdown
-                        v-if="canDeleteTags() || canUpdateTags()"
-                        :tag="tag"
-                        @edit="showTagEditModal = true"
-                        @delete="deleteTag"></TagMoreOptionsDropdown>
-                </div>
-                <TagEditModal v-model:show="showTagEditModal" :tag="tag"></TagEditModal>
-            </TableRow>
-        </ContextMenuTrigger>
-        <ContextMenuContent class="min-w-[160px]">
-            <ContextMenuItem
-                v-if="canUpdateTags()"
-                class="space-x-3"
-                @select="showTagEditModal = true">
-                <PencilSquareIcon class="w-4 h-4 text-icon-default" />
-                <span>Edit</span>
-            </ContextMenuItem>
-            <ContextMenuSeparator v-if="canDeleteTags()" />
-            <ContextMenuItem
-                v-if="canDeleteTags()"
-                class="space-x-3 text-destructive"
-                @select="deleteTag()">
-                <TrashIcon class="w-4 h-4 text-icon-default" />
-                <span>Delete</span>
-            </ContextMenuItem>
-        </ContextMenuContent>
-    </ContextMenu>
+    <TableRow>
+        <div
+            class="whitespace-nowrap flex items-center space-x-5 3xl:pl-12 py-4 pr-3 text-sm font-medium text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            <span>
+                {{ tag.name }}
+            </span>
+        </div>
+        <div
+            class="relative whitespace-nowrap flex items-center pl-3 text-right text-sm font-medium sm:pr-0 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
+            <TagMoreOptionsDropdown
+                v-if="canDeleteTags() || canUpdateTags()"
+                :tag="tag"
+                @edit="showTagEditModal = true"
+                @delete="deleteTag"></TagMoreOptionsDropdown>
+        </div>
+        <TagEditModal v-model:show="showTagEditModal" :tag="tag"></TagEditModal>
+    </TableRow>
 </template>
 
 <style scoped></style>

resources/js/Components/Common/Task/TaskMoreOptionsDropdown.vue

@@ -7,7 +7,7 @@ import {
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger,
-} from '@/packages/ui/src';
+} from '@/Components/ui/dropdown-menu';
 
 const emit = defineEmits<{
     delete: [];

resources/js/Components/CurrentSidebarTimer.vue

@@ -44,7 +44,7 @@ const isRunningInDifferentOrganization = computed(() => {
         </div>
         <div>
             <div class="text-text-secondary font-medium text-xs">Current Timer</div>
-            <div class="text-text-primary font-medium text-base">
+            <div class="text-text-primary font-medium text-lg">
                 {{ currentTime }}
             </div>
         </div>

resources/js/Components/Dashboard/ActivityGraphCard.vue

@@ -20,7 +20,7 @@ import {
     getDayJsInstance,
 } from '@/packages/ui/src/utils/time';
 import chroma from 'chroma-js';
-import { useCssVariable } from '@/packages/ui/src';
+import { useCssVariable } from '@/utils/useCssVariable';
 import { useQuery } from '@tanstack/vue-query';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { api, type Organization } from '@/packages/api/src';

resources/js/Components/Dashboard/DayOverviewCardChart.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import VChart from 'vue-echarts';
 import { computed } from 'vue';
-import { useCssVariable } from '@/packages/ui/src';
+import { useCssVariable } from '@/utils/useCssVariable';
 
 const props = defineProps<{
     history: number[];

resources/js/Components/Dashboard/DayOverviewCardEntry.vue

@@ -23,7 +23,7 @@ defineProps<{
         <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-primary min-w-[65px]">
+        <div class="flex text-sm items-center justify-center text-text-secondary min-w-[65px]">
             {{
                 formatHumanReadableDuration(
                     duration,

resources/js/Components/Dashboard/ProjectsChartCard.vue

@@ -11,7 +11,7 @@ import {
     TooltipComponent,
 } from 'echarts/components';
 import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
-import { useCssVariable } from '@/packages/ui/src';
+import { useCssVariable } from '@/utils/useCssVariable';
 import type { Organization } from '@/packages/api/src';
 
 use([CanvasRenderer, PieChart, TitleComponent, GridComponent, TooltipComponent, LegendComponent]);

resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue

@@ -47,9 +47,9 @@ async function startTaskTimer() {
 <template>
     <div class="px-3.5 py-2 grid grid-cols-5">
         <div class="col-span-4">
-            <p class="text-text-primary text-sm pb-1.5 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-secondary">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">

resources/js/Components/Dashboard/TeamActivityCard.vue

@@ -48,7 +48,7 @@ const { data: latestTeamActivity, isLoading } = useQuery({
             class="text-center flex flex-1 justify-center items-center">
             <div>
                 <UserGroupIcon class="w-8 text-icon-default inline pb-2"></UserGroupIcon>
-                <h3 class="text-text-primary font-medium text-sm">Invite your co-workers</h3>
+                <h3 class="text-text-primary font-semibold text-sm">Invite your co-workers</h3>
                 <p class="pb-5 text-sm">You can invite your entire team.</p>
                 <SecondaryButton @click="router.visit(route('members'))"
                     >Go to Members

resources/js/Components/Dashboard/TeamActivityCardEntry.vue

@@ -11,7 +11,7 @@ defineProps<{
         <div class="col-span-2">
             <div class="flex justify-between">
                 <p
-                    class="text-sm font-medium 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">
@@ -20,11 +20,11 @@ defineProps<{
                             class="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-500 opacity-75"></span>
                         <span class="relative inline-flex rounded-full h-2 w-2 bg-green-500"></span>
                     </span>
-                    <span class="text-green-500 text-sm block pb-0.5"> working </span>
+                    <span class="text-green-500 font-medium text-sm block pb-0.5"> working </span>
                 </div>
             </div>
             <div
-                class="text-text-secondary text-sm text-ellipsis whitespace-nowrap max-w-full overflow-hidden">
+                class="text-text-secondary text-sm font-medium text-ellipsis whitespace-nowrap max-w-full overflow-hidden">
                 {{ description }}
             </div>
         </div>

resources/js/Components/Dashboard/ThisWeekOverview.vue

@@ -16,10 +16,10 @@ 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 { formatReportingDuration } from '@/packages/ui/src/utils/time';
+import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
 import { formatCents } from '@/packages/ui/src/utils/money';
 import { getWeekStart } from '@/packages/ui/src/utils/settings';
-import { useCssVariable } from '@/packages/ui/src';
+import { useCssVariable } from '@/utils/useCssVariable';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { useQuery } from '@tanstack/vue-query';
 import { getCurrentOrganizationId } from '@/utils/useUser';
@@ -223,7 +223,7 @@ const option = computed(() => {
                 type: 'bar',
                 tooltip: {
                     valueFormatter: (value: number) => {
-                        return formatReportingDuration(
+                        return formatHumanReadableDuration(
                             value,
                             organization?.value?.interval_format,
                             organization?.value?.number_format
@@ -252,7 +252,7 @@ const option = computed(() => {
                 title="Spent Time"
                 :value="
                     totalWeeklyTime
-                        ? formatReportingDuration(
+                        ? formatHumanReadableDuration(
                               totalWeeklyTime,
                               organization?.interval_format,
                               organization?.number_format
@@ -263,7 +263,7 @@ const option = computed(() => {
                 title="Billable Time"
                 :value="
                     totalWeeklyBillableTime
-                        ? formatReportingDuration(
+                        ? formatHumanReadableDuration(
                               totalWeeklyBillableTime,
                               organization?.interval_format,
                               organization?.number_format

resources/js/Components/Dashboard/ThisWeekReportingTable.vue

@@ -2,7 +2,7 @@
 import ReportingRow from '@/Components/Common/Reporting/ReportingRow.vue';
 import ReportingGroupBySelect from '@/Components/Common/Reporting/ReportingGroupBySelect.vue';
 import {
-    formatReportingDuration,
+    formatHumanReadableDuration,
     getDayJsInstance,
     getLocalizedDayJs,
 } from '@/packages/ui/src/utils/time';
@@ -174,7 +174,7 @@ const showBillableRate = computed(() => {
                         class="justify-end flex items-center font-medium"
                         :class="!showBillableRate ? 'pr-6' : ''">
                         {{
-                            formatReportingDuration(
+                            formatHumanReadableDuration(
                                 aggregatedTableTimeEntries.seconds,
                                 organization?.interval_format,
                                 organization?.number_format

resources/js/Components/NavigationSidebarItem.vue

@@ -28,7 +28,7 @@ const open = useSessionStorage('nav-collapse-state-' + props.title, true);
         <CollapsibleRoot v-else v-model:open="open"
             ><CollapsibleTrigger class="w-full group py-0.5">
                 <div
-                    class="text-text-secondary group-hover:text-text-primary group-hover:bg-menu-active group flex gap-x-2 rounded-md transition leading-6 py-0.5 px-2 font-regular text-sm items-center justify-between">
+                    class="text-text-secondary group-hover:text-text-primary group-hover:bg-menu-active group flex gap-x-2 rounded-md transition leading-6 py-0.5 px-2 font-medium text-sm items-center justify-between">
                     <div class="flex items-center gap-x-2">
                         <component
                             :is="icon"

resources/js/Components/OrganizationSwitcher.vue

@@ -17,7 +17,7 @@ import {
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuLabel,
-} from '@/packages/ui/src';
+} from '@/Components/ui/dropdown-menu';
 
 const page = usePage<{
     jetstream: {

resources/js/Components/TimeTracker.vue

@@ -11,7 +11,6 @@ import duration from 'dayjs/plugin/duration';
 import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
 import { storeToRefs } from 'pinia';
 import { getCurrentOrganizationId } from '@/utils/useUser';
-import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
 import { switchOrganization } from '@/utils/useOrganization';
 import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import { useTasksQuery } from '@/utils/useTasksQuery';
@@ -48,8 +47,6 @@ dayjs.extend(duration);
 
 dayjs.extend(utc);
 
-const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
-
 const currentTimeEntryStore = useCurrentTimeEntryStore();
 const { currentTimeEntry, isActive, now } = storeToRefs(currentTimeEntryStore);
 const { startLiveTimer, stopLiveTimer, setActiveState } = currentTimeEntryStore;
@@ -155,13 +152,12 @@ const { tags } = useTagsQuery();
         :create-time-entry="createTimeEntry"
         :currency="getOrganizationCurrencyString()"
         :can-create-project="canCreateProjects()"
-        :organization-billable-rate="organization?.billable_rate ?? null"
         :projects
         :tasks
         :tags
         :clients></TimeEntryCreateModal>
     <CardTitle title="Time Tracker" :icon="ClockIcon"></CardTitle>
-    <div class="relative pt-1.5">
+    <div class="relative pt-1">
         <TimeTrackerRunningInDifferentOrganizationOverlay
             v-if="isRunningInDifferentOrganization"
             @switch-organization="
@@ -177,7 +173,6 @@ const { tags } = useTagsQuery();
                         :create-project
                         :enable-estimated-time="isAllowedToPerformPremiumAction()"
                         :can-create-project="canCreateProjects()"
-                        :organization-billable-rate="organization?.billable_rate ?? null"
                         :create-client
                         :clients
                         :tags

resources/js/Components/UserSettingsIcon.vue

@@ -7,7 +7,7 @@ import {
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuLabel,
-} from '@/packages/ui/src';
+} from '@/Components/ui/dropdown-menu';
 import {
     UserCircleIcon,
     KeyIcon,

resources/js/Components/ui/calendar/Calendar.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 import {
     CalendarRoot,
     type CalendarRootEmits,

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-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-quaternary 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

resources/js/Components/ui/calendar/CalendarDateInput.vue

@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import { Popover, PopoverContent, PopoverTrigger } from '@/packages/ui/src';
+import { Button } from '@/packages/ui/src';
+import { Calendar } from '@/Components/ui/calendar';
+import { CalendarIcon, XIcon } from 'lucide-vue-next';
+import { formatDate } from '@/packages/ui/src/utils/time';
+import { parseDate } from '@internationalized/date';
+import { computed, inject, type ComputedRef } from 'vue';
+import { type Organization } from '@/packages/api/src';
+
+const model = defineModel<string | null>();
+const emit = defineEmits<{
+    blur: [];
+}>();
+
+defineProps<{
+    clearable?: boolean;
+}>();
+
+const handleChange = (date: string) => {
+    model.value = date;
+};
+
+const handleBlur = () => {
+    emit('blur');
+};
+
+const handleClear = (event: Event) => {
+    event.stopPropagation();
+    model.value = null;
+};
+
+const date = computed(() => {
+    return model.value ? parseDate(model.value) : undefined;
+});
+
+const organization = inject<ComputedRef<Organization>>('organization');
+</script>
+
+<template>
+    <Popover>
+        <PopoverTrigger as-child>
+            <Button
+                variant="input"
+                :class="[
+                    'w-full justify-start text-left font-normal',
+                    !model && 'text-muted-foreground',
+                ]">
+                <CalendarIcon class="mr-2 h-4 w-4" />
+                <span class="flex-1">
+                    {{ model ? formatDate(model, organization?.date_format) : 'Pick a date' }}
+                </span>
+                <button
+                    v-if="clearable && model"
+                    class="ml-2 hover:bg-muted rounded p-1 transition-colors"
+                    type="button"
+                    @click="handleClear">
+                    <XIcon class="h-4 w-4" />
+                </button>
+            </Button>
+        </PopoverTrigger>
+        <PopoverContent class="w-auto p-0">
+            <Calendar
+                mode="single"
+                :model-value="date"
+                :initial-focus="true"
+                @update:model-value="(date) => handleChange(date ? date.toString() : '')"
+                @blur="handleBlur" />
+        </PopoverContent>
+    </Popover>
+</template>

resources/js/Components/ui/calendar/CalendarGrid.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 import { CalendarGrid, type CalendarGridProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 

resources/js/Components/ui/calendar/CalendarGridRow.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 import { CalendarGridRow, type CalendarGridRowProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 

resources/js/Components/ui/calendar/CalendarHeadCell.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 import { CalendarHeadCell, type CalendarHeadCellProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 

resources/js/Components/ui/calendar/CalendarHeader.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 import { CalendarHeader, type CalendarHeaderProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 

resources/js/Components/ui/calendar/CalendarHeading.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 import { CalendarHeading, type CalendarHeadingProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 

resources/js/Components/ui/dialog/DialogContent.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 import {
     DialogContent,
     type DialogContentEmits,

resources/js/Components/ui/dialog/DialogDescription.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 import { DialogDescription, type DialogDescriptionProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 

resources/js/Components/ui/dialog/DialogFooter.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { HTMLAttributes } from 'vue';
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 
 const props = defineProps<{ class?: HTMLAttributes['class'] }>();
 </script>

resources/js/Components/ui/dialog/DialogHeader.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { HTMLAttributes } from 'vue';
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 
 const props = defineProps<{
     class?: HTMLAttributes['class'];

resources/js/Components/ui/dialog/DialogScrollContent.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 import { X } from 'lucide-vue-next';
 import {
     DialogClose,

resources/js/Components/ui/dialog/DialogTitle.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 import { DialogTitle, type DialogTitleProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 

resources/js/Components/ui/dropdown-menu/DropdownMenuCheckboxItem.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 import { Check } from 'lucide-vue-next';
 import {
     DropdownMenuCheckboxItem,

resources/js/Components/ui/dropdown-menu/DropdownMenuContent.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 import {
     DropdownMenuContent,
     type DropdownMenuContentEmits,