Updated the PR template

.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 }}

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

@@ -46,9 +46,6 @@ class OrganizationController extends Controller
         if ($request->getEmployeesCanSeeBillableRates() !== null) {
             $organization->employees_can_see_billable_rates = $request->getEmployeesCanSeeBillableRates();
         }
-        if ($request->getEmployeesCanManageTasks() !== null) {
-            $organization->employees_can_manage_tasks = $request->getEmployeesCanManageTasks();
-        }
         if ($request->getNumberFormat() !== null) {
             $organization->number_format = $request->getNumberFormat();
         }
@@ -64,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/TaskController.php

@@ -11,7 +11,6 @@ use App\Http\Requests\V1\Task\TaskUpdateRequest;
 use App\Http\Resources\V1\Task\TaskCollection;
 use App\Http\Resources\V1\Task\TaskResource;
 use App\Models\Organization;
-use App\Models\Project;
 use App\Models\Task;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
@@ -28,26 +27,6 @@ class TaskController extends Controller
         }
     }
 
-    /**
-     * Check scoped permission and verify user has access to the project
-     *
-     * @throws AuthorizationException
-     */
-    private function checkScopedPermissionForProject(Organization $organization, Project $project, string $permission): void
-    {
-        $this->checkPermission($organization, $permission);
-
-        $user = $this->user();
-        $hasAccess = Project::query()
-            ->where('id', $project->id)
-            ->visibleByEmployee($user)
-            ->exists();
-
-        if (! $hasAccess) {
-            throw new AuthorizationException('You do not have permission to '.$permission.' in this project.');
-        }
-    }
-
     /**
      * Get tasks
      *
@@ -96,15 +75,7 @@ class TaskController extends Controller
      */
     public function store(Organization $organization, TaskStoreRequest $request): JsonResource
     {
-        /** @var Project $project */
-        $project = Project::query()->findOrFail($request->input('project_id'));
-
-        if ($this->hasPermission($organization, 'tasks:create:all')) {
-            $this->checkPermission($organization, 'tasks:create:all');
-        } else {
-            $this->checkScopedPermissionForProject($organization, $project, 'tasks:create');
-        }
-
+        $this->checkPermission($organization, 'tasks:create');
         $task = new Task;
         $task->name = $request->input('name');
         $task->project_id = $request->input('project_id');
@@ -126,17 +97,7 @@ class TaskController extends Controller
      */
     public function update(Organization $organization, Task $task, TaskUpdateRequest $request): JsonResource
     {
-        // Check task belongs to organization
-        if ($task->organization_id !== $organization->id) {
-            throw new AuthorizationException('Task does not belong to organization');
-        }
-
-        if ($this->hasPermission($organization, 'tasks:update:all')) {
-            $this->checkPermission($organization, 'tasks:update:all');
-        } else {
-            $this->checkScopedPermissionForProject($organization, $task->project, 'tasks:update');
-        }
-
+        $this->checkPermission($organization, 'tasks:update', $task);
         $task->name = $request->input('name');
         if ($this->canAccessPremiumFeatures($organization) && $request->has('estimated_time')) {
             $task->estimated_time = $request->getEstimatedTime();
@@ -158,16 +119,7 @@ class TaskController extends Controller
      */
     public function destroy(Organization $organization, Task $task): JsonResponse
     {
-        // Check task belongs to organization
-        if ($task->organization_id !== $organization->id) {
-            throw new AuthorizationException('Task does not belong to organization');
-        }
-
-        if ($this->hasPermission($organization, 'tasks:delete:all')) {
-            $this->checkPermission($organization, 'tasks:delete:all');
-        } else {
-            $this->checkScopedPermissionForProject($organization, $task->project, 'tasks:delete');
-        }
+        $this->checkPermission($organization, 'tasks:delete', $task);
 
         if ($task->timeEntries()->exists()) {
             throw new EntityStillInUseApiException('task', 'time_entry');

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,12 +39,6 @@ class OrganizationUpdateRequest extends BaseFormRequest
             'employees_can_see_billable_rates' => [
                 'boolean',
             ],
-            'employees_can_manage_tasks' => [
-                'boolean',
-            ],
-            'prevent_overlapping_time_entries' => [
-                'boolean',
-            ],
             'number_format' => [
                 Rule::enum(NumberFormat::class),
             ],
@@ -104,14 +98,4 @@ class OrganizationUpdateRequest extends BaseFormRequest
     {
         return $this->has('employees_can_see_billable_rates') ? $this->boolean('employees_can_see_billable_rates') : null;
     }
-
-    public function getEmployeesCanManageTasks(): ?bool
-    {
-        return $this->has('employees_can_manage_tasks') ? $this->boolean('employees_can_manage_tasks') : 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,10 +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 $employees_can_manage_tasks Can members of the organization with role "employee" manage tasks in public projects and projects they are assigned to */
-            'employees_can_manage_tasks' => $this->resource->employees_can_manage_tasks,
-            /** @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

@@ -35,7 +35,6 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property int|null $billable_rate
  * @property string $user_id
  * @property bool $employees_can_see_billable_rates
- * @property bool $employees_can_manage_tasks
  * @property User $owner
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
@@ -71,8 +70,6 @@ class Organization extends JetstreamTeam implements AuditableContract
         'personal_team' => 'boolean',
         'currency' => 'string',
         'employees_can_see_billable_rates' => 'boolean',
-        'employees_can_manage_tasks' => 'boolean',
-        'prevent_overlapping_time_entries' => 'boolean',
         'number_format' => NumberFormat::class,
         'currency_format' => CurrencyFormat::class,
         'date_format' => DateFormat::class,

app/Providers/JetstreamServiceProvider.php

@@ -94,11 +94,8 @@ class JetstreamServiceProvider extends ServiceProvider
             'tasks:view',
             'tasks:view:all',
             'tasks:create',
-            'tasks:create:all',
             'tasks:update',
-            'tasks:update:all',
             'tasks:delete',
-            'tasks:delete:all',
             'time-entries:view:all',
             'time-entries:create:all',
             'time-entries:update:all',
@@ -112,7 +109,6 @@ class JetstreamServiceProvider extends ServiceProvider
             'tags:update',
             'tags:delete',
             'clients:view',
-            'clients:view:all',
             'clients:create',
             'clients:update',
             'clients:delete',
@@ -161,11 +157,8 @@ class JetstreamServiceProvider extends ServiceProvider
             'tasks:view',
             'tasks:view:all',
             'tasks:create',
-            'tasks:create:all',
             'tasks:update',
-            'tasks:update:all',
             'tasks:delete',
-            'tasks:delete:all',
             'time-entries:view:all',
             'time-entries:create:all',
             'time-entries:update:all',
@@ -179,7 +172,6 @@ class JetstreamServiceProvider extends ServiceProvider
             'tags:update',
             'tags:delete',
             'clients:view',
-            'clients:view:all',
             'clients:create',
             'clients:update',
             'clients:delete',
@@ -225,11 +217,8 @@ class JetstreamServiceProvider extends ServiceProvider
             'tasks:view',
             'tasks:view:all',
             'tasks:create',
-            'tasks:create:all',
             'tasks:update',
-            'tasks:update:all',
             'tasks:delete',
-            'tasks:delete:all',
             'time-entries:view:all',
             'time-entries:create:all',
             'time-entries:update:all',
@@ -243,7 +232,6 @@ class JetstreamServiceProvider extends ServiceProvider
             'tags:update',
             'tags:delete',
             'clients:view',
-            'clients:view:all',
             'clients:create',
             'clients:update',
             'clients:delete',
@@ -268,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/DashboardService.php

@@ -266,8 +266,7 @@ class DashboardService
                ) as aggregate'))
             ->where('billable', '=', true)
             ->whereNotNull('billable_rate')
-            ->where('user_id', '=', $user->getKey())
-            ->where('organization_id', '=', $organization->getKey());
+            ->where('user_id', '=', $user->id);
 
         $query = $this->constrainDateByPossibleDates($query, $possibleDays, $timezone);
         /** @var Collection<int, object{aggregate: int}> $resultDb */

app/Service/Export/ExportService.php

@@ -167,7 +167,7 @@ class ExportService
                             $client->id,
                             $client->name,
                             $client->organization_id,
-                            $client->archived_at?->toIso8601ZuluString() ?? '',
+                            $client->archived_at ?? '',
                             $client->created_at?->toIso8601ZuluString() ?? '',
                             $client->updated_at?->toIso8601ZuluString() ?? '',
                         ]);

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/PermissionStore.php

@@ -71,19 +71,7 @@ class PermissionStore
         /** @var Role|null $roleObj */
         $roleObj = Jetstream::findRole($role);
 
-        $permissions = $roleObj->permissions ?? [];
-
-        // If the organization allows employees to manage tasks and the user is an employee,
-        // add the task management permissions for accessible projects
-        if ($role === \App\Enums\Role::Employee->value && $organization->employees_can_manage_tasks) {
-            $permissions = array_merge($permissions, [
-                'tasks:create',
-                'tasks:update',
-                'tasks:delete',
-            ]);
-        }
-
-        return $permissions;
+        return $roleObj->permissions ?? [];
     }
 
     /**

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/migrations/2025_10_24_120845_add_employees_can_manage_tasks_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('employees_can_manage_tasks')->default(false)->after('employees_can_see_billable_rates');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->dropColumn('employees_can_manage_tasks');
-        });
-    }
-};

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

@@ -1,14 +1,237 @@
-/* Import shared solidtime styles from UI package */
-@import '../js/packages/ui/styles.css';
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+:root.dark {
+    --color-bg-primary: #101012;
+    --color-bg-secondary: #17181B;
+    --color-bg-tertiary: #2A2C32;
+    --color-bg-quaternary: #141518;
+    --color-bg-background: #090909;
+    --color-text-primary: #ffffff;
+    --color-text-secondary: #e3e4e6;
+    --color-text-tertiary: #969799;
+    --color-text-quaternary: #595a5c;
 
-/* Main app specific styles - Inter font */
+    --color-border-primary: #191b1f;
+    --color-border-secondary: #23252a;
+    --color-border-tertiary: #2c2e33;
+    --color-border-quaternary: #393B42;
+    --color-input-border-active: rgba(255,255,255,0.3);
+
+    --theme-color-chart: var(--color-accent-200);
+
+    --theme-color-menu-active: var(--color-bg-secondary);
+    --theme-color-card-background: var(--color-bg-secondary);
+    --theme-shadow-card: 0 4px 7px 0px rgb(0 0 0 / 15%);
+    --theme-shadow-dropdown: 0 4px 7px 0px rgb(0 0 0 / 40%);
+
+    --theme-color-card-background-active: var(--color-bg-tertiary);
+
+    --theme-color-row-background: var(--color-bg-primary);
+    --theme-color-row-heading-background: var(--theme-color-card-background);
+    --theme-color-row-heading-border: var(--theme-color-card-border);
+    --theme-color-icon-default: var(--color-text-tertiary);
+
+    --theme-color-ring: rgba(255,255,255,0.5);
+
+    --theme-color-button-primary-background: rgba(var(--color-accent-300), 0.1);
+    --theme-color-button-primary-background-hover: rgba(var(--color-accent-300), 0.2);
+    --theme-color-button-primary-border: rgba(var(--color-accent-300), 0.2);
+    --theme-color-button-primary-text: var(--color-text-primary);
+
+    --theme-color-input-background: var(--color-bg-secondary);
+
+    --theme-color-input-select-active: rgb(var(--color-accent-300));
+    --theme-color-input-select-active-hover: rgb(var(--color-accent-200));
+
+    --color-accent-default: rgba(var(--color-accent-300), 0.2);
+    --color-accent-foreground: rgb(var(--color-accent-100));
+}
+
+:root.light {
+    --color-bg-primary: #F5F5F5;
+    --color-bg-secondary: #f7f7f8;
+    --color-bg-tertiary: #e1e1e3;
+    --color-bg-quaternary: #ffffff;
+    --color-bg-background: #ffffff;
+    --color-text-primary: #18181b;
+    --color-text-secondary: #3f3f46;
+    --color-text-tertiary: #57575C;
+    --color-text-quaternary: #a1a1aa;
+    --color-border-primary: #e7e7e7;
+    --color-border-secondary: #e5e5e5;
+    --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-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: 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);
+    --theme-color-row-heading-background: var(--color-bg-secondary);
+    --theme-color-row-heading-border: var(--color-border-tertiary);
+    --theme-color-icon-default: var(--color-text-quaternary);
+
+    --theme-color-ring: rgba(0,0,0, 0.7);
+
+    --theme-color-button-primary-background: rgba(var(--color-accent-600), 0.9);
+    --theme-color-button-primary-background-hover: rgba(var(--color-accent-600), 1);
+    --theme-color-button-primary-border: rgba(var(--color-accent-600), 1);
+    --theme-color-button-primary-text: #FFFFFF;
+
+    --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));
+}
+
+: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);
+    --theme-color-card-border-active: var(--color-border-tertiary);
+    --theme-color-default-background-separator: var(--color-border-primary);
+    --theme-color-primary-text: var(--color-text-primary);
+    --theme-color-input-border: var(--color-border-quaternary);
+    --theme-color-tab-background: var(--theme-color-card-background);
+    --theme-color-tab-background-active: var(--theme-color-card-background-active);
+    --theme-color-tab-border: var(--theme-color-card-border);
+    --theme-color-row-separator-background: var(--theme-color-default-background-separator);
+    --theme-color-row-border: var(--theme-color-card-border);
+
+    --color-accent-50: 240, 249, 255;    /* sky-50 */
+    --color-accent-100: 224, 242, 254;   /* sky-100 */
+    --color-accent-200: 186, 230, 253;   /* sky-200 */
+    --color-accent-300: 125, 211, 252;   /* sky-300 */
+    --color-accent-400: 56, 189, 248;    /* sky-400 */
+    --color-accent-500: 14, 165, 233;    /* sky-500 */
+    --color-accent-600: 2, 132, 199;     /* sky-600 */
+    --color-accent-700: 3, 105, 161;     /* sky-700 */
+    --color-accent-800: 7, 89, 133;      /* sky-800 */
+    --color-accent-900: 12, 74, 110;     /* sky-900 */
+    --color-accent-950: 8, 47, 73;       /* sky-950 */
+
+    --theme-button-secondary-background: var(--theme-color-card-background);
+    --theme-button-secondary-background-active: var(--theme-color-card-background-active);
+    --popover-border: var(--color-border-secondary);
+}
+
+* {
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+}
+
+/* width */
+::-webkit-scrollbar {
+    width: 5px;
+}
+
+/* Track */
+::-webkit-scrollbar-track, ::-webkit-scrollbar-corner {
+    background: transparent;
+}
+
+/* Handle */
+::-webkit-scrollbar-thumb {
+    background: #888;
+    border-radius: 2px;
+}
+
+/* Handle on hover */
+::-webkit-scrollbar-thumb:hover {
+    background: #555;
+}
+
+[x-cloak] {
+    display: none;
+}
+body {
+    background-color: var(--theme-color-default-background);
+}
+
+
+/* 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/InterVariable.woff2') format('woff2'),
+         url('/fonts/InterVariable.ttf') format('truetype');
     font-weight: 100 900;
     font-style: normal;
     font-display: swap;
     font-feature-settings: 'cv02', 'cv03', 'cv04', 'cv11';
 }
+
+@layer base {
+  :root {
+        --background: var(--color-bg-background);
+        --foreground: var(--color-text-primary);
+        --card: var(--theme-color-card-background);
+        --card-foreground: var(--color-text-primary);
+        --popover: var(--theme-color-card-background);
+        --popover-foreground: var(--color-text-primary);
+        --primary: var(--theme-color-button-primary-background);
+        --primary-foreground: var(--theme-color-button-primary-text);
+        --secondary: var(--color-bg-secondary);
+        --secondary-foreground: var(--color-text-primary);
+        --muted: var(--color-bg-tertiary);
+        --muted-foreground: var(--color-text-tertiary);
+        --accent: var(--theme-color-button-primary-background);
+        --accent-foreground: var(--theme-color-button-primary-text);
+        --destructive: 0 84.2% 60.2%;
+        --destructive-foreground: var(--color-text-primary);
+        --border: var(--color-border-primary);
+        --input: var(--color-border-tertiary);
+        --ring: var(--theme-color-ring);
+        --chart-1: var(--color-accent-400);
+        --chart-2: var(--color-accent-500);
+        --chart-3: var(--color-accent-600);
+        --chart-4: var(--color-accent-700);
+        --chart-5: var(--color-accent-800);
+        --radius: 0.5rem;
+    }
+  .dark {
+        --background: var(--color-bg-background);
+        --foreground: var(--color-text-primary);
+        --card: var(--theme-color-card-background);
+        --card-foreground: var(--color-text-primary);
+        --popover: var(--theme-color-card-background);
+        --popover-foreground: var(--color-text-primary);
+        --primary: var(--theme-color-button-primary-background);
+        --primary-foreground: var(--theme-color-button-primary-text);
+        --secondary: var(--color-bg-secondary);
+        --secondary-foreground: var(--color-text-primary);
+        --muted: var(--color-bg-tertiary);
+        --muted-foreground: var(--color-text-tertiary);
+        --accent: var(--theme-color-button-primary-background);
+        --accent-foreground: var(--theme-color-button-primary-text);
+        --destructive: 0 62.8% 30.6%;
+        --destructive-foreground: var(--color-text-primary);
+        --border: var(--color-border-primary);
+        --input: var(--color-border-tertiary);
+        --ring: var(--theme-color-ring);
+        --chart-1: var(--color-accent-200);
+        --chart-2: var(--color-accent-300);
+        --chart-3: var(--color-accent-400);
+        --chart-4: var(--color-accent-500);
+        --chart-5: var(--color-accent-600);
+    }
+}
+
+@layer base {
+  * {
+    @apply border-border;
+    }
+  body {
+    @apply bg-background text-foreground;
+    }
+}

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/ReportingFilterBadge.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Button } from '@/packages/ui/src';
+import { Button } from '@/Components/ui/button';
 
 const props = defineProps<{
     icon: Component;

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { Switch } from '@/Components/ui/switch';
-import { Popover, PopoverContent, PopoverTrigger } from '@/packages/ui/src';
-import { Button } from '@/packages/ui/src';
+import { Popover, PopoverContent, PopoverTrigger } from '@/Components/ui/popover';
+import { Button } from '@/Components/ui/button';
 import {
     Select,
     SelectContent,

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,45 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue';
-import { useForm, usePage } from '@inertiajs/vue3';
-import type { User } from '@/types/models';
-import TimezoneMismatchModal from '@/packages/ui/src/TimezoneMismatchModal.vue';
-
-const show = defineModel('show', { default: false });
-const saving = ref(false);
-
-const page = usePage<{
-    auth: {
-        user: User;
-    };
-}>();
-
-function handleUpdate(timezone: string) {
-    saving.value = true;
-    const form = useForm({
-        _method: 'PUT',
-        timezone: timezone,
-        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();
-        },
-        onError: () => {
-            saving.value = false;
-        },
-    });
-}
-</script>
-
-<template>
-    <TimezoneMismatchModal v-model:show="show" :saving="saving" @update="handleUpdate" />
-</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,73 +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());
-const { timeEntries } = storeToRefs(useTimeEntriesStore());
 </script>
 
 <template>
-    <TimeEntryCreateModal
-        v-model:show="showManualTimeEntryModal"
-        :enable-estimated-time="isAllowedToPerformPremiumAction()"
-        :create-project="createProject"
-        :create-client="createClient"
-        :create-tag="createTag"
-        :create-time-entry="createTimeEntry"
-        :currency="getOrganizationCurrencyString()"
-        :can-create-project="canCreateProjects()"
-        :projects
-        :tasks
-        :tags
-        :clients></TimeEntryCreateModal>
     <CardTitle title="Time Tracker" :icon="ClockIcon"></CardTitle>
     <div class="relative">
         <TimeTrackerRunningInDifferentOrganizationOverlay
@@ -183,36 +109,24 @@ const { timeEntries } = storeToRefs(useTimeEntriesStore());
                 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
-                        :time-entries
-                        :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/accordion/AccordionContent.vue

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

resources/js/Components/ui/accordion/AccordionItem.vue

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

resources/js/Components/ui/accordion/AccordionTrigger.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { cn } from '../utils/cn';
+import { cn } from '@/lib/utils';
 import { ChevronDown } from 'lucide-vue-next';
 import { AccordionHeader, AccordionTrigger, type AccordionTriggerProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';

resources/js/Components/ui/alert-dialog/AlertDialogAction.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { buttonVariants } from '@/packages/ui/src';
+import { buttonVariants } from '@/Components/ui/button';
 import { AlertDialogAction, type AlertDialogActionProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 import { twMerge } from 'tailwind-merge';

resources/js/Components/ui/alert-dialog/AlertDialogCancel.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { buttonVariants } from '@/packages/ui/src';
+import { buttonVariants } from '@/Components/ui/button';
 import { AlertDialogCancel, type AlertDialogCancelProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 import { twMerge } from 'tailwind-merge';

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

@@ -1,5 +1,6 @@
 <script lang="ts" setup>
-import { cn, buttonVariants } from '@/packages/ui/src';
+import { cn } from '@/lib/utils';
+import { buttonVariants } from '@/Components/ui/button';
 import { CalendarCellTrigger, type CalendarCellTriggerProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 

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

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { Popover, PopoverContent, PopoverTrigger } from '@/packages/ui/src';
-import { Button } from '@/packages/ui/src';
+import { Popover, PopoverContent, PopoverTrigger } from '@/Components/ui/popover';
+import { Button } from '@/Components/ui/button';
 import { Calendar } from '@/Components/ui/calendar';
 import { CalendarIcon, XIcon } from 'lucide-vue-next';
 import { formatDate } from '@/packages/ui/src/utils/time';

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

@@ -1,5 +1,6 @@
 <script lang="ts" setup>
-import { cn, buttonVariants } from '@/packages/ui/src/index';
+import { cn } from '@/lib/utils';
+import { buttonVariants } from '@/Components/ui/button';
 import { ChevronRight } from 'lucide-vue-next';
 import { CalendarNext, type CalendarNextProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';

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

@@ -1,5 +1,6 @@
 <script lang="ts" setup>
-import { cn, buttonVariants } from '@/packages/ui/src';
+import { cn } from '@/lib/utils';
+import { buttonVariants } from '@/Components/ui/button';
 import { ChevronLeft } from 'lucide-vue-next';
 import { CalendarPrev, type CalendarPrevProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';

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/Components/ui/range-calendar/RangeCalendarCellTrigger.vue

@@ -1,5 +1,6 @@
 <script lang="ts" setup>
-import { cn, buttonVariants } from '@/packages/ui/src';
+import { cn } from '@/lib/utils';
+import { buttonVariants } from '@/Components/ui/button';
 import {
     RangeCalendarCellTrigger,
     type RangeCalendarCellTriggerProps,

resources/js/Components/ui/range-calendar/RangeCalendarNextButton.vue

@@ -1,5 +1,6 @@
 <script lang="ts" setup>
-import { cn, buttonVariants } from '@/packages/ui/src';
+import { cn } from '@/lib/utils';
+import { buttonVariants } from '@/Components/ui/button';
 import { ChevronRight } from 'lucide-vue-next';
 import { RangeCalendarNext, type RangeCalendarNextProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';

resources/js/Components/ui/range-calendar/RangeCalendarPrevButton.vue

@@ -1,5 +1,6 @@
 <script lang="ts" setup>
-import { cn, buttonVariants } from '@/packages/ui/src';
+import { cn } from '@/lib/utils';
+import { buttonVariants } from '@/Components/ui/button';
 import { ChevronLeft } from 'lucide-vue-next';
 import { RangeCalendarPrev, type RangeCalendarPrevProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';

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 '@/packages/ui/src';
-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,145 +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';
-import { getOrganizationCurrencyString } from '@/utils/money';
-import { canCreateProjects } from '@/utils/permissions';
-
-const calendarStart = ref<Date | undefined>(undefined);
-const calendarEnd = ref<Date | undefined>(undefined);
-
-const enableCalendarQuery = computed(() => {
-    return !!getCurrentOrganizationId() && !!calendarStart.value && !!calendarEnd.value;
-});
-
-// Calculate expanded date range to include previous and next periods with timezone transformations
-const expandedDateRange = computed(() => {
-    if (!calendarStart.value || !calendarEnd.value) {
-        return { start: null, end: null };
-    }
-
-    const dayjs = getDayJsInstance();
-    const duration = dayjs(calendarEnd.value).diff(dayjs(calendarStart.value), 'milliseconds');
-
-    // Calculate previous period
-    const previousStart = dayjs(calendarStart.value).subtract(duration, 'milliseconds');
-    // Calculate next period
-    const nextEnd = dayjs(calendarEnd.value).add(duration, 'milliseconds');
-
-    // Apply timezone transformations
-    const formattedStart = previousStart.utc().tz(getUserTimezone(), true).utc().format();
-    const formattedEnd = nextEnd.utc().tz(getUserTimezone(), true).utc().format();
-
-    return {
-        start: formattedStart,
-        end: formattedEnd,
-    };
-});
-
-const { data: timeEntryResponse, isLoading: timeEntriesLoading } = useQuery<TimeEntryResponse>({
-    queryKey: computed(() => [
-        'timeEntry',
-        'calendar',
-        {
-            start: expandedDateRange.value.start,
-            end: expandedDateRange.value.end,
-            organization: getCurrentOrganizationId(),
-        },
-    ]),
-    enabled: enableCalendarQuery,
-    placeholderData: (previousData) => previousData,
-    queryFn: () =>
-        api.getTimeEntries({
-            params: {
-                organization: getCurrentOrganizationId() || '',
-            },
-            queries: {
-                start: expandedDateRange.value.start!,
-                end: expandedDateRange.value.end!,
-                member_id: getCurrentMembershipId(),
-            },
-        }),
-});
-
-const 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()"
-            :currency="getOrganizationCurrencyString()"
-            :can-create-project="canCreateProjects()"
-            :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(
@@ -383,7 +382,7 @@ async function downloadExport(format: ExportFormat) {
             @submit="clearSelectionAndState"
             @select-all="selectedTimeEntries = [...timeEntries]"
             @unselect-all="selectedTimeEntries = []"></TimeEntryMassActionRow>
-        <div class="w-full relative @container">
+        <div class="w-full relative">
             <div v-for="entry in timeEntries" :key="entry.id">
                 <TimeEntryRow
                     :selected="selectedTimeEntries.includes(entry)"
@@ -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,81 +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;
-    employees_can_manage_tasks: boolean;
-}>({
-    prevent_overlapping_time_entries: false,
-    employees_can_manage_tasks: false,
-});
-
-onMounted(async () => {
-    form.value.prevent_overlapping_time_entries =
-        organization.value?.prevent_overlapping_time_entries ?? false;
-    form.value.employees_can_manage_tasks = organization.value?.employees_can_manage_tasks ?? 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,
-        employees_can_manage_tasks: form.value.employees_can_manage_tasks,
-    });
-}
-</script>
-
-<template>
-    <FormSection>
-        <template #title>Organization Settings</template>
-        <template #description>
-            Configure various settings for your organization, including time entry and task
-            management permissions.
-        </template>
-
-        <template #form>
-            <div class="col-span-6">
-                <div class="col-span-6 sm:col-span-4 space-y-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 class="flex items-center space-x-2">
-                        <Checkbox
-                            id="employeesCanManageTasks"
-                            v-model:checked="form.employees_can_manage_tasks" />
-                        <InputLabel
-                            for="employeesCanManageTasks"
-                            value="Allow Employees to manage tasks" />
-                    </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/package-lock.json

@@ -1,16 +1,15 @@
 {
     "name": "@solidtime/api",
-    "version": "0.0.6",
+    "version": "0.0.4",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@solidtime/api",
-            "version": "0.0.6",
+            "version": "0.0.3",
             "license": "AGPL-3.0",
             "dependencies": {
                 "@zodios/core": "^10.9.6",
-                "axios": "^1.13.2",
                 "typescript": "^5.5.4",
                 "zod": "^3.23.8"
             },
@@ -1095,16 +1094,18 @@
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
             "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/axios": {
-            "version": "1.13.2",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz",
-            "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
+            "version": "1.7.5",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.5.tgz",
+            "integrity": "sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "follow-redirects": "^1.15.6",
-                "form-data": "^4.0.4",
+                "form-data": "^4.0.0",
                 "proxy-from-env": "^1.1.0"
             }
         },
@@ -1126,24 +1127,12 @@
                 "concat-map": "0.0.1"
             }
         },
-        "node_modules/call-bind-apply-helpers": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-            "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
-            "license": "MIT",
-            "dependencies": {
-                "es-errors": "^1.3.0",
-                "function-bind": "^1.1.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
         "node_modules/combined-stream": {
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
             "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "delayed-stream": "~1.0.0"
             },
@@ -1209,24 +1198,11 @@
             "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
             "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=0.4.0"
             }
         },
-        "node_modules/dunder-proto": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-            "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-            "license": "MIT",
-            "dependencies": {
-                "call-bind-apply-helpers": "^1.0.1",
-                "es-errors": "^1.3.0",
-                "gopd": "^1.2.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
         "node_modules/entities": {
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
@@ -1240,51 +1216,6 @@
                 "url": "https://github.com/fb55/entities?sponsor=1"
             }
         },
-        "node_modules/es-define-property": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-            "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/es-errors": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-            "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/es-object-atoms": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-            "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
-            "license": "MIT",
-            "dependencies": {
-                "es-errors": "^1.3.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/es-set-tostringtag": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-            "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-            "license": "MIT",
-            "dependencies": {
-                "es-errors": "^1.3.0",
-                "get-intrinsic": "^1.2.6",
-                "has-tostringtag": "^1.0.2",
-                "hasown": "^2.0.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
         "node_modules/esbuild": {
             "version": "0.21.5",
             "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
@@ -1349,6 +1280,7 @@
                 }
             ],
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=4.0"
             },
@@ -1359,15 +1291,14 @@
             }
         },
         "node_modules/form-data": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-            "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+            "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "asynckit": "^0.4.0",
                 "combined-stream": "^1.0.8",
-                "es-set-tostringtag": "^2.1.0",
-                "hasown": "^2.0.2",
                 "mime-types": "^2.1.12"
             },
             "engines": {
@@ -1408,60 +1339,12 @@
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
             "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+            "dev": true,
             "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/get-intrinsic": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-            "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
-            "license": "MIT",
-            "dependencies": {
-                "call-bind-apply-helpers": "^1.0.2",
-                "es-define-property": "^1.0.1",
-                "es-errors": "^1.3.0",
-                "es-object-atoms": "^1.1.1",
-                "function-bind": "^1.1.2",
-                "get-proto": "^1.0.1",
-                "gopd": "^1.2.0",
-                "has-symbols": "^1.1.0",
-                "hasown": "^2.0.2",
-                "math-intrinsics": "^1.1.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/get-proto": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-            "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-            "license": "MIT",
-            "dependencies": {
-                "dunder-proto": "^1.0.1",
-                "es-object-atoms": "^1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/gopd": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-            "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/graceful-fs": {
             "version": "4.2.11",
             "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -1479,37 +1362,11 @@
                 "node": ">=8"
             }
         },
-        "node_modules/has-symbols": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-            "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/has-tostringtag": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-            "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-            "license": "MIT",
-            "dependencies": {
-                "has-symbols": "^1.0.3"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/hasown": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
             "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "function-bind": "^1.1.2"
@@ -1632,20 +1489,12 @@
                 "@jridgewell/sourcemap-codec": "^1.5.0"
             }
         },
-        "node_modules/math-intrinsics": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-            "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
         "node_modules/mime-db": {
             "version": "1.52.0",
             "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
             "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">= 0.6"
             }
@@ -1655,6 +1504,7 @@
             "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
             "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "mime-db": "1.52.0"
             },
@@ -1807,7 +1657,8 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
             "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/punycode": {
             "version": "2.3.1",

resources/js/packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@solidtime/api",
-    "version": "0.0.6",
+    "version": "0.0.4",
     "description": "Package containing the solidtime api client and type declarations",
     "main": "./dist/solidtime-api.umd.cjs",
     "module": "./dist/solidtime-api.js",
@@ -29,7 +29,6 @@
     "license": "AGPL-3.0",
     "dependencies": {
         "@zodios/core": "^10.9.6",
-        "axios": "^1.13.2",
         "typescript": "^5.5.4",
         "zod": "^3.23.8"
     },

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,8 +320,6 @@ const OrganizationResource = z
         is_personal: z.boolean(),
         billable_rate: z.union([z.number(), z.null()]),
         employees_can_see_billable_rates: z.boolean(),
-        employees_can_manage_tasks: z.boolean(),
-        prevent_overlapping_time_entries: z.boolean(),
         currency: z.string(),
         currency_symbol: z.string(),
         number_format: NumberFormat,
@@ -333,8 +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(),
-        employees_can_manage_tasks: z.boolean(),
-        prevent_overlapping_time_entries: z.boolean(),
         number_format: NumberFormat,
         currency_format: CurrencyFormat,
         date_format: DateFormat,
@@ -389,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()]) })
@@ -418,7 +420,6 @@ const TimeEntryAggregationType = z.enum([
     'client',
     'billable',
     'description',
-    'tag',
 ]);
 const TimeEntryAggregationTypeInterval = z.enum(['day', 'week', 'month', 'year']);
 const Weekday = z.enum([
@@ -430,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),
@@ -453,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(),
     })
@@ -481,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(),
@@ -596,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();
@@ -628,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(),
@@ -749,7 +749,6 @@ export const schemas = {
     TimeEntryAggregationType,
     TimeEntryAggregationTypeInterval,
     Weekday,
-    TimeEntryRoundingType,
     ReportStoreRequest,
     DetailedReportResource,
     ReportUpdateRequest,
@@ -762,7 +761,6 @@ export const schemas = {
     TaskStoreRequest,
     TaskUpdateRequest,
     start,
-    rounding_minutes,
     TimeEntryResource,
     TimeEntryStoreRequest,
     TimeEntryUpdateMultipleRequest,
@@ -792,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()
         ),
     },
     {
@@ -864,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(),
             },
         ],
@@ -1159,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: [
             {
@@ -1222,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(),
             },
         ],
@@ -1265,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(),
             },
         ],
@@ -1313,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(),
             },
         ],
@@ -1341,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(),
             },
             {
@@ -1379,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(),
             },
             {
@@ -1435,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(),
                 ]),
             },
             {
@@ -1457,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(),
             },
         ],
@@ -1478,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()
                 ),
             })
@@ -1566,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(),
             },
         ],
@@ -1594,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(),
             },
             {
@@ -1616,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(),
             },
         ],
@@ -1762,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(),
             },
         ],
@@ -1805,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(),
             },
         ],
@@ -1848,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(),
             },
         ],
@@ -1932,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(),
             },
         ],
@@ -1997,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`,
@@ -2023,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(),
             },
         ],
@@ -2047,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`,
@@ -2099,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(),
             },
             {
@@ -2121,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(),
             },
         ],
@@ -2191,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(),
             },
         ],
@@ -2224,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(),
             },
             {
@@ -2246,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(),
             },
         ],
@@ -2279,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(),
             },
             {
@@ -2301,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(),
             },
         ],
@@ -2329,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(),
             },
             {
@@ -2372,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(),
             },
             {
@@ -2435,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(),
             },
         ],
@@ -2551,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(),
             },
         ],
@@ -2594,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(),
             },
         ],
@@ -2678,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(),
             },
         ],
@@ -2706,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(),
             },
             {
@@ -2822,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(),
             },
             {
@@ -2844,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(),
             },
         ],
@@ -2950,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(),
             },
         ],
@@ -3034,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(),
             },
         ],
@@ -3144,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(),
             },
         ],
@@ -3192,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(),
             },
         ],
@@ -3220,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(),
             },
             {
@@ -3315,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(),
             },
         ],
@@ -3358,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(),
             },
         ],
@@ -3406,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(),
             },
         ],
@@ -3434,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(),
             },
             {
@@ -3507,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',
@@ -3574,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(),
             },
         ],
@@ -3602,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(),
             },
             {
@@ -3624,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(),
             },
         ],
@@ -3667,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(),
             },
         ],
@@ -3710,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(),
             },
         ],
@@ -3743,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(),
             },
             {
@@ -3765,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(),
             },
         ],
@@ -3835,7 +3980,6 @@ If the group parameters are all set to `null` or are all missing, the
                         'client',
                         'billable',
                         'description',
-                        'tag',
                     ])
                     .optional(),
             },
@@ -3854,7 +3998,6 @@ If the group parameters are all set to `null` or are all missing, the
                         'client',
                         'billable',
                         'description',
-                        'tag',
                     ])
                     .optional(),
             },
@@ -3893,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',
@@ -3987,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(),
             },
         ],
@@ -4022,7 +4158,6 @@ If the group parameters are all set to `null` or are all missing, the
                     'client',
                     'billable',
                     'description',
-                    'tag',
                 ]),
             },
             {
@@ -4039,7 +4174,6 @@ If the group parameters are all set to `null` or are all missing, the
                     'client',
                     'billable',
                     'description',
-                    'tag',
                 ]),
             },
             {
@@ -4087,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',
@@ -4132,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(),
             },
             {
@@ -4154,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(),
             },
         ],
@@ -4215,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',
@@ -4255,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(),
             },
             {
@@ -4277,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(),
             },
         ],
@@ -4359,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(),
             },
             {
@@ -4376,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(),
             },
         ],
@@ -4399,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(),
             },
             {
@@ -4437,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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@solidtime/ui",
-    "version": "0.0.15",
+    "version": "0.0.10",
     "description": "Package containing the solidtime ui components",
     "main": "./dist/solidtime-ui-lib.umd.cjs",
     "module": "./dist/solidtime-ui-lib.js",
@@ -21,21 +21,16 @@
                 "default": "./dist/solidtime-ui-lib.umd.cjs"
             }
         },
-        "./style.css": "./dist/style.css",
-        "./styles.css": "./styles.css",
-        "./tailwind.theme.js": "./tailwind.theme.js"
+        "./style.css": "./dist/style.css"
     },
     "scripts": {
         "dev": "vite",
         "build": "vite build && vue-tsc --emitDeclarationOnly",
-        "watch": "vite build --watch",
         "types": "vue-tsc ",
         "preview": "vite preview"
     },
     "files": [
-        "dist",
-        "styles.css",
-        "tailwind.theme.js"
+        "dist"
     ],
     "keywords": [
         "solidtime",
@@ -64,11 +59,8 @@
         "@heroicons/vue": "^2.1.5",
         "@vueuse/core": "^12.5.0",
         "@zodios/core": "^10.9.6",
-        "class-variance-authority": "^0.7.1",
-        "clsx": "^2.1.1",
         "dayjs": "^1.11.13",
         "parse-duration": "^2.0.1",
-        "reka-ui": "^2.2.0",
         "tailwind-merge": "^2.5.2",
         "tailwindcss": "^3.1.0",
         "vue": "^3.5.0",

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

@@ -1,25 +0,0 @@
-<script setup lang="ts">
-import type { HTMLAttributes } from 'vue';
-import { cn } from '../utils/cn';
-import { Primitive, type PrimitiveProps } from 'reka-ui';
-import { type ButtonVariants, buttonVariants } from '.';
-
-interface Props extends PrimitiveProps {
-    variant?: ButtonVariants['variant'];
-    size?: ButtonVariants['size'];
-    class?: HTMLAttributes['class'];
-}
-
-const props = withDefaults(defineProps<Props>(), {
-    as: 'button',
-});
-</script>
-
-<template>
-    <Primitive
-        :as="as"
-        :as-child="asChild"
-        :class="cn(buttonVariants({ variant, size }), props.class)">
-        <slot />
-    </Primitive>
-</template>

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/Buttons/index.ts

@@ -1,36 +0,0 @@
-import { cva, type VariantProps } from 'class-variance-authority';
-
-export { default as Button } from './Button.vue';
-
-export const buttonVariants = cva(
-    'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
-    {
-        variants: {
-            variant: {
-                default: 'bg-primary text-primary-foreground shadow hover:bg-primary/90',
-                destructive:
-                    'bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90',
-                outline:
-                    'border shadow-xs hover:text-text-primary bg-card-background dark:bg-transparent border-input dark:border-input hover:bg-white/5',
-                secondary: 'bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80',
-                ghost: 'hover:bg-white/5',
-                link: 'text-primary underline-offset-4 hover:underline',
-                input: 'border-input-border border bg-input-background text-text-primary focus-visible:ring-2 focus-visible:ring-ring focus-visible:border-transparent shadow-sm',
-            },
-            size: {
-                default: 'h-9 px-4 py-2',
-                xs: 'h-7 rounded px-2',
-                sm: 'h-8 rounded-md px-3 text-xs',
-                lg: 'h-10 rounded-md px-8',
-                icon: 'h-9 w-9',
-                input: 'h-[42px] px-3 py-2 text-base',
-            },
-        },
-        defaultVariants: {
-            variant: 'default',
-            size: 'default',
-        },
-    }
-);
-
-export type ButtonVariants = VariantProps<typeof buttonVariants>;

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 class="text-xs">{{ 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-2xs leading-tight px-0.5 py-1.5">
-        <div class="font-semibold">{{ title }}</div>
-        <div v-if="projectName" class="font-medium opacity-90">
-            {{ projectName }}
-        </div>
-        <div v-if="taskName" class="font-medium">
-            {{ taskName }}
-        </div>
-        <div v-if="clientName" class="opacity-85">
-            {{ clientName }}
-        </div>
-        <div class="opacity-90">
-            {{ formattedDuration }}
-        </div>
-    </div>
-</template>

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

@@ -1,765 +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,
-    nextTick,
-    onMounted,
-    onActivated,
-    onUnmounted,
-} 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 activityStatusPlugin, {
-    type ActivityPeriod,
-    renderActivityStatusBoxes,
-} from './idleStatusPlugin';
-import type {
-    TimeEntry,
-    Project,
-    Client,
-    Task,
-    CreateProjectBody,
-    CreateClientBody,
-    Tag,
-    Organization,
-} from '@/packages/api/src';
-import type { Dayjs } from 'dayjs';
-
-type CalendarExtendedProps = { timeEntry: TimeEntry; isRunning?: boolean } & 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[];
-    activityPeriods?: ActivityPeriod[];
-    loading?: boolean;
-
-    // Permissions / feature flags
-    enableEstimatedTime: boolean;
-    currency: string;
-    canCreateProject: 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);
-
-// Reactive "now" for running time entry - updates every minute
-const currentTime = ref(getDayJsInstance()());
-let currentTimeInterval: ReturnType<typeof setInterval> | 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?.map((timeEntry) => {
-        const isRunning = timeEntry.end === null;
-        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);
-
-        // For running entries, use current time as end
-        const effectiveEnd = isRunning ? currentTime.value : getDayJsInstance()(timeEntry.end!);
-        const duration = effectiveEnd.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
-                : isRunning
-                  ? getLocalizedDayJs(currentTime.value.toISOString())
-                  : getLocalizedDayJs(timeEntry.end!);
-
-        return {
-            id: timeEntry.id,
-            start: startTime.format(),
-            end: endTime.format(),
-            title,
-            backgroundColor,
-            borderColor,
-            textColor: 'var(--foreground)',
-            // For running entries: disable dragging and resizing
-            startEditable: !isRunning,
-            classNames: isRunning ? ['running-entry'] : [],
-            extendedProps: {
-                timeEntry,
-                project,
-                client,
-                task,
-                duration,
-                isRunning,
-            },
-        };
-    });
-});
-
-// Daily totals used in day header
-const dailyTotals = computed(() => {
-    const totals: Record<string, number> = {};
-    props.timeEntries.forEach((entry) => {
-        const date = getDayJsInstance()(entry.start).format('YYYY-MM-DD');
-        let duration: number;
-
-        if (entry.end !== null) {
-            // Completed entry
-            duration = getDayJsInstance()(entry.end).diff(
-                getDayJsInstance()(entry.start),
-                'minutes'
-            );
-        } else {
-            // Running entry - use current time
-            duration = currentTime.value.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 });
-    // Render activity boxes after calendar view has been rendered
-    renderActivityBoxes();
-}
-
-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;
-    // Don't open edit modal for running time entries
-    if (ext.isRunning) {
-        return;
-    }
-    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)
-            .second(0)
-            .utc()
-            .format(),
-        end: getDayJsInstance()(arg.event.end.toISOString())
-            .utc()
-            .tz(getUserTimezone(), true)
-            .second(0)
-            .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)
-            .second(0)
-            .utc()
-            .format(),
-        // Preserve null end for running entries
-        end: ext.isRunning
-            ? null
-            : getDayJsInstance()(arg.event.end.toISOString())
-                  .utc()
-                  .tz(getUserTimezone(), true)
-                  .second(0)
-                  .utc()
-                  .format(),
-    } as TimeEntry;
-    await props.updateTimeEntry(updatedTimeEntry);
-    emit('refresh');
-}
-
-const calendarOptions = computed(() => ({
-    plugins: [dayGridPlugin, timeGridPlugin, interactionPlugin, activityStatusPlugin],
-    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:01:00',
-    firstDay: getFirstDay(),
-    allDaySlot: false,
-    nowIndicator: true,
-    eventMinHeight: 1,
-    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,
-    activityPeriods: props.activityPeriods || [],
-}));
-
-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');
-    }
-});
-
-// Render activity status boxes after FullCalendar has rendered
-const renderActivityBoxes = () => {
-    if (!calendarRef.value || !props.activityPeriods) return;
-
-    const calendarEl = calendarRef.value.$el as HTMLElement;
-    if (calendarEl && props.activityPeriods.length > 0) {
-        renderActivityStatusBoxes(calendarEl, props.activityPeriods);
-    }
-};
-
-// Watch for activity periods changes - re-render when data changes
-watch(
-    () => props.activityPeriods,
-    () => {
-        renderActivityBoxes();
-    }
-);
-
-const scrollToCurrentTime = () => {
-    nextTick(() => {
-        if (calendarRef.value) {
-            const now = getDayJsInstance()();
-            const oneHourBefore = now.subtract(1, 'hour');
-
-            // If subtracting 1 hour keeps us on the same day, scroll to 1 hour before
-            const scrollTime = now.isSame(oneHourBefore, 'day')
-                ? oneHourBefore.format('HH:mm:ss')
-                : now.format('HH:mm:ss');
-
-            calendarRef.value.getApi().scrollToTime(scrollTime);
-        }
-    });
-};
-
-onMounted(() => {
-    scrollToCurrentTime();
-    // Start interval to update running time entry
-    currentTimeInterval = setInterval(() => {
-        currentTime.value = getDayJsInstance()();
-    }, 60000); // Update every minute
-});
-
-onActivated(() => {
-    scrollToCurrentTime();
-});
-
-onUnmounted(() => {
-    // Clean up interval
-    if (currentTimeInterval) {
-        clearInterval(currentTimeInterval);
-        currentTimeInterval = null;
-    }
-});
-</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"
-            :currency="currency"
-            :can-create-project="canCreateProject"
-            :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"
-            :currency="currency"
-            :can-create-project="canCreateProject" />
-        <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(--background);
-}
-
-.fullcalendar :deep(.fc-toolbar) {
-    background-color: var(--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: calc(var(--radius) - 4px);
-    padding: 0;
-    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(--primary);
-}
-
-.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(--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;
-}
-
-/* Activity status plugin styles */
-.fullcalendar :deep(.activity-status-box) {
-    position: absolute;
-    width: 10px;
-    left: 0px;
-    z-index: 10;
-    cursor: default;
-}
-
-.fullcalendar :deep(.activity-status-box::before) {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    width: 5px;
-    transition: opacity 0.2s ease;
-}
-
-.fullcalendar :deep(.activity-status-box.idle::before) {
-    background-color: rgba(156, 163, 175, 0.1);
-}
-
-.fullcalendar :deep(.activity-status-box.idle):hover::before {
-    background-color: rgba(156, 163, 175, 0.5);
-}
-
-.fullcalendar :deep(.activity-status-box.active::before) {
-    background-color: rgba(34, 197, 94, 0.3);
-}
-
-.fullcalendar :deep(.activity-status-box.active):hover::before {
-    background-color: rgba(34, 197, 94, 1);
-}
-
-/* Add left margin to events only on days with activity status data */
-.fullcalendar :deep(.has-activity-status .fc-timegrid-event-harness) {
-    margin-left: 8px !important;
-}
-
-.fullcalendar :deep(.fc-timegrid-event) {
-    margin-left: 0 !important;
-}
-
-/* Hide end resizer for running time entries */
-.fullcalendar :deep(.running-entry .fc-event-resizer-end) {
-    display: none;
-}
-
-.fullcalendar :deep(.running-entry) {
-    border-bottom-left-radius: 0px;
-    border-bottom-right-radius: 0px;
-}
-</style>

resources/js/packages/ui/src/FullCalendar/idleStatusPlugin.ts

@@ -1,393 +0,0 @@
-import { createPlugin, type PluginDef } from '@fullcalendar/core';
-import { computePosition, flip, shift, offset, autoUpdate } from '@floating-ui/dom';
-
-export interface WindowActivityInPeriod {
-    appName: string;
-    url: string | null;
-    count: number;
-    icon?: string | null;
-}
-
-export interface ActivityPeriod {
-    start: string;
-    end: string;
-    isIdle: boolean;
-    windowActivities?: WindowActivityInPeriod[];
-}
-
-export interface ActivityStatusPluginOptions {
-    activityPeriods?: ActivityPeriod[];
-}
-
-// Tooltip state management - single instance per module
-let tooltipInstance: HTMLElement | null = null;
-let cleanupAutoUpdate: (() => void) | null = null;
-
-/**
- * Creates and manages a tooltip element for activity status boxes
- */
-function getOrCreateTooltip(): HTMLElement {
-    if (!tooltipInstance) {
-        tooltipInstance = document.createElement('div');
-        tooltipInstance.className =
-            'z-50 overflow-hidden rounded-md bg-primary px-3 py-1.5 text-xs text-primary-foreground';
-        tooltipInstance.style.position = 'fixed';
-        tooltipInstance.style.pointerEvents = 'none';
-        tooltipInstance.style.opacity = '0';
-        tooltipInstance.style.whiteSpace = 'nowrap';
-        tooltipInstance.style.transform = 'scale(0.95)';
-        tooltipInstance.style.transition = 'opacity 150ms, transform 150ms';
-        document.body.appendChild(tooltipInstance);
-    }
-    return tooltipInstance;
-}
-
-/**
- * Shows tooltip for an activity status box using Floating UI's autoUpdate
- */
-function showTooltip(box: HTMLElement, tooltip: HTMLElement, content: string | HTMLElement) {
-    // Clear previous content
-    tooltip.innerHTML = '';
-
-    if (typeof content === 'string') {
-        tooltip.textContent = content;
-    } else {
-        tooltip.appendChild(content);
-    }
-
-    tooltip.style.opacity = '1';
-    tooltip.style.transform = 'scale(1)';
-
-    // Clean up previous autoUpdate if it exists
-    if (cleanupAutoUpdate) {
-        cleanupAutoUpdate();
-    }
-
-    // Use autoUpdate to automatically update position
-    cleanupAutoUpdate = autoUpdate(box, tooltip, () => {
-        computePosition(box, tooltip, {
-            placement: 'right',
-            middleware: [offset(8), flip(), shift({ padding: 5 })],
-        }).then(({ x, y }) => {
-            tooltip.style.left = `${x}px`;
-            tooltip.style.top = `${y}px`;
-        });
-    });
-}
-
-/**
- * Hides the tooltip immediately
- */
-function hideTooltip(tooltip: HTMLElement) {
-    tooltip.style.opacity = '0';
-    tooltip.style.transform = 'scale(0.95)';
-
-    // Clean up autoUpdate when tooltip is hidden
-    if (cleanupAutoUpdate) {
-        cleanupAutoUpdate();
-        cleanupAutoUpdate = null;
-    }
-}
-
-/**
- * Formats duration in minutes to human readable format
- */
-function formatDuration(durationMinutes: number): string {
-    const hours = Math.floor(durationMinutes / 60);
-    const minutes = durationMinutes % 60;
-    return hours > 0 ? `${hours}h ${minutes}m` : `${minutes}m`;
-}
-
-/**
- * Creates tooltip content for an activity period
- */
-function createTooltipContent(
-    status: string,
-    durationText: string,
-    windowActivities?: WindowActivityInPeriod[]
-): string | HTMLElement {
-    if (!windowActivities || windowActivities.length === 0) {
-        return `${status} (${durationText})`;
-    }
-
-    const container = document.createElement('div');
-    container.style.maxWidth = '300px';
-
-    // Header with status and duration
-    const header = document.createElement('div');
-    header.style.fontWeight = '600';
-    header.style.marginBottom = '8px';
-    header.textContent = `${status} (${durationText})`;
-    container.appendChild(header);
-
-    // Window activities list
-    const totalActivities = windowActivities.reduce((sum, act) => sum + act.count, 0);
-
-    // Show top 5 activities
-    const topActivities = windowActivities.slice(0, 5);
-
-    topActivities.forEach((activity) => {
-        const activityDiv = document.createElement('div');
-        activityDiv.style.marginTop = '4px';
-        activityDiv.style.fontSize = '11px';
-        activityDiv.style.opacity = '0.9';
-        activityDiv.style.display = 'flex';
-        activityDiv.style.alignItems = 'center';
-        activityDiv.style.gap = '6px';
-
-        // Add icon if available
-        if (activity.icon) {
-            const icon = document.createElement('img');
-            icon.src = activity.icon;
-            icon.alt = activity.appName;
-            icon.style.width = '16px';
-            icon.style.height = '16px';
-            icon.style.borderRadius = '2px';
-            icon.style.flexShrink = '0';
-            activityDiv.appendChild(icon);
-        } else {
-            // Placeholder for no icon
-            const placeholder = document.createElement('div');
-            placeholder.style.width = '16px';
-            placeholder.style.height = '16px';
-            placeholder.style.borderRadius = '2px';
-            placeholder.style.backgroundColor = 'rgba(255, 255, 255, 0.1)';
-            placeholder.style.display = 'flex';
-            placeholder.style.alignItems = 'center';
-            placeholder.style.justifyContent = 'center';
-            placeholder.style.fontSize = '8px';
-            placeholder.style.flexShrink = '0';
-            placeholder.textContent = activity.appName.charAt(0).toUpperCase();
-            activityDiv.appendChild(placeholder);
-        }
-
-        const textSpan = document.createElement('span');
-        textSpan.style.flex = '1';
-        textSpan.style.overflow = 'hidden';
-        textSpan.style.textOverflow = 'ellipsis';
-        textSpan.style.whiteSpace = 'nowrap';
-
-        const percentage = ((activity.count / totalActivities) * 100).toFixed(0);
-        const activityText = activity.url
-            ? `${activity.appName} - ${activity.url}`
-            : activity.appName;
-
-        textSpan.textContent = `${percentage}% ${activityText}`;
-        activityDiv.appendChild(textSpan);
-
-        container.appendChild(activityDiv);
-    });
-
-    // Show "and X more" if there are more activities
-    if (windowActivities.length > 5) {
-        const moreDiv = document.createElement('div');
-        moreDiv.style.marginTop = '4px';
-        moreDiv.style.fontSize = '11px';
-        moreDiv.style.opacity = '0.7';
-        moreDiv.style.fontStyle = 'italic';
-        moreDiv.textContent = `...and ${windowActivities.length - 5} more`;
-        container.appendChild(moreDiv);
-    }
-
-    return container;
-}
-
-/**
- * Renders activity status boxes in the calendar time grid
- */
-export function renderActivityStatusBoxes(
-    calendarEl: HTMLElement,
-    activityPeriods: ActivityPeriod[]
-) {
-    if (!calendarEl) return;
-
-    // Clean up existing activity boxes
-    const existingBoxes = calendarEl.querySelectorAll('.activity-status-box');
-    existingBoxes.forEach((box) => box.remove());
-
-    // Remove has-activity-status class from all lanes
-    const allLanes = calendarEl.querySelectorAll('.fc-timegrid-col');
-    allLanes.forEach((lane) => lane.classList.remove('has-activity-status'));
-
-    const timeGrid = calendarEl.querySelector('.fc-timegrid-body');
-    if (!timeGrid) return;
-
-    const lanes = timeGrid.querySelectorAll('.fc-timegrid-col');
-    if (lanes.length === 0) return;
-
-    // Get or reuse the single tooltip instance
-    const tooltip = getOrCreateTooltip();
-
-    // Get slot duration from calendar (fallback to 15 minutes)
-    const slotDurationMinutes = getSlotDuration(calendarEl);
-
-    lanes.forEach((lane: Element) => {
-        // Get the date for this lane from the data attribute
-        const laneEl = lane as HTMLElement;
-        const dateStr = laneEl.getAttribute('data-date');
-
-        if (!dateStr) return;
-
-        const laneDate = new Date(dateStr);
-        const laneDateStart = new Date(laneDate);
-        laneDateStart.setHours(0, 0, 0, 0);
-        const laneDateEnd = new Date(laneDate);
-        laneDateEnd.setHours(23, 59, 59, 999);
-
-        let hasActivityStatusForThisDay = false;
-
-        activityPeriods.forEach((period) => {
-            const periodStart = new Date(period.start);
-            const periodEnd = new Date(period.end);
-
-            // Check if period overlaps with this day
-            if (periodEnd < laneDateStart || periodStart > laneDateEnd) {
-                return;
-            }
-
-            // Calculate actual start and end times for this day
-            const actualStart = periodStart > laneDateStart ? periodStart : laneDateStart;
-            const actualEnd = periodEnd < laneDateEnd ? periodEnd : laneDateEnd;
-
-            // Calculate the position and height of the activity box
-            const { top, height } = calculateBoxPosition(
-                calendarEl,
-                actualStart,
-                actualEnd,
-                slotDurationMinutes
-            );
-
-            if (height <= 0) return;
-
-            hasActivityStatusForThisDay = true;
-
-            // Calculate duration in minutes
-            const durationMs = actualEnd.getTime() - actualStart.getTime();
-            const durationMinutes = Math.round(durationMs / 60000);
-            const durationText = formatDuration(durationMinutes);
-
-            // Add tooltip text based on status
-            const status = period.isIdle ? 'Idling' : 'Active';
-
-            // Create and append the activity status box
-            const box = document.createElement('div');
-            box.className = `activity-status-box ${period.isIdle ? 'idle' : 'active'}`;
-            box.style.top = `${top}px`;
-            box.style.height = `${height}px`;
-
-            // Store tooltip content generator in data attribute for event delegation
-            const tooltipContent = createTooltipContent(
-                status,
-                durationText,
-                period.windowActivities
-            );
-
-            // Add hover event listeners for tooltip
-            box.addEventListener('mouseenter', () => {
-                showTooltip(box, tooltip, tooltipContent);
-            });
-
-            box.addEventListener('mouseleave', () => {
-                hideTooltip(tooltip);
-            });
-
-            // Position relative to the lane
-            const laneFrame = lane.querySelector('.fc-timegrid-col-frame');
-            if (laneFrame) {
-                laneFrame.appendChild(box);
-            }
-        });
-
-        // Mark this lane as having activity status if any periods were rendered
-        if (hasActivityStatusForThisDay) {
-            laneEl.classList.add('has-activity-status');
-        }
-    });
-}
-
-/**
- * Gets the slot duration from the calendar configuration
- */
-function getSlotDuration(calendarEl: HTMLElement): number {
-    const slotsEl = calendarEl.querySelectorAll('.fc-timegrid-slot');
-    if (slotsEl.length < 2) return 15; // Default to 15 minutes
-
-    // Try to calculate from the time difference between slots
-    const firstSlot = slotsEl[0] as HTMLElement;
-    const secondSlot = slotsEl[1] as HTMLElement;
-
-    const firstTime = firstSlot.getAttribute('data-time');
-    const secondTime = secondSlot.getAttribute('data-time');
-
-    if (firstTime && secondTime) {
-        const [h1, m1] = firstTime.split(':').map(Number);
-        const [h2, m2] = secondTime.split(':').map(Number);
-        const diff = h2 * 60 + m2 - (h1 * 60 + m1);
-        if (diff > 0) return diff;
-    }
-
-    // Fallback to 15 minutes
-    return 15;
-}
-
-/**
- * Calculates the pixel position and height for an activity status box
- */
-function calculateBoxPosition(
-    calendarEl: HTMLElement,
-    startTime: Date,
-    endTime: Date,
-    slotDurationMinutes: number
-): { top: number; height: number } {
-    // Get the slot duration and slot height
-    const slotsEl = calendarEl.querySelectorAll('.fc-timegrid-slot');
-    if (slotsEl.length === 0) {
-        return { top: 0, height: 0 };
-    }
-
-    // Calculate slot height (assuming all slots are equal height)
-    const firstSlot = slotsEl[0] as HTMLElement;
-    const slotHeight = firstSlot.offsetHeight;
-
-    const pixelsPerMinute = slotHeight / slotDurationMinutes;
-
-    // Calculate start position (minutes from midnight)
-    const startMinutes = startTime.getHours() * 60 + startTime.getMinutes();
-    const endMinutes = endTime.getHours() * 60 + endTime.getMinutes();
-
-    // Calculate pixel positions
-    const top = startMinutes * pixelsPerMinute;
-    const height = (endMinutes - startMinutes) * pixelsPerMinute;
-
-    return { top, height };
-}
-
-/**
- * Cleanup function to remove tooltip from DOM
- */
-export function cleanupActivityStatusPlugin() {
-    if (tooltipInstance) {
-        tooltipInstance.remove();
-        tooltipInstance = null;
-    }
-    if (cleanupAutoUpdate) {
-        cleanupAutoUpdate();
-        cleanupAutoUpdate = null;
-    }
-}
-
-/**
- * FullCalendar plugin to display idle/active status boxes in the time grid
- */
-const activityStatusPlugin: PluginDef = createPlugin({
-    name: '@solidtime/activity-status',
-
-    optionRefiners: {
-        activityPeriods: (rawVal: unknown): ActivityPeriod[] => {
-            if (!Array.isArray(rawVal)) return [];
-            return rawVal as ActivityPeriod[];
-        },
-    },
-});
-
-export default activityStatusPlugin;

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { Popover, PopoverContent, PopoverTrigger } from '../popover';
-import Button from '../Buttons/Button.vue';
-import { RangeCalendar } from '../range-calendar';
+import { Popover, PopoverContent, PopoverTrigger } from '@/Components/ui/popover';
+import { Button } from '@/Components/ui/button';
+import { RangeCalendar } from '@/Components/ui/range-calendar';
 import { CalendarDate } from '@internationalized/date';
 import { CalendarIcon } from 'lucide-vue-next';
 import { computed, ref, inject, type ComputedRef, watch } from 'vue';

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Popover, PopoverContent, PopoverTrigger } from '../popover';
+import { Popover, PopoverContent, PopoverTrigger } from '@/Components/ui/popover';
 import { watch } from 'vue';
 
 const props = withDefaults(

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

@@ -27,19 +27,11 @@ function updateTime(event: Event) {
     if (newValue.split(':').length === 2) {
         const [hours, minutes] = newValue.split(':');
         if (!isNaN(parseInt(hours)) && !isNaN(parseInt(minutes))) {
-            const currentTime = getLocalizedDayJs(model.value);
-            const newHours = Math.min(parseInt(hours), 23);
-            const newMinutes = Math.min(parseInt(minutes), 59);
-
-            // Only update if hours or minutes are different
-            if (currentTime.hour() !== newHours || currentTime.minute() !== newMinutes) {
-                model.value = currentTime
-                    .set('hours', newHours)
-                    .set('minutes', newMinutes)
-                    .set('seconds', 0)
-                    .format();
-                emit('changed', model.value);
-            }
+            model.value = getLocalizedDayJs(model.value)
+                .set('hours', Math.min(parseInt(hours), 23))
+                .set('minutes', Math.min(parseInt(minutes), 59))
+                .format();
+            emit('changed', model.value);
         }
     }
     // check if input is only numbers
@@ -50,7 +42,6 @@ function updateTime(event: Event) {
             model.value = getLocalizedDayJs(model.value)
                 .set('hours', Math.min(parseInt(hours), 23))
                 .set('minutes', Math.min(parseInt(minutes), 59))
-                .set('seconds', 0)
                 .format();
             emit('changed', model.value);
         } else if (newValue.length === 3) {
@@ -59,7 +50,6 @@ function updateTime(event: Event) {
             model.value = getLocalizedDayJs(model.value)
                 .set('hours', Math.min(parseInt(hours), 23))
                 .set('minutes', Math.min(parseInt(minutes), 59))
-                .set('seconds', 0)
                 .format();
             emit('changed', model.value);
         } else if (newValue.length === 2) {
@@ -67,7 +57,6 @@ function updateTime(event: Event) {
             model.value = getLocalizedDayJs(model.value)
                 .set('hours', Math.min(parseInt(newValue), 23))
                 .set('minutes', 0)
-                .set('seconds', 0)
                 .format();
             emit('changed', model.value);
         } else if (newValue.length === 1) {
@@ -75,7 +64,6 @@ function updateTime(event: Event) {
             model.value = getLocalizedDayJs(model.value)
                 .set('hours', Math.min(parseInt(newValue), 23))
                 .set('minutes', 0)
-                .set('seconds', 0)
                 .format();
             emit('changed', model.value);
         }
@@ -105,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 '../Buttons/Button.vue';
 
 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>