add format check, update prettier rules, apply rules consistently

.env.example

@@ -80,7 +80,8 @@ GOTENBERG_URL=http://gotenberg:3000
 # Local setup
 NGINX_HOST_NAME=solidtime.test
 NETWORK_NAME=reverse-proxy-docker-traefik_routing
-FORWARD_DB_PORT=54329
+FORWARD_DB_PORT=5432
+FORWARD_WEB_PORT=8083
 VITE_HOST_NAME=vite.solidtime.test
 VITE_APP_NAME="${APP_NAME}"
 #SAIL_XDEBUG_MODE=develop,debug,coverage

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,8 @@
-## What does this PR do?
+<!--
+This project is early stage. The structure and APIs are still subject to change and not stable.
+Therefore, we do not currently accept any contributions, unless you are a member of the team.
 
-<!-- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. -->
+As soon as we feel comfortable enough that the application structure is stable enough, we will open up the project for contributions.
 
-- Fixes #XXXX (GitHub issue number)
-
-## Checklist (DO NOT REMOVE)
-
-- [ ] I read the [contributing guide](https://github.com/solidtime-io/solidtime/blob/main/CONTRIBUTING.md)
-- [ ] I signed the [Contributor License Agreement](https://cla-assistant.io/solidtime-io/solidtime).
-- [ ] I commented my code, particularly in hard-to-understand areas
+We do accept contributions in the [documentation repository](https://github.com/solidtime-io/docs) f.e. to add new self-hosting guides.
+-->

.github/workflows/build-onpremise.yml

@@ -1,216 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-      - develop
-    tags:
-      - '*'
-  pull_request:
-    paths:
-      - '.github/workflows/build-onpremise.yml'
-      - 'docker/prod/**'
-  workflow_dispatch:
-
-permissions:
-  packages: write
-  contents: read
-  attestations: write
-  id-token: write
-
-env:
-  DOCKER_REPO: registry.on-premise.solidtime.io/solidtime/solidtime
-
-name: Build - On Premise
-jobs:
-  build:
-    strategy:
-      matrix:
-        include:
-          - runs-on: "ubuntu-24.04-arm"
-            platform: "linux/arm64"
-          - runs-on: "ubuntu-24.04"
-            platform: "linux/amd64"
-    runs-on: ${{ matrix.runs-on }}
-    timeout-minutes: 90
-
-    steps:
-      - name: "Check out code"
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
-
-      - name: "Get build"
-        id: release-build
-        run: echo "build=$(git rev-parse --short=8 HEAD)" >> "$GITHUB_OUTPUT"
-
-      - name: "Get Previous tag (normal push)"
-        id: previoustag
-        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        uses: "WyriHaximus/github-action-get-previous-tag@v1"
-        with:
-          prefix: "v"
-
-      - name: "Get version"
-        id: release-version
-        run: |
-          if ${{ !startsWith(github.ref, 'refs/tags/v') }}; then
-            if ${{ startsWith(steps.previoustag.outputs.tag, 'v') }}; then
-              version=$(echo "${{ steps.previoustag.outputs.tag }}" | cut -c 2-)
-              echo "app_version=${version}" >> "$GITHUB_OUTPUT"
-            else
-              echo "ERROR: No previous tag found";
-              exit 1;
-            fi
-          else
-            version=$(echo "${{ github.ref }}" | cut -c 12-)
-            echo "app_version=${version}" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: "Copy .env template for production"
-        run: |
-          cp .env.production .env
-          rm .env.production .env.ci .env.example
-
-      - name: "Add version to .env"
-        run: sed -i 's/APP_VERSION=0.0.0/APP_VERSION=${{ steps.release-version.outputs.app_version }}/g' .env
-
-      - name: "Add build to .env"
-        run: sed -i 's/APP_BUILD=0/APP_BUILD=${{ steps.release-build.outputs.build }}/g' .env
-
-      - name: "Output .env"
-        run: cat .env
-
-      - name: "Setup PHP with PECL extension"
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.3'
-          extensions: mbstring, dom, fileinfo, pgsql
-
-      - name: "Install dependencies"
-        run: composer install --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
-        if: steps.cache-vendor.outputs.cache-hit != 'true' # Skip if cache hit
-
-      - name: "Use Node.js"
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.x'
-
-      - name: "Checkout invoicing extension"
-        uses: actions/checkout@v4
-        with:
-          repository: solidtime-io/extension-invoicing
-          path: extensions/Invoicing
-          ssh-key: ${{ secrets.SSH_PRIVATE_KEY_INVOICING_EXTENSION }}
-
-      - name: "Install composer dependencies in invoicing extension"
-        run: cd extensions/Invoicing && composer install --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
-
-      - name: "Install npm dependencies in invoicing extension"
-        run: cd extensions/Invoicing && npm ci
-
-      - name: "Activate invoicing extension"
-        run: php artisan module:enable Invoicing
-
-      - name: "Install npm dependencies"
-        run: npm ci
-
-      - name: "Build"
-        run: npm run build
-
-      - name: "Prepare"
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
-      - name: "Docker meta"
-        id: "meta"
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ env.DOCKER_REPO }}
-
-      - name: "Login to solidtime OnPremise Registry"
-        uses: docker/login-action@v3
-        with:
-          registry: registry.on-premise.solidtime.io
-          username: ${{ secrets.ONPREMISE_USERNAME }}
-          password: ${{ secrets.ONPREMISE_TOKEN }}
-
-      - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v3
-
-      - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v3
-
-      - name: "Build and push by digest"
-        id: build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: docker/prod/Dockerfile
-          build-args: |
-            DOCKER_FILES_BASE_PATH=docker/prod/
-          platforms: ${{ matrix.platform }}
-          labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,"name=${{ env.DOCKER_REPO }}",push-by-digest=true,name-canonical=true,push=true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: "Export digest"
-        run: |
-          mkdir -p ${{ runner.temp }}/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "${{ runner.temp }}/digests/${digest#sha256:}"
-
-      - name: "Upload digest"
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-${{ env.PLATFORM_PAIR }}
-          path: ${{ runner.temp }}/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  merge:
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-    needs:
-      - build
-    steps:
-      - name: "Download digests"
-        uses: actions/download-artifact@v4
-        with:
-          path: ${{ runner.temp }}/digests
-          pattern: digests-*
-          merge-multiple: true
-
-      - name: "Login to solidtime OnPremise Registry"
-        uses: docker/login-action@v3
-        with:
-          registry: registry.on-premise.solidtime.io
-          username: ${{ secrets.ONPREMISE_USERNAME }}
-          password: ${{ secrets.ONPREMISE_TOKEN }}
-
-      - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v3
-
-      - name: "Docker meta"
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ env.DOCKER_REPO }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-
-      - name: "Create manifest list and push"
-        working-directory: ${{ runner.temp }}/digests
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.DOCKER_REPO }}@sha256:%s ' *)
-
-      - name: "Inspect image"
-        run: |
-          docker buildx imagetools inspect ${{ env.DOCKER_REPO }}:${{ steps.meta.outputs.version }}

CONTRIBUTING.md

@@ -1,81 +0,0 @@
-# Contributing to solidtime
-
-Contributions are greatly apprecited, please make sure to read the rules and vision for solidtime before contributing. 
-
-## Rules
-
-### Issues for Bugs, Discussions for Feature requests
-
-In order to keep the issues of the repository clean we decided to only use them for bugs. Feature Requests and enhancement are handled in discussions. This also helps us to see which feature requests are popular as they can be upvoted. 
-
-### Only work on approved issues
-
-To respect your time and help us manage contributions effectively, please open an issue or start a discussion and wait for approval before submitting a pull request (PR). This does not apply to tiny fixes or changes however, please keep in mind that we might not merge PRs for various reasons. 
-
-### Contributor License Agreement
-
-You'll also notice that we’ve set up a [Contributor License Agreement (CLA)](https://cla-assistant.io/solidtime-io/solidtime), which must be signed before any PR can be merged. Don’t worry - the process is quick and only takes a few clicks.
-
-We want to be transparent about why we require the CLA and what it means for your contributions and the codebase. That’s why we’ve written a few paragraphs below outlining our plans and vision for solidtime in the **Vision** part of this document. 
-
-### Prevent Duplicate Work
-
-Before you submit a new PR, make sure that none exists already. If you plan to work on an issue, make sure to let us and others know by commenting on the issue/discussion. 
-
-### Give context
-
-Tell us what you thinking was behind the decisions you made while drafting the PR. Treat the PR itself as documentation for everyone who wants to go back and understand why certain decisions were made. 
-
-### Summarize your PR
-
-Please make sure to include a short summary at the top of your PR to make it easy for us to quickly check what the PR is about, without looking at the code changes. 
-
-### Use Github Keywords and Auto-Link Issues
-
-Use phrases like "Closes #123" or "Fixes #123" in the PR description to link the PR with the issue that you are adressing. 
-
-### Mention what you tested and how
-
-Explain how you tested and validated the implementation. 
-
-### Keep Naming consistent
-
-Look at existing code patterns and use naming conventions that already exist in the code base. 
-
-### Testing
-
-We have an exhaustive test-suite of PHPUnit (Backend) and Playwright (Frontend) testing. Whereever applicable please make sure to write add tests to the codebase. 
-
-### Linting & Formatting
-
-Make sure to run linting and formatting commands before you commit the changes. 
-
-For backend changes:
-
-```
-composer fix
-composer analyse
-```
-
-For frontend changes: 
-
-```
-npm run lint:fix
-npm run format
-```
-
-## Vision
-
-We started solidtime to provide an open infrastructure solution for time tracking—one that empowers teams and individuals to fully own their data, instead of depending on proprietary platforms. We believe infrastructure software should be open, accessible, and built to last. However, competing with established market leaders in this space requires long-term financial sustainability.
-
-solidtime is licensed under the AGPL, which we believe is the best available license to strike a balance between openness and financial viability. The AGPL gives us, as the copyright holders, certain exclusive rights that we plan to leverage to fund development. To ensure we retain those rights across the entire codebase, we've put a CLA in place that contributors must sign before submitting code.
-
-One of solidtime’s key advantages is that it's built to be self-hostable. This makes it a great solution for organizations like governments, healthcare providers, and enterprises that are required to keep data on their own infrastructure due to regulations or internal policies. These organizations may need custom licenses, integrations, or modifications that aren't suitable for the open-source version. To support them, we offer relicensed versions of solidtime along with support plans.
-
-We’ll also provide proprietary extensions for solidtime. These will be available to enterprise customers with support plans, but also to individual users or teams who don’t need support, at much more accessible price points. For companies running solidtime on their own infrastructure, this is the easiest way to support the project while gaining additional functionality. While we plan to make it easier to build custom extensions in the future, our current APIs are still highly experimental.
-
-Finally - and perhaps most importantly - we offer a hosted SaaS version called solidtime Cloud, for users who can’t or don’t want to run the software themselves. This version includes proprietary extensions, always runs the latest commit, and includes monitoring and billing features available exclusively on this hosted instance. We expect solidtime Cloud to play a critical role in funding the project long-term.
-
-Having full control over the source code’s licensing also gives us the ability to change the license of the main project in the future. That said, we have no plans to do so and would only consider it in extreme cases - for example, if a malicious actor were to directly compete with our hosted service in a way that threatens the sustainability of the project, the legal interpretation of AGPL changes in a way that would make it unreasonable to use for certain companies, or a new similar license gains wide-spread adoption. Regardless, solidtime will always remain free to self-host for individuals and companies who use it as part of their work, and all previous releases will remain licensed under AGPL.
-
-If you are using the open-source version of solidtime and want to support us, the best way to do so is to spread the word. 

README.md

@@ -35,9 +35,10 @@ If you have a **feature request**, please [**create a discussion**](https://gith
 
 ## Contributing
 
-Please open an issue or start a discussion and wait for approval before submitting a pull request. This does not apply to tiny fixes or changes however, please keep in mind that we might not merge PRs for various reasons. 
+This project is in a very early stage. The structure and APIs are still subject to change and not stable. 
+Therefore, we do not currently accept any contributions, unless you are a member of the team.
 
-Please read the [CONTRIBUTING.md](./CONTRIBUTING.md) before sumbitting a Pull Request.
+As soon as we feel comfortable enough that the application structure is stable enough, we will open up the project for contributions.
 
 We do accept contributions in the [documentation repository](https://github.com/solidtime-io/docs) f.e. to add new self-hosting guides.
 

app/Console/Kernel.php

@@ -22,27 +22,13 @@ class Kernel extends ConsoleKernel
             ->when(fn (): bool => config('scheduling.tasks.auth_send_mails_expiring_api_tokens'))
             ->everyTenMinutes();
 
-        if (config('app.key') && (config('scheduling.tasks.self_hosting_check_for_update') || config('scheduling.tasks.self_hosting_telemetry'))) {
-            // Convert string to a stable integer for seeding
-            /** @var int $seed Take the first 8 hex chars → 32-bit int */
-            $seed = hexdec(substr(hash('md5', config('app.key')), 0, 8));
-            $seed = abs($seed); // Ensure it's positive
-            mt_srand($seed);
-            $firstHour = mt_rand(0, 23);
-            $secondHour = ($firstHour + 12) % 24;
-            $minuteOffset = mt_rand(0, 59);
-            mt_srand(null); // Reset the random number generator
+        $schedule->command('self-host:check-for-update')
+            ->when(fn (): bool => config('scheduling.tasks.self_hosting_check_for_update'))
+            ->twiceDaily();
 
-            if (config('scheduling.tasks.self_hosting_check_for_update')) {
-                $schedule->command('self-host:check-for-update')
-                    ->twiceDailyAt($firstHour, $secondHour, $minuteOffset);
-            }
-
-            if (config('scheduling.tasks.self_hosting_telemetry')) {
-                $schedule->command('self-host:telemetry')
-                    ->twiceDailyAt($firstHour, $secondHour, $minuteOffset);
-            }
-        }
+        $schedule->command('self-host:telemetry')
+            ->when(fn (): bool => config('scheduling.tasks.self_hosting_telemetry'))
+            ->twiceDaily();
 
         $schedule->command('self-host:database-consistency')
             ->when(fn (): bool => config('scheduling.tasks.self_hosting_database_consistency'))

app/Enums/TimeEntryAggregationType.php

@@ -20,7 +20,6 @@ enum TimeEntryAggregationType: string
     case Client = 'client';
     case Billable = 'billable';
     case Description = 'description';
-    case Tag = 'tag';
 
     public static function fromInterval(TimeEntryAggregationTypeInterval $timeEntryAggregationTypeInterval): TimeEntryAggregationType
     {

app/Exceptions/Api/OverlappingTimeEntryApiException.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Exceptions\Api;
-
-class OverlappingTimeEntryApiException extends ApiException
-{
-    public const string KEY = 'overlapping_time_entry';
-}

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

@@ -14,8 +14,6 @@ use Illuminate\Http\JsonResponse;
 class ChartController extends Controller
 {
     /**
-     * Get chart data for the weekly project overview.
-     *
      * @throws AuthorizationException
      *
      * @operationId weeklyProjectOverview
@@ -33,8 +31,6 @@ class ChartController extends Controller
     }
 
     /**
-     * Get chart data for the latest tasks.
-     *
      * @throws AuthorizationException
      *
      * @operationId latestTasks
@@ -52,8 +48,6 @@ class ChartController extends Controller
     }
 
     /**
-     * Get chart data for the last seven days.
-     *
      * @throws AuthorizationException
      *
      * @operationId lastSevenDays
@@ -71,8 +65,6 @@ class ChartController extends Controller
     }
 
     /**
-     * Get chart data for the latest team activity.
-     *
      * @throws AuthorizationException
      *
      * @operationId latestTeamActivity
@@ -89,8 +81,6 @@ class ChartController extends Controller
     }
 
     /**
-     * Get chart data for daily tracked hours.
-     *
      * @throws AuthorizationException
      *
      * @operationId dailyTrackedHours
@@ -108,8 +98,6 @@ class ChartController extends Controller
     }
 
     /**
-     * Get chart data for total weekly time.
-     *
      * @throws AuthorizationException
      *
      * @operationId totalWeeklyTime
@@ -127,8 +115,6 @@ class ChartController extends Controller
     }
 
     /**
-     * Get chart data for total weekly billable time.
-     *
      * @throws AuthorizationException
      *
      * @operationId totalWeeklyBillableTime
@@ -146,8 +132,6 @@ class ChartController extends Controller
     }
 
     /**
-     * Get chart data for total weekly billable amount.
-     *
      * @throws AuthorizationException
      *
      * @operationId totalWeeklyBillableAmount
@@ -170,8 +154,6 @@ class ChartController extends Controller
     }
 
     /**
-     * Get chart data for weekly history.
-     *
      * @throws AuthorizationException
      *
      * @operationId weeklyHistory

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

@@ -38,17 +38,11 @@ class ClientController extends Controller
     public function index(Organization $organization, ClientIndexRequest $request): ClientCollection
     {
         $this->checkPermission($organization, 'clients:view');
-        $canViewAllClients = $this->hasPermission($organization, 'clients:view:all');
-        $user = $this->user();
 
         $clientsQuery = Client::query()
             ->whereBelongsTo($organization, 'organization')
             ->orderBy('created_at', 'desc');
 
-        if (! $canViewAllClients) {
-            $clientsQuery->visibleByEmployee($user);
-        }
-
         $filterArchived = $request->getFilterArchived();
         if ($filterArchived === 'true') {
             $clientsQuery->whereNotNull('archived_at');

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

@@ -61,9 +61,6 @@ class OrganizationController extends Controller
         if ($request->getTimeFormat() !== null) {
             $organization->time_format = $request->getTimeFormat();
         }
-        if ($request->getPreventOverlappingTimeEntries() !== null) {
-            $organization->prevent_overlapping_time_entries = $request->getPreventOverlappingTimeEntries();
-        }
         $hasBillableRate = $request->has('billable_rate');
         if ($hasBillableRate) {
             $oldBillableRate = $organization->billable_rate;

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

@@ -7,7 +7,6 @@ namespace App\Http\Controllers\Api\V1;
 use App\Enums\ExportFormat;
 use App\Enums\Role;
 use App\Exceptions\Api\FeatureIsNotAvailableInFreePlanApiException;
-use App\Exceptions\Api\OverlappingTimeEntryApiException;
 use App\Exceptions\Api\PdfRendererIsNotConfiguredException;
 use App\Exceptions\Api\TimeEntryCanNotBeRestartedApiException;
 use App\Exceptions\Api\TimeEntryStillRunningApiException;
@@ -46,7 +45,6 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\File;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Blade;
@@ -58,43 +56,6 @@ use Spatie\TemporaryDirectory\TemporaryDirectory;
 
 class TimeEntryController extends Controller
 {
-    private function assertNoOverlap(Organization $organization, Member $member, \Illuminate\Support\Carbon $start, ?\Illuminate\Support\Carbon $end, ?TimeEntry $exclude = null): void
-    {
-        if (! $organization->prevent_overlapping_time_entries) {
-            return;
-        }
-
-        $query = TimeEntry::query()
-            ->where('organization_id', $organization->getKey())
-            ->where('user_id', $member->user_id)
-            ->when($exclude !== null, function (Builder $q) use ($exclude): void {
-                $q->where('id', '!=', $exclude->getKey());
-            })
-            ->where(function (Builder $q) use ($start, $end): void {
-                $q->where(function (Builder $q2) use ($start): void {
-                    $q2->where('end', '>', $start)
-                        ->where('start', '<', $start);
-                });
-
-                if ($end !== null) {
-                    $q->orWhere(function (Builder $q4) use ($end): void {
-                        $q4->where('start', '<', $end)
-                            ->where('end', '>', $end);
-                    });
-                    // Check if the new entry completely surrounds an existing entry
-                    $q->orWhere(function (Builder $q6) use ($start, $end): void {
-                        $q6->where('start', '>=', $start)
-                            ->where('end', '<=', $end);
-                    });
-                }
-
-            });
-
-        if ($query->exists()) {
-            throw new OverlappingTimeEntryApiException;
-        }
-    }
-
     protected function checkPermission(Organization $organization, string $permission, ?TimeEntry $timeEntry = null): void
     {
         parent::checkPermission($organization, $permission);
@@ -588,15 +549,17 @@ class TimeEntryController extends Controller
             throw new TimeEntryStillRunningApiException;
         }
 
-        // Overlap check for create
-        $start = Carbon::parse($request->input('start'));
-        $end = $request->input('end') !== null ? Carbon::parse($request->input('end')) : null;
-        $this->assertNoOverlap($organization, $member, $start, $end);
-
         $project = $request->input('project_id') !== null ? Project::findOrFail((string) $request->input('project_id')) : null;
         $client = $project?->client;
         $task = $request->input('task_id') !== null ? $project->tasks()->findOrFail((string) $request->input('task_id')) : null;
 
+        if ($project !== null) {
+            RecalculateSpentTimeForProject::dispatch($project);
+        }
+        if ($task !== null) {
+            RecalculateSpentTimeForTask::dispatch($task);
+        }
+
         $timeEntry = new TimeEntry;
         $timeEntry->fill($request->validated());
         $timeEntry->client()->associate($client);
@@ -606,13 +569,6 @@ class TimeEntryController extends Controller
         $timeEntry->setComputedAttributeValue('billable_rate');
         $timeEntry->save();
 
-        if ($project !== null) {
-            RecalculateSpentTimeForProject::dispatch($project);
-        }
-        if ($task !== null) {
-            RecalculateSpentTimeForTask::dispatch($task);
-        }
-
         return new TimeEntryResource($timeEntry);
     }
 
@@ -637,13 +593,6 @@ class TimeEntryController extends Controller
             throw new TimeEntryCanNotBeRestartedApiException;
         }
 
-        // Overlap check for update (exclude current)
-        /** @var Member $effectiveMember */
-        $effectiveMember = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : $timeEntry->member;
-        $effectiveStart = $request->has('start') ? Carbon::parse($request->input('start')) : $timeEntry->start;
-        $effectiveEnd = $request->has('end') ? ($request->input('end') !== null ? Carbon::parse($request->input('end')) : null) : $timeEntry->end;
-        $this->assertNoOverlap($organization, $effectiveMember, $effectiveStart, $effectiveEnd, $timeEntry);
-
         $oldProject = $timeEntry->project;
         $oldTask = $timeEntry->task;
 

app/Http/Middleware/HandleInertiaRequests.php

@@ -41,7 +41,6 @@ class HandleInertiaRequests extends Middleware
     {
         $hasBilling = Module::has('Billing') && Module::isEnabled('Billing');
         $hasInvoicing = Module::has('Invoicing') && Module::isEnabled('Invoicing');
-        $hasServices = Module::has('Services') && Module::isEnabled('Services');
 
         /** @var BillingContract $billing */
         $billing = app(BillingContract::class);
@@ -51,7 +50,6 @@ class HandleInertiaRequests extends Middleware
         return array_merge(parent::share($request), [
             'has_billing_extension' => $hasBilling,
             'has_invoicing_extension' => $hasInvoicing,
-            'has_services_extension' => $hasServices,
             'billing' => $currentOrganization !== null ? [
                 'has_subscription' => $billing->hasSubscription($currentOrganization),
                 'has_trial' => $billing->hasTrial($currentOrganization),

app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php

@@ -39,9 +39,6 @@ class OrganizationUpdateRequest extends BaseFormRequest
             'employees_can_see_billable_rates' => [
                 'boolean',
             ],
-            'prevent_overlapping_time_entries' => [
-                'boolean',
-            ],
             'number_format' => [
                 Rule::enum(NumberFormat::class),
             ],
@@ -101,9 +98,4 @@ class OrganizationUpdateRequest extends BaseFormRequest
     {
         return $this->has('employees_can_see_billable_rates') ? $this->boolean('employees_can_see_billable_rates') : null;
     }
-
-    public function getPreventOverlappingTimeEntries(): ?bool
-    {
-        return $this->has('prevent_overlapping_time_entries') ? $this->boolean('prevent_overlapping_time_entries') : null;
-    }
 }

app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php

@@ -79,7 +79,7 @@ class TimeEntryStoreRequest extends BaseFormRequest
             'description' => [
                 'nullable',
                 'string',
-                'max:5000',
+                'max:500',
             ],
             // List of tag IDs
             'tags' => [

app/Http/Requests/V1/TimeEntry/TimeEntryUpdateMultipleRequest.php

@@ -79,7 +79,7 @@ class TimeEntryUpdateMultipleRequest extends BaseFormRequest
             'changes.description' => [
                 'nullable',
                 'string',
-                'max:5000',
+                'max:500',
             ],
             // List of tag IDs
             'changes.tags' => [

app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php

@@ -77,7 +77,7 @@ class TimeEntryUpdateRequest extends BaseFormRequest
             'description' => [
                 'nullable',
                 'string',
-                'max:5000',
+                'max:500',
             ],
             // List of tag IDs
             'tags' => [

app/Http/Resources/V1/Organization/OrganizationResource.php

@@ -53,8 +53,6 @@ class OrganizationResource extends BaseResource
             'billable_rate' => $this->showBillableRate ? $this->resource->billable_rate : null,
             /** @var bool $employees_can_see_billable_rates Can members of the organization with role "employee" see the billable rates */
             'employees_can_see_billable_rates' => $this->resource->employees_can_see_billable_rates,
-            /** @var bool $prevent_overlapping_time_entries Prevent creating overlapping time entries (only new entries) */
-            'prevent_overlapping_time_entries' => $this->resource->prevent_overlapping_time_entries,
             /** @var string $currency Currency code (ISO 4217) */
             'currency' => $this->resource->currency,
             /** @var string $currency_symbol Currency symbol */

app/Models/Client.php

@@ -7,7 +7,6 @@ namespace App\Models;
 use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\ClientFactory;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -63,18 +62,6 @@ class Client extends Model implements AuditableContract
         return $this->hasMany(Project::class, 'client_id');
     }
 
-    /**
-     * @param  Builder<Client>  $builder
-     * @return Builder<Client>
-     */
-    public function scopeVisibleByEmployee(Builder $builder, User $user): Builder
-    {
-        return $builder->whereHas('projects', function (Builder $builder) use ($user): Builder {
-            /** @var Builder<Project> $builder */
-            return $builder->visibleByEmployee($user);
-        });
-    }
-
     /**
      * @return Attribute<bool, never>
      */

app/Models/Organization.php

@@ -70,7 +70,6 @@ class Organization extends JetstreamTeam implements AuditableContract
         'personal_team' => 'boolean',
         'currency' => 'string',
         'employees_can_see_billable_rates' => 'boolean',
-        'prevent_overlapping_time_entries' => 'boolean',
         'number_format' => NumberFormat::class,
         'currency_format' => CurrencyFormat::class,
         'date_format' => DateFormat::class,

app/Providers/JetstreamServiceProvider.php

@@ -109,7 +109,6 @@ class JetstreamServiceProvider extends ServiceProvider
             'tags:update',
             'tags:delete',
             'clients:view',
-            'clients:view:all',
             'clients:create',
             'clients:update',
             'clients:delete',
@@ -173,7 +172,6 @@ class JetstreamServiceProvider extends ServiceProvider
             'tags:update',
             'tags:delete',
             'clients:view',
-            'clients:view:all',
             'clients:create',
             'clients:update',
             'clients:delete',
@@ -234,7 +232,6 @@ class JetstreamServiceProvider extends ServiceProvider
             'tags:update',
             'tags:delete',
             'clients:view',
-            'clients:view:all',
             'clients:create',
             'clients:update',
             'clients:delete',
@@ -259,13 +256,12 @@ class JetstreamServiceProvider extends ServiceProvider
             'projects:view',
             'tags:view',
             'tasks:view',
-            'clients:view',
             'time-entries:view:own',
             'time-entries:create:own',
             'time-entries:update:own',
             'time-entries:delete:own',
             'organizations:view',
-        ])->description('Employees have the ability to read, create, and update their own time entries, they can see the projects that they are members of and the clients they are assigned to.');
+        ])->description('Employees have the ability to read, create, and update their own time entries and they can see the projects that they are members of.');
 
         Jetstream::role(Role::Placeholder->value, 'Placeholder', [
         ])->description('Placeholders are used for importing data. They cannot log in and have no permissions.');

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -112,7 +112,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                 $timeEntry->project_id = $projectId;
                 $timeEntry->client_id = $clientId;
                 $timeEntry->organization_id = $this->organization->id;
-                if (strlen($record['Description']) > 5000) {
+                if (strlen($record['Description']) > 500) {
                     throw new ImportException('Time entry description is too long');
                 }
                 $timeEntry->description = $record['Description'];

app/Service/Import/Importers/HarvestTimeEntriesImporter.php

@@ -107,7 +107,7 @@ class HarvestTimeEntriesImporter extends DefaultImporter
                 $timeEntry->project_id = $projectId;
                 $timeEntry->client_id = $clientId;
                 $timeEntry->organization_id = $this->organization->id;
-                if (strlen($record['Notes']) > 5000) {
+                if (strlen($record['Notes']) > 500) {
                     throw new ImportException('Time entry note is too long');
                 }
                 $timeEntry->description = $record['Notes'];

app/Service/Import/Importers/SolidtimeImporter.php

@@ -247,7 +247,7 @@ class SolidtimeImporter extends DefaultImporter
                 $timeEntry->project_id = $projectId;
                 $timeEntry->client_id = $clientId;
                 $timeEntry->organization_id = $this->organization->id;
-                if (strlen($timeEntryRow['description']) > 5000) {
+                if (strlen($timeEntryRow['description']) > 500) {
                     throw new ImportException('Time entry description is too long');
                 }
                 $timeEntry->description = $timeEntryRow['description'];

app/Service/TimeEntryAggregationService.php

@@ -10,7 +10,6 @@ use App\Enums\TimeEntryRoundingType;
 use App\Enums\Weekday;
 use App\Models\Client;
 use App\Models\Project;
-use App\Models\Tag;
 use App\Models\Task;
 use App\Models\TimeEntry;
 use App\Models\User;
@@ -18,7 +17,6 @@ use Carbon\CarbonTimeZone;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 
 class TimeEntryAggregationService
@@ -47,21 +45,9 @@ class TimeEntryAggregationService
     public function getAggregatedTimeEntries(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end, bool $showBillableRate, ?TimeEntryRoundingType $roundingType, ?int $roundingMinutes): array
     {
         $fillGapsInTimeGroupsIsPossible = $fillGapsInTimeGroups && $start !== null && $end !== null;
-        /** @var Builder<TimeEntry> $baseTotalsQuery */
-        $baseTotalsQuery = $timeEntriesQuery->clone();
         $group1Select = null;
         $group2Select = null;
         $groupBy = null;
-        // If any grouping is by tag, expand rows per tag and ensure a NULL row for entries without tags
-        if (($group1Type === TimeEntryAggregationType::Tag) || ($group2Type === TimeEntryAggregationType::Tag)) {
-            $timeEntriesQuery->crossJoin(DB::raw(
-                "LATERAL (\n".
-                "  SELECT jsonb_array_elements_text(coalesce(tags, '[]'::jsonb)) AS tag\n".
-                "  UNION ALL\n".
-                "  SELECT ''::text AS tag WHERE coalesce(jsonb_array_length(tags), 0) = 0\n".
-                ') AS tag(tag)'
-            ));
-        }
         if ($group1Type !== null) {
             $group1Select = $this->getGroupByQuery($group1Type, $timezone, $startOfWeek);
             $groupBy = ['group_1'];
@@ -98,26 +84,6 @@ class TimeEntryAggregationService
             $group1Response = [];
             $group1ResponseSum = 0;
             $group1ResponseCost = 0;
-            // If Tag is subgroup, prepare base totals per primary group without tag expansion
-            $baseTotalsPerGroup1Map = [];
-            if ($group2Type === TimeEntryAggregationType::Tag) {
-                $baseTotalsPerGroup1Query = $baseTotalsQuery->clone();
-                $baseTotalsPerGroup1 = $baseTotalsPerGroup1Query
-                    ->selectRaw(
-                        $group1Select.' as group_1,'.
-                        ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')))) as aggregate,'.
-                        ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')) * (coalesce(billable_rate, 0)::float/60/60))) as cost'
-                    )
-                    ->groupBy('group_1')
-                    ->get();
-                foreach ($baseTotalsPerGroup1 as $row) {
-                    /** @var object{group_1: mixed, aggregate: int|null, cost: int|null} $row */
-                    $baseTotalsPerGroup1Map[(string) ($row->group_1 ?? '')] = [
-                        'aggregate' => (int) ($row->aggregate ?? 0),
-                        'cost' => (int) ($row->cost ?? 0),
-                    ];
-                }
-            }
             foreach ($groupedAggregates as $group1 => $group1Aggregates) {
                 /** @var string|int $group1 */
                 $group2Response = [];
@@ -137,14 +103,6 @@ class TimeEntryAggregationService
                         $group2ResponseSum += (int) $aggregate->get(0)->aggregate;
                         $group2ResponseCost += (int) $aggregate->get(0)->cost;
                     }
-                    // Override primary group totals when Tag is subgroup to avoid double counting
-                    if ($group2Type === TimeEntryAggregationType::Tag) {
-                        $keyForMap = (string) $group1;
-                        if (array_key_exists($keyForMap, $baseTotalsPerGroup1Map)) {
-                            $group2ResponseSum = $baseTotalsPerGroup1Map[$keyForMap]['aggregate'];
-                            $group2ResponseCost = $baseTotalsPerGroup1Map[$keyForMap]['cost'];
-                        }
-                    }
                 } else {
                     /** @var Collection<int, object{aggregate: int, cost: int}> $group1Aggregates */
                     $group2ResponseSum = (int) $group1Aggregates->get(0)->aggregate;
@@ -163,23 +121,6 @@ class TimeEntryAggregationService
                 $group1ResponseCost += $group2ResponseCost;
             }
 
-            // If Tag is selected in any grouping, compute overall totals from base (non-tag-expanded) query to avoid double counting
-            $hasTagGrouping = ($group1Type === TimeEntryAggregationType::Tag) || ($group2Type === TimeEntryAggregationType::Tag);
-            if ($hasTagGrouping) {
-                // Reset selects and ordering on the cloned base query
-                $baseTotals = $baseTotalsQuery
-                    ->selectRaw(
-                        ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')))) as aggregate,'.
-                        ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')) * (coalesce(billable_rate, 0)::float/60/60))) as cost'
-                    )
-                    ->first();
-                if ($baseTotals !== null) {
-                    /** @var object{aggregate: int|null, cost: int|null} $baseTotals */
-                    $group1ResponseSum = (int) ($baseTotals->aggregate ?? 0);
-                    $group1ResponseCost = (int) ($baseTotals->cost ?? 0);
-                }
-            }
-
             if ($fillGapsInTimeGroupsIsPossible) {
                 $group1Response = $this->fillGapsInTimeGroups($group1Response, $group1Type, $group2Type, $timezone, $startOfWeek, $start, $end);
             }
@@ -353,17 +294,6 @@ class TimeEntryAggregationService
                     'color' => null,
                 ];
             }
-        } elseif ($type === TimeEntryAggregationType::Tag) {
-            $tags = Tag::query()
-                ->whereIn('id', $keys)
-                ->select('id', 'name')
-                ->get();
-            foreach ($tags as $tag) {
-                $descriptorMap[$tag->id] = [
-                    'description' => $tag->name,
-                    'color' => null,
-                ];
-            }
         }
 
         return $descriptorMap;
@@ -506,8 +436,6 @@ class TimeEntryAggregationService
             return 'billable';
         } elseif ($group === TimeEntryAggregationType::Description) {
             return 'description';
-        } elseif ($group === TimeEntryAggregationType::Tag) {
-            return 'tag';
         }
     }
 

database/migrations/2025_10_02_000001_add_prevent_overlapping_time_entries_to_organizations_table.php

@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->boolean('prevent_overlapping_time_entries')->default(false)->after('employees_can_see_billable_rates');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->dropColumn('prevent_overlapping_time_entries');
-        });
-    }
-};

database/migrations/2025_10_16_000001_extend_time_entry_description.php

@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('time_entries', function (Blueprint $table): void {
-            $table->string('description', 5000)->change();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('time_entries', function (Blueprint $table): void {
-            $table->string('description', 500)->change();
-        });
-    }
-};

database/schema/pgsql_test-schema.sql

@@ -435,7 +435,7 @@ CREATE TABLE public.tasks (
 
 CREATE TABLE public.time_entries (
     id uuid NOT NULL,
-    description character varying(5000) NOT NULL,
+    description character varying(500) NOT NULL,
     start timestamp(0) without time zone NOT NULL,
     "end" timestamp(0) without time zone,
     billable_rate integer,

docker-compose.yml

@@ -5,6 +5,8 @@ services:
             dockerfile: Dockerfile
             args:
                 WWWGROUP: '${WWWGROUP}'
+        ports:
+            - '${FORWARD_WEB_PORT:-8083}:80'
         image: sail-8.3/app
         labels:
             - "traefik.enable=true"

docker/local/minio/create_bucket.sh

@@ -2,7 +2,7 @@
 
 # Source: https://helgesver.re/articles/laravel-sail-create-minio-bucket-automatically
 
-/usr/bin/mc alias set local ${S3_ENDPOINT} ${S3_ACCESS_KEY_ID} ${S3_SECRET_ACCESS_KEY};
+/usr/bin/mc config host add local ${S3_ENDPOINT} ${S3_ACCESS_KEY_ID} ${S3_SECRET_ACCESS_KEY};
 /usr/bin/mc rm -r --force local/${S3_BUCKET};
 /usr/bin/mc mb --ignore-existing local/${S3_BUCKET};
 /usr/bin/mc anonymous set public local/${S3_BUCKET};

docker/prod/Dockerfile

@@ -16,7 +16,7 @@ RUN CGO_ENABLED=1 \
     XCADDY_GO_BUILD_FLAGS="-ldflags='-w -s' -tags=nobadger,nomysql,nopgx" \
     CGO_CFLAGS=$(php-config --includes) \
     CGO_LDFLAGS="$(php-config --ldflags) $(php-config --libs)" \
-    xcaddy build v2.10.0 \
+    xcaddy build \
         --output /usr/local/bin/frankenphp \
         --with github.com/dunglas/frankenphp=./ \
         --with github.com/dunglas/frankenphp/caddy=./caddy/ \

e2e/organization.spec.ts

@@ -9,10 +9,7 @@ async function goToOrganizationSettings(page) {
 
 async function createTimeEntry(page, duration: string) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/time');
-
-    // Open the dropdown menu and click "Manual time entry"
-    await page.getByRole('button', { name: 'Time entry actions' }).click();
-    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
+    await page.getByRole('button', { name: 'Manual time entry' }).click();
 
     // Fill in the time entry details
     await page.getByTestId('time_entry_description').fill('Test time entry');

e2e/reporting.spec.ts

@@ -26,10 +26,7 @@ async function createTimeEntryWithProject(page: Page, projectName: string, durat
 
     // Then create the time entry
     await goToTimeOverview(page);
-
-    // Open the dropdown menu and click "Manual time entry"
-    await page.getByRole('button', { name: 'Time entry actions' }).click();
-    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
+    await page.getByRole('button', { name: 'Manual time entry' }).click();
 
     // Fill in the time entry details
     await page
@@ -55,10 +52,7 @@ async function createTimeEntryWithProject(page: Page, projectName: string, durat
 
 async function createTimeEntryWithTag(page: Page, tagName: string, duration: string) {
     await goToTimeOverview(page);
-
-    // Open the dropdown menu and click "Manual time entry"
-    await page.getByRole('button', { name: 'Time entry actions' }).click();
-    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
+    await page.getByRole('button', { name: 'Manual time entry' }).click();
 
     // Fill in the time entry details
     await page
@@ -87,10 +81,7 @@ async function createTimeEntryWithBillableStatus(
     duration: string
 ) {
     await goToTimeOverview(page);
-
-    // Open the dropdown menu and click "Manual time entry"
-    await page.getByRole('button', { name: 'Time entry actions' }).click();
-    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
+    await page.getByRole('button', { name: 'Manual time entry' }).click();
 
     // Fill in the time entry details
     await page

lang/en/exceptions.php

@@ -14,7 +14,6 @@ use App\Exceptions\Api\OnlyOwnerCanChangeOwnership;
 use App\Exceptions\Api\OnlyPlaceholdersCanBeMergedIntoAnotherMember;
 use App\Exceptions\Api\OrganizationHasNoSubscriptionButMultipleMembersException;
 use App\Exceptions\Api\OrganizationNeedsAtLeastOneOwner;
-use App\Exceptions\Api\OverlappingTimeEntryApiException;
 use App\Exceptions\Api\PdfRendererIsNotConfiguredException;
 use App\Exceptions\Api\PersonalAccessClientIsNotConfiguredException;
 use App\Exceptions\Api\ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException;
@@ -48,7 +47,6 @@ return [
         OnlyPlaceholdersCanBeMergedIntoAnotherMember::KEY => 'Only placeholders can be merged into another member',
         ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException::KEY => 'This placeholder can not be invited use the merge tool instead',
         InvitationForTheEmailAlreadyExistsApiException::KEY => 'The email has already been invited to the organization. Please wait for the user to accept the invitation or resend the invitation email.',
-        OverlappingTimeEntryApiException::KEY => 'Overlapping time entries are not allowed.',
     ],
     'unknown_error_in_admin_panel' => 'An unknown error occurred. Please check the logs.',
 ];

lang/en/validation.php

@@ -203,7 +203,6 @@ return [
     'organization' => 'The :attribute does not exist.',
     'task_belongs_to_project' => 'The :attribute is not part of the given project.',
     'project_name_already_exists' => 'A project with the same name and client already exists in the organization.',
-    'overlapping_time_entry' => 'Overlapping time entries are not allowed.',
     'tag_name_already_exists' => 'A tag with the same name already exists in the organization.',
     'client_name_already_exists' => 'A client with the same name already exists in the organization.',
     'task_name_already_exists' => 'A task with the same name already exists in the project.',

package-lock.json

@@ -7,11 +7,6 @@
             "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",
@@ -23,7 +18,6 @@
                 "@vue/eslint-config-typescript": "^14.3.0",
                 "@vueuse/core": "^12.8.2",
                 "@vueuse/integrations": "^12.5.0",
-                "chroma-js": "3.1.2",
                 "class-variance-authority": "^0.7.1",
                 "clsx": "^2.1.1",
                 "dayjs": "^1.11.11",
@@ -45,7 +39,6 @@
                 "@playwright/test": "^1.41.1",
                 "@tailwindcss/forms": "^0.5.9",
                 "@tailwindcss/typography": "^0.5.15",
-                "@types/chroma-js": "2.4.5",
                 "@types/node": "^22.10.10",
                 "@vitejs/plugin-vue": "^5.2.1",
                 "@vue/tsconfig": "^0.5.1",
@@ -1034,55 +1027,6 @@
                 "vue-demi": ">=0.13.0"
             }
         },
-        "node_modules/@fullcalendar/core": {
-            "version": "6.1.18",
-            "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.18.tgz",
-            "integrity": "sha512-cD7XtZIZZ87Cg2+itnpsONCsZ89VIfLLDZ22pQX4IQVWlpYUB3bcCf878DhWkqyEen6dhi5ePtBoqYgm5K+0fQ==",
-            "license": "MIT",
-            "dependencies": {
-                "preact": "~10.12.1"
-            }
-        },
-        "node_modules/@fullcalendar/daygrid": {
-            "version": "6.1.18",
-            "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.18.tgz",
-            "integrity": "sha512-s452Zle1SdMEzZDw+pDczm8m3JLIZzS9ANMThXTnqeqJewW1gqNFYas18aHypJSgF9Fh9rDJjTSUw04BpXB/Mg==",
-            "license": "MIT",
-            "peerDependencies": {
-                "@fullcalendar/core": "~6.1.18"
-            }
-        },
-        "node_modules/@fullcalendar/interaction": {
-            "version": "6.1.18",
-            "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-6.1.18.tgz",
-            "integrity": "sha512-f/mD5RTjzw+Q6MGTMZrLCgIrQLIUUO9NV/58aM2J6ZBQZeRlNizDqmqldqyG+j49zj2vFhUfZibPrVKWm5yA4Q==",
-            "license": "MIT",
-            "peerDependencies": {
-                "@fullcalendar/core": "~6.1.18"
-            }
-        },
-        "node_modules/@fullcalendar/timegrid": {
-            "version": "6.1.18",
-            "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-6.1.18.tgz",
-            "integrity": "sha512-T/ouhs+T1tM8JcW7Cjx+KiohL/qQWKqvRITwjol8ktJ1e1N/6noC40/obR1tyolqOxMRWHjJkYoj9fUqfoez9A==",
-            "license": "MIT",
-            "dependencies": {
-                "@fullcalendar/daygrid": "~6.1.18"
-            },
-            "peerDependencies": {
-                "@fullcalendar/core": "~6.1.18"
-            }
-        },
-        "node_modules/@fullcalendar/vue3": {
-            "version": "6.1.18",
-            "resolved": "https://registry.npmjs.org/@fullcalendar/vue3/-/vue3-6.1.18.tgz",
-            "integrity": "sha512-YMagwTumxsIx3GFYWLa9Yr73EMA+JuH6S3EeZGS+rEjvG5fDGdf+33rxGMzmw+LdO7SWi3ctbzRnJlv3fnm3RQ==",
-            "license": "MIT",
-            "peerDependencies": {
-                "@fullcalendar/core": "~6.1.18",
-                "vue": "^3.0.11"
-            }
-        },
         "node_modules/@heroicons/vue": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/@heroicons/vue/-/vue-2.2.0.tgz",
@@ -1898,13 +1842,6 @@
                 "vue": "^2.7.0 || ^3.0.0"
             }
         },
-        "node_modules/@types/chroma-js": {
-            "version": "2.4.5",
-            "resolved": "https://registry.npmjs.org/@types/chroma-js/-/chroma-js-2.4.5.tgz",
-            "integrity": "sha512-6ISjhzJViaPCy2q2e6PgK+8HcHQDQ0V2LDiKmYAh+jJlLqDa6HbwDh0wOevHY0kHHUx0iZwjSRbVD47WOUx5EQ==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/@types/estree": {
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
@@ -2940,12 +2877,6 @@
                 "node": ">= 6"
             }
         },
-        "node_modules/chroma-js": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-3.1.2.tgz",
-            "integrity": "sha512-IJnETTalXbsLx1eKEgx19d5L6SRM7cH4vINw/99p/M11HCuXGRWL+6YmCm7FWFGIo6dtWuQoQi1dc5yQ7ESIHg==",
-            "license": "(BSD-3-Clause AND Apache-2.0)"
-        },
         "node_modules/class-variance-authority": {
             "version": "0.7.1",
             "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.1.tgz",
@@ -5209,16 +5140,6 @@
             "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",

package.json

@@ -19,7 +19,6 @@
         "@playwright/test": "^1.41.1",
         "@tailwindcss/forms": "^0.5.9",
         "@tailwindcss/typography": "^0.5.15",
-        "@types/chroma-js": "2.4.5",
         "@types/node": "^22.10.10",
         "@vitejs/plugin-vue": "^5.2.1",
         "@vue/tsconfig": "^0.5.1",
@@ -40,11 +39,6 @@
     "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",
@@ -56,7 +50,6 @@
         "@vue/eslint-config-typescript": "^14.3.0",
         "@vueuse/core": "^12.8.2",
         "@vueuse/integrations": "^12.5.0",
-        "chroma-js": "3.1.2",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
         "dayjs": "^1.11.11",

resources/css/app.css

@@ -46,16 +46,14 @@
 
     --color-accent-default: rgba(var(--color-accent-300), 0.2);
     --color-accent-foreground: rgb(var(--color-accent-100));
-    --theme-color-default-background: var(--color-bg-primary);
-
 }
 
 :root.light {
-    --color-bg-primary: #FFFFFF;
+    --color-bg-primary: #F5F5F5;
     --color-bg-secondary: #f7f7f8;
-    --color-bg-tertiary: #eeeeef;
-    --color-bg-quaternary: #e1e1e3;
-    --color-bg-background: #F5F5F5;
+    --color-bg-tertiary: #e1e1e3;
+    --color-bg-quaternary: #ffffff;
+    --color-bg-background: #ffffff;
     --color-text-primary: #18181b;
     --color-text-secondary: #3f3f46;
     --color-text-tertiary: #57575C;
@@ -65,14 +63,14 @@
     --color-border-tertiary: #dfdfdf;
     --color-border-quaternary: #d1d1d1;
     --color-input-border-active: rgba(0,0,0,0.3);
-    --theme-color-menu-active: var(--color-bg-quaternary);
+    --theme-color-menu-active: var(--color-bg-tertiary);
 
-    --theme-color-card-background: var(--color-bg-primary);
-    --theme-color-card-background-active: var(--color-bg-tertiary);
+    --theme-color-card-background: var(--color-bg-quaternary);
+    --theme-color-card-background-active: var(--color-bg-primary);
 
     --theme-color-chart: var(--color-accent-400);
 
-    --theme-shadow-card: lch(0 0 0 / 0.022) 0px 3px 6px -2px, lch(0 0 0 / 0.044) 0px 1px 1px;
+    --theme-shadow-card: 0 1px 2px 0 rgb(0 0 0 / 0.05);
     --theme-shadow-dropdown: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
 
     --theme-color-row-background: var(--theme-color-card-background);
@@ -87,18 +85,17 @@
     --theme-color-button-primary-border: rgba(var(--color-accent-600), 1);
     --theme-color-button-primary-text: #FFFFFF;
 
-    --theme-color-input-background: var(--color-bg-primary);
+    --theme-color-input-background: var(--color-bg-quaternary);
 
     --theme-color-input-select-active: rgb(var(--color-accent-400));
     --theme-color-input-select-active-hover: rgb(var(--color-accent-500));
 
     --color-accent-default: rgb(var(--color-accent-100));
     --color-accent-foreground: rgb(var(--color-accent-800));
-    --theme-color-default-background: #FCFCFC;
-
 }
 
 :root {
+    --theme-color-default-background: var(--color-bg-primary);
     --theme-color-icon-active: rgb(var(--color-text-tertiary));
     --theme-color-card-background-separator: var(--color-border-tertiary);
     --theme-color-card-border: var(--color-border-secondary);
@@ -166,8 +163,10 @@ body {
 /* Inter Variable Font with browser compatibility considerations */
 @font-face {
     font-family: 'Inter';
-    src: url('/fonts/InterVariable.woff2') format('woff2'),
-         url('/fonts/InterVariable.ttf') format('truetype');
+    src: url('/fonts/Inter-Variable.woff2') format('woff2 supports variations'),
+         url('/fonts/Inter-Variable.woff2') format('woff2-variations'),
+         url('/fonts/Inter-Variable.ttf') format('truetype supports variations'),
+         url('/fonts/Inter-Variable.ttf') format('truetype-variations');
     font-weight: 100 900;
     font-style: normal;
     font-display: swap;

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

@@ -113,7 +113,7 @@ const option = computed(() => ({
         },
         axisLabel: {
             fontSize: 12,
-            fontWeight: 400,
+            fontWeight: 600,
             color: labelColor.value,
             margin: 16,
             fontFamily: 'Inter, sans-serif',

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

@@ -30,7 +30,10 @@ const organization = inject<ComputedRef<Organization>>('organization');
 <template>
     <div
         class="contents text-text-primary [&>*]:transition [&>*]:border-card-background-separator [&>*]:border-b [&>*]:h-[50px]">
-        <div :class="twMerge('pl-6 flex items-center space-x-3', props.indent ? 'pl-16' : '')">
+        <div
+            :class="
+                twMerge('pl-6 font-medium flex items-center space-x-3', props.indent ? 'pl-16' : '')
+            ">
             <GroupedItemsCountButton
                 v-if="entry.grouped_data && entry.grouped_data?.length > 0"
                 :expanded="expanded"

resources/js/Components/Common/User/UserTimezoneMismatchModal.vue

@@ -1,107 +0,0 @@
-<script setup lang="ts">
-import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
-import DialogModal from '@/packages/ui/src/DialogModal.vue';
-import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
-import { onMounted, ref } from 'vue';
-import { getUserTimezone } from '@/packages/ui/src/utils/settings';
-import { getDayJsInstance } from '@/packages/ui/src/utils/time';
-import { useForm, usePage } from '@inertiajs/vue3';
-import type { User } from '@/types/models';
-import { useSessionStorage } from '@vueuse/core';
-
-const show = defineModel('show', { default: false });
-const saving = defineModel('saving', { default: false });
-
-const timezone = ref('');
-const userTimezone = ref('');
-
-const page = usePage<{
-    auth: {
-        user: User;
-    };
-}>();
-
-const hideTimezoneMismatchModal = useSessionStorage<boolean>('hide-timezone-mismatch-modal', false);
-
-onMounted(() => {
-    timezone.value = Intl.DateTimeFormat().resolvedOptions().timeZone;
-    userTimezone.value = getUserTimezone();
-
-    const now = getDayJsInstance()();
-
-    if (
-        now.tz(timezone.value).format() !== now.tz(userTimezone.value).format() &&
-        !hideTimezoneMismatchModal.value
-    ) {
-        show.value = true;
-    }
-});
-
-function submit() {
-    saving.value = true;
-    const form = useForm({
-        _method: 'PUT',
-        timezone: timezone.value,
-        name: page.props.auth.user.name,
-        email: page.props.auth.user.email,
-        week_start: page.props.auth.user.week_start,
-    });
-
-    form.post(route('user-profile-information.update'), {
-        errorBag: 'updateProfileInformation',
-        preserveScroll: true,
-        onSuccess: () => {
-            saving.value = false;
-            show.value = false;
-            location.reload();
-        },
-    });
-}
-
-function cancel() {
-    show.value = false;
-    hideTimezoneMismatchModal.value = true;
-}
-</script>
-
-<template>
-    <DialogModal closeable :show="show" @close="show = false">
-        <template #title>
-            <div class="flex justify-center">
-                <span> Timezone mismatch detected </span>
-            </div>
-        </template>
-        <template #content>
-            <div class="flex items-center space-x-4">
-                <div class="col-span-6 sm:col-span-4 flex-1 space-y-2">
-                    <p>
-                        The timezone of your device does not match the timezone in your user
-                        settings. <br />
-                        <strong
-                            >We highly recommend that you update your timezone settings to your
-                            current timezone.</strong
-                        >
-                    </p>
-
-                    <p>
-                        Want to change your timezone setting from
-                        <strong>{{ userTimezone }}</strong> to <strong>{{ timezone }}</strong
-                        >.
-                    </p>
-                </div>
-            </div>
-        </template>
-        <template #footer>
-            <SecondaryButton @click="cancel"> Cancel</SecondaryButton>
-            <PrimaryButton
-                class="ms-3"
-                :class="{ 'opacity-25': saving }"
-                :disabled="saving"
-                @click="submit()">
-                Update timezone
-            </PrimaryButton>
-        </template>
-    </DialogModal>
-</template>
-
-<style scoped></style>

resources/js/Components/Dashboard/RecentlyTrackedTasksCard.vue

@@ -4,7 +4,9 @@ import { computed } from 'vue';
 import RecentlyTrackedTasksCardEntry from '@/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue';
 import DashboardCard from '@/Components/Dashboard/DashboardCard.vue';
 import { CheckCircleIcon } from '@heroicons/vue/20/solid';
+import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
 import { PlusCircleIcon } from '@heroicons/vue/24/solid';
+import { router } from '@inertiajs/vue3';
 import { getCurrentMembershipId, getCurrentOrganizationId } from '@/utils/useUser';
 import { api } from '@/packages/api/src';
 import { LoadingSpinner } from '@/packages/ui/src';
@@ -88,8 +90,23 @@ window.addEventListener('dashboard:refresh', () => {
         <div v-else class="text-center flex flex-1 justify-center items-center">
             <div>
                 <PlusCircleIcon class="w-8 text-icon-default inline pb-2"></PlusCircleIcon>
-                <h3 class="text-text-primary font-semibold text-sm">No recent time entries</h3>
-                <p class="pb-5 text-sm">Start tracking your time!</p>
+                <h3 class="text-text-primary font-semibold text-sm">No recent tasks found</h3>
+                <p class="pb-5 text-sm">Create tasks inside of a project!</p>
+                <SecondaryButton @click="router.visit(route('projects'))"
+                    >Go to Projects
+                </SecondaryButton>
+            </div>
+        </div>
+        <div
+            v-if="latestTasks && latestTasks.length === 1"
+            class="text-center flex flex-1 justify-center items-center text-sm">
+            <div>
+                <PlusCircleIcon class="w-8 text-icon-default inline pb-2"></PlusCircleIcon>
+                <h3 class="text-text-primary font-semibold">Add more tasks</h3>
+                <p class="pb-5">Create tasks inside of a project!</p>
+                <SecondaryButton @click="router.visit(route('projects'))"
+                    >Go to Projects
+                </SecondaryButton>
             </div>
         </div>
     </DashboardCard>

resources/js/Components/Dashboard/TeamActivityCardEntry.vue

@@ -10,8 +10,7 @@ defineProps<{
     <div class="px-4 py-2 2xl:py-3 border-b border-b-background-separator">
         <div class="col-span-2">
             <div class="flex justify-between">
-                <p
-                    class="font-semibold text-sm min-w-0 overflow-ellipsis overflow-hidden flex-1 text-text-primary">
+                <p class="font-semibold text-sm text-text-primary">
                     {{ name }}
                 </p>
                 <div v-if="working" class="flex space-x-1.5 items-center justify-end">

resources/js/Components/NotificationContainer.vue

@@ -1,7 +1,7 @@
 <template>
     <div
         aria-live="assertive"
-        class="pointer-events-none fixed inset-0 flex items-end px-4 py-6 sm:items-end sm:p-6 z-[70]">
+        class="pointer-events-none fixed inset-0 flex items-end px-4 py-6 sm:items-end sm:p-6 sm:pb-24 z-[70]">
         <div class="flex w-full flex-col items-center space-y-4 sm:items-end">
             <Notification
                 v-for="notification in notifications"

resources/js/Components/OrganizationSwitcher.vue

@@ -1,23 +1,12 @@
 <script setup lang="ts">
 import { ChevronDownIcon } from '@heroicons/vue/20/solid';
-import { Link, usePage } from '@inertiajs/vue3';
-import {
-    Cog6ToothIcon,
-    PlusCircleIcon,
-    CheckCircleIcon,
-    ArrowRightIcon,
-} from '@heroicons/vue/24/solid';
+import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
+import DropdownLink from '@/Components/DropdownLink.vue';
+import { usePage } from '@inertiajs/vue3';
 import type { Organization, User } from '@/types/models';
 import { isBillingActivated } from '@/utils/billing';
 import { canManageBilling } from '@/utils/permissions';
 import { switchOrganization } from '@/utils/useOrganization';
-import {
-    DropdownMenu,
-    DropdownMenuTrigger,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuLabel,
-} from '@/Components/ui/dropdown-menu';
 
 const page = usePage<{
     jetstream: {
@@ -39,79 +28,84 @@ const switchToTeam = (organization: Organization) => {
 </script>
 
 <template>
-    <DropdownMenu v-if="page.props.jetstream.hasTeamFeatures">
-        <DropdownMenuTrigger
-            class="flex w-full text-left hover:bg-white/10 focus-visible:ring-2 focus-visible:ring-ring cursor-pointer transition pl-2 py-1 rounded w-full items-center justify-between"
-            as-child>
-            <button data-testid="organization_switcher">
+    <Dropdown v-if="page.props.jetstream.hasTeamFeatures" align="center" width="60">
+        <template #trigger>
+            <div
+                data-testid="organization_switcher"
+                class="flex hover:bg-white/10 cursor-pointer transition px-2 py-1 rounded-lg w-full items-center justify-between font-medium">
                 <div class="flex flex-1 space-x-2 items-center w-[calc(100%-30px)]">
                     <div
-                        class="rounded bg-blue-900 font-medium text-xs flex-shrink-0 text-white w-5 h-5 flex items-center justify-center">
+                        class="rounded sm:rounded-lg bg-blue-900 font-semibold text-xs sm:text-sm flex-shrink-0 text-white w-5 sm:w-6 h-5 sm:h-6 flex items-center justify-center">
                         {{ page.props.auth.user.current_team.name.slice(0, 1).toUpperCase() }}
                     </div>
-                    <span class="text-xs flex-1 truncate font-medium">
+                    <span class="text-sm flex-1 truncate font-semibold">
                         {{ page.props.auth.user.current_team.name }}
                     </span>
                 </div>
                 <div class="w-[30px]">
-                    <div class="p-1 rounded-full flex items-center w-6 h-6">
-                        <ChevronDownIcon class="w-4 sm:w-full mt-[1px]"></ChevronDownIcon>
-                    </div>
+                    <button
+                        class="p-1 transition hover:bg-white/10 rounded-full flex items-center w-8 h-8">
+                        <ChevronDownIcon class="w-5 sm:w-full mt-[1px]"></ChevronDownIcon>
+                    </button>
                 </div>
-            </button>
-        </DropdownMenuTrigger>
+            </div>
+        </template>
 
-        <DropdownMenuContent align="start">
+        <template #content>
             <div class="w-60">
-                <DropdownMenuLabel>Manage Organization</DropdownMenuLabel>
+                <!-- Organization Management -->
+                <div class="block px-4 py-2 text-xs text-text-secondary">Manage Organization</div>
 
-                <DropdownMenuItem as-child>
-                    <Link
-                        :href="route('teams.show', page.props.auth.user.current_team.id)"
-                        class="inline-flex items-center gap-2.5 w-full">
-                        <Cog6ToothIcon class="w-5 h-5 text-icon-default" />
-                        <span>Organization Settings</span>
-                    </Link>
-                </DropdownMenuItem>
+                <!-- Organization Settings -->
+                <DropdownLink :href="route('teams.show', page.props.auth.user.current_team.id)">
+                    Organization Settings
+                </DropdownLink>
 
-                <DropdownMenuItem v-if="canManageBilling() && isBillingActivated()" as-child>
-                    <Link href="/billing" class="inline-flex items-center w-full"> Billing </Link>
-                </DropdownMenuItem>
+                <DropdownLink v-if="canManageBilling() && isBillingActivated()" href="/billing">
+                    Billing
+                </DropdownLink>
 
-                <DropdownMenuItem v-if="page.props.jetstream.canCreateTeams" as-child>
-                    <Link
-                        :href="route('teams.create')"
-                        class="inline-flex items-center gap-2.5 w-full">
-                        <PlusCircleIcon class="w-5 h-5 text-icon-default" />
-                        <span>Create new organization</span>
-                    </Link>
-                </DropdownMenuItem>
+                <DropdownLink
+                    v-if="page.props.jetstream.canCreateTeams"
+                    :href="route('teams.create')">
+                    Create new organization
+                </DropdownLink>
 
+                <!-- Organization Switcher -->
                 <template v-if="page.props.auth.user.all_teams.length > 1">
                     <div class="border-t border-card-background-separator" />
 
-                    <DropdownMenuLabel>Switch Organizations</DropdownMenuLabel>
+                    <div class="block px-4 py-2 text-xs text-text-secondary">
+                        Switch Organizations
+                    </div>
 
                     <template v-for="team in page.props.auth.user.all_teams" :key="team.id">
                         <form @submit.prevent="switchToTeam(team)">
-                            <DropdownMenuItem
-                                as-child
-                                class="inline-flex gap-2.5 items-center w-full">
-                                <button type="submit">
-                                    <CheckCircleIcon
+                            <DropdownLink as="button">
+                                <div class="flex items-center">
+                                    <svg
                                         v-if="team.id == page.props.auth.user.current_team_id"
-                                        class="h-5 w-5 text-green-400" />
-                                    <ArrowRightIcon v-else class="h-5 w-5 text-icon-default" />
+                                        class="me-2 h-5 w-5 text-green-400"
+                                        xmlns="http://www.w3.org/2000/svg"
+                                        fill="none"
+                                        viewBox="0 0 24 24"
+                                        stroke-width="1.5"
+                                        stroke="currentColor">
+                                        <path
+                                            stroke-linecap="round"
+                                            stroke-linejoin="round"
+                                            d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+                                    </svg>
 
-                                    <div class="w-full truncate text-left">
+                                    <div>
                                         {{ team.name }}
                                     </div>
-                                </button>
-                            </DropdownMenuItem>
+                                </div>
+                            </DropdownLink>
                         </form>
                     </template>
                 </template>
             </div>
-        </DropdownMenuContent>
-    </DropdownMenu>
+        </template>
+    </Dropdown>
 </template>

resources/js/Components/TimeTracker.vue

@@ -16,25 +16,12 @@ import { useProjectsStore } from '@/utils/useProjects';
 import { useTasksStore } from '@/utils/useTasks';
 import { useTagsStore } from '@/utils/useTags';
 import TimeTrackerControls from '@/packages/ui/src/TimeTracker/TimeTrackerControls.vue';
-import type {
-    CreateClientBody,
-    CreateProjectBody,
-    CreateTimeEntryBody,
-    Project,
-    Tag,
-} from '@/packages/api/src';
+import type { CreateClientBody, CreateProjectBody, Project } from '@/packages/api/src';
 import TimeTrackerRunningInDifferentOrganizationOverlay from '@/packages/ui/src/TimeTracker/TimeTrackerRunningInDifferentOrganizationOverlay.vue';
-import TimeTrackerMoreOptionsDropdown from '@/packages/ui/src/TimeTracker/TimeTrackerMoreOptionsDropdown.vue';
-import TimeEntryCreateModal from '@/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue';
 import { useClientsStore } from '@/utils/useClients';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import { canCreateProjects } from '@/utils/permissions';
-import { ref } from 'vue';
-import { useTimeEntriesStore } from '@/utils/useTimeEntries';
-import { useMutation, useQueryClient } from '@tanstack/vue-query';
-import { api } from '@/packages/api/src';
-import { useNotificationsStore } from '@/utils/notification';
 
 const page = usePage<{
     auth: {
@@ -60,8 +47,6 @@ const emit = defineEmits<{
     change: [];
 }>();
 
-const showManualTimeEntryModal = ref(false);
-
 watch(isActive, () => {
     if (isActive.value) {
         startLiveTimer();
@@ -108,70 +93,14 @@ function switchToTimeEntryOrganization() {
         switchOrganization(currentTimeEntry.value.organization_id);
     }
 }
-async function createTag(tag: string): Promise<Tag | undefined> {
+async function createTag(tag: string) {
     return await useTagsStore().createTag(tag);
 }
 
-async function createTimeEntry(timeEntry: Omit<CreateTimeEntryBody, 'member_id'>) {
-    await useTimeEntriesStore().createTimeEntry(timeEntry);
-    showManualTimeEntryModal.value = false;
-}
-
-async function createTimeEntryFromCurrentEntry() {
-    const { start, end, description, project_id, task_id, billable, tags } = currentTimeEntry.value;
-    await createTimeEntry({ start, end, description, project_id, task_id, billable, tags });
-    currentTimeEntryStore.$reset();
-}
-
-const { handleApiRequestNotifications } = useNotificationsStore();
-const queryClient = useQueryClient();
-
-const deleteTimeEntryMutation = useMutation({
-    mutationFn: async (timeEntryId: string) => {
-        const organizationId = getCurrentOrganizationId();
-        if (!organizationId) {
-            throw new Error('No organization selected');
-        }
-        return await api.deleteTimeEntry(undefined, {
-            params: {
-                organization: organizationId,
-                timeEntry: timeEntryId,
-            },
-        });
-    },
-    onSuccess: async () => {
-        await currentTimeEntryStore.fetchCurrentTimeEntry();
-        await useTimeEntriesStore().fetchTimeEntries();
-        queryClient.invalidateQueries({ queryKey: ['timeEntry'] });
-        queryClient.invalidateQueries({ queryKey: ['timeEntries'] });
-    },
-});
-
-async function discardCurrentTimeEntry() {
-    if (currentTimeEntry.value.id) {
-        await handleApiRequestNotifications(
-            () => deleteTimeEntryMutation.mutateAsync(currentTimeEntry.value.id),
-            'Time entry discarded successfully',
-            'Failed to discard time entry'
-        );
-    }
-}
-
 const { tags } = storeToRefs(useTagsStore());
 </script>
 
 <template>
-    <TimeEntryCreateModal
-        v-model:show="showManualTimeEntryModal"
-        :enable-estimated-time="isAllowedToPerformPremiumAction()"
-        :create-project="createProject"
-        :create-client="createClient"
-        :create-tag="createTag"
-        :create-time-entry="createTimeEntry"
-        :projects
-        :tasks
-        :tags
-        :clients></TimeEntryCreateModal>
     <CardTitle title="Time Tracker" :icon="ClockIcon"></CardTitle>
     <div class="relative">
         <TimeTrackerRunningInDifferentOrganizationOverlay
@@ -180,35 +109,24 @@ const { tags } = storeToRefs(useTagsStore());
                 switchToTimeEntryOrganization
             "></TimeTrackerRunningInDifferentOrganizationOverlay>
 
-        <div class="flex w-full items-center gap-2">
-            <div class="flex w-full items-center gap-2">
-                <div class="flex-1">
-                    <TimeTrackerControls
-                        v-model:current-time-entry="currentTimeEntry"
-                        v-model:live-timer="now"
-                        :create-project
-                        :enable-estimated-time="isAllowedToPerformPremiumAction()"
-                        :can-create-project="canCreateProjects()"
-                        :create-client
-                        :clients
-                        :tags
-                        :tasks
-                        :projects
-                        :create-tag
-                        :is-active
-                        :currency="getOrganizationCurrencyString()"
-                        @start-live-timer="startLiveTimer"
-                        @stop-live-timer="stopLiveTimer"
-                        @start-timer="setActiveState(true)"
-                        @stop-timer="setActiveState(false)"
-                        @update-time-entry="updateTimeEntry"
-                        @create-time-entry="createTimeEntryFromCurrentEntry"></TimeTrackerControls>
-                </div>
-                <TimeTrackerMoreOptionsDropdown
-                    :has-active-timer="isActive"
-                    @manual-entry="showManualTimeEntryModal = true"
-                    @discard="discardCurrentTimeEntry"></TimeTrackerMoreOptionsDropdown>
-            </div>
-        </div>
+        <TimeTrackerControls
+            v-model:current-time-entry="currentTimeEntry"
+            v-model:live-timer="now"
+            :create-project
+            :enable-estimated-time="isAllowedToPerformPremiumAction()"
+            :can-create-project="canCreateProjects()"
+            :create-client
+            :clients
+            :tags
+            :tasks
+            :projects
+            :create-tag
+            :is-active
+            :currency="getOrganizationCurrencyString()"
+            @start-live-timer="startLiveTimer"
+            @stop-live-timer="stopLiveTimer"
+            @start-timer="setActiveState(true)"
+            @stop-timer="setActiveState(false)"
+            @update-time-entry="updateTimeEntry"></TimeTrackerControls>
     </div>
 </template>

resources/js/Components/UserSettingsIcon.vue

@@ -1,24 +1,10 @@
 <script setup lang="ts">
-import { Link, router, usePage } from '@inertiajs/vue3';
+import { router, usePage } from '@inertiajs/vue3';
 import type { Organization, User } from '@/types/models';
-import {
-    DropdownMenu,
-    DropdownMenuTrigger,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuLabel,
-} from '@/Components/ui/dropdown-menu';
-import {
-    UserCircleIcon,
-    KeyIcon,
-    ArrowLeftOnRectangleIcon,
-    ChatBubbleLeftRightIcon,
-} from '@heroicons/vue/24/solid';
-import { openFeedback } from '@/utils/feedback';
+import DropdownLink from '@/Components/DropdownLink.vue';
+import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
 
 const page = usePage<{
-    has_services_extension?: boolean;
-    has_billing_extension?: boolean;
     jetstream: {
         canCreateTeams: boolean;
         hasTeamFeatures: boolean;
@@ -37,58 +23,60 @@ const logout = () => {
 };
 </script>
 <template>
-    <div class="relative">
-        <DropdownMenu>
-            <DropdownMenuTrigger
-                class="flex text-sm border-2 outline-none border-transparent rounded-full focus-visible:ring-2 focus-visible:ring-ring transition"
-                as-child>
-                <button data-testid="current_user_button">
+    <div class="ms-3 relative">
+        <Dropdown align="center" width="48">
+            <template #trigger>
+                <button
+                    v-if="page.props.jetstream.managesProfilePhotos"
+                    data-testid="current_user_button"
+                    class="flex text-sm border-2 border-transparent rounded-full focus:outline-none focus:border-gray-300 transition">
                     <img
-                        class="h-7 w-7 rounded-full object-cover"
+                        class="h-8 w-8 rounded-full object-cover"
                         :src="page.props.auth.user.profile_photo_url"
                         :alt="page.props.auth.user.name" />
                 </button>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent align="center" class="max-w-48">
-                <DropdownMenuLabel>Manage Account</DropdownMenuLabel>
 
-                <DropdownMenuItem as-child>
-                    <Link
-                        :href="route('profile.show')"
-                        class="inline-flex items-center gap-2.5 w-full">
-                        <UserCircleIcon class="w-5 h-5 text-icon-default" />
-                        <span>Profile Settings</span>
-                    </Link>
-                </DropdownMenuItem>
-
-                <DropdownMenuItem v-if="page.props.jetstream.hasApiFeatures" as-child>
-                    <Link
-                        :href="route('api-tokens.index')"
-                        class="inline-flex items-center gap-2.5 w-full">
-                        <KeyIcon class="w-5 h-5 text-icon-default" />
-                        <span>API Tokens</span>
-                    </Link>
-                </DropdownMenuItem>
-
-                <DropdownMenuItem v-if="page.props.has_services_extension" as-child>
+                <span v-else class="inline-flex rounded-md">
                     <button
                         type="button"
-                        class="inline-flex items-center gap-2.5 w-full"
-                        @click="openFeedback">
-                        <ChatBubbleLeftRightIcon class="w-5 h-5 text-icon-default" />
-                        <span>Feedback</span>
-                    </button>
-                </DropdownMenuItem>
+                        class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 bg-white hover:text-gray-700 focus:outline-none focus:bg-gray-50 active:bg-gray-50 transition ease-in-out duration-150">
+                        {{ page.props.auth.user.name }}
 
-                <form class="w-full" @submit.prevent="logout">
-                    <DropdownMenuItem as-child class="inline-flex items-center gap-2.5 w-full">
-                        <button type="submit" data-testid="logout_button">
-                            <ArrowLeftOnRectangleIcon class="w-5 h-5 text-icon-default" />
-                            <span>Log Out</span>
-                        </button>
-                    </DropdownMenuItem>
+                        <svg
+                            class="ms-2 -me-0.5 h-4 w-4"
+                            xmlns="http://www.w3.org/2000/svg"
+                            fill="none"
+                            viewBox="0 0 24 24"
+                            stroke-width="1.5"
+                            stroke="currentColor">
+                            <path
+                                stroke-linecap="round"
+                                stroke-linejoin="round"
+                                d="M19.5 8.25l-7.5 7.5-7.5-7.5" />
+                        </svg>
+                    </button>
+                </span>
+            </template>
+
+            <template #content>
+                <!-- Account Management -->
+                <div class="block px-4 py-2 text-xs text-gray-400">Manage Account</div>
+
+                <DropdownLink :href="route('profile.show')"> Profile </DropdownLink>
+
+                <DropdownLink
+                    v-if="page.props.jetstream.hasApiFeatures"
+                    :href="route('api-tokens.index')">
+                    API Tokens
+                </DropdownLink>
+
+                <div class="border-t border-card-border" />
+
+                <!-- Authentication -->
+                <form @submit.prevent="logout">
+                    <DropdownLink as="button" data-testid="logout_button"> Log Out </DropdownLink>
                 </form>
-            </DropdownMenuContent>
-        </DropdownMenu>
+            </template>
+        </Dropdown>
     </div>
 </template>

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

@@ -19,7 +19,7 @@ const forwardedProps = useForwardProps(delegatedProps);
 <template>
     <DropdownMenuLabel
         v-bind="forwardedProps"
-        :class="cn('block px-2 py-2 text-xs text-gray-400', inset && 'pl-8', props.class)">
+        :class="cn('px-2 py-1.5 text-sm font-semibold', inset && 'pl-8', props.class)">
         <slot />
     </DropdownMenuLabel>
 </template>

resources/js/Layouts/AppLayout.vue

@@ -5,7 +5,6 @@ import OrganizationSwitcher from '@/Components/OrganizationSwitcher.vue';
 import CurrentSidebarTimer from '@/Components/CurrentSidebarTimer.vue';
 import {
     Bars3Icon,
-    CalendarIcon,
     ChartBarIcon,
     ClockIcon,
     Cog6ToothIcon,
@@ -40,19 +39,14 @@ import { ArrowsRightLeftIcon } from '@heroicons/vue/16/solid';
 import { fetchToken, isTokenValid } from '@/utils/session';
 import UpdateSidebarNotification from '@/Components/UpdateSidebarNotification.vue';
 import BillingBanner from '@/Components/Billing/BillingBanner.vue';
-import UserTimezoneMismatchModal from '@/Components/Common/User/UserTimezoneMismatchModal.vue';
 import { useTheme } from '@/utils/theme';
 import { useQuery } from '@tanstack/vue-query';
 import { api } from '@/packages/api/src';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
-import { twMerge } from 'tailwind-merge';
-import Button from '@/Components/ui/button/Button.vue';
-import { openFeedback } from '@/utils/feedback';
 
 defineProps({
     title: String,
-    mainClass: String,
 });
 
 const showSidebarMenu = ref(false);
@@ -96,8 +90,8 @@ onMounted(async () => {
         }, 100);
     };
 });
+
 const page = usePage<{
-    has_services_extension?: boolean;
     auth: {
         user: User;
     };
@@ -108,7 +102,7 @@ const page = usePage<{
     <div v-bind="$attrs" class="flex flex-wrap bg-background text-text-secondary">
         <div
             :class="{
-                '!flex bg-default-background w-full z-30': showSidebarMenu,
+                '!flex bg-default-background w-full z-[9999999999]': showSidebarMenu,
             }"
             class="flex-shrink-0 h-screen hidden fixed w-[230px] 2xl:w-[250px] px-2.5 2xl:px-3 py-4 lg:flex flex-col justify-between">
             <div class="flex flex-col h-full">
@@ -137,11 +131,6 @@ const page = usePage<{
                                 :icon="ClockIcon"
                                 :current="route().current('time')"
                                 :href="route('time')"></NavigationSidebarItem>
-                            <NavigationSidebarItem
-                                title="Calendar"
-                                :icon="CalendarIcon"
-                                :current="route().current('calendar')"
-                                :href="route('calendar')"></NavigationSidebarItem>
                             <NavigationSidebarItem
                                 title="Reporting"
                                 :icon="ChartBarIcon"
@@ -244,44 +233,35 @@ const page = usePage<{
                 <div class="justify-self-end">
                     <UpdateSidebarNotification></UpdateSidebarNotification>
                     <ul
-                        class="border-t border-default-background-separator pt-3 gap-1 pr-2 flex justify-between items-center">
-                        <UserSettingsIcon></UserSettingsIcon>
-
+                        class="border-t border-default-background-separator pt-3 flex justify-between pr-4 items-center">
                         <NavigationSidebarItem
                             class="flex-1"
                             title="Profile Settings"
                             :icon="Cog6ToothIcon"
                             :href="route('profile.show')"></NavigationSidebarItem>
 
-                        <Button
-                            v-if="page.props.has_services_extension"
-                            variant="outline"
-                            size="xs"
-                            class="rounded-full ml-2 flex h-6 w-6 items-center text-xs text-icon-default justify-center"
-                            @click="openFeedback">
-                            ?
-                        </Button>
+                        <UserSettingsIcon></UserSettingsIcon>
                     </ul>
                 </div>
             </div>
         </div>
         <div class="flex-1 lg:ml-[230px] 2xl:ml-[250px] min-w-0">
             <div
-                class="h-screen overflow-y-auto flex flex-col bg-default-background border-l border-default-background-separator">
-                <div
-                    class="lg:hidden w-full px-3 py-1 border-b border-b-default-background-separator text-text-secondary flex justify-between items-center">
-                    <Bars3Icon
-                        class="w-7 text-text-secondary"
-                        @click="showSidebarMenu = !showSidebarMenu"></Bars3Icon>
-                    <OrganizationSwitcher></OrganizationSwitcher>
-                </div>
+                class="lg:hidden w-full px-3 py-1 border-b border-b-default-background-separator text-text-secondary flex justify-between items-center">
+                <Bars3Icon
+                    class="w-7 text-text-secondary"
+                    @click="showSidebarMenu = !showSidebarMenu"></Bars3Icon>
+                <OrganizationSwitcher></OrganizationSwitcher>
+            </div>
 
-                <Head :title="title" />
+            <Head :title="title" />
 
+            <Banner />
+            <BillingBanner v-if="isBillingActivated()" />
+
+            <div
+                class="min-h-screen flex flex-col bg-default-background border-l border-default-background-separator">
                 <!-- Page Heading -->
-                <Banner />
-                <BillingBanner v-if="isBillingActivated()" />
-
                 <header
                     v-if="$slots.header"
                     class="bg-default-background border-b border-default-background-separator shadow">
@@ -293,7 +273,7 @@ const page = usePage<{
                 </header>
 
                 <!-- Page Content -->
-                <main :class="twMerge('pb-28 relative flex-1', mainClass)">
+                <main class="pb-28 flex-1">
                     <div
                         v-if="isOrganizationLoading"
                         class="flex items-center justify-center h-screen">
@@ -305,5 +285,4 @@ const page = usePage<{
         </div>
     </div>
     <NotificationContainer></NotificationContainer>
-    <UserTimezoneMismatchModal></UserTimezoneMismatchModal>
 </template>

resources/js/Pages/Calendar.vue

@@ -1,141 +0,0 @@
-<script setup lang="ts">
-import AppLayout from '@/Layouts/AppLayout.vue';
-import { useQuery, useQueryClient } from '@tanstack/vue-query';
-import {
-    api,
-    type Client,
-    type CreateClientBody,
-    type CreateProjectBody,
-    type Project,
-    type TimeEntryResponse,
-} from '@/packages/api/src';
-import { getCurrentOrganizationId, getCurrentMembershipId } from '@/utils/useUser';
-import { computed, ref } from 'vue';
-import { getDayJsInstance } from '@/packages/ui/src/utils/time';
-import { TimeEntryCalendar } from '@/packages/ui/src';
-import { isAllowedToPerformPremiumAction } from '@/utils/billing';
-import { useTimeEntriesStore } from '@/utils/useTimeEntries';
-import { useTagsStore } from '@/utils/useTags';
-import { useProjectsStore } from '@/utils/useProjects';
-import { useClientsStore } from '@/utils/useClients';
-import { storeToRefs } from 'pinia';
-import { useTasksStore } from '@/utils/useTasks';
-import { getUserTimezone } from '@/packages/ui/src/utils/settings';
-
-const calendarStart = ref<Date | undefined>(undefined);
-const calendarEnd = ref<Date | undefined>(undefined);
-
-const enableCalendarQuery = computed(() => {
-    return !!getCurrentOrganizationId() && !!calendarStart.value && !!calendarEnd.value;
-});
-
-// Calculate expanded date range to include previous and next periods with timezone transformations
-const expandedDateRange = computed(() => {
-    if (!calendarStart.value || !calendarEnd.value) {
-        return { start: null, end: null };
-    }
-
-    const dayjs = getDayJsInstance();
-    const duration = dayjs(calendarEnd.value).diff(dayjs(calendarStart.value), 'milliseconds');
-
-    // Calculate previous period
-    const previousStart = dayjs(calendarStart.value).subtract(duration, 'milliseconds');
-    // Calculate next period
-    const nextEnd = dayjs(calendarEnd.value).add(duration, 'milliseconds');
-
-    // Apply timezone transformations
-    const formattedStart = previousStart.utc().tz(getUserTimezone(), true).utc().format();
-    const formattedEnd = nextEnd.utc().tz(getUserTimezone(), true).utc().format();
-
-    return {
-        start: formattedStart,
-        end: formattedEnd,
-    };
-});
-
-const { data: timeEntryResponse, isLoading: timeEntriesLoading } = useQuery<TimeEntryResponse>({
-    queryKey: computed(() => [
-        'timeEntry',
-        'calendar',
-        {
-            start: expandedDateRange.value.start,
-            end: expandedDateRange.value.end,
-            organization: getCurrentOrganizationId(),
-        },
-    ]),
-    enabled: enableCalendarQuery,
-    placeholderData: (previousData) => previousData,
-    queryFn: () =>
-        api.getTimeEntries({
-            params: {
-                organization: getCurrentOrganizationId() || '',
-            },
-            queries: {
-                start: expandedDateRange.value.start!,
-                end: expandedDateRange.value.end!,
-                member_id: getCurrentMembershipId(),
-            },
-        }),
-});
-
-const currentTimeEntries = computed(() => {
-    return timeEntryResponse?.value?.data || [];
-});
-
-const { createTimeEntry, updateTimeEntry, deleteTimeEntry } = useTimeEntriesStore();
-
-async function createTag(name: string) {
-    return await useTagsStore().createTag(name);
-}
-
-async function createProject(project: CreateProjectBody): Promise<Project | undefined> {
-    return await useProjectsStore().createProject(project);
-}
-
-async function createClient(body: CreateClientBody): Promise<Client | undefined> {
-    return await useClientsStore().createClient(body);
-}
-
-const projectStore = useProjectsStore();
-const { projects } = storeToRefs(projectStore);
-const taskStore = useTasksStore();
-const { tasks } = storeToRefs(taskStore);
-const clientStore = useClientsStore();
-const { clients } = storeToRefs(clientStore);
-const tagsStore = useTagsStore();
-const { tags } = storeToRefs(tagsStore);
-
-const queryClient = useQueryClient();
-
-function onDatesChange({ start, end }: { start: Date; end: Date }) {
-    calendarStart.value = start;
-    calendarEnd.value = end;
-}
-
-function onRefresh() {
-    queryClient.invalidateQueries({
-        queryKey: ['timeEntry', 'calendar'],
-    });
-}
-</script>
-
-<template>
-    <AppLayout title="Calendar" data-testid="calendar_view" main-class="p-0">
-        <TimeEntryCalendar
-            :time-entries="currentTimeEntries"
-            :projects="projects"
-            :tasks="tasks"
-            :clients="clients"
-            :tags="tags"
-            :loading="timeEntriesLoading"
-            :enable-estimated-time="isAllowedToPerformPremiumAction()"
-            :create-time-entry="createTimeEntry"
-            :update-time-entry="updateTimeEntry"
-            :delete-time-entry="deleteTimeEntry"
-            :create-client="createClient"
-            :create-project="createProject"
-            :create-tag="createTag"
-            @dates-change="onDatesChange"
-            @refresh="onRefresh" />
-    </AppLayout>
-</template>

resources/js/Pages/ReportingDetailed.vue

@@ -369,7 +369,6 @@ async function downloadExport(format: ExportFormat) {
             :tags="tags"
             :currency="getOrganizationCurrencyString()"
             :clients="clients"
-            class="border-b border-default-background-separator"
             :update-time-entries="
                 (args) =>
                     updateTimeEntries(
@@ -400,7 +399,6 @@ async function downloadExport(format: ExportFormat) {
                     :on-start-stop-click="() => startTimeEntryFromExisting(entry)"
                     :delete-time-entry="() => deleteTimeEntries([entry])"
                     :currency="getOrganizationCurrencyString()"
-                    :duplicate-time-entry="() => createTimeEntry(entry)"
                     :members="members"
                     show-date
                     show-member

resources/js/Pages/Teams/Partials/OrganizationFormatSettings.vue

@@ -27,7 +27,7 @@ interface FormValues {
 }
 
 const store = useOrganizationStore();
-const { updateOrganization } = store;
+const { fetchOrganization, updateOrganization } = store;
 const { organization } = storeToRefs(store);
 const queryClient = useQueryClient();
 
@@ -47,6 +47,7 @@ const mutation = useMutation({
 });
 
 onMounted(async () => {
+    await fetchOrganization();
     if (organization.value) {
         form.value = {
             number_format: organization.value.number_format as NumberFormat,

resources/js/Pages/Teams/Partials/OrganizationTimeEntrySettings.vue

@@ -1,68 +0,0 @@
-<script setup lang="ts">
-import FormSection from '@/Components/FormSection.vue';
-import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
-import { onMounted, ref } from 'vue';
-import InputLabel from '@/packages/ui/src/Input/InputLabel.vue';
-import { Checkbox } from '@/packages/ui/src';
-import type { UpdateOrganizationBody } from '@/packages/api/src';
-import { useOrganizationStore } from '@/utils/useOrganization';
-import { storeToRefs } from 'pinia';
-import { useMutation, useQueryClient } from '@tanstack/vue-query';
-
-const store = useOrganizationStore();
-const { updateOrganization } = store;
-const { organization } = storeToRefs(store);
-const queryClient = useQueryClient();
-
-const form = ref<{ prevent_overlapping_time_entries: boolean }>({
-    prevent_overlapping_time_entries: false,
-});
-
-onMounted(async () => {
-    form.value.prevent_overlapping_time_entries =
-        organization.value?.prevent_overlapping_time_entries ?? false;
-});
-
-const mutation = useMutation({
-    mutationFn: (values: Partial<UpdateOrganizationBody>) => updateOrganization(values),
-    onSuccess: () => {
-        queryClient.invalidateQueries({ queryKey: ['organization'] });
-    },
-});
-
-async function submit() {
-    await mutation.mutateAsync({
-        prevent_overlapping_time_entries: form.value.prevent_overlapping_time_entries,
-    });
-}
-</script>
-
-<template>
-    <FormSection>
-        <template #title>Time Entry Settings</template>
-        <template #description>
-            Disallow overlapping time entries for members of this organization. When enabled, users
-            cannot create new time entries that overlap with their existing ones. This only affects
-            newly created entries.
-        </template>
-
-        <template #form>
-            <div class="col-span-6">
-                <div class="col-span-6 sm:col-span-4">
-                    <div class="flex items-center space-x-2">
-                        <Checkbox
-                            id="preventOverlappingTimeEntries"
-                            v-model:checked="form.prevent_overlapping_time_entries" />
-                        <InputLabel
-                            for="preventOverlappingTimeEntries"
-                            value="Prevent overlapping time entries (new entries only)" />
-                    </div>
-                </div>
-            </div>
-        </template>
-
-        <template #actions>
-            <PrimaryButton :disabled="mutation.isPending.value" @click="submit">Save</PrimaryButton>
-        </template>
-    </FormSection>
-</template>

resources/js/Pages/Teams/Show.vue

@@ -8,25 +8,12 @@ import type { Permissions, Role } from '@/types/jetstream';
 import { canUpdateOrganization } from '@/utils/permissions';
 import OrganizationBillableRate from '@/Pages/Teams/Partials/OrganizationBillableRate.vue';
 import OrganizationFormatSettings from '@/Pages/Teams/Partials/OrganizationFormatSettings.vue';
-import OrganizationTimeEntrySettings from '@/Pages/Teams/Partials/OrganizationTimeEntrySettings.vue';
-import { onMounted, ref } from 'vue';
-import { useOrganizationStore } from '@/utils/useOrganization';
-import { storeToRefs } from 'pinia';
 
 defineProps<{
     team: Organization;
     availableRoles: Role[];
     permissions: Permissions;
 }>();
-
-const loading = ref(true);
-const orgStore = useOrganizationStore();
-const { organization } = storeToRefs(orgStore);
-
-onMounted(async () => {
-    await orgStore.fetchOrganization();
-    loading.value = false;
-});
 </script>
 
 <template>
@@ -39,25 +26,17 @@ onMounted(async () => {
 
         <div>
             <div class="max-w-7xl mx-auto py-10 sm:px-6 lg:px-8">
-                <div v-if="loading || !organization" class="py-16 text-center text-text-secondary">
-                    Loading organization settings...
-                </div>
-                <template v-else>
-                    <UpdateTeamNameForm :team="team" :permissions="permissions" />
+                <UpdateTeamNameForm :team="team" :permissions="permissions" />
 
-                    <SectionBorder />
-                    <OrganizationBillableRate v-if="canUpdateOrganization()" :team="team" />
-                    <SectionBorder />
+                <SectionBorder />
+                <OrganizationBillableRate v-if="canUpdateOrganization()" :team="team" />
+                <SectionBorder />
 
-                    <OrganizationFormatSettings v-if="canUpdateOrganization()" :team="team" />
-                    <SectionBorder />
+                <OrganizationFormatSettings v-if="canUpdateOrganization()" :team="team" />
+                <SectionBorder />
 
-                    <OrganizationTimeEntrySettings v-if="canUpdateOrganization()" />
-                    <SectionBorder />
-
-                    <template v-if="permissions.canDeleteTeam && !team.personal_team">
-                        <DeleteTeamForm class="mt-10 sm:mt-0" :team="team" />
-                    </template>
+                <template v-if="permissions.canDeleteTeam && !team.personal_team">
+                    <DeleteTeamForm class="mt-10 sm:mt-0" :team="team" />
                 </template>
             </div>
         </div>

resources/js/Pages/Time.vue

@@ -15,6 +15,8 @@ import type {
 } from '@/packages/api/src';
 import { useElementVisibility } from '@vueuse/core';
 import { ClockIcon } from '@heroicons/vue/20/solid';
+import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
+import { PlusIcon } from '@heroicons/vue/16/solid';
 import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
 import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
 import { useTasksStore } from '@/utils/useTasks';
@@ -22,6 +24,7 @@ import { useProjectsStore } from '@/utils/useProjects';
 import TimeEntryGroupedTable from '@/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue';
 import { useTagsStore } from '@/utils/useTags';
 import { useClientsStore } from '@/utils/useClients';
+import TimeEntryCreateModal from '@/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import TimeEntryMassActionRow from '@/packages/ui/src/TimeEntry/TimeEntryMassActionRow.vue';
 import type { UpdateMultipleTimeEntriesChangeset } from '@/packages/api/src';
@@ -70,6 +73,7 @@ onMounted(async () => {
     await timeEntriesStore.fetchTimeEntries();
 });
 
+const showManualTimeEntryModal = ref(false);
 const projectStore = useProjectsStore();
 const { projects } = storeToRefs(projectStore);
 const taskStore = useTasksStore();
@@ -101,9 +105,33 @@ function deleteSelected() {
 </script>
 
 <template>
+    <TimeEntryCreateModal
+        v-model:show="showManualTimeEntryModal"
+        :enable-estimated-time="isAllowedToPerformPremiumAction()"
+        :create-project="createProject"
+        :create-client="createClient"
+        :create-tag="createTag"
+        :create-time-entry="createTimeEntry"
+        :projects
+        :tasks
+        :tags
+        :clients></TimeEntryCreateModal>
     <AppLayout title="Dashboard" data-testid="time_view">
         <MainContainer class="pt-5 lg:pt-8 pb-4 lg:pb-6">
-            <TimeTracker></TimeTracker>
+            <div
+                class="lg:flex items-end lg:divide-x divide-default-background-separator divide-y lg:divide-y-0 space-y-2 lg:space-y-0 lg:space-x-2">
+                <div class="flex-1">
+                    <TimeTracker></TimeTracker>
+                </div>
+                <div class="pb-2 pt-2 lg:pt-0 lg:pl-4 flex justify-center">
+                    <SecondaryButton
+                        class="w-full text-center flex justify-center"
+                        :icon="PlusIcon"
+                        @click="showManualTimeEntryModal = true"
+                        >Manual time entry
+                    </SecondaryButton>
+                </div>
+            </div>
         </MainContainer>
         <TimeEntryMassActionRow
             :selected-time-entries="selectedTimeEntries"
@@ -116,7 +144,6 @@ function deleteSelected() {
             :tags="tags"
             :currency="getOrganizationCurrencyString()"
             :clients="clients"
-            class="border-t border-default-background-separator"
             :update-time-entries="
                 (args) =>
                     updateTimeEntries(

resources/js/packages/api/src/openapi.json.client.ts

@@ -36,14 +36,20 @@ const ClientResource = z
 const ClientCollection = z.array(ClientResource);
 const ClientStoreRequest = z.object({ name: z.string().min(1).max(255) }).passthrough();
 const ClientUpdateRequest = z
-    .object({ name: z.string().min(1).max(255), is_archived: z.boolean().optional() })
+    .object({
+        name: z.string().min(1).max(255),
+        is_archived: z.boolean().optional(),
+    })
     .passthrough();
 const ImportRequest = z.object({ type: z.string(), data: z.string() }).passthrough();
 const InvitationResource = z
     .object({ id: z.string(), email: z.string(), role: z.string() })
     .passthrough();
 const InvitationStoreRequest = z
-    .object({ email: z.string().email(), role: z.enum(['admin', 'manager', 'employee']) })
+    .object({
+        email: z.string().email(),
+        role: z.enum(['admin', 'manager', 'employee']),
+    })
     .passthrough();
 const InvoiceResource = z
     .object({
@@ -91,7 +97,6 @@ const InvoiceStoreRequest = z
         billing_period_end: z.union([z.string(), z.null()]).optional(),
         reference: z.string(),
         currency: z.string(),
-        payment_iban: z.union([z.string(), z.null()]).optional(),
         tax_rate: z.number().int().gte(0).lte(2147483647).optional(),
         discount_amount: z.number().int().gte(0).lte(9223372036854776000).optional(),
         discount_type: InvoiceDiscountType.optional(),
@@ -156,7 +161,6 @@ const DetailedInvoiceResource = z
         discount_type: z.string(),
         discount_amount: z.number().int(),
         tax_rate: z.number().int(),
-        payment_iban: z.string(),
         status: z.string(),
         currency: z.string(),
         date: z.string(),
@@ -202,7 +206,6 @@ const InvoiceUpdateRequest = z
         billing_period_end: z.union([z.string(), z.null()]),
         reference: z.string(),
         currency: z.string(),
-        payment_iban: z.union([z.string(), z.null()]),
         tax_rate: z.number().int().gte(0).lte(2147483647),
         discount_amount: z.number().int().gte(0).lte(9223372036854776000),
         discount_type: InvoiceDiscountType,
@@ -317,7 +320,6 @@ const OrganizationResource = z
         is_personal: z.boolean(),
         billable_rate: z.union([z.number(), z.null()]),
         employees_can_see_billable_rates: z.boolean(),
-        prevent_overlapping_time_entries: z.boolean(),
         currency: z.string(),
         currency_symbol: z.string(),
         number_format: NumberFormat,
@@ -332,7 +334,6 @@ const OrganizationUpdateRequest = z
         name: z.string().max(255),
         billable_rate: z.union([z.number(), z.null()]),
         employees_can_see_billable_rates: z.boolean(),
-        prevent_overlapping_time_entries: z.boolean(),
         number_format: NumberFormat,
         currency_format: CurrencyFormat,
         date_format: DateFormat,
@@ -387,7 +388,10 @@ const ProjectMemberResource = z
     })
     .passthrough();
 const ProjectMemberStoreRequest = z
-    .object({ member_id: z.string(), billable_rate: z.union([z.number(), z.null()]).optional() })
+    .object({
+        member_id: z.string(),
+        billable_rate: z.union([z.number(), z.null()]).optional(),
+    })
     .passthrough();
 const ProjectMemberUpdateRequest = z
     .object({ billable_rate: z.union([z.number(), z.null()]) })
@@ -416,7 +420,6 @@ const TimeEntryAggregationType = z.enum([
     'client',
     'billable',
     'description',
-    'tag',
 ]);
 const TimeEntryAggregationTypeInterval = z.enum(['day', 'week', 'month', 'year']);
 const Weekday = z.enum([
@@ -428,7 +431,6 @@ const Weekday = z.enum([
     'saturday',
     'sunday',
 ]);
-const TimeEntryRoundingType = z.enum(['up', 'down', 'nearest']);
 const ReportStoreRequest = z
     .object({
         name: z.string().max(255),
@@ -451,8 +453,6 @@ const ReportStoreRequest = z
                 history_group: TimeEntryAggregationTypeInterval,
                 week_start: Weekday.optional(),
                 timezone: z.union([z.string(), z.null()]).optional(),
-                rounding_type: TimeEntryRoundingType.optional(),
-                rounding_minutes: z.union([z.number(), z.null()]).optional(),
             })
             .passthrough(),
     })
@@ -479,8 +479,6 @@ const DetailedReportResource = z
                 project_ids: z.union([z.array(z.string()), z.null()]),
                 tag_ids: z.union([z.array(z.string()), z.null()]),
                 task_ids: z.union([z.array(z.string()), z.null()]),
-                rounding_type: z.union([z.string(), z.null()]),
-                rounding_minutes: z.union([z.number(), z.null()]),
             })
             .passthrough(),
         created_at: z.string(),
@@ -594,7 +592,12 @@ const DetailedWithDataReportResource = z
     })
     .passthrough();
 const TagResource = z
-    .object({ id: z.string(), name: z.string(), created_at: z.string(), updated_at: z.string() })
+    .object({
+        id: z.string(),
+        name: z.string(),
+        created_at: z.string(),
+        updated_at: z.string(),
+    })
     .passthrough();
 const TagCollection = z.array(TagResource);
 const TagStoreRequest = z.object({ name: z.string().min(1).max(255) }).passthrough();
@@ -626,7 +629,6 @@ const TaskUpdateRequest = z
     })
     .passthrough();
 const start = z.union([z.string(), z.null()]).optional();
-const rounding_minutes = z.union([z.number(), z.null()]).optional();
 const TimeEntryResource = z
     .object({
         id: z.string(),
@@ -747,7 +749,6 @@ export const schemas = {
     TimeEntryAggregationType,
     TimeEntryAggregationTypeInterval,
     Weekday,
-    TimeEntryRoundingType,
     ReportStoreRequest,
     DetailedReportResource,
     ReportUpdateRequest,
@@ -760,7 +761,6 @@ export const schemas = {
     TaskStoreRequest,
     TaskUpdateRequest,
     start,
-    rounding_minutes,
     TimeEntryResource,
     TimeEntryStoreRequest,
     TimeEntryUpdateMultipleRequest,
@@ -790,7 +790,13 @@ const endpoints = makeApi([
         alias: 'getCurrencies',
         requestFormat: 'json',
         response: z.array(
-            z.object({ code: z.string(), name: z.string(), symbol: z.string() }).passthrough()
+            z
+                .object({
+                    code: z.string(),
+                    name: z.string(),
+                    symbol: z.string(),
+                })
+                .passthrough()
         ),
     },
     {
@@ -862,7 +868,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -1157,7 +1166,13 @@ const endpoints = makeApi([
             },
         ],
         response: z.array(
-            z.object({ value: z.number().int(), name: z.string(), color: z.string() }).passthrough()
+            z
+                .object({
+                    value: z.number().int(),
+                    name: z.string(),
+                    color: z.string(),
+                })
+                .passthrough()
         ),
         errors: [
             {
@@ -1220,7 +1235,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -1263,7 +1281,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -1311,7 +1332,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -1339,7 +1363,11 @@ const endpoints = makeApi([
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -1377,7 +1405,11 @@ const endpoints = makeApi([
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -1433,7 +1465,7 @@ const endpoints = makeApi([
                 status: 400,
                 schema: z.union([
                     z.object({ message: z.string() }).passthrough(),
-                    z.object({ message: z.literal('Invalid base64 encoded data') }).passthrough(),
+                    z.object({ message: z.string() }).passthrough(),
                 ]),
             },
             {
@@ -1455,7 +1487,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -1476,7 +1511,11 @@ const endpoints = makeApi([
             .object({
                 data: z.array(
                     z
-                        .object({ key: z.string(), name: z.string(), description: z.string() })
+                        .object({
+                            key: z.string(),
+                            name: z.string(),
+                            description: z.string(),
+                        })
                         .passthrough()
                 ),
             })
@@ -1564,7 +1603,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -1592,7 +1634,11 @@ const endpoints = makeApi([
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -1614,7 +1660,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -1760,7 +1809,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -1803,7 +1855,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -1846,7 +1901,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -1930,7 +1988,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -1995,13 +2056,6 @@ const endpoints = makeApi([
         ],
         response: z.object({ download_link: z.string() }).passthrough(),
         errors: [
-            {
-                status: 400,
-                description: `API exception`,
-                schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
-                    .passthrough(),
-            },
             {
                 status: 401,
                 description: `Unauthenticated`,
@@ -2021,7 +2075,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -2045,13 +2102,6 @@ const endpoints = makeApi([
         ],
         response: z.object({ download_link: z.string() }).passthrough(),
         errors: [
-            {
-                status: 400,
-                description: `API exception`,
-                schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
-                    .passthrough(),
-            },
             {
                 status: 401,
                 description: `Unauthenticated`,
@@ -2097,7 +2147,11 @@ const endpoints = makeApi([
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -2119,7 +2173,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -2189,7 +2246,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -2222,7 +2282,11 @@ const endpoints = makeApi([
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -2244,7 +2308,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -2277,7 +2344,11 @@ const endpoints = makeApi([
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -2299,7 +2370,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -2327,7 +2401,11 @@ const endpoints = makeApi([
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -2370,7 +2448,11 @@ const endpoints = makeApi([
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -2433,7 +2515,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -2549,7 +2634,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -2592,7 +2680,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -2676,7 +2767,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -2704,7 +2798,11 @@ const endpoints = makeApi([
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -2820,7 +2918,11 @@ const endpoints = makeApi([
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -2842,7 +2944,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -2948,7 +3053,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -3032,7 +3140,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -3142,7 +3253,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -3190,7 +3304,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -3218,7 +3335,11 @@ const endpoints = makeApi([
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -3313,7 +3434,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -3356,7 +3480,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -3404,7 +3531,10 @@ const endpoints = makeApi([
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -3432,7 +3562,11 @@ const endpoints = makeApi([
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -3505,16 +3639,6 @@ Users with the permission `time-entries:view:own` can only use this en
                 type: 'Query',
                 schema: z.enum(['true', 'false']).optional(),
             },
-            {
-                name: 'rounding_type',
-                type: 'Query',
-                schema: z.enum(['up', 'down', 'nearest']).optional(),
-            },
-            {
-                name: 'rounding_minutes',
-                type: 'Query',
-                schema: rounding_minutes,
-            },
             {
                 name: 'user_id',
                 type: 'Query',
@@ -3572,7 +3696,10 @@ Users with the permission `time-entries:view:own` can only use this en
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -3600,7 +3727,11 @@ Users with the permission `time-entries:view:own` can only use this en
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -3622,7 +3753,10 @@ Users with the permission `time-entries:view:own` can only use this en
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -3665,7 +3799,10 @@ Users with the permission `time-entries:view:own` can only use this en
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -3708,7 +3845,10 @@ Users with the permission `time-entries:view:own` can only use this en
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -3741,7 +3881,11 @@ Users with the permission `time-entries:view:own` can only use this en
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -3763,7 +3907,10 @@ Users with the permission `time-entries:view:own` can only use this en
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -3833,7 +3980,6 @@ If the group parameters are all set to `null` or are all missing, the
                         'client',
                         'billable',
                         'description',
-                        'tag',
                     ])
                     .optional(),
             },
@@ -3852,7 +3998,6 @@ If the group parameters are all set to `null` or are all missing, the
                         'client',
                         'billable',
                         'description',
-                        'tag',
                     ])
                     .optional(),
             },
@@ -3891,16 +4036,6 @@ If the group parameters are all set to `null` or are all missing, the
                 type: 'Query',
                 schema: z.enum(['true', 'false']).optional(),
             },
-            {
-                name: 'rounding_type',
-                type: 'Query',
-                schema: z.enum(['up', 'down', 'nearest']).optional(),
-            },
-            {
-                name: 'rounding_minutes',
-                type: 'Query',
-                schema: rounding_minutes,
-            },
             {
                 name: 'member_ids',
                 type: 'Query',
@@ -3985,7 +4120,10 @@ If the group parameters are all set to `null` or are all missing, the
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -4020,7 +4158,6 @@ If the group parameters are all set to `null` or are all missing, the
                     'client',
                     'billable',
                     'description',
-                    'tag',
                 ]),
             },
             {
@@ -4037,7 +4174,6 @@ If the group parameters are all set to `null` or are all missing, the
                     'client',
                     'billable',
                     'description',
-                    'tag',
                 ]),
             },
             {
@@ -4085,16 +4221,6 @@ If the group parameters are all set to `null` or are all missing, the
                 type: 'Query',
                 schema: z.enum(['true', 'false']).optional(),
             },
-            {
-                name: 'rounding_type',
-                type: 'Query',
-                schema: z.enum(['up', 'down', 'nearest']).optional(),
-            },
-            {
-                name: 'rounding_minutes',
-                type: 'Query',
-                schema: rounding_minutes,
-            },
             {
                 name: 'member_ids',
                 type: 'Query',
@@ -4130,7 +4256,11 @@ If the group parameters are all set to `null` or are all missing, the
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -4152,7 +4282,10 @@ If the group parameters are all set to `null` or are all missing, the
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -4213,16 +4346,6 @@ If the group parameters are all set to `null` or are all missing, the
                 type: 'Query',
                 schema: z.enum(['true', 'false']).optional(),
             },
-            {
-                name: 'rounding_type',
-                type: 'Query',
-                schema: z.enum(['up', 'down', 'nearest']).optional(),
-            },
-            {
-                name: 'rounding_minutes',
-                type: 'Query',
-                schema: rounding_minutes,
-            },
             {
                 name: 'member_ids',
                 type: 'Query',
@@ -4253,7 +4376,11 @@ If the group parameters are all set to `null` or are all missing, the
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -4275,7 +4402,10 @@ If the group parameters are all set to `null` or are all missing, the
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -4357,7 +4487,11 @@ Please note that the access token is only shown in this response and cannot be r
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -4374,7 +4508,10 @@ Please note that the access token is only shown in this response and cannot be r
                 status: 422,
                 description: `Validation error`,
                 schema: z
-                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
                     .passthrough(),
             },
         ],
@@ -4397,7 +4534,11 @@ Please note that the access token is only shown in this response and cannot be r
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {
@@ -4435,7 +4576,11 @@ Please note that the access token is only shown in this response and cannot be r
                 status: 400,
                 description: `API exception`,
                 schema: z
-                    .object({ error: z.boolean(), key: z.string(), message: z.string() })
+                    .object({
+                        error: z.boolean(),
+                        key: z.string(),
+                        message: z.string(),
+                    })
                     .passthrough(),
             },
             {

resources/js/packages/ui/src/Buttons/SecondaryButton.vue

@@ -10,8 +10,7 @@ const props = withDefaults(
         icon?: Component;
         size?: 'small' | 'base';
         loading?: boolean;
-        // Accept any valid Vue class binding shape (string | object | array)
-        class?: Parameters<typeof twMerge>[0];
+        class?: string;
     }>(),
     {
         type: 'button',

resources/js/packages/ui/src/FullCalendar/FullCalendarDayHeader.vue

@@ -1,31 +0,0 @@
-<script setup lang="ts">
-import { computed, inject, type ComputedRef } from 'vue';
-import { formatDate, formatHumanReadableDuration } from '../utils/time';
-import type { Organization } from '@/packages/api/src';
-import type { Dayjs } from 'dayjs';
-
-const props = defineProps<{
-    date: Dayjs;
-    totalMinutes?: number;
-}>();
-
-const totalSeconds = computed(() => (props.totalMinutes ?? 0) * 60);
-
-// Injected organization for formatting settings
-const organization = inject('organization') as ComputedRef<Organization | undefined> | undefined;
-const intervalFormat = computed(() => organization?.value?.interval_format);
-const numberFormat = computed(() => organization?.value?.number_format);
-const dateFormat = computed(() => organization?.value?.date_format);
-</script>
-
-<template>
-    <div class="fc-day-header-custom">
-        <div class="text-xs text-muted-foreground font-medium">
-            {{ date.format('ddd') }}
-        </div>
-        <span>{{ formatDate(date.toISOString(), dateFormat) }}</span>
-        <span class="block text-xs text-muted-foreground font-medium mt-1">
-            {{ formatHumanReadableDuration(totalSeconds, intervalFormat, numberFormat) }}
-        </span>
-    </div>
-</template>

resources/js/packages/ui/src/FullCalendar/FullCalendarEventContent.vue

@@ -1,58 +0,0 @@
-<script setup lang="ts">
-import { computed, inject, type ComputedRef } from 'vue';
-import { formatHumanReadableDuration, getDayJsInstance } from '../utils/time';
-import type { Organization } from '@/packages/api/src';
-
-const props = defineProps<{
-    title: string;
-    projectName?: string | null;
-    taskName?: string | null;
-    clientName?: string | null;
-    durationSeconds?: number;
-    start?: string | Date | null;
-    end?: string | Date | null;
-}>();
-
-const effectiveDurationSeconds = computed(() => {
-    if (typeof props.durationSeconds === 'number') {
-        return props.durationSeconds;
-    }
-    if (props.start && props.end) {
-        const end = getDayJsInstance()(props.end as unknown as string | Date);
-        const start = getDayJsInstance()(props.start as unknown as string | Date);
-        const minutes = end.diff(start, 'minutes');
-        return minutes * 60;
-    }
-    return 0;
-});
-
-const organization = inject('organization') as ComputedRef<Organization | undefined> | undefined;
-const intervalFormat = computed(() => organization?.value?.interval_format);
-const numberFormat = computed(() => organization?.value?.number_format);
-
-const formattedDuration = computed(() =>
-    formatHumanReadableDuration(
-        effectiveDurationSeconds.value,
-        intervalFormat.value,
-        numberFormat.value
-    )
-);
-</script>
-
-<template>
-    <div class="text-xs leading-tight">
-        <div class="font-semibold mb-0.5">{{ title }}</div>
-        <div v-if="projectName" class="font-medium text-[0.6875rem] opacity-90">
-            {{ projectName }}
-        </div>
-        <div v-if="taskName" class="font-medium text-[0.6875rem] opacity-90">
-            {{ taskName }}
-        </div>
-        <div v-if="clientName" class="text-[0.625rem] italic opacity-85">
-            {{ clientName }}
-        </div>
-        <div class="text-[0.625rem] font-semibold opacity-90 mt-0.5">
-            {{ formattedDuration }}
-        </div>
-    </div>
-</template>

resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue

@@ -1,603 +0,0 @@
-<script setup lang="ts">
-import FullCalendar from '@fullcalendar/vue3';
-import dayGridPlugin from '@fullcalendar/daygrid';
-import timeGridPlugin from '@fullcalendar/timegrid';
-import interactionPlugin from '@fullcalendar/interaction';
-import type { DatesSetArg, EventClickArg, EventDropArg, EventChangeArg } from '@fullcalendar/core';
-import { computed, ref, watch, inject, type ComputedRef } from 'vue';
-import chroma from 'chroma-js';
-import { useCssVariable } from '@/utils/useCssVariable';
-import { getDayJsInstance, getLocalizedDayJs } from '../utils/time';
-import { getUserTimezone, getWeekStart } from '../utils/settings';
-import { LoadingSpinner, TimeEntryCreateModal, TimeEntryEditModal } from '..';
-import FullCalendarEventContent from './FullCalendarEventContent.vue';
-import FullCalendarDayHeader from './FullCalendarDayHeader.vue';
-import type {
-    TimeEntry,
-    Project,
-    Client,
-    Task,
-    CreateProjectBody,
-    CreateClientBody,
-    Tag,
-    Organization,
-} from '@/packages/api/src';
-import type { Dayjs } from 'dayjs';
-
-type CalendarExtendedProps = { timeEntry: TimeEntry } & Record<string, unknown>;
-
-const emit = defineEmits<{
-    (e: 'dates-change', payload: { start: Date; end: Date }): void;
-    (e: 'refresh'): void;
-}>();
-
-const props = defineProps<{
-    timeEntries: TimeEntry[];
-    projects: Project[];
-    tasks: Task[];
-    clients: Client[];
-    tags: Tag[];
-    loading?: boolean;
-
-    // Permissions / feature flags
-    enableEstimatedTime: boolean;
-
-    createTimeEntry: (
-        entry: Omit<TimeEntry, 'id' | 'organization_id' | 'user_id'>
-    ) => Promise<void>;
-    updateTimeEntry: (entry: TimeEntry) => Promise<void>;
-    deleteTimeEntry: (timeEntryId: string) => Promise<void>;
-    createProject: (project: CreateProjectBody) => Promise<Project | undefined>;
-    createClient: (client: CreateClientBody) => Promise<Client | undefined>;
-    createTag: (name: string) => Promise<Tag | undefined>;
-}>();
-
-// Local component state
-const newEventStart = ref<Dayjs | null>(null);
-const newEventEnd = ref<Dayjs | null>(null);
-const showCreateTimeEntryModal = ref<boolean>(false);
-const showEditTimeEntryModal = ref<boolean>(false);
-const selectedTimeEntry = ref<TimeEntry | null>(null);
-
-const calendarRef = ref<InstanceType<typeof FullCalendar> | null>(null);
-
-// Inject organization data for settings
-const organization = inject<ComputedRef<Organization>>('organization');
-
-// Helper function to convert week start to FullCalendar firstDay value
-const getFirstDay = () => {
-    const weekStart = getWeekStart();
-    const weekStartMap: Record<string, number> = {
-        'sunday': 0,
-        'monday': 1,
-        'tuesday': 2,
-        'wednesday': 3,
-        'thursday': 4,
-        'friday': 5,
-        'saturday': 6,
-    };
-    return weekStartMap[weekStart] ?? 1; // Default to Monday if not found
-};
-
-// Helper function to get time format for slot labels
-const getSlotLabelFormat = () => {
-    const timeFormat = organization?.value?.time_format || '24-hours';
-    if (timeFormat === '12-hours') {
-        return {
-            hour: 'numeric' as const,
-            hour12: true,
-        };
-    } else {
-        return {
-            hour: '2-digit' as const,
-            minute: '2-digit' as const,
-            hour12: false,
-        };
-    }
-};
-
-const cssBackground = useCssVariable('--color-bg-background');
-
-const events = computed(() => {
-    const themeBackground = (() => {
-        return cssBackground.value?.trim();
-    })();
-    return props.timeEntries
-        ?.filter((timeEntry) => timeEntry.end !== null)
-        ?.map((timeEntry) => {
-            const project = props.projects.find((p) => p.id === timeEntry.project_id);
-            const client = props.clients.find((c) => c.id === project?.client_id);
-            const task = props.tasks.find((t) => t.id === timeEntry.task_id);
-            const duration = getDayJsInstance()(timeEntry.end!).diff(
-                getDayJsInstance()(timeEntry.start),
-                'minutes'
-            );
-
-            const title = timeEntry.description || 'No description';
-
-            const baseColor = project?.color || '#6B7280';
-            const backgroundColor = chroma.mix(baseColor, themeBackground, 0.65, 'lab').hex();
-            const borderColor = chroma.mix(baseColor, themeBackground, 0.5, 'lab').hex();
-
-            // For 0-duration events, display them with minimum visual duration but preserve actual duration
-            const startTime = getLocalizedDayJs(timeEntry.start);
-            const endTime =
-                duration === 0
-                    ? startTime.add(1, 'second') // Show as 1 second for minimal visibility
-                    : getLocalizedDayJs(timeEntry.end!);
-
-            return {
-                id: timeEntry.id,
-                start: startTime.format(),
-                end: endTime.format(),
-                title,
-                backgroundColor,
-                borderColor,
-                textColor: 'var(--foreground)',
-                extendedProps: {
-                    timeEntry,
-                    project,
-                    client,
-                    task,
-                    duration,
-                },
-            };
-        });
-});
-
-// Daily totals used in day header
-const dailyTotals = computed(() => {
-    const totals: Record<string, number> = {};
-    props.timeEntries
-        .filter((entry) => entry.end !== null)
-        .forEach((entry) => {
-            const date = getDayJsInstance()(entry.start).format('YYYY-MM-DD');
-            const duration = getDayJsInstance()(entry.end!).diff(
-                getDayJsInstance()(entry.start),
-                'minutes'
-            );
-            totals[date] = (totals[date] || 0) + duration;
-        });
-    return totals;
-});
-
-function emitDatesChange(arg: DatesSetArg) {
-    emit('dates-change', { start: arg.start, end: arg.end });
-}
-
-function handleDateSelect(arg: { start: Date; end: Date }) {
-    const startTime = getDayJsInstance()(arg.start.toISOString())
-        .utc()
-        .tz(getUserTimezone(), true)
-        .utc();
-    const endTime = getDayJsInstance()(arg.end.toISOString())
-        .utc()
-        .tz(getUserTimezone(), true)
-        .utc();
-    newEventStart.value = startTime;
-    newEventEnd.value = endTime;
-    showCreateTimeEntryModal.value = true;
-}
-
-function handleEventClick(arg: EventClickArg) {
-    const ext = arg.event.extendedProps as CalendarExtendedProps;
-    selectedTimeEntry.value = ext.timeEntry;
-    showEditTimeEntryModal.value = true;
-}
-
-async function handleEventDrop(arg: EventDropArg) {
-    const ext = arg.event.extendedProps as CalendarExtendedProps;
-    const timeEntry = ext.timeEntry;
-    if (!arg.event.start || !arg.event.end) return;
-    const updatedTimeEntry = {
-        ...timeEntry,
-        start: getDayJsInstance()(arg.event.start.toISOString())
-            .utc()
-            .tz(getUserTimezone(), true)
-            .utc()
-            .format(),
-        end: getDayJsInstance()(arg.event.end.toISOString())
-            .utc()
-            .tz(getUserTimezone(), true)
-            .utc()
-            .format(),
-    } as TimeEntry;
-    await props.updateTimeEntry(updatedTimeEntry);
-    emit('refresh');
-}
-
-async function handleEventResize(arg: EventChangeArg) {
-    const ext = arg.event.extendedProps as CalendarExtendedProps;
-    const timeEntry = ext.timeEntry;
-    if (!arg.event.start || !arg.event.end) return;
-    const updatedTimeEntry = {
-        ...timeEntry,
-        start: getDayJsInstance()(arg.event.start.toISOString())
-            .utc()
-            .tz(getUserTimezone(), true)
-            .utc()
-            .format(),
-        end: getDayJsInstance()(arg.event.end.toISOString())
-            .utc()
-            .tz(getUserTimezone(), true)
-            .utc()
-            .format(),
-    } as TimeEntry;
-    await props.updateTimeEntry(updatedTimeEntry);
-    emit('refresh');
-}
-
-const calendarOptions = computed(() => ({
-    plugins: [dayGridPlugin, timeGridPlugin, interactionPlugin],
-    initialView: 'timeGridWeek',
-    headerToolbar: {
-        left: 'prev,next today',
-        center: 'title',
-        right: 'timeGridWeek,timeGridDay',
-    },
-    height: 'parent',
-    slotMinTime: '00:00:00',
-    slotMaxTime: '24:00:00',
-    slotDuration: '00:15:00',
-    slotLabelInterval: '01:00:00',
-    slotLabelFormat: getSlotLabelFormat(),
-    snapDuration: '00:15:00',
-    firstDay: getFirstDay(),
-    allDaySlot: false,
-    nowIndicator: true,
-    selectable: true,
-    selectMirror: true,
-    editable: true,
-    eventResizableFromStart: true,
-    eventDurationEditable: true,
-    timeZone: getUserTimezone(),
-    eventStartEditable: true,
-    select: handleDateSelect,
-    eventClick: handleEventClick,
-    eventDrop: handleEventDrop,
-    eventResize: handleEventResize,
-    datesSet: emitDatesChange,
-
-    events: events.value,
-}));
-
-watch(showCreateTimeEntryModal, (value) => {
-    if (!value) {
-        newEventStart.value = null;
-        newEventEnd.value = null;
-        // Ensure FullCalendar clears the selection mirror when modal closes
-        calendarRef.value?.getApi().unselect();
-        emit('refresh');
-    }
-});
-
-watch(showEditTimeEntryModal, (value) => {
-    if (!value) {
-        selectedTimeEntry.value = null;
-        emit('refresh');
-    }
-});
-</script>
-
-<template>
-    <div class="w-full relative h-full flex-1">
-        <div v-if="loading" class="flex items-center justify-center h-full">
-            <div class="flex flex-col items-center space-y-4">
-                <LoadingSpinner class="h-8 w-8" />
-                <p class="text-muted-foreground">Loading calendar data...</p>
-            </div>
-        </div>
-
-        <TimeEntryCreateModal
-            v-model:show="showCreateTimeEntryModal"
-            :enable-estimated-time="enableEstimatedTime"
-            :create-time-entry="createTimeEntry"
-            :create-client="createClient"
-            :create-project="createProject"
-            :create-tag="createTag"
-            :tags="tags as any"
-            :projects="projects"
-            :tasks="tasks"
-            :clients="clients"
-            :start="newEventStart ? newEventStart.toISOString() : undefined"
-            :end="newEventEnd ? newEventEnd.toISOString() : undefined" />
-
-        <TimeEntryEditModal
-            v-model:show="showEditTimeEntryModal"
-            :time-entry="selectedTimeEntry as any"
-            :enable-estimated-time="enableEstimatedTime"
-            :update-time-entry="updateTimeEntry"
-            :delete-time-entry="deleteTimeEntry"
-            :create-client="createClient"
-            :create-project="createProject"
-            :create-tag="createTag"
-            :tags="tags as any"
-            :projects="projects"
-            :tasks="tasks"
-            :clients="clients" />
-        <FullCalendar ref="calendarRef" class="fullcalendar" :options="calendarOptions">
-            <template #eventContent="arg">
-                <FullCalendarEventContent
-                    :title="arg.event.title"
-                    :project-name="(arg.event.extendedProps as any).project?.name"
-                    :task-name="(arg.event.extendedProps as any).task?.name"
-                    :client-name="(arg.event.extendedProps as any).client?.name"
-                    :duration-seconds="
-                        ((arg.event.extendedProps as any).duration ?? undefined)
-                            ? (arg.event.extendedProps as any).duration * 60
-                            : undefined
-                    "
-                    :start="arg.event.start as any"
-                    :end="arg.event.end as any" />
-            </template>
-            <template #dayHeaderContent="arg">
-                <FullCalendarDayHeader
-                    :date="
-                        getDayJsInstance()(arg.date.toISOString()).utc().tz(getUserTimezone(), true)
-                    "
-                    :total-minutes="
-                        dailyTotals[
-                            getDayJsInstance()(arg.date)
-                                .utc()
-                                .tz(getUserTimezone(), true)
-                                .format('YYYY-MM-DD')
-                        ] || 0
-                    " />
-            </template>
-        </FullCalendar>
-    </div>
-</template>
-
-<style scoped>
-.fullcalendar {
-    height: 100%;
-    --fc-border-color: var(--border);
-}
-
-/* FullCalendar theme customization */
-.fullcalendar :deep(.fc) {
-    background-color: var(--theme-color-default-background);
-    color: var(--foreground);
-    font-family: inherit;
-}
-
-.fullcalendar :deep(.fc-timegrid-slot) {
-    height: 25px;
-    transition: height 0.2s ease;
-}
-
-.fullcalendar :deep(.fc-timegrid-slot-label) {
-    background-color: var(--theme-color-default-background);
-}
-
-.fullcalendar :deep(.fc-toolbar) {
-    background-color: var(--theme-color-default-background);
-    padding: 0.5rem;
-    margin-bottom: 0;
-}
-
-.fullcalendar :deep(.fc-toolbar-title) {
-    color: var(--foreground);
-    font-size: 1rem;
-    font-weight: 600;
-}
-
-.fullcalendar :deep(.fc-button) {
-    background-color: var(--secondary);
-    border: 1px solid var(--border);
-    color: var(--foreground);
-    font-weight: 500;
-    font-size: 14px !important;
-}
-
-.fullcalendar :deep(.fc-button:hover) {
-    background-color: var(--muted);
-    border-color: var(--border);
-}
-
-.fullcalendar :deep(.fc-button:focus) {
-    box-shadow: 0 0 0 2px var(--ring);
-}
-
-.fullcalendar :deep(.fc-button-active) {
-    background-color: var(--primary);
-    border-color: var(--primary);
-    color: var(--primary-foreground);
-}
-
-.fullcalendar :deep(.fc-col-header) {
-    border-bottom: 1px solid var(--border);
-}
-
-.fullcalendar :deep(.fc-col-header-cell) {
-    border-right: 1px solid var(--border);
-    border-bottom: 1px solid var(--border);
-    padding: 0.75rem 0.5rem;
-    background-color: var(--theme-color-default-background);
-}
-
-.fullcalendar :deep(.fc-timegrid-axis) {
-    background-color: var(--theme-color-default-background) !important;
-}
-
-.fullcalendar :deep(.fc-col-header-cell .fc-col-header-cell-cushion) {
-    padding: 0;
-}
-
-.fullcalendar :deep(.fc-timegrid-axis) {
-    background-color: var(--theme-color-default-background);
-    border-right: 1px solid var(--border);
-}
-
-/* Quarter-hour slots - transparent borders */
-.fullcalendar :deep(.fc-timegrid-slot-minor.fc-timegrid-slot-label) {
-    border-top: 1px solid transparent;
-}
-
-.fullcalendar :deep(.fc-timegrid-slot-minor.fc-timegrid-slot-lane) {
-    --tw-border-opacity: 0;
-}
-
-.fullcalendar :deep(.fc-day-today.fc-col-header-cell) {
-    background-color: var(--color-accent-default);
-}
-
-.fullcalendar :deep(.fc-day-today) {
-    background-color: var(--theme-color-default-background);
-}
-
-.fullcalendar :deep(.fc-now-indicator) {
-    border-color: var(--primary);
-    border-width: 2px;
-}
-
-.fullcalendar :deep(.fc-event) {
-    border-radius: var(--radius);
-    padding: 0.45rem 0.25rem;
-    font-size: 0.75rem;
-    cursor: pointer;
-    box-shadow: var(--theme-shadow-card);
-    opacity: 0.9;
-    overflow: hidden;
-}
-
-.fullcalendar :deep(.fc-v-event) {
-    background-color: var(--muted);
-    border-color: var(--muted);
-}
-
-.fullcalendar :deep(.fc-event-title) {
-    font-weight: 500;
-    line-height: 1.2;
-}
-
-/* Enhanced FullCalendar resize handles */
-.fullcalendar :deep(.fc-event-resizer) {
-    position: absolute;
-    z-index: 99;
-    background: '#FFF';
-    border-radius: 2px;
-    width: 100%;
-    height: 4px;
-    left: 0;
-    transition: all 0.2s ease;
-    opacity: 0;
-}
-
-.fullcalendar :deep(.fc-event-resizer-start) {
-    top: -2px;
-    cursor: n-resize;
-}
-
-.fullcalendar :deep(.fc-event-resizer-end) {
-    bottom: -2px;
-    cursor: s-resize;
-}
-
-.fullcalendar :deep(.fc-event:hover .fc-event-resizer) {
-    opacity: 1;
-}
-
-.fullcalendar :deep(.fc-event-resizer:hover) {
-    background: '#FFF';
-    height: 6px;
-}
-
-/* Update the earlier hover rule to include the shadow */
-.fullcalendar :deep(.fc-event:hover) {
-    opacity: 1;
-    transition: all 0.2s ease;
-    box-shadow: var(--theme-shadow-dropdown);
-}
-
-.fullcalendar :deep(.fc-timegrid-event-harness) {
-    margin: 0 1px;
-}
-
-.fullcalendar :deep(.fc-highlight) {
-    background-color: var(--theme-color-default-background);
-}
-
-.fullcalendar :deep(.fc-select-mirror) {
-    background-color: var(--accent);
-    border: 1px solid var(--primary);
-}
-
-.fullcalendar :deep(.fc-scrollgrid) {
-    border: 1px solid var(--border);
-    border-left: 1px solid transparent;
-}
-
-.fullcalendar :deep(.fc-scrollgrid-section > td) {
-    border-right: 1px solid var(--border);
-}
-
-.fullcalendar :deep(.fc-timegrid-body) {
-    background-color: var(--theme-color-default-background);
-}
-
-.fullcalendar :deep(.fc-timegrid-col) {
-    border-right: 1px solid var(--border);
-}
-
-.fullcalendar :deep(.fc-timegrid-axis-cushion) {
-    color: var(--theme-text-secondary);
-    font-size: 0.75rem;
-    font-weight: 500;
-}
-
-.fullcalendar :deep(.fc-timegrid-slot-label-cushion) {
-    font-size: 0.8125rem;
-    color: var(--muted-foreground);
-}
-
-.fullcalendar :deep(.fc-col-header-cell-cushion) {
-    color: var(--foreground);
-    font-size: 0.875rem;
-    font-weight: 600;
-}
-
-/* Daily totals styling */
-.fullcalendar :deep(.fc-col-header-cell .text-muted-foreground) {
-    color: var(--muted-foreground);
-    margin-top: 0.125rem;
-}
-
-/* Reduce visibility of time slot dividers */
-.fullcalendar :deep(.fc-timegrid-divider) {
-    display: none;
-}
-
-/* Make scrollbars gray */
-.fullcalendar :deep(.fc-scroller) {
-    scrollbar-width: thin;
-    scrollbar-color: var(--muted-foreground) transparent;
-}
-
-.fullcalendar :deep(.fc-scroller::-webkit-scrollbar) {
-    width: 8px;
-}
-
-.fullcalendar :deep(.fc-scroller::-webkit-scrollbar-track) {
-    background: transparent;
-}
-
-.fullcalendar :deep(.fc-scroller::-webkit-scrollbar-thumb) {
-    background-color: var(--muted-foreground);
-    border-radius: 4px;
-}
-
-.fullcalendar :deep(.fc-scroller::-webkit-scrollbar-thumb:hover) {
-    background-color: var(--foreground);
-}
-
-/* Improve time axis styling */
-.fullcalendar :deep(.fc-timegrid-axis-chunk) {
-    background-color: var(--theme-color-default-background);
-}
-
-/* Simple event main styling */
-.fullcalendar :deep(.fc-event-main) {
-    padding: 0.125rem 0.25rem;
-}
-</style>

resources/js/packages/ui/src/Input/TimePickerSimple.vue

@@ -93,7 +93,6 @@ const inputValue = ref(model.value ? getLocalizedDayJs(model.value).format('HH:m
         data-testid="time_picker_input"
         type="text"
         @blur="updateTime"
-        @keydown.enter.prevent="updateTime"
         @focus="($event.target as HTMLInputElement).select()"
         @mouseup="($event.target as HTMLInputElement).select()"
         @click="($event.target as HTMLInputElement).select()"

resources/js/packages/ui/src/Input/TimeRangeSelector.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { defineProps, nextTick, ref, watch } from 'vue';
+import { useFocusWithin } from '@vueuse/core';
 import DatePicker from '@/packages/ui/src/Input/DatePicker.vue';
 import { getDayJsInstance, getLocalizedDayJs } from '@/packages/ui/src/utils/time';
 import dayjs from 'dayjs';
 import TimePickerSimple from '@/packages/ui/src/Input/TimePickerSimple.vue';
-import { Button } from '@/Components/ui/button';
 
 const props = defineProps<{
     start: string;
@@ -17,42 +17,31 @@ const emit = defineEmits(['changed', 'close']);
 
 const tempStart = ref(props.start ? getLocalizedDayJs(props.start).format() : dayjs().format());
 const tempEnd = ref(props.end ? getLocalizedDayJs(props.end).format() : null);
-const showEndTimePicker = ref(false);
 
 watch(props, () => {
     tempStart.value = getLocalizedDayJs(props.start).format();
     tempEnd.value = props.end ? getLocalizedDayJs(props.end).format() : null;
-    showEndTimePicker.value = false;
 });
-
 function updateTimeEntry() {
     const tempStartUtc = getDayJsInstance()(tempStart.value).utc().format();
     const tempEndUtc = tempEnd.value ? getDayJsInstance()(tempEnd.value).utc().format() : null;
-
     if (tempStartUtc !== props.start || tempEndUtc !== props.end) {
         emit(
             'changed',
             getDayJsInstance()(tempStart.value).utc().format(),
-            tempEnd.value ? getDayJsInstance()(tempEnd.value).utc().format() : null
+            getDayJsInstance()(tempEnd.value).utc().format()
         );
     }
 }
 
-function setEndTime() {
-    showEndTimePicker.value = true;
-    tempEnd.value = getDayJsInstance()().format();
-}
-
-function confirmEndTime() {
-    // wait for the v-model for the end time to update
-    nextTick(() => {
-        updateTimeEntry();
-        showEndTimePicker.value = false;
-        emit('close');
-    });
-}
-
 const dropdownContent = ref();
+const { focused } = useFocusWithin(dropdownContent);
+
+watch(focused, (newValue, oldValue) => {
+    if (oldValue === true && newValue === false) {
+        updateTimeEntry();
+    }
+});
 </script>
 
 <template>
@@ -78,7 +67,7 @@ const dropdownContent = ref();
         </div>
         <div class="px-2">
             <div class="font-semibold text-text-primary text-sm pb-2">End</div>
-            <div v-if="end !== null && tempEnd !== null" class="space-y-2">
+            <div v-if="tempEnd !== null" class="space-y-2">
                 <TimePickerSimple
                     v-model="tempEnd"
                     data-testid="time_entry_range_end"
@@ -88,22 +77,6 @@ const dropdownContent = ref();
                     class="text-xs text-text-tertiary max-w-24 px-1.5 py-1.5"
                     @changed="updateTimeEntry"></DatePicker>
             </div>
-            <div v-else-if="end === null && !showEndTimePicker">
-                <Button variant="outline" size="sm" @click="setEndTime"> Set End Time </Button>
-            </div>
-            <div v-else-if="showEndTimePicker && tempEnd !== null" class="space-y-2">
-                <TimePickerSimple
-                    v-model="tempEnd"
-                    data-testid="time_entry_range_end"
-                    @keydown.enter.prevent.stop="confirmEndTime"></TimePickerSimple>
-                <DatePicker
-                    v-model="tempEnd"
-                    class="text-xs text-text-tertiary max-w-24 px-1.5 py-1.5"
-                    @keydown.enter.prevent="confirmEndTime"></DatePicker>
-                <Button variant="outline" size="sm" class="w-full" @click="confirmEndTime">
-                    Confirm
-                </Button>
-            </div>
             <div v-else class="text-text-secondary">-- : --</div>
             <div tabindex="0" @focusin="emit('close')"></div>
         </div>

resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue

@@ -33,7 +33,6 @@ const props = defineProps<{
     createProject: (project: CreateProjectBody) => Promise<Project | undefined>;
     createClient: (client: CreateClientBody) => Promise<Client | undefined>;
     onStartStopClick: (timeEntry: TimeEntry) => void;
-    duplicateTimeEntry: (timeEntry: TimeEntry) => void;
     updateTimeEntries: (ids: string[], changes: Partial<TimeEntry>) => void;
     updateTimeEntry: (timeEntry: TimeEntry) => void;
     deleteTimeEntries: (timeEntries: TimeEntry[]) => void;
@@ -93,7 +92,7 @@ function onSelectChange(checked: boolean) {
         class="border-b border-default-background-separator bg-row-background min-w-0 transition"
         data-testid="time_entry_row">
         <MainContainer class="min-w-0">
-            <div class="sm:flex py-2 items-center min-w-0 justify-between group">
+            <div class="sm:flex py-1.5 items-center min-w-0 justify-between group">
                 <div class="flex space-x-3 items-center min-w-0">
                     <Checkbox
                         :checked="
@@ -173,8 +172,6 @@ function onSelectChange(checked: boolean) {
                         class="opacity-20 flex group-hover:opacity-100 focus-visible:opacity-100"
                         @changed="onStartStopClick(timeEntry)"></TimeTrackerStartStop>
                     <TimeEntryMoreOptionsDropdown
-                        :show-edit="false"
-                        :show-duplicate="false"
                         @delete="
                             deleteTimeEntries(timeEntry?.timeEntries ?? [])
                         "></TimeEntryMoreOptionsDropdown>
@@ -204,7 +201,6 @@ function onSelectChange(checked: boolean) {
                 :update-time-entry="(timeEntry: TimeEntry) => updateTimeEntry(timeEntry)"
                 :on-start-stop-click="() => onStartStopClick(subEntry)"
                 :delete-time-entry="() => deleteTimeEntries([subEntry])"
-                :duplicate-time-entry="() => duplicateTimeEntry(subEntry)"
                 :currency="currency"
                 :create-tag
                 :time-entry="subEntry"

resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue

@@ -41,8 +41,6 @@ const props = defineProps<{
     projects: Project[];
     tasks: Task[];
     clients: Client[];
-    start?: string;
-    end?: string;
 }>();
 
 const description = ref<HTMLInputElement | null>(null);
@@ -65,27 +63,7 @@ const timeEntryDefaultValues = {
     end: getDayJsInstance().utc().format(),
 };
 
-const timeEntry = ref({
-    ...timeEntryDefaultValues,
-});
-
-// update the localStart and localEnd when props.start or props.end get updates
-watch(
-    () => props.start,
-    (value) => {
-        if (value) {
-            localStart.value = getLocalizedDayJs(value).format();
-        }
-    }
-);
-watch(
-    () => props.end,
-    (value) => {
-        if (value) {
-            localEnd.value = getLocalizedDayJs(value).format();
-        }
-    }
-);
+const timeEntry = ref({ ...timeEntryDefaultValues });
 
 watch(
     () => timeEntry.value.project_id,

resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue

@@ -1,298 +0,0 @@
-<script setup lang="ts">
-import TextInput from '@/packages/ui/src/Input/TextInput.vue';
-import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
-import DialogModal from '@/packages/ui/src/DialogModal.vue';
-import { computed, nextTick, ref, watch } from 'vue';
-import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
-import TimeTrackerProjectTaskDropdown from '@/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue';
-import InputLabel from '@/packages/ui/src/Input/InputLabel.vue';
-import { TagIcon } from '@heroicons/vue/20/solid';
-import { getLocalizedDayJs } from '@/packages/ui/src/utils/time';
-import type {
-    CreateClientBody,
-    CreateProjectBody,
-    Project,
-    Client,
-    TimeEntry,
-} from '@/packages/api/src';
-import { getOrganizationCurrencyString } from '@/utils/money';
-import { canCreateProjects } from '@/utils/permissions';
-import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
-import { Badge } from '@/packages/ui/src';
-import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
-import SelectDropdown from '@/packages/ui/src/Input/SelectDropdown.vue';
-import DatePicker from '@/packages/ui/src/Input/DatePicker.vue';
-import DurationHumanInput from '@/packages/ui/src/Input/DurationHumanInput.vue';
-
-import { InformationCircleIcon } from '@heroicons/vue/20/solid';
-import type { Tag, Task } from '@/packages/api/src';
-import TimePickerSimple from '@/packages/ui/src/Input/TimePickerSimple.vue';
-
-const show = defineModel('show', { default: false });
-const saving = ref(false);
-const deleting = ref(false);
-
-const props = defineProps<{
-    timeEntry: TimeEntry | null;
-    enableEstimatedTime: boolean;
-    updateTimeEntry: (entry: TimeEntry) => Promise<void>;
-    deleteTimeEntry: (timeEntryId: string) => Promise<void>;
-    createClient: (client: CreateClientBody) => Promise<Client | undefined>;
-    createProject: (project: CreateProjectBody) => Promise<Project | undefined>;
-    createTag: (name: string) => Promise<Tag | undefined>;
-    tags: Tag[];
-    projects: Project[];
-    tasks: Task[];
-    clients: Client[];
-}>();
-
-const description = ref<HTMLInputElement | null>(null);
-
-watch(show, (value) => {
-    if (value) {
-        nextTick(() => {
-            description.value?.focus();
-        });
-    }
-});
-
-const editableTimeEntry = ref<TimeEntry | null>(null);
-
-watch(
-    () => props.timeEntry,
-    (newTimeEntry) => {
-        if (newTimeEntry) {
-            editableTimeEntry.value = { ...newTimeEntry };
-        }
-    },
-    { immediate: true }
-);
-
-const localStart = computed({
-    get: () =>
-        editableTimeEntry.value ? getLocalizedDayJs(editableTimeEntry.value.start).format() : '',
-    set: (value: string) => {
-        if (editableTimeEntry.value) {
-            editableTimeEntry.value.start = getLocalizedDayJs(value).utc().format();
-            if (getLocalizedDayJs(localEnd.value).isBefore(getLocalizedDayJs(value))) {
-                localEnd.value = value;
-            }
-        }
-    },
-});
-
-const localEnd = computed({
-    get: () =>
-        editableTimeEntry.value ? getLocalizedDayJs(editableTimeEntry.value.end).format() : '',
-    set: (value: string) => {
-        if (editableTimeEntry.value) {
-            editableTimeEntry.value.end = getLocalizedDayJs(value).utc().format();
-        }
-    },
-});
-
-async function submit() {
-    if (editableTimeEntry.value) {
-        saving.value = true;
-        try {
-            await props.updateTimeEntry(editableTimeEntry.value);
-            show.value = false;
-        } finally {
-            saving.value = false;
-        }
-    }
-}
-
-async function deleteEntry() {
-    if (editableTimeEntry.value) {
-        deleting.value = true;
-        try {
-            await props.deleteTimeEntry(editableTimeEntry.value.id);
-            show.value = false;
-        } finally {
-            deleting.value = false;
-        }
-    }
-}
-
-const billableProxy = computed({
-    get: () =>
-        editableTimeEntry.value ? (editableTimeEntry.value.billable ? 'true' : 'false') : 'false',
-    set: (value: string) => {
-        if (editableTimeEntry.value) {
-            editableTimeEntry.value.billable = value === 'true';
-        }
-    },
-});
-
-type BillableOption = {
-    label: string;
-    value: string;
-};
-</script>
-
-<template>
-    <DialogModal closeable :show="show" @close="show = false">
-        <template #title>
-            <div class="flex space-x-2">
-                <span> Edit time entry </span>
-            </div>
-        </template>
-
-        <template #content>
-            <div v-if="editableTimeEntry" class="space-y-4">
-                <div class="sm:flex items-end space-y-2 sm:space-y-0 sm:space-x-4">
-                    <div class="flex-1">
-                        <TextInput
-                            id="description"
-                            ref="description"
-                            v-model="editableTimeEntry.description"
-                            placeholder="What did you work on?"
-                            type="text"
-                            class="mt-1 block w-full"
-                            @keydown.enter="submit" />
-                    </div>
-                </div>
-                <div
-                    class="sm:flex justify-between items-end space-y-2 sm:space-y-0 pt-4 sm:space-x-4">
-                    <div class="flex w-full items-center space-x-2 justify-between">
-                        <div class="flex-1 min-w-0">
-                            <TimeTrackerProjectTaskDropdown
-                                v-model:project="editableTimeEntry.project_id"
-                                v-model:task="editableTimeEntry.task_id"
-                                :clients
-                                :create-project
-                                :create-client
-                                :can-create-project="canCreateProjects()"
-                                :currency="getOrganizationCurrencyString()"
-                                size="xlarge"
-                                class="bg-input-background"
-                                :projects="projects"
-                                :tasks="tasks"
-                                :enable-estimated-time="
-                                    enableEstimatedTime
-                                "></TimeTrackerProjectTaskDropdown>
-                        </div>
-                        <div class="flex items-center space-x-2">
-                            <div class="flex-col">
-                                <TagDropdown
-                                    v-model="editableTimeEntry.tags"
-                                    :create-tag
-                                    :tags="tags">
-                                    <template #trigger>
-                                        <Badge
-                                            class="bg-input-background"
-                                            tag="button"
-                                            size="xlarge">
-                                            <TagIcon
-                                                v-if="editableTimeEntry.tags.length === 0"
-                                                class="w-4"></TagIcon>
-                                            <div
-                                                v-else
-                                                class="bg-accent-300/20 w-5 h-5 font-medium rounded flex items-center transition justify-center">
-                                                {{ editableTimeEntry.tags.length }}
-                                            </div>
-                                            <span>Tags</span>
-                                        </Badge>
-                                    </template>
-                                </TagDropdown>
-                            </div>
-                            <div class="flex-col">
-                                <SelectDropdown
-                                    v-model="billableProxy"
-                                    :get-key-from-item="(item: BillableOption) => item.value"
-                                    :get-name-for-item="(item: BillableOption) => item.label"
-                                    :items="[
-                                        {
-                                            label: 'Billable',
-                                            value: 'true',
-                                        },
-                                        {
-                                            label: 'Non Billable',
-                                            value: 'false',
-                                        },
-                                    ]">
-                                    <template #trigger>
-                                        <Badge
-                                            class="bg-input-background"
-                                            tag="button"
-                                            size="xlarge">
-                                            <BillableIcon class="h-4"></BillableIcon>
-                                            <span>{{
-                                                editableTimeEntry.billable
-                                                    ? 'Billable'
-                                                    : 'Non-Billable'
-                                            }}</span>
-                                        </Badge>
-                                    </template>
-                                </SelectDropdown>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="flex pt-4 space-x-4">
-                    <div class="flex-1">
-                        <InputLabel>Duration</InputLabel>
-                        <div class="space-y-2 mt-1 flex flex-col">
-                            <DurationHumanInput
-                                v-model:start="localStart"
-                                v-model:end="localEnd"
-                                name="Duration"></DurationHumanInput>
-                            <div class="text-sm flex space-x-1">
-                                <InformationCircleIcon
-                                    class="w-4 text-text-quaternary"></InformationCircleIcon>
-                                <span class="text-text-secondary text-xs">
-                                    You can type natural language here f.e.
-                                    <span class="font-semibold"> 2h 30m</span>
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="">
-                        <InputLabel>Start</InputLabel>
-                        <div class="flex flex-col items-center space-y-2 mt-1">
-                            <TimePickerSimple v-model="localStart" size="large"></TimePickerSimple>
-                            <DatePicker
-                                v-model="localStart"
-                                tabindex="1"
-                                class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"></DatePicker>
-                        </div>
-                    </div>
-                    <div class="">
-                        <InputLabel>End</InputLabel>
-                        <div class="flex flex-col items-center space-y-2 mt-1">
-                            <TimePickerSimple v-model="localEnd" size="large"></TimePickerSimple>
-                            <DatePicker
-                                v-model="localEnd"
-                                tabindex="1"
-                                class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"></DatePicker>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </template>
-        <template #footer>
-            <div class="flex justify-between w-full">
-                <SecondaryButton
-                    tabindex="2"
-                    class="bg-red-600 hover:bg-red-700 text-white border-red-600 hover:border-red-700"
-                    :disabled="deleting || saving"
-                    @click="deleteEntry">
-                    {{ deleting ? 'Deleting...' : 'Delete' }}
-                </SecondaryButton>
-                <div class="flex space-x-3">
-                    <SecondaryButton tabindex="2" @click="show = false"> Cancel</SecondaryButton>
-                    <PrimaryButton
-                        tabindex="2"
-                        :class="{ 'opacity-25': saving }"
-                        :disabled="saving || deleting"
-                        @click="submit">
-                        {{ saving ? 'Updating...' : 'Update Time Entry' }}
-                    </PrimaryButton>
-                </div>
-            </div>
-        </template>
-    </DialogModal>
-</template>
-
-<style scoped></style>

resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue

@@ -108,7 +108,6 @@ function startTimeEntryFromExisting(entry: TimeEntry) {
         tags: [...entry.tags],
     });
 }
-
 function sumDuration(timeEntries: TimeEntry[]) {
     return timeEntries.reduce((acc, entry) => acc + (entry?.duration ?? 0), 0);
 }
@@ -159,7 +158,6 @@ function unselectAllTimeEntries(value: TimeEntriesGroupedByType[]) {
                 :tags="tags"
                 :clients
                 :on-start-stop-click="startTimeEntryFromExisting"
-                :duplicate-time-entry="createTimeEntry"
                 :update-time-entries
                 :update-time-entry
                 :delete-time-entries
@@ -200,7 +198,6 @@ function unselectAllTimeEntries(value: TimeEntriesGroupedByType[]) {
                 :update-time-entry
                 :on-start-stop-click="() => startTimeEntryFromExisting(entry)"
                 :delete-time-entry="() => deleteTimeEntries([entry])"
-                :duplicate-time-entry="() => createTimeEntry(entry)"
                 :currency="currency"
                 :time-entry="entry.timeEntries[0]"
                 @selected="selectedTimeEntries.push(entry)"

resources/js/packages/ui/src/TimeEntry/TimeEntryMassActionRow.vue

@@ -63,7 +63,7 @@ const showMassUpdateModal = ref(false);
         :class="
             twMerge(
                 props.class,
-                'text-sm py-1.5 font-medium bg-secondary flex items-center space-x-3'
+                'text-sm py-1.5 font-medium border-t border-b bg-secondary border-border-secondary flex items-center space-x-3'
             )
         ">
         <Checkbox

resources/js/packages/ui/src/TimeEntry/TimeEntryMoreOptionsDropdown.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { TrashIcon, PencilIcon, DocumentDuplicateIcon } from '@heroicons/vue/20/solid';
+import { TrashIcon } from '@heroicons/vue/20/solid';
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -7,21 +7,8 @@ import {
     DropdownMenuTrigger,
 } from '@/Components/ui/dropdown-menu';
 
-const props = withDefaults(
-    defineProps<{
-        showEdit?: boolean;
-        showDuplicate?: boolean;
-    }>(),
-    {
-        showDuplicate: true,
-        showEdit: true,
-    }
-);
-
 const emit = defineEmits<{
-    edit: [];
     delete: [];
-    duplicate: [];
 }>();
 </script>
 
@@ -46,22 +33,6 @@ const emit = defineEmits<{
             </button>
         </DropdownMenuTrigger>
         <DropdownMenuContent class="min-w-[150px]" align="end">
-            <DropdownMenuItem
-                v-if="props.showEdit"
-                data-testid="time_entry_edit"
-                class="flex items-center space-x-3 cursor-pointer"
-                @click="emit('edit')">
-                <PencilIcon class="w-5" />
-                <span>Edit</span>
-            </DropdownMenuItem>
-            <DropdownMenuItem
-                v-if="props.showDuplicate"
-                data-testid="time_entry_duplicate"
-                class="flex items-center space-x-3 cursor-pointer"
-                @click="emit('duplicate')">
-                <DocumentDuplicateIcon class="w-5" />
-                <span>Duplicate</span>
-            </DropdownMenuItem>
             <DropdownMenuItem
                 data-testid="time_entry_delete"
                 class="flex items-center space-x-3 cursor-pointer text-destructive focus:text-destructive"

resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue

@@ -16,9 +16,8 @@ import TimeEntryDescriptionInput from '@/packages/ui/src/TimeEntry/TimeEntryDesc
 import TimeEntryRowTagDropdown from '@/packages/ui/src/TimeEntry/TimeEntryRowTagDropdown.vue';
 import TimeEntryRowDurationInput from '@/packages/ui/src/TimeEntry/TimeEntryRowDurationInput.vue';
 import TimeEntryMoreOptionsDropdown from '@/packages/ui/src/TimeEntry/TimeEntryMoreOptionsDropdown.vue';
-import { TimeEntryEditModal } from '@/packages/ui/src';
 import BillableToggleButton from '@/packages/ui/src/Input/BillableToggleButton.vue';
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import TimeTrackerProjectTaskDropdown from '@/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue';
 import { Checkbox } from '@/packages/ui/src';
 import { twMerge } from 'tailwind-merge';
@@ -36,7 +35,6 @@ const props = defineProps<{
     createClient: (client: CreateClientBody) => Promise<Client | undefined>;
     onStartStopClick: () => void;
     deleteTimeEntry: () => void;
-    duplicateTimeEntry?: () => void;
     updateTimeEntry: (timeEntry: TimeEntry) => void;
     currency: string;
     showMember?: boolean;
@@ -48,8 +46,6 @@ const props = defineProps<{
 
 const emit = defineEmits<{ selected: []; unselected: [] }>();
 
-const showEditModal = ref(false);
-
 function updateTimeEntryDescription(description: string) {
     props.updateTimeEntry({ ...props.timeEntry, description });
 }
@@ -91,20 +87,6 @@ function onSelectChange(checked: boolean) {
         emit('unselected');
     }
 }
-
-function handleEdit() {
-    showEditModal.value = true;
-}
-
-async function handleUpdateTimeEntry(updatedEntry: TimeEntry) {
-    props.updateTimeEntry(updatedEntry);
-    showEditModal.value = false;
-}
-
-async function handleDeleteTimeEntry() {
-    props.deleteTimeEntry();
-    showEditModal.value = false;
-}
 </script>
 
 <template>
@@ -166,27 +148,11 @@ async function handleDeleteTimeEntry() {
                         class="opacity-20 flex focus-visible:opacity-100 group-hover:opacity-100"
                         @changed="onStartStopClick"></TimeTrackerStartStop>
                     <TimeEntryMoreOptionsDropdown
-                        @edit="handleEdit"
-                        @duplicate="duplicateTimeEntry"
                         @delete="deleteTimeEntry"></TimeEntryMoreOptionsDropdown>
                 </div>
             </div>
         </MainContainer>
     </div>
-
-    <TimeEntryEditModal
-        v-model:show="showEditModal"
-        :time-entry="timeEntry"
-        :enable-estimated-time="enableEstimatedTime"
-        :update-time-entry="handleUpdateTimeEntry"
-        :delete-time-entry="handleDeleteTimeEntry"
-        :create-client="createClient"
-        :create-project="createProject"
-        :create-tag="createTag"
-        :tags="tags"
-        :projects="projects"
-        :tasks="tasks"
-        :clients="clients" />
 </template>
 
 <style scoped></style>

resources/js/packages/ui/src/TimeEntry/TimeEntryRowDurationInput.vue

@@ -29,7 +29,7 @@ const open = ref(false);
 function updateTimerAndStartLiveTimerUpdate() {
     const defaultUnit =
         organizationSettings?.value?.intervalFormat === 'decimal' ? 'hours' : 'minutes';
-    const seconds = parseTimeInput(temporaryCustomTimerEntry.value, defaultUnit);
+    const { seconds } = parseTimeInput(temporaryCustomTimerEntry.value, defaultUnit);
     if (seconds && seconds > 0) {
         let newEndDate = props.end;
         let newStartDate = props.start;

resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue

@@ -49,7 +49,6 @@ const emit = defineEmits<{
     updateTimeEntry: [];
     startLiveTimer: [];
     stopLiveTimer: [];
-    createTimeEntry: [];
 }>();
 
 function updateProject() {
@@ -281,7 +280,6 @@ useSelectEvents(
                         @stop-live-timer="emit('stopLiveTimer')"
                         @update-timer="emit('updateTimeEntry')"
                         @start-timer="emit('startTimer')"
-                        @create-time-entry="emit('createTimeEntry')"
                         @keydown.enter="startTimerIfNotActive"></TimeTrackerRangeSelector>
                 </div>
             </div>

resources/js/packages/ui/src/TimeTracker/TimeTrackerMoreOptionsDropdown.vue

@@ -1,58 +0,0 @@
-<script setup lang="ts">
-import { PlusIcon, XMarkIcon } from '@heroicons/vue/20/solid';
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuTrigger,
-} from '@/Components/ui/dropdown-menu';
-
-const props = defineProps<{
-    hasActiveTimer: boolean;
-}>();
-
-const emit = defineEmits<{
-    manualEntry: [];
-    discard: [];
-}>();
-</script>
-
-<template>
-    <DropdownMenu>
-        <DropdownMenuTrigger as-child>
-            <button
-                class="focus-visible:outline-none focus-visible:bg-card-background rounded-full focus-visible:ring-2 focus-visible:ring-ring hover:bg-card-background hover:opacity-100 opacity-20 transition-opacity text-text-secondary"
-                aria-label="Time entry actions">
-                <svg
-                    class="h-8 w-8 p-1 rounded-full"
-                    viewBox="0 0 24 24"
-                    xmlns="http://www.w3.org/2000/svg">
-                    <path
-                        fill="none"
-                        stroke="currentColor"
-                        stroke-linecap="round"
-                        stroke-linejoin="round"
-                        stroke-width="1.5"
-                        d="M12 5.92A.96.96 0 1 0 12 4a.96.96 0 0 0 0 1.92m0 7.04a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92M12 20a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92" />
-                </svg>
-            </button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent class="min-w-[150px]" align="end">
-            <DropdownMenuItem
-                class="flex items-center space-x-3 cursor-pointer"
-                @click="emit('manualEntry')">
-                <PlusIcon class="w-5" />
-                <span>Manual time entry</span>
-            </DropdownMenuItem>
-            <DropdownMenuItem
-                v-if="props.hasActiveTimer"
-                class="flex items-center space-x-3 cursor-pointer text-destructive focus:text-destructive"
-                @click="emit('discard')">
-                <XMarkIcon class="w-5" />
-                <span>Discard</span>
-            </DropdownMenuItem>
-        </DropdownMenuContent>
-    </DropdownMenu>
-</template>
-
-<style scoped></style>

resources/js/packages/ui/src/TimeTracker/TimeTrackerRangeSelector.vue

@@ -16,7 +16,6 @@ const emit = defineEmits<{
     stopLiveTimer: [];
     updateTimer: [];
     startTimer: [];
-    createTimeEntry: [];
 }>();
 
 const open = ref(false);
@@ -56,7 +55,7 @@ const currentTime = computed({
 });
 
 function updateTimerAndStartLiveTimerUpdate() {
-    const seconds = parseTimeInput(temporaryCustomTimerEntry.value, 'minutes');
+    const { seconds } = parseTimeInput(temporaryCustomTimerEntry.value, 'minutes');
 
     if (seconds && seconds > 0) {
         const newStartDate = dayjs().subtract(seconds, 's');
@@ -74,16 +73,12 @@ function updateTimerAndStartLiveTimerUpdate() {
 
 const temporaryCustomTimerEntry = ref<string>('');
 
-async function updateTimeRange(newStart: string, newEnd: string | null) {
+async function updateTimeRange(newStart: string) {
     // prohibit updates in the future
     if (getDayJsInstance()(newStart).isBefore(getDayJsInstance()())) {
         currentTimeEntry.value.start = newStart;
-        currentTimeEntry.value.end = newEnd;
         if (currentTimeEntry.value.id) {
             emit('updateTimer');
-        } else if (newEnd !== null) {
-            // If there's no ID but we have both start and end, create a new time entry
-            emit('createTimeEntry');
         } else {
             emit('startTimer');
         }
@@ -96,21 +91,11 @@ const startTime = computed(() => {
     }
     return dayjs().utc().format();
 });
-
-const endTime = computed(() => {
-    if (currentTimeEntry.value.end && currentTimeEntry.value.end !== '') {
-        return currentTimeEntry.value.end;
-    }
-    return null;
-});
-
 const inputField = ref<HTMLInputElement | null>(null);
 
 const timeRangeSelector = ref<HTMLElement | null>(null);
 
 function openModalOnTab(e: FocusEvent) {
-    pauseLiveTimerUpdate(e);
-
     // check if the source is inside the dropdown
     const source = e.relatedTarget as HTMLElement;
     if (source && window.document.body.querySelector<HTMLElement>('#app')?.contains(source)) {
@@ -118,12 +103,6 @@ function openModalOnTab(e: FocusEvent) {
     }
 }
 
-function openModalOnClick(e: MouseEvent) {
-    pauseLiveTimerUpdate(e);
-
-    open.value = true;
-}
-
 function focusNextElement(e: KeyboardEvent) {
     if (open.value) {
         e.preventDefault();
@@ -156,8 +135,8 @@ function closeAndFocusInput() {
                     data-testid="time_entry_time"
                     class="w-[110px] lg:w-[130px] h-full text-text-primary py-2.5 rounded-lg border-border-secondary border text-center px-4 text-base lg:text-lg font-semibold bg-card-background border-none placeholder-muted focus:ring-0 transition"
                     type="text"
+                    @focus="pauseLiveTimerUpdate"
                     @focusin="openModalOnTab"
-                    @click="openModalOnClick"
                     @keydown.exact.tab="focusNextElement"
                     @keydown.exact.shift.tab="open = false"
                     @blur="updateTimerAndStartLiveTimerUpdate"
@@ -167,7 +146,7 @@ function closeAndFocusInput() {
                 <div ref="timeRangeSelector">
                     <TimeRangeSelector
                         :start="startTime"
-                        :end="endTime"
+                        :end="null"
                         @changed="updateTimeRange"
                         @close="closeAndFocusInput">
                     </TimeRangeSelector>

resources/js/packages/ui/src/index.ts

@@ -27,11 +27,7 @@ import Checkbox from './Input/Checkbox.vue';
 import TimeEntryGroupedTable from './TimeEntry/TimeEntryGroupedTable.vue';
 import TimeEntryMassActionRow from './TimeEntry/TimeEntryMassActionRow.vue';
 import TimeEntryCreateModal from './TimeEntry/TimeEntryCreateModal.vue';
-import TimeEntryEditModal from './TimeEntry/TimeEntryEditModal.vue';
 import MoreOptionsDropdown from './MoreOptionsDropdown.vue';
-import FullCalendarEventContent from './FullCalendar/FullCalendarEventContent.vue';
-import FullCalendarDayHeader from './FullCalendar/FullCalendarDayHeader.vue';
-import TimeEntryCalendar from './FullCalendar/TimeEntryCalendar.vue';
 
 export {
     money,
@@ -56,8 +52,4 @@ export {
     TimeEntryMassActionRow,
     MoreOptionsDropdown,
     TimeEntryCreateModal,
-    TimeEntryEditModal,
-    FullCalendarEventContent,
-    FullCalendarDayHeader,
-    TimeEntryCalendar,
 };

resources/js/packages/ui/src/utils/time.ts

@@ -208,30 +208,22 @@ export function formatStartEnd(
 export function parseTimeInput(
     input: string,
     defaultUnit: TimeInputUnit = 'minutes'
-): number | null {
+): {
+    seconds: number | null;
+    isHHMM: boolean;
+} {
     // Check if input is a decimal number (hours)
     const decimalRegex = /^-?\d+[.,]\d+$/;
     if (decimalRegex.test(input)) {
         const hours = parseFloat(input.replace(',', '.'));
-        return Math.round(hours * 3600);
+        return { seconds: Math.round(hours * 3600), isHHMM: false };
     }
 
     // Check if input is just a number (minutes or hours based on defaultUnit)
     if (/^-?\d+$/.test(input)) {
         const value = parseInt(input);
-        return defaultUnit === 'minutes' ? value * 60 : value * 3600;
-    }
-
-    // Check if input is in HH:MM:SS format
-    const HHMMSStimeRegex = /^([0-9]{1,2}):([0-5]?[0-9]):([0-5]?[0-9])$/;
-    if (HHMMSStimeRegex.test(input)) {
-        const match = input.match(HHMMSStimeRegex);
-        if (match) {
-            const hours = parseInt(match[1]);
-            const minutes = parseInt(match[2]);
-            const seconds = parseInt(match[3]);
-            return hours * 3600 + minutes * 60 + seconds;
-        }
+        const seconds = defaultUnit === 'minutes' ? value * 60 : value * 3600;
+        return { seconds, isHHMM: false };
     }
 
     // Check if input is in HH:MM format
@@ -241,15 +233,15 @@ export function parseTimeInput(
         if (match) {
             const hours = parseInt(match[1]);
             const minutes = parseInt(match[2]);
-            return (hours * 60 + minutes) * 60;
+            return { seconds: (hours * 60 + minutes) * 60, isHHMM: true };
         }
     }
 
     // Try to parse natural language like "1h 30m"
     const parsedDuration = parse(input, 's');
     if (parsedDuration && parsedDuration > 0) {
-        return parsedDuration;
+        return { seconds: parsedDuration, isHHMM: false };
     }
 
-    return null;
+    return { seconds: null, isHHMM: false };
 }

resources/js/utils/feedback.ts

@@ -1,9 +0,0 @@
-export function openFeedback(): void {
-    if (
-        typeof window !== 'undefined' &&
-        'showChatWindow' in window &&
-        typeof window.showChatWindow === 'function'
-    ) {
-        window.showChatWindow();
-    }
-}

resources/js/utils/useCurrentTimeEntry.ts

@@ -162,7 +162,7 @@ export const useCurrentTimeEntryStore = defineStore('currentTimeEntry', () => {
                             task_id: currentTimeEntry.value.task_id,
                             start: currentTimeEntry.value.start,
                             billable: currentTimeEntry.value.billable,
-                            end: currentTimeEntry.value.end,
+                            end: null,
                             tags: currentTimeEntry.value.tags,
                         },
                         {
@@ -175,12 +175,7 @@ export const useCurrentTimeEntryStore = defineStore('currentTimeEntry', () => {
                 'Time entry updated!'
             );
             if (response?.data) {
-                if (response.data.end === null) {
-                    currentTimeEntry.value = response.data;
-                } else {
-                    $reset();
-                    stopLiveTimer();
-                }
+                currentTimeEntry.value = response.data;
             }
         } else {
             throw new Error(
@@ -220,6 +215,5 @@ export const useCurrentTimeEntryStore = defineStore('currentTimeEntry', () => {
         stopLiveTimer,
         now,
         setActiveState,
-        $reset,
     };
 });

resources/js/utils/useReporting.ts

@@ -12,19 +12,11 @@ import { useProjectsStore } from '@/utils/useProjects';
 import { useMembersStore } from '@/utils/useMembers';
 import { useTasksStore } from '@/utils/useTasks';
 import { useClientsStore } from '@/utils/useClients';
-import { useTagsStore } from '@/utils/useTags';
 import { CheckCircleIcon, UserCircleIcon, UserGroupIcon } from '@heroicons/vue/20/solid';
 import { DocumentTextIcon, FolderIcon } from '@heroicons/vue/16/solid';
 import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
 
-export type GroupingOption =
-    | 'project'
-    | 'task'
-    | 'user'
-    | 'billable'
-    | 'client'
-    | 'description'
-    | 'tag';
+export type GroupingOption = 'project' | 'task' | 'user' | 'billable' | 'client' | 'description';
 
 export const useReportingStore = defineStore('reporting', () => {
     const reportingGraphResponse = ref<ReportingResponse | null>(null);
@@ -81,7 +73,6 @@ export const useReportingStore = defineStore('reporting', () => {
         billable: 'Non-Billable',
         client: 'No Client',
         description: 'No Description',
-        tag: 'No Tag',
     } as Record<string, string>;
 
     function getNameForReportingRowEntry(key: string | null, type: string | null) {
@@ -115,11 +106,6 @@ export const useReportingStore = defineStore('reporting', () => {
             const { clients } = storeToRefs(clientsStore);
             return clients.value.find((client) => client.id === key)?.name;
         }
-        if (type === 'tag') {
-            const tagsStore = useTagsStore();
-            const { tags } = storeToRefs(tagsStore);
-            return tags.value.find((tag) => tag.id === key)?.name;
-        }
         if (type === 'billable') {
             if (key === '0') {
                 return 'Non-Billable';
@@ -165,11 +151,6 @@ export const useReportingStore = defineStore('reporting', () => {
             value: 'description',
             icon: DocumentTextIcon,
         },
-        {
-            label: 'Tags',
-            value: 'tag',
-            icon: DocumentTextIcon,
-        },
     ];
 
     return {

routes/web.php

@@ -36,10 +36,6 @@ Route::middleware([
         return Inertia::render('Time');
     })->name('time');
 
-    Route::get('/calendar', function () {
-        return Inertia::render('Calendar');
-    })->name('calendar');
-
     Route::get('/reporting', function () {
         return Inertia::render('Reporting');
     })->name('reporting');

tests/Unit/Console/KernelTest.php

@@ -1,114 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Unit\Console;
-
-use App\Console\Kernel;
-use PHPUnit\Framework\Attributes\CoversClass;
-use Tests\TestCase;
-
-#[CoversClass(Kernel::class)]
-class KernelTest extends TestCase
-{
-    public function test_self_host_commands_schedule_time_is_consistent_with_app_key(): void
-    {
-        // Arrange
-        config([
-            'app.key' => 'base64:cOXN4GLMXYjcdG0fKosnFogofXw1pNoXkLAViRH+a5Y=',
-        ]);
-
-        // Act
-        $schedule1 = app()->make(Kernel::class)->resolveConsoleSchedule();
-        $firstRunEvents = collect($schedule1->events())->filter(fn ($event) => str_contains($event->command, 'self-host:check-for-update') ||
-            str_contains($event->command, 'self-host:telemetry')
-        );
-
-        $schedule2 = app()->make(Kernel::class)->resolveConsoleSchedule();
-        $secondRunEvents = collect($schedule2->events())->filter(fn ($event) => str_contains($event->command, 'self-host:check-for-update') ||
-            str_contains($event->command, 'self-host:telemetry')
-        );
-        config([
-            'app.key' => 'base64:eP58hkQ8l3guqf8wvWJR7pB0weVQtnpjMdYpaVwX4Jw=',
-        ]);
-        $schedule3 = app()->make(Kernel::class)->resolveConsoleSchedule();
-        $thirdRunEvents = collect($schedule3->events())->filter(fn ($event) => str_contains($event->command, 'self-host:check-for-update') ||
-            str_contains($event->command, 'self-host:telemetry')
-        );
-
-        // Assert
-        $this->assertCount(2, $firstRunEvents);
-        $this->assertCount(2, $secondRunEvents);
-        $this->assertCount(2, $thirdRunEvents);
-
-        foreach ($firstRunEvents as $index => $event) {
-            $this->assertSame('52 9,21 * * *', $firstRunEvents[$index]->expression);
-            $this->assertSame('52 9,21 * * *', $secondRunEvents[$index]->expression);
-            $this->assertSame('48 13,1 * * *', $thirdRunEvents[$index]->expression);
-        }
-    }
-
-    public function test_self_hosting_telemetry_can_be_activated(): void
-    {
-        // Arrange
-        config([
-            'scheduling.tasks.self_hosting_telemetry' => true,
-        ]);
-
-        // Act
-        $schedule = app()->make(Kernel::class)->resolveConsoleSchedule();
-        $events = collect($schedule->events())->filter(fn ($event) => str_contains($event->command, 'self-host:telemetry')
-        );
-
-        // Assert
-        $this->assertCount(1, $events);
-    }
-
-    public function test_self_hosting_telemetry_can_be_deactivated(): void
-    {
-        // Arrange
-        config([
-            'scheduling.tasks.self_hosting_telemetry' => false,
-        ]);
-
-        // Act
-        $schedule = app()->make(Kernel::class)->resolveConsoleSchedule();
-        $events = collect($schedule->events())->filter(fn ($event) => str_contains($event->command, 'self-host:telemetry')
-        );
-
-        // Assert
-        $this->assertCount(0, $events);
-    }
-
-    public function test_self_hosting_check_for_update_can_be_activated(): void
-    {
-        // Arrange
-        config([
-            'scheduling.tasks.self_hosting_check_for_update' => true,
-        ]);
-
-        // Act
-        $schedule = app()->make(Kernel::class)->resolveConsoleSchedule();
-        $events = collect($schedule->events())->filter(fn ($event) => str_contains($event->command, 'self-host:check-for-update')
-        );
-
-        // Assert
-        $this->assertCount(1, $events);
-    }
-
-    public function test_self_hosting_check_for_update_can_be_deactivated(): void
-    {
-        // Arrange
-        config([
-            'scheduling.tasks.self_hosting_check_for_update' => false,
-        ]);
-
-        // Act
-        $schedule = app()->make(Kernel::class)->resolveConsoleSchedule();
-        $events = collect($schedule->events())->filter(fn ($event) => str_contains($event->command, 'self-host:check-for-update')
-        );
-
-        // Assert
-        $this->assertCount(0, $events);
-    }
-}

tests/Unit/Endpoint/Api/V1/ClientEndpointTest.php

@@ -34,7 +34,6 @@ class ClientEndpointTest extends ApiEndpointTestAbstract
         // Arrange
         $data = $this->createUserWithPermission([
             'clients:view',
-            'clients:view:all',
         ]);
         $clients = Client::factory()->forOrganization($data->organization)->randomCreatedAt()->createMany(4);
         Passport::actingAs($data->user);
@@ -58,43 +57,11 @@ class ClientEndpointTest extends ApiEndpointTestAbstract
         );
     }
 
-    public function test_index_endpoint_returns_list_of_clients_assigned_to_employee_user(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'clients:view',
-        ]);
-
-        $clients = Client::factory()->forOrganization($data->organization)->createMany(2);
-        $projectWithMembership1 = Project::factory()->forOrganization($data->organization)->forClient($clients->get(0))->addMember($data->member)->isPrivate()->create();
-        $projectWithMembership2 = Project::factory()->forOrganization($data->organization)->forClient($clients->get(1))->addMember($data->member)->isPrivate()->create();
-
-        $otherClients = Client::factory()->forOrganization($data->organization)->createMany(2);
-        $projectWithoutMembership = Project::factory()->forOrganization($data->organization)->forClient($otherClients->get(0))->isPrivate()->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.clients.index', [$data->organization->getKey()]));
-
-        // Assert
-        $response->assertStatus(200);
-        $response->assertJsonCount(2, 'data');
-        $response->assertJson(fn (AssertableJson $json) => $json
-            ->has('data')
-            ->has('links')
-            ->has('meta')
-            ->count('data', 2)
-            ->where('data.0.id', $clients->get(0)->getKey())
-            ->where('data.1.id', $clients->get(1)->getKey())
-        );
-    }
-
     public function test_index_endpoint_without_filter_archived_returns_only_non_archived_clients(): void
     {
         // Arrange
         $data = $this->createUserWithPermission([
             'clients:view',
-            'clients:view:all',
         ]);
         $archivedClients = Client::factory()->forOrganization($data->organization)->archived()->createMany(2);
         $nonArchivedClients = Client::factory()->forOrganization($data->organization)->createMany(2);
@@ -114,7 +81,6 @@ class ClientEndpointTest extends ApiEndpointTestAbstract
         // Arrange
         $data = $this->createUserWithPermission([
             'clients:view',
-            'clients:view:all',
         ]);
         $archivedClients = Client::factory()->forOrganization($data->organization)->archived()->createMany(2);
         $nonArchivedClients = Client::factory()->forOrganization($data->organization)->createMany(2);
@@ -137,7 +103,6 @@ class ClientEndpointTest extends ApiEndpointTestAbstract
         // Arrange
         $data = $this->createUserWithPermission([
             'clients:view',
-            'clients:view:all',
         ]);
         $archivedClients = Client::factory()->forOrganization($data->organization)->archived()->createMany(2);
         $nonArchivedClients = Client::factory()->forOrganization($data->organization)->createMany(2);
@@ -160,7 +125,6 @@ class ClientEndpointTest extends ApiEndpointTestAbstract
         // Arrange
         $data = $this->createUserWithPermission([
             'clients:view',
-            'clients:view:all',
         ]);
         $archivedClients = Client::factory()->forOrganization($data->organization)->archived()->createMany(2);
         $nonArchivedClients = Client::factory()->forOrganization($data->organization)->createMany(2);

tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php

@@ -3393,241 +3393,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         ]);
     }
 
-    public function test_store_endpoint_blocks_overlapping_entries_when_start_overlaps(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:create:own',
-        ]);
-        $data->organization->prevent_overlapping_time_entries = true;
-        $data->organization->save();
-        $baseStart = Carbon::create(2025, 1, 1, 12, 0, 0, 'UTC');
-        $baseEnd = Carbon::create(2025, 1, 1, 13, 0, 0, 'UTC');
-        TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
-            ->create([
-                'start' => $baseStart,
-                'end' => $baseEnd,
-            ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
-            'member_id' => $data->member->getKey(),
-            'billable' => true,
-            'start' => $baseStart->copy()->addMinutes(30)->toIso8601ZuluString(),
-            'end' => $baseEnd->copy()->addMinutes(30)->toIso8601ZuluString(),
-        ]);
-
-        // Assert
-        $response->assertStatus(400);
-        $response->assertExactJson([
-            'error' => true,
-            'key' => 'overlapping_time_entry',
-            'message' => 'Overlapping time entries are not allowed.',
-        ]);
-    }
-
-    public function test_store_endpoint_blocks_overlapping_entries_when_end_overlaps(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:create:own',
-        ]);
-        $data->organization->prevent_overlapping_time_entries = true;
-        $data->organization->save();
-        $baseStart = Carbon::create(2025, 1, 1, 12, 0, 0, 'UTC');
-        $baseEnd = Carbon::create(2025, 1, 1, 13, 0, 0, 'UTC');
-        TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
-            ->create([
-                'start' => $baseStart,
-                'end' => $baseEnd,
-            ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
-            'member_id' => $data->member->getKey(),
-            'billable' => true,
-            'start' => $baseStart->copy()->subMinutes(30)->toIso8601ZuluString(),
-            'end' => $baseStart->copy()->addMinutes(30)->toIso8601ZuluString(),
-        ]);
-
-        // Assert
-        $response->assertStatus(400);
-        $response->assertExactJson([
-            'error' => true,
-            'key' => 'overlapping_time_entry',
-            'message' => 'Overlapping time entries are not allowed.',
-        ]);
-    }
-
-    public function test_store_endpoint_blocks_overlapping_entries_when_new_entry_is_within_existing(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:create:own',
-        ]);
-        $data->organization->prevent_overlapping_time_entries = true;
-        $data->organization->save();
-        $baseStart = Carbon::create(2025, 1, 1, 12, 0, 0, 'UTC');
-        $baseEnd = Carbon::create(2025, 1, 1, 13, 0, 0, 'UTC');
-        TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
-            ->create([
-                'start' => $baseStart,
-                'end' => $baseEnd,
-            ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
-            'member_id' => $data->member->getKey(),
-            'billable' => true,
-            'start' => $baseStart->copy()->addMinutes(15)->toIso8601ZuluString(),
-            'end' => $baseStart->copy()->addMinutes(45)->toIso8601ZuluString(),
-        ]);
-
-        // Assert
-        $response->assertStatus(400);
-        $response->assertExactJson([
-            'error' => true,
-            'key' => 'overlapping_time_entry',
-            'message' => 'Overlapping time entries are not allowed.',
-        ]);
-    }
-
-    public function test_store_endpoint_blocks_overlapping_entries_when_new_entry_surrounds_existing(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:create:own',
-        ]);
-        $data->organization->prevent_overlapping_time_entries = true;
-        $data->organization->save();
-        $baseStart = Carbon::create(2025, 1, 1, 12, 0, 0, 'UTC');
-        $baseEnd = Carbon::create(2025, 1, 1, 13, 0, 0, 'UTC');
-        TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
-            ->create([
-                'start' => $baseStart,
-                'end' => $baseEnd,
-            ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
-            'member_id' => $data->member->getKey(),
-            'billable' => true,
-            'start' => $baseStart->copy()->subMinutes(30)->toIso8601ZuluString(),
-            'end' => $baseEnd->copy()->addMinutes(30)->toIso8601ZuluString(),
-        ]);
-
-        // Assert
-        $response->assertStatus(400);
-        $response->assertExactJson([
-            'error' => true,
-            'key' => 'overlapping_time_entry',
-            'message' => 'Overlapping time entries are not allowed.',
-        ]);
-    }
-
-    public function test_store_endpoint_blocks_starting_active_entry_when_it_overlaps_with_existing(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:create:own',
-        ]);
-        $data->organization->prevent_overlapping_time_entries = true;
-        $data->organization->save();
-        $baseStart = Carbon::create(2025, 1, 1, 12, 0, 0, 'UTC');
-        $baseEnd = Carbon::create(2025, 1, 1, 13, 0, 0, 'UTC');
-        TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
-            ->create([
-                'start' => $baseStart,
-                'end' => $baseEnd,
-            ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
-            'member_id' => $data->member->getKey(),
-            'billable' => true,
-            'start' => $baseStart->copy()->addMinutes(30)->toIso8601ZuluString(),
-            'end' => null,
-        ]);
-
-        // Assert
-        $response->assertStatus(400);
-        $response->assertExactJson([
-            'error' => true,
-            'key' => 'overlapping_time_entry',
-            'message' => 'Overlapping time entries are not allowed.',
-        ]);
-    }
-
-    public function test_store_endpoint_allows_future_time_entries_even_with_running_now(): void
-    {
-        // Arrange
-        $now = Carbon::create(2025, 1, 1, 12, 0, 0, 'UTC');
-        $this->travelTo($now);
-        $data = $this->createUserWithPermission([
-            'time-entries:create:own',
-        ]);
-        $data->organization->prevent_overlapping_time_entries = true;
-        $data->organization->save();
-        TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
-            ->create([
-                'start' => $now->copy()->subHour(),
-                'end' => null,
-            ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
-            'member_id' => $data->member->getKey(),
-            'billable' => true,
-            'start' => $now->copy()->addDay()->toIso8601ZuluString(),
-            'end' => $now->copy()->addDay()->addHour()->toIso8601ZuluString(),
-        ]);
-
-        // Assert
-        $response->assertStatus(201);
-    }
-
-    public function test_update_endpoint_blocks_overlap_and_excludes_current_entry(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:update:own',
-        ]);
-        $data->organization->prevent_overlapping_time_entries = true;
-        $data->organization->save();
-        $baseStart = Carbon::create(2025, 1, 1, 14, 0, 0, 'UTC');
-        $baseEnd = Carbon::create(2025, 1, 1, 15, 0, 0, 'UTC');
-        $base = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
-            ->create([
-                'start' => $baseStart,
-                'end' => $baseEnd,
-            ]);
-        $toUpdate = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
-            ->create([
-                'start' => $baseEnd->copy()->addMinutes(30),
-                'end' => $baseEnd->copy()->addHour(),
-            ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->putJson(route('api.v1.time-entries.update', [$data->organization->getKey(), $toUpdate->getKey()]), [
-            'start' => $baseStart->copy()->addMinutes(30)->toIso8601ZuluString(),
-        ]);
-
-        // Assert
-        $response->assertStatus(400);
-        $response->assertExactJson([
-            'error' => true,
-            'key' => 'overlapping_time_entry',
-            'message' => 'Overlapping time entries are not allowed.',
-        ]);
-    }
-
     public function test_update_multiple_refreshes_billable_rate_on_updates_time_entries(): void
     {
         // Arrange

tests/Unit/Service/TimeEntryAggregationServiceTest.php

@@ -9,7 +9,6 @@ use App\Enums\TimeEntryRoundingType;
 use App\Enums\Weekday;
 use App\Models\Client;
 use App\Models\Project;
-use App\Models\Tag;
 use App\Models\TimeEntry;
 use App\Service\TimeEntryAggregationService;
 use Illuminate\Support\Carbon;
@@ -1008,201 +1007,4 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
             ],
         ], $result);
     }
-
-    public function test_aggregate_time_entries_group_by_tag_includes_no_tag_and_avoids_double_counting_overall(): void
-    {
-        // Arrange
-        $tag1 = Tag::factory()->create();
-        $tag2 = Tag::factory()->create();
-        $start = Carbon::now();
-
-        // One entry with two tags (100s)
-        TimeEntry::factory()->startWithDuration($start, 100)->create([
-            'tags' => [$tag1->getKey(), $tag2->getKey()],
-        ]);
-        // One entry with one tag (50s)
-        TimeEntry::factory()->startWithDuration($start, 50)->create([
-            'tags' => [$tag1->getKey()],
-        ]);
-        // One entry with no tags (25s)
-        TimeEntry::factory()->startWithDuration($start, 25)->create([
-            'tags' => [],
-        ]);
-
-        $query = TimeEntry::query();
-
-        // Act
-        $result = $this->service->getAggregatedTimeEntries(
-            $query,
-            TimeEntryAggregationType::Tag,
-            null,
-            'Europe/Vienna',
-            Weekday::Monday,
-            false,
-            null,
-            null,
-            true,
-            null,
-            null
-        );
-
-        // Assert - overall total should be 175 and groups: null=25, tag1=150, tag2=100
-        $expected = [
-            'seconds' => 175,
-            'cost' => 0,
-            'grouped_type' => 'tag',
-            'grouped_data' => [
-                [
-                    'key' => null,
-                    'seconds' => 25,
-                    'cost' => 0,
-                    'grouped_type' => null,
-                    'grouped_data' => null,
-                ],
-                [
-                    'key' => $tag1->getKey(),
-                    'seconds' => 150,
-                    'cost' => 0,
-                    'grouped_type' => null,
-                    'grouped_data' => null,
-                ],
-                [
-                    'key' => $tag2->getKey(),
-                    'seconds' => 100,
-                    'cost' => 0,
-                    'grouped_type' => null,
-                    'grouped_data' => null,
-                ],
-            ],
-        ];
-        $this->assertEqualsCanonicalizing($expected, $result);
-    }
-
-    public function test_aggregate_time_entries_group_by_project_and_subgroup_tag(): void
-    {
-        // Arrange
-        $project = Project::factory()->create();
-        $tag1 = Tag::factory()->create();
-        $tag2 = Tag::factory()->create();
-        $start = Carbon::now();
-
-        TimeEntry::factory()->startWithDuration($start, 120)->forProject($project)->create([
-            'tags' => [$tag1->getKey()],
-        ]);
-        TimeEntry::factory()->startWithDuration($start, 60)->forProject($project)->create([
-            'tags' => [$tag2->getKey()],
-        ]);
-
-        $query = TimeEntry::query();
-
-        // Act
-        $result = $this->service->getAggregatedTimeEntries(
-            $query,
-            TimeEntryAggregationType::Project,
-            TimeEntryAggregationType::Tag,
-            'Europe/Vienna',
-            Weekday::Monday,
-            false,
-            null,
-            null,
-            true,
-            null,
-            null
-        );
-
-        // Assert
-        $expected = [
-            'seconds' => 180,
-            'cost' => 0,
-            'grouped_type' => 'project',
-            'grouped_data' => [
-                [
-                    'key' => $project->getKey(),
-                    'seconds' => 180,
-                    'cost' => 0,
-                    'grouped_type' => 'tag',
-                    'grouped_data' => [
-                        [
-                            'key' => $tag1->getKey(),
-                            'seconds' => 120,
-                            'cost' => 0,
-                            'grouped_type' => null,
-                            'grouped_data' => null,
-                        ],
-                        [
-                            'key' => $tag2->getKey(),
-                            'seconds' => 60,
-                            'cost' => 0,
-                            'grouped_type' => null,
-                            'grouped_data' => null,
-                        ],
-                    ],
-                ],
-            ],
-        ];
-        $this->assertEqualsCanonicalizing($expected, $result);
-    }
-
-    public function test_aggregate_time_entries_group_by_project_and_subgroup_tag_avoids_double_counting(): void
-    {
-        // Arrange
-        $project = Project::factory()->create();
-        $tag1 = Tag::factory()->create();
-        $tag2 = Tag::factory()->create();
-        $start = Carbon::now();
-
-        // One entry with two tags => subgroup rows show both tags, but project total should equal entry duration
-        TimeEntry::factory()->startWithDuration($start, 100)->forProject($project)->create([
-            'tags' => [$tag1->getKey(), $tag2->getKey()],
-        ]);
-
-        $query = TimeEntry::query();
-
-        // Act
-        $result = $this->service->getAggregatedTimeEntries(
-            $query,
-            TimeEntryAggregationType::Project,
-            TimeEntryAggregationType::Tag,
-            'Europe/Vienna',
-            Weekday::Monday,
-            false,
-            null,
-            null,
-            true,
-            null,
-            null
-        );
-
-        // Assert
-        $expected = [
-            'seconds' => 100,
-            'cost' => 0,
-            'grouped_type' => 'project',
-            'grouped_data' => [
-                [
-                    'key' => $project->getKey(),
-                    'seconds' => 100,
-                    'cost' => 0,
-                    'grouped_type' => 'tag',
-                    'grouped_data' => [
-                        [
-                            'key' => $tag1->getKey(),
-                            'seconds' => 100,
-                            'cost' => 0,
-                            'grouped_type' => null,
-                            'grouped_data' => null,
-                        ],
-                        [
-                            'key' => $tag2->getKey(),
-                            'seconds' => 100,
-                            'cost' => 0,
-                            'grouped_type' => null,
-                            'grouped_data' => null,
-                        ],
-                    ],
-                ],
-            ],
-        ];
-        $this->assertEqualsCanonicalizing($expected, $result);
-    }
 }