add invoice copy to openapi client

update and invalid email

.github/workflows/npm-test-unit.yml

@@ -1,27 +0,0 @@
-name: NPM Test Unit
-
-on: [push]
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    env:
-      TZ: UTC
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v4
-
-      - name: "Use Node.js"
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.x'
-
-      - name: "Install npm dependencies"
-        run: npm ci
-
-      - name: "Run vitest"
-        run: npm run test:unit

.npmrc

@@ -1 +0,0 @@
-min-release-age=7

app/Actions/Fortify/CreateNewUser.php

@@ -16,6 +16,7 @@ use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 use Laravel\Fortify\Contracts\CreatesNewUsers;
+use Laravel\Jetstream\Jetstream;
 use Log;
 
 class CreateNewUser implements CreatesNewUsers
@@ -54,7 +55,7 @@ class CreateNewUser implements CreatesNewUsers
                 }),
             ],
             'password' => $this->passwordRules(),
-            'terms' => ['accepted', 'required'],
+            'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature() ? ['accepted', 'required'] : '',
             'newsletter_consent' => [
                 'boolean',
             ],

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -4,9 +4,16 @@ declare(strict_types=1);
 
 namespace App\Actions\Fortify;
 
-use App\Exceptions\MovedToApiException;
+use App\Enums\Weekday;
+use App\Mail\VerifyUpdatedEmailMail;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
+use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
+use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
 
 class UpdateUserProfileInformation implements UpdatesUserProfileInformation
@@ -20,6 +27,61 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
      */
     public function update(User $user, array $input): void
     {
-        throw new MovedToApiException;
+        if (isset($input['email']) && is_string($input['email'])) {
+            $input['email'] = Str::lower($input['email']);
+        }
+
+        Validator::make($input, [
+            'name' => [
+                'required',
+                'string',
+                'max:255',
+            ],
+            'email' => [
+                'required',
+                'email',
+                'max:255',
+                UniqueEloquent::make(User::class, 'email')->ignore($user->id)->query(function (Builder $query) {
+                    /** @var Builder<User> $query */
+                    return $query->where('is_placeholder', '=', false);
+                }),
+            ],
+            'photo' => [
+                'nullable',
+                'mimes:jpg,jpeg,png',
+                'max:1024',
+            ],
+            'timezone' => [
+                'required',
+                'timezone:all',
+            ],
+            'week_start' => [
+                'required',
+                Rule::enum(Weekday::class),
+            ],
+        ])->validateWithBag('updateProfileInformation');
+
+        if (isset($input['photo'])) {
+            $user->updateProfilePhoto($input['photo']);
+        }
+
+        $email = Str::lower((string) $input['email']);
+
+        if ($email !== Str::lower($user->email)) {
+            $user->forceFill([
+                'name' => $input['name'],
+                'pending_email' => $email,
+                'timezone' => $input['timezone'],
+                'week_start' => $input['week_start'],
+            ])->save();
+
+            Mail::to($email)->send(new VerifyUpdatedEmailMail($user, $email));
+        } else {
+            $user->forceFill([
+                'name' => $input['name'],
+                'timezone' => $input['timezone'],
+                'week_start' => $input['week_start'],
+            ])->save();
+        }
     }
 }

app/Actions/Jetstream/AddOrganizationMember.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Exceptions\MovedToApiException;
+use App\Models\Organization;
+use App\Models\User;
+use Laravel\Jetstream\Contracts\AddsTeamMembers;
+
+class AddOrganizationMember implements AddsTeamMembers
+{
+    /**
+     * Add a new team member to the given team.
+     */
+    public function add(User $owner, Organization $organization, string $email, ?string $role = null): void
+    {
+        throw new MovedToApiException;
+    }
+}

app/Actions/Jetstream/CreateOrganization.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Events\AfterCreateOrganization;
+use App\Models\Organization;
+use App\Models\User;
+use App\Service\IpLookup\IpLookupServiceContract;
+use App\Service\OrganizationService;
+use App\Service\UserService;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
+use Laravel\Jetstream\Contracts\CreatesTeams;
+use Laravel\Jetstream\Jetstream;
+
+class CreateOrganization implements CreatesTeams
+{
+    /**
+     * Validate and create a new team for the given user.
+     *
+     * @param  array<string, string>  $input
+     *
+     * @throws AuthorizationException
+     * @throws ValidationException
+     *
+     * @deprecated Use REST endpoint instead
+     */
+    public function create(User $user, array $input): Organization
+    {
+        Gate::forUser($user)->authorize('create', Jetstream::newTeamModel());
+
+        Validator::make($input, [
+            'name' => ['required', 'string', 'max:255'],
+        ])->validateWithBag('createTeam');
+
+        $ipLookupResponse = app(IpLookupServiceContract::class)->lookup(request()->ip());
+
+        $currency = null;
+        if ($ipLookupResponse !== null) {
+            $currency = $ipLookupResponse->currency;
+        }
+
+        $organization = app(OrganizationService::class)->createOrganization(
+            $input['name'],
+            $user,
+            false,
+            $currency
+        );
+
+        app(UserService::class)->switchCurrentOrganization($user, $organization);
+
+        AfterCreateOrganization::dispatch($organization);
+
+        return $organization;
+    }
+}

app/Actions/Jetstream/DeleteOrganization.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Models\Organization;
+use App\Service\DeletionService;
+use Laravel\Jetstream\Contracts\DeletesTeams;
+
+class DeleteOrganization implements DeletesTeams
+{
+    /**
+     * Delete the given team.
+     *
+     * @deprecated Use REST endpoint instead
+     */
+    public function delete(Organization $organization): void
+    {
+        /** @see ValidateOrganizationDeletion */
+        app(DeletionService::class)->deleteOrganization($organization);
+    }
+}

app/Actions/Jetstream/DeleteUser.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Exceptions\Api\ApiException;
+use App\Models\User;
+use App\Service\DeletionService;
+use Illuminate\Validation\ValidationException;
+use Laravel\Jetstream\Contracts\DeletesUsers;
+
+class DeleteUser implements DeletesUsers
+{
+    /**
+     * Delete the given user.
+     *
+     * @throws ValidationException
+     *
+     * @deprecated Use REST endpoint instead
+     */
+    public function delete(User $user): void
+    {
+        try {
+            app(DeletionService::class)->deleteUser($user);
+        } catch (ApiException $exception) {
+            throw ValidationException::withMessages([
+                'password' => $exception->getTranslatedMessage(),
+            ]);
+        }
+    }
+}

app/Actions/Jetstream/InviteOrganizationMember.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Exceptions\MovedToApiException;
+use App\Models\Organization;
+use App\Models\User;
+use Exception;
+use Laravel\Jetstream\Contracts\InvitesTeamMembers;
+
+class InviteOrganizationMember implements InvitesTeamMembers
+{
+    /**
+     * Invite a new team member to the given team.
+     *
+     * @throws Exception
+     */
+    public function invite(User $user, Organization $organization, string $email, ?string $role = null): void
+    {
+        throw new MovedToApiException;
+    }
+}

app/Actions/Jetstream/RemoveOrganizationMember.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Exceptions\MovedToApiException;
+use App\Models\Organization;
+use App\Models\User;
+use Exception;
+use Laravel\Jetstream\Contracts\RemovesTeamMembers;
+
+class RemoveOrganizationMember implements RemovesTeamMembers
+{
+    /**
+     * Remove the team member from the given team.
+     *
+     * @throws Exception
+     */
+    public function remove(User $user, Organization $organization, User $teamMember): void
+    {
+        throw new MovedToApiException;
+    }
+}

app/Actions/Jetstream/UpdateMemberRole.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Enums\Role;
+use App\Exceptions\MovedToApiException;
+use App\Models\Member;
+use App\Models\Organization;
+use App\Models\User;
+use Exception;
+
+class UpdateMemberRole
+{
+    /**
+     * Update the role for the given team member.
+     *
+     * @throws Exception
+     */
+    public function update(User $actingUser, Organization $organization, string $userId, string $role): void
+    {
+        throw new MovedToApiException;
+    }
+}

app/Actions/Jetstream/UpdateOrganization.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Models\Organization;
+use App\Models\User;
+use App\Rules\CurrencyRule;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
+use Laravel\Jetstream\Contracts\UpdatesTeamNames;
+
+class UpdateOrganization implements UpdatesTeamNames
+{
+    /**
+     * Validate and update the given team's name.
+     *
+     * @param  array<string, string>  $input
+     *
+     * @throws AuthorizationException
+     * @throws ValidationException
+     */
+    public function update(User $user, Organization $organization, array $input): void
+    {
+        Gate::forUser($user)->authorize('update', $organization);
+
+        Validator::make($input, [
+            'name' => [
+                'required',
+                'string',
+                'max:255',
+            ],
+            'currency' => [
+                'required',
+                'string',
+                new CurrencyRule,
+            ],
+        ])->validateWithBag('updateTeamName');
+
+        $organization->forceFill([
+            'name' => $input['name'],
+            'currency' => $input['currency'],
+        ])->save();
+    }
+}

app/Actions/Jetstream/ValidateOrganizationDeletion.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Models\Organization;
+use App\Models\User;
+use App\Service\PermissionStore;
+use Illuminate\Auth\Access\AuthorizationException;
+
+class ValidateOrganizationDeletion
+{
+    /**
+     * Validate that the team can be deleted by the given user.
+     *
+     * @param  User  $user  Authenticated user
+     * @param  Organization  $organization  Organization to be deleted
+     *
+     * @throws AuthorizationException
+     *
+     * @deprecated Use REST endpoint instead
+     */
+    public function validate(User $user, Organization $organization): void
+    {
+        if (! app(PermissionStore::class)->userHas($organization, $user, 'organizations:delete')) {
+            throw new AuthorizationException;
+        }
+    }
+}

app/Enums/Role.php

@@ -4,12 +4,8 @@ declare(strict_types=1);
 
 namespace App\Enums;
 
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
 enum Role: string
 {
-    use LaravelEnumHelper;
-
     case Owner = 'owner';
     case Admin = 'admin';
     case Manager = 'manager';

app/Events/OrganizationInvitationAdding.php

@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Events;
-
-use App\Enums\Role;
-use App\Models\Organization;
-use App\Models\User;
-use Illuminate\Foundation\Events\Dispatchable;
-
-class OrganizationInvitationAdding
-{
-    use Dispatchable;
-
-    public Organization $organization;
-
-    public string $email;
-
-    public Role $role;
-
-    public User $inviter;
-
-    public function __construct(
-        Organization $organization,
-        string $email,
-        Role $role,
-        User $inviter
-    ) {
-        $this->role = $role;
-        $this->email = $email;
-        $this->organization = $organization;
-        $this->inviter = $inviter;
-    }
-}

app/Filament/Resources/OrganizationResource/RelationManagers/InvitationsRelationManager.php

@@ -64,7 +64,7 @@ class InvitationsRelationManager extends RelationManager
                         $ownerRecord = $this->getOwnerRecord();
 
                         return app(InvitationService::class)
-                            ->inviteUser($ownerRecord, $data['email'], Role::from($data['role']), auth()->user());
+                            ->inviteUser($ownerRecord, $data['email'], Role::from($data['role']));
                     }),
             ])
             ->actions([

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

@@ -63,7 +63,7 @@ class InvitationController extends Controller
         $email = $request->getEmail();
         $role = $request->getRole();
 
-        $invitationService->inviteUser($organization, $email, $role, $this->user());
+        $invitationService->inviteUser($organization, $email, $role);
 
         return response()->json(null, 204);
     }

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

@@ -192,7 +192,7 @@ class MemberController extends Controller
             throw new ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException;
         }
 
-        $invitationService->inviteUser($organization, $user->email, Role::Employee, $this->user());
+        $invitationService->inviteUser($organization, $user->email, Role::Employee);
 
         return response()->json(null, 204);
     }

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

@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Api\V1;
-
-use App\Service\TimezoneService;
-use Illuminate\Http\JsonResponse;
-
-class TimeZoneController extends Controller
-{
-    /**
-     * Get all timezones
-     *
-     * @response object{key: string}[]
-     *
-     * @operationId getTimezones
-     */
-    public function index(): JsonResponse
-    {
-        $timezones = app(TimezoneService::class)->getTimezones();
-
-        $response = [];
-
-        foreach ($timezones as $timezone) {
-            $response[] = (object) [
-                'key' => $timezone,
-            ];
-        }
-
-        return response()->json($response);
-    }
-}

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

@@ -6,14 +6,11 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Exceptions\Api\CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers;
 use App\Exceptions\Api\UserResendEmailVerificationNoPendingEmailApiException;
-use App\Http\Requests\V1\User\UserUpdateCurrentOrganizationRequest;
 use App\Http\Requests\V1\User\UserUpdateRequest;
 use App\Http\Resources\V1\User\UserResource;
 use App\Mail\VerifyUpdatedEmailMail;
-use App\Models\Organization;
 use App\Models\User;
 use App\Service\DeletionService;
-use App\Service\UserService;
 use App\Support\Base64File;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
@@ -39,35 +36,6 @@ class UserController extends Controller
         return new UserResource($user);
     }
 
-    /**
-     * Update the current organization of the current user
-     *
-     * Switches the organization that the user is currently working in. The user
-     * must be a member of the given organization. This endpoint is independent of
-     * the organization.
-     *
-     * @operationId updateMyCurrentOrganization
-     *
-     * @throws AuthorizationException
-     */
-    public function updateMyCurrentOrganization(UserUpdateCurrentOrganizationRequest $request, UserService $userService): UserResource
-    {
-        $user = $this->user();
-
-        /** @var Organization|null $organization */
-        $organization = $user->organizations()
-            ->whereKey($request->getOrganizationId())
-            ->first();
-
-        if ($organization === null) {
-            throw new AuthorizationException;
-        }
-
-        $userService->switchCurrentOrganization($user, $organization);
-
-        return new UserResource($user->refresh());
-    }
-
     /**
      * Update the current user
      *
@@ -82,7 +50,7 @@ class UserController extends Controller
         }
 
         if ($request->hasPhotoKey()) {
-            $photoDisk = (string) config('filesystems.public');
+            $photoDisk = (string) config('jetstream.profile_photo_disk', 'public');
             $previousPhotoPath = $user->profile_photo_path;
             $newPhoto = $request->getPhoto();
 

app/Http/Controllers/Web/Controller.php

@@ -4,21 +4,4 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Web;
 
-use App\Models\Organization;
-use App\Service\PermissionStore;
-use Illuminate\Auth\Access\AuthorizationException;
-
-abstract class Controller extends \App\Http\Controllers\Controller
-{
-    public function __construct(
-        protected PermissionStore $permissionStore,
-    ) {}
-
-    /**
-     * @throws AuthorizationException
-     */
-    protected function hasPermission(Organization $organization, string $permission): bool
-    {
-        return $this->permissionStore->has($organization, $permission);
-    }
-}
+abstract class Controller extends \App\Http\Controllers\Controller {}

app/Http/Controllers/Web/OrganizationController.php

@@ -1,69 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Web;
-
-use App\Models\Organization;
-use Brick\Money\Currency;
-use Brick\Money\ISOCurrencyProvider;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Str;
-use Inertia\Inertia;
-use Inertia\Response;
-
-class OrganizationController extends Controller
-{
-    /**
-     * Show the team creation screen.
-     */
-    public function create(Request $request): Response
-    {
-        return Inertia::render('Teams/Create');
-    }
-
-    /**
-     * Show the organizatio details screen.
-     *
-     * @param  string  $organizationId  The organization ID
-     */
-    public function show(string $organizationId): Response|RedirectResponse
-    {
-        $organization = Str::isUuid($organizationId) ? Organization::find($organizationId) : null;
-        if ($organization === null) {
-            return redirect()->route('dashboard');
-        }
-        if (! $this->hasPermission($organization, 'organizations:view')) {
-            return redirect()->route('dashboard');
-        }
-
-        $owner = $organization->owner;
-
-        return Inertia::render('Teams/Show', [
-            'team' => [
-                'id' => $organization->getKey(),
-                'name' => $organization->name,
-                'currency' => $organization->currency,
-                'owner' => [
-                    'id' => $owner->getKey(),
-                    'name' => $owner->name,
-                    'profile_photo_url' => $owner->profile_photo_url,
-                ],
-            ],
-            'currencies' => array_map(function (Currency $currency): string {
-                return $currency->getName();
-            }, ISOCurrencyProvider::getInstance()->getAvailableCurrencies()),
-            'availableRoles' => [],
-            'availablePermissions' => [],
-            'defaultPermissions' => [],
-            'permissions' => [
-                'canAddTeamMembers' => true,
-                'canDeleteTeam' => true,
-                'canRemoveTeamMembers' => true,
-                'canUpdateTeam' => true,
-                'canUpdateTeamMembers' => true,
-            ],
-        ]);
-    }
-}

app/Http/Controllers/Web/UserProfileController.php

@@ -1,142 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Web;
-
-use App\Enums\Weekday;
-use App\Service\Dto\UserAgentDto;
-use App\Service\TimezoneService;
-use Illuminate\Http\Request;
-use Illuminate\Routing\Controller;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Inertia\Inertia;
-use Inertia\Response;
-use Laravel\Fortify\Actions\DisableTwoFactorAuthentication;
-use Laravel\Fortify\Features;
-
-class UserProfileController extends Controller
-{
-    /**
-     * Validate the two-factor authentication state for the request.
-     */
-    protected function validateTwoFactorAuthenticationState(Request $request): void
-    {
-        if (! Features::optionEnabled(Features::twoFactorAuthentication(), 'confirm')) {
-            return;
-        }
-
-        $currentTime = time();
-
-        // Notate totally disabled state in session...
-        if ($this->twoFactorAuthenticationDisabled($request)) {
-            $request->session()->put('two_factor_empty_at', $currentTime);
-        }
-
-        // If was previously totally disabled this session but is now confirming, notate time...
-        if ($this->hasJustBegunConfirmingTwoFactorAuthentication($request)) {
-            $request->session()->put('two_factor_confirming_at', $currentTime);
-        }
-
-        // If the profile is reloaded and is not confirmed but was previously in confirming state, disable...
-        if ($this->neverFinishedConfirmingTwoFactorAuthentication($request, $currentTime)) {
-            app(DisableTwoFactorAuthentication::class)(Auth::user());
-
-            $request->session()->put('two_factor_empty_at', $currentTime);
-            $request->session()->remove('two_factor_confirming_at');
-        }
-    }
-
-    /**
-     * Determine if two-factor authentication is totally disabled.
-     *
-     * @return bool
-     */
-    protected function twoFactorAuthenticationDisabled(Request $request)
-    {
-        return is_null($request->user()->two_factor_secret) &&
-            is_null($request->user()->two_factor_confirmed_at);
-    }
-
-    /**
-     * Determine if two-factor authentication is just now being confirmed within the last request cycle.
-     *
-     * @return bool
-     */
-    protected function hasJustBegunConfirmingTwoFactorAuthentication(Request $request)
-    {
-        return ! is_null($request->user()->two_factor_secret) &&
-            is_null($request->user()->two_factor_confirmed_at) &&
-            $request->session()->has('two_factor_empty_at') &&
-            is_null($request->session()->get('two_factor_confirming_at'));
-    }
-
-    /**
-     * Determine if two-factor authentication was never totally confirmed once confirmation started.
-     *
-     * @return bool
-     */
-    protected function neverFinishedConfirmingTwoFactorAuthentication(Request $request, int $currentTime)
-    {
-        return ! array_key_exists('code', $request->session()->getOldInput()) &&
-            is_null($request->user()->two_factor_confirmed_at) &&
-            $request->session()->get('two_factor_confirming_at', 0) !== $currentTime;
-    }
-
-    /**
-     * Show the general profile settings screen.
-     */
-    public function show(Request $request): Response
-    {
-        $this->validateTwoFactorAuthenticationState($request);
-
-        return Inertia::render('Profile/Show', [
-            'timezones' => app(TimezoneService::class)->getSelectOptions(),
-            'weekdays' => Weekday::toSelectArray(),
-            'confirmsTwoFactorAuthentication' => Features::optionEnabled(Features::twoFactorAuthentication(), 'confirm'),
-            'sessions' => $this->sessions($request),
-        ]);
-    }
-
-    /**
-     * Get the current sessions.
-     *
-     * @return array<int, object{agent: array{is_desktop: bool, platform: string|null, browser: string|null}, ip_address: string, is_current_device: bool, last_active: string}&\stdClass>
-     */
-    public function sessions(Request $request): array
-    {
-        if (config('session.driver') !== 'database') {
-            return [];
-        }
-
-        return collect(
-            DB::connection(config('session.connection'))->table(config('session.table', 'sessions'))
-                ->where('user_id', $request->user()->getAuthIdentifier())
-                ->orderBy('last_activity', 'desc')
-                ->get()
-        )->map(function (object $session) use ($request): object {
-            $agent = $this->createAgent(is_string($session->user_agent) ? $session->user_agent : '');
-
-            return (object) [
-                'agent' => [
-                    'is_desktop' => $agent->isDesktop(),
-                    'platform' => $agent->platform(),
-                    'browser' => $agent->browser(),
-                ],
-                'ip_address' => is_string($session->ip_address) ? $session->ip_address : '',
-                'is_current_device' => $session->id === $request->session()->getId(),
-                'last_active' => Carbon::createFromTimestamp($session->last_activity)->diffForHumans(),
-            ];
-        })->all();
-    }
-
-    /**
-     * Create a new agent instance from the given session.
-     */
-    protected function createAgent(string $userAgent): UserAgentDto
-    {
-        return tap(new UserAgentDto, fn ($agent) => $agent->setUserAgent($userAgent));
-    }
-}

app/Http/Middleware/ShareInertiaData.php

@@ -9,10 +9,12 @@ use App\Models\User;
 use App\Service\PermissionStore;
 use Closure;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\MessageBag;
 use Inertia\Inertia;
 use Laravel\Fortify\Features;
+use Laravel\Jetstream\Jetstream;
 use Symfony\Component\HttpFoundation\Response;
 
 class ShareInertiaData
@@ -25,8 +27,27 @@ class ShareInertiaData
         /** @var PermissionStore $permissions */
         $permissions = app(PermissionStore::class);
         Inertia::share([
+            'jetstream' => function () use ($request) {
+                /** @var User|null $user */
+                $user = $request->user();
+
+                return [
+                    'canCreateTeams' => $user !== null &&
+                        Jetstream::userHasTeamFeatures($user) &&
+                        Gate::forUser($user)->check('create', Jetstream::newTeamModel()),
+                    'canManageTwoFactorAuthentication' => Features::canManageTwoFactorAuthentication(),
+                    'canUpdatePassword' => Features::enabled(Features::updatePasswords()),
+                    'canUpdateProfileInformation' => Features::canUpdateProfileInformation(),
+                    'hasEmailVerification' => Features::enabled(Features::emailVerification()),
+                    'hasAccountDeletionFeatures' => Jetstream::hasAccountDeletionFeatures(),
+                    'hasApiFeatures' => Jetstream::hasApiFeatures(),
+                    'hasTeamFeatures' => Jetstream::hasTeamFeatures(),
+                    'hasTermsAndPrivacyPolicyFeature' => Jetstream::hasTermsAndPrivacyPolicyFeature(),
+                    'managesProfilePhotos' => Jetstream::managesProfilePhotos(),
+                ];
+            },
             'auth' => [
-                'permissions' => $request->user() !== null && $request->user()->currentOrganization !== null ? $permissions->getPermissions($request->user()->currentOrganization) : [],
+                'permissions' => $request->user() !== null && $request->user()->currentTeam !== null ? $permissions->getPermissions($request->user()->currentTeam) : [],
                 'user' => function () use ($request): array {
                     /** @var User|null $user */
                     $user = $request->user();
@@ -35,8 +56,6 @@ class ShareInertiaData
                         return [];
                     }
 
-                    $currentOrganization = $user->currentOrganization;
-
                     return array_merge([
                         'id' => $user->id,
                         'name' => $user->name,
@@ -49,12 +68,12 @@ class ShareInertiaData
                         'profile_photo_url' => $user->profile_photo_url,
                         'two_factor_enabled' => Features::enabled(Features::twoFactorAuthentication())
                             && ! is_null($user->two_factor_secret),
-                        'current_team' => $currentOrganization !== null ? [
-                            'id' => $currentOrganization->id,
-                            'user_id' => $currentOrganization->user_id,
-                            'name' => $currentOrganization->name,
-                            'personal_team' => $currentOrganization->personal_team,
-                            'currency' => $currentOrganization->currency,
+                        'current_team' => $user->currentTeam !== null ? [
+                            'id' => $user->currentTeam->id,
+                            'user_id' => $user->currentTeam->user_id,
+                            'name' => $user->currentTeam->name,
+                            'personal_team' => $user->currentTeam->personal_team,
+                            'currency' => $user->currentTeam->currency,
                         ] : null,
                     ], array_filter([
                         'all_teams' => $user->organizations->map(function (Organization $organization): array {

app/Http/Requests/V1/User/UserUpdateCurrentOrganizationRequest.php

@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Requests\V1\User;
-
-use App\Http\Requests\V1\BaseFormRequest;
-use Illuminate\Contracts\Validation\ValidationRule;
-
-class UserUpdateCurrentOrganizationRequest extends BaseFormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, array<string|ValidationRule>>
-     */
-    public function rules(): array
-    {
-        return [
-            'organization_id' => [
-                'required',
-                'string',
-                'uuid',
-            ],
-        ];
-    }
-
-    public function getOrganizationId(): string
-    {
-        return (string) $this->input('organization_id');
-    }
-}

app/Models/Member.php

@@ -9,11 +9,10 @@ use App\Models\Concerns\HasUuids;
 use Database\Factories\MemberFactory;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Support\Carbon;
+use Laravel\Jetstream\Membership as JetstreamMembership;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
@@ -31,7 +30,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  *
  * @method static MemberFactory factory()
  */
-class Member extends Pivot implements AuditableContract
+class Member extends JetstreamMembership implements AuditableContract
 {
     use CustomAuditable;
 

app/Models/Organization.php

@@ -14,7 +14,6 @@ use App\Models\Concerns\HasUuids;
 use Database\Factories\OrganizationFactory;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -22,6 +21,11 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
+use Laravel\Jetstream\Events\TeamCreated;
+use Laravel\Jetstream\Events\TeamDeleted;
+use Laravel\Jetstream\Events\TeamUpdated;
+use Laravel\Jetstream\Team;
+use Laravel\Jetstream\Team as JetstreamTeam;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
@@ -49,7 +53,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  *
  * @method static OrganizationFactory factory()
  */
-class Organization extends Model implements AuditableContract
+class Organization extends JetstreamTeam implements AuditableContract
 {
     use CustomAuditable;
 
@@ -87,6 +91,17 @@ class Organization extends Model implements AuditableContract
         'personal_team',
     ];
 
+    /**
+     * The event map for the model.
+     *
+     * @var array<string, class-string>
+     */
+    protected $dispatchesEvents = [
+        'created' => TeamCreated::class,
+        'updated' => TeamUpdated::class,
+        'deleted' => TeamDeleted::class,
+    ];
+
     /**
      * The model's default values for attributes.
      *
@@ -148,13 +163,12 @@ class Organization extends Model implements AuditableContract
     }
 
     /**
-     * Find a model by its primary key or throw an exception.
+     * This method prevents an unhandled exception when the ID is not a UUID.
+     * Normally this can be fixed with a route pattern, but Jetstream does not use route model binding.
      *
-     * @param  array<int, string>  $columns
-     *
-     * @throws ModelNotFoundException<Model>
+     * @param  array<string>  $columns
      */
-    public static function findOrFail(string $id, array $columns = ['*']): Model
+    public function findOrFail(string $id, array $columns = ['*']): Team
     {
         if (! Str::isUuid($id)) {
             throw (new ModelNotFoundException)->setModel(

app/Models/OrganizationInvitation.php

@@ -8,9 +8,9 @@ use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\OrganizationInvitationFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Carbon;
+use Laravel\Jetstream\TeamInvitation as JetstreamTeamInvitation;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
@@ -25,7 +25,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  *
  * @method static OrganizationInvitationFactory factory()
  */
-class OrganizationInvitation extends Model implements AuditableContract
+class OrganizationInvitation extends JetstreamTeamInvitation implements AuditableContract
 {
     use CustomAuditable;
 

app/Models/User.php

@@ -26,6 +26,8 @@ use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Storage;
 use Laravel\Fortify\TwoFactorAuthenticatable;
+use Laravel\Jetstream\HasProfilePhoto;
+use Laravel\Jetstream\HasTeams;
 use Laravel\Passport\AuthCode;
 use Laravel\Passport\Contracts\OAuthenticatable;
 use Laravel\Passport\HasApiTokens;
@@ -44,6 +46,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property Weekday $week_start
  * @property string|null $profile_photo_path
  * @property-read Organization|null $currentOrganization
+ * @property-read Organization|null $currentTeam
  * @property-read string $profile_photo_url
  * @property-read Collection<int, Token> $tokens
  * @property Carbon|null $created_at
@@ -68,6 +71,8 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
     /** @use HasFactory<UserFactory> */
     use HasFactory;
 
+    use HasProfilePhoto;
+    use HasTeams;
     use HasUuids;
     use Notifiable;
     use TwoFactorAuthenticatable;

app/Policies/OrganizationPolicy.php

@@ -0,0 +1,102 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Policies;
+
+use App\Models\Organization;
+use App\Models\User;
+use App\Service\PermissionStore;
+use Filament\Facades\Filament;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class OrganizationPolicy
+{
+    use HandlesAuthorization;
+
+    /**
+     * Determine whether the user can view any models.
+     */
+    public function viewAny(User $user): bool
+    {
+        if (Filament::isServing()) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Determine whether the user can view the model.
+     */
+    public function view(User $user, Organization $organization): bool
+    {
+        if (Filament::isServing()) {
+            return true;
+        }
+
+        return $user->isMemberOfOrganization($organization);
+    }
+
+    /**
+     * Determine whether the user can create models.
+     */
+    public function create(User $user): bool
+    {
+        if (Filament::isServing()) {
+            return true;
+        }
+
+        return true;
+    }
+
+    /**
+     * Determine whether the user can update the model.
+     */
+    public function update(User $user, Organization $organization): bool
+    {
+        if (Filament::isServing()) {
+            return true;
+        }
+
+        return app(PermissionStore::class)->userHas($organization, $user, 'organizations:update');
+    }
+
+    /**
+     * Determine whether the user can update team member permissions.
+     */
+    public function updateTeamMember(User $user, Organization $organization): bool
+    {
+        if (Filament::isServing()) {
+            return true;
+        }
+
+        // Note: since this policy is only used for jetstream endpoints, we can return false here
+        return false;
+    }
+
+    /**
+     * Determine whether the user can remove team members.
+     */
+    public function removeTeamMember(User $user, Organization $organization): bool
+    {
+        if (Filament::isServing()) {
+            return true;
+        }
+
+        // Note: since this policy is only used for jetstream endpoints that are no longer in use, we can return false here
+        return false;
+    }
+
+    /**
+     * Determine whether the user can delete the model.
+     */
+    public function delete(User $user, Organization $organization): bool
+    {
+        if (Filament::isServing()) {
+            return true;
+        }
+
+        return app(PermissionStore::class)->userHas($organization, $user, 'organizations:delete');
+    }
+}

app/Providers/AuthServiceProvider.php

@@ -4,11 +4,14 @@ declare(strict_types=1);
 
 namespace App\Providers;
 
+use App\Models\Organization;
 use App\Models\Passport\AuthCode;
 use App\Models\Passport\Client;
 use App\Models\Passport\RefreshToken;
 use App\Models\Passport\Token;
+use App\Policies\OrganizationPolicy;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use Laravel\Jetstream\Jetstream;
 use Laravel\Passport\Passport;
 
 class AuthServiceProvider extends ServiceProvider
@@ -19,6 +22,7 @@ class AuthServiceProvider extends ServiceProvider
      * @var array<class-string, class-string>
      */
     protected $policies = [
+        Organization::class => OrganizationPolicy::class,
     ];
 
     /**
@@ -52,5 +56,11 @@ class AuthServiceProvider extends ServiceProvider
         // Passport::tokensExpireIn(now()->addDays(15));
         // Passport::refreshTokensExpireIn(now()->addDays(30));
         Passport::personalAccessTokensExpireIn(now()->addMonths(12));
+
+        // same as passport default above
+        Jetstream::defaultApiTokenPermissions(['read']);
+
+        // use passport scopes for jetstream token permissions
+        Jetstream::permissions(Passport::scopeIds());
     }
 }

app/Providers/FortifyServiceProvider.php

@@ -15,13 +15,12 @@ use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\RateLimiter;
-use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
 use Inertia\Inertia;
-use Laravel\Fortify\Contracts\LoginResponse as LoginResponseContract;
 use Laravel\Fortify\Contracts\TwoFactorLoginResponse;
 use Laravel\Fortify\Fortify;
+use Laravel\Fortify\Http\Responses\LoginResponse;
 
 class FortifyServiceProvider extends ServiceProvider
 {
@@ -51,40 +50,6 @@ class FortifyServiceProvider extends ServiceProvider
             ]);
         });
 
-        Fortify::loginView(function () {
-            return Inertia::render('Auth/Login', [
-                'canResetPassword' => Route::has('password.request'),
-                'status' => session('status'),
-            ]);
-        });
-
-        Fortify::requestPasswordResetLinkView(function () {
-            return Inertia::render('Auth/ForgotPassword', [
-                'status' => session('status'),
-            ]);
-        });
-
-        Fortify::resetPasswordView(function (Request $request) {
-            return Inertia::render('Auth/ResetPassword', [
-                'email' => $request->input('email'),
-                'token' => $request->route('token'),
-            ]);
-        });
-
-        Fortify::verifyEmailView(function () {
-            return Inertia::render('Auth/VerifyEmail', [
-                'status' => session('status'),
-            ]);
-        });
-
-        Fortify::twoFactorChallengeView(function () {
-            return Inertia::render('Auth/TwoFactorChallenge');
-        });
-
-        Fortify::confirmPasswordView(function () {
-            return Inertia::render('Auth/ConfirmPassword');
-        });
-
         Fortify::authenticateUsing(function (Request $request): ?User {
             /** @var User|null $user */
             $user = User::query()
@@ -109,7 +74,7 @@ class FortifyServiceProvider extends ServiceProvider
             return Limit::perMinute(5)->by($request->session()->get('login.id'));
         });
 
-        $this->app->instance(LoginResponseContract::class, new CustomLoginResponse);
+        $this->app->instance(LoginResponse::class, new CustomLoginResponse);
         $this->app->instance(TwoFactorLoginResponse::class, new CustomTwoFactorLoginResponse);
     }
 }

app/Providers/JetstreamServiceProvider.php

@@ -0,0 +1,113 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Providers;
+
+use App\Actions\Jetstream\AddOrganizationMember;
+use App\Actions\Jetstream\CreateOrganization;
+use App\Actions\Jetstream\DeleteOrganization;
+use App\Actions\Jetstream\DeleteUser;
+use App\Actions\Jetstream\InviteOrganizationMember;
+use App\Actions\Jetstream\RemoveOrganizationMember;
+use App\Actions\Jetstream\UpdateMemberRole;
+use App\Actions\Jetstream\UpdateOrganization;
+use App\Actions\Jetstream\ValidateOrganizationDeletion;
+use App\Enums\Weekday;
+use App\Models\Member;
+use App\Models\Organization;
+use App\Models\OrganizationInvitation;
+use App\Models\User;
+use App\Service\PermissionStore;
+use App\Service\TimezoneService;
+use Brick\Money\Currency;
+use Brick\Money\ISOCurrencyProvider;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\ServiceProvider;
+use Laravel\Jetstream\Actions\UpdateTeamMemberRole;
+use Laravel\Jetstream\Actions\ValidateTeamDeletion;
+use Laravel\Jetstream\Jetstream;
+
+class JetstreamServiceProvider extends ServiceProvider
+{
+    /**
+     * Register any application services.
+     */
+    public function register(): void
+    {
+        //
+    }
+
+    /**
+     * Bootstrap any application services.
+     */
+    public function boot(): void
+    {
+        $this->configurePermissions();
+
+        Jetstream::createTeamsUsing(CreateOrganization::class);
+        Jetstream::updateTeamNamesUsing(UpdateOrganization::class);
+        Jetstream::addTeamMembersUsing(AddOrganizationMember::class);
+        Jetstream::inviteTeamMembersUsing(InviteOrganizationMember::class);
+        Jetstream::removeTeamMembersUsing(RemoveOrganizationMember::class);
+        Jetstream::deleteTeamsUsing(DeleteOrganization::class);
+        Jetstream::deleteUsersUsing(DeleteUser::class);
+        Jetstream::useTeamModel(Organization::class);
+        Jetstream::useMembershipModel(Member::class);
+        Jetstream::useTeamInvitationModel(OrganizationInvitation::class);
+        app()->singleton(UpdateTeamMemberRole::class, UpdateMemberRole::class);
+        app()->singleton(ValidateTeamDeletion::class, ValidateOrganizationDeletion::class);
+        Gate::define('removeTeamMember', function (User $user, Organization $team) {
+            return false;
+        });
+    }
+
+    /**
+     * Configure the roles and permissions that are available within the application.
+     */
+    protected function configurePermissions(): void
+    {
+        Jetstream::defaultApiTokenPermissions([]);
+
+        foreach (PermissionStore::roleDefinitions() as $role => $definition) {
+            Jetstream::role($role, $definition['name'], $definition['permissions'])
+                ->description($definition['description']);
+        }
+
+        Jetstream::inertia()
+            ->whenRendering(
+                'Profile/Show',
+                function (Request $request, array $data): array {
+                    return array_merge($data, [
+                        'timezones' => $this->app->get(TimezoneService::class)->getSelectOptions(),
+                        'weekdays' => Weekday::toSelectArray(),
+                    ]);
+                }
+            )
+            ->whenRendering(
+                'Teams/Show',
+                function (Request $request, array $data): array {
+                    /** @var Organization $teamModel */
+                    $teamModel = $data['team'];
+                    $owner = $teamModel->owner;
+
+                    return array_merge($data, [
+                        'team' => [
+                            'id' => $teamModel->getKey(),
+                            'name' => $teamModel->name,
+                            'currency' => $teamModel->currency,
+                            'owner' => [
+                                'id' => $owner->getKey(),
+                                'name' => $owner->name,
+                                'profile_photo_url' => $owner->profile_photo_url,
+                            ],
+                        ],
+                        'currencies' => array_map(function (Currency $currency): string {
+                            return $currency->getName();
+                        }, ISOCurrencyProvider::getInstance()->getAvailableCurrencies()),
+                    ]);
+                }
+            );
+    }
+}

app/Service/Dto/UserAgentDto.php

@@ -1,179 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service\Dto;
-
-use Closure;
-use Detection\MobileDetect;
-
-/**
- * @copyright Originally created by Jens Segers: https://github.com/jenssegers/agent
- */
-class UserAgentDto extends MobileDetect
-{
-    /**
-     * List of additional operating systems.
-     *
-     * @var array<string, string>
-     */
-    protected static array $additionalOperatingSystems = [
-        'Windows' => 'Windows',
-        'Windows NT' => 'Windows NT',
-        'OS X' => 'Mac OS X',
-        'Debian' => 'Debian',
-        'Ubuntu' => 'Ubuntu',
-        'Macintosh' => 'PPC',
-        'OpenBSD' => 'OpenBSD',
-        'Linux' => 'Linux',
-        'ChromeOS' => 'CrOS',
-    ];
-
-    /**
-     * List of additional browsers.
-     *
-     * @var array<string, string>
-     */
-    protected static array $additionalBrowsers = [
-        'Opera Mini' => 'Opera Mini',
-        'Opera' => 'Opera|OPR',
-        'Edge' => 'Edge|Edg',
-        'Coc Coc' => 'coc_coc_browser',
-        'UCBrowser' => 'UCBrowser',
-        'Vivaldi' => 'Vivaldi',
-        'Chrome' => 'Chrome',
-        'Firefox' => 'Firefox',
-        'Safari' => 'Safari',
-        'IE' => 'MSIE|IEMobile|MSIEMobile|Trident/[.0-9]+',
-        'Netscape' => 'Netscape',
-        'Mozilla' => 'Mozilla',
-        'WeChat' => 'MicroMessenger',
-    ];
-
-    /**
-     * Key value store for resolved strings.
-     *
-     * @var array<string, mixed>
-     */
-    protected array $store = [];
-
-    /**
-     * Get the platform name from the User Agent.
-     */
-    public function platform(): ?string
-    {
-        return $this->retrieveUsingCacheOrResolve('platform', function () {
-            return $this->findDetectionRulesAgainstUserAgent(
-                $this->mergeRules(MobileDetect::getOperatingSystems(), static::$additionalOperatingSystems)
-            );
-        });
-    }
-
-    /**
-     * Get the browser name from the User Agent.
-     */
-    public function browser(): ?string
-    {
-        return $this->retrieveUsingCacheOrResolve('browser', function (): ?string {
-            return $this->findDetectionRulesAgainstUserAgent(
-                $this->mergeRules(static::$additionalBrowsers, MobileDetect::getBrowsers())
-            );
-        });
-    }
-
-    /**
-     * Determine if the device is a desktop computer.
-     */
-    public function isDesktop(): bool
-    {
-        return $this->retrieveUsingCacheOrResolve('desktop', function (): bool {
-            // Check specifically for cloudfront headers if the useragent === 'Amazon CloudFront'
-            if (
-                $this->getUserAgent() === static::$cloudFrontUA
-                && $this->getHttpHeader('HTTP_CLOUDFRONT_IS_DESKTOP_VIEWER') === 'true'
-            ) {
-                return true;
-            }
-
-            return ! $this->isMobile() && ! $this->isTablet();
-        });
-    }
-
-    /**
-     * Match a detection rule and return the matched key.
-     *
-     * @param  array<string, string|list<string>>  $rules
-     */
-    protected function findDetectionRulesAgainstUserAgent(array $rules): ?string
-    {
-        $userAgent = $this->getUserAgent();
-
-        foreach ($rules as $key => $regex) {
-            if (is_array($regex)) {
-                $regex = implode('|', $regex);
-            }
-
-            if (empty($regex)) {
-                continue;
-            }
-
-            if ($this->match($regex, $userAgent)) {
-                if ($key !== '') {
-                    return $key;
-                }
-
-                $match = reset($this->matchesArray);
-
-                return is_string($match) ? $match : null;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieve from the given key from the cache or resolve the value.
-     *
-     * @template TReturn of string|bool|null
-     *
-     * @param  Closure():TReturn  $callback
-     * @return TReturn
-     */
-    protected function retrieveUsingCacheOrResolve(string $key, Closure $callback): string|bool|null
-    {
-        $cacheKey = $this->createCacheKey($key);
-
-        if (! is_null($cacheItem = $this->store[$cacheKey] ?? null)) {
-            return $cacheItem;
-        }
-
-        return tap(call_user_func($callback), function ($result) use ($cacheKey): void {
-            $this->store[$cacheKey] = $result;
-        });
-    }
-
-    /**
-     * Merge multiple rules into one array.
-     *
-     * @param  array<string, string|list<string>>  ...$all
-     * @return array<string, string>
-     */
-    protected function mergeRules(array ...$all): array
-    {
-        $merged = [];
-
-        foreach ($all as $rules) {
-            foreach ($rules as $key => $value) {
-                $value = is_array($value) ? implode('|', $value) : $value;
-
-                if (empty($merged[$key])) {
-                    $merged[$key] = $value;
-                } else {
-                    $merged[$key] .= '|'.$value;
-                }
-            }
-        }
-
-        return $merged;
-    }
-}

app/Service/InvitationService.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Service;
 
 use App\Enums\Role;
-use App\Events\OrganizationInvitationAdding;
 use App\Exceptions\Api\InvitationForTheEmailAlreadyExistsApiException;
 use App\Exceptions\Api\UserIsAlreadyMemberOfOrganizationApiException;
 use App\Mail\OrganizationInvitationMail;
@@ -15,13 +14,14 @@ use App\Models\User;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
+use Laravel\Jetstream\Events\InvitingTeamMember;
 
 class InvitationService
 {
     /**
      * @throws UserIsAlreadyMemberOfOrganizationApiException|InvitationForTheEmailAlreadyExistsApiException
      */
-    public function inviteUser(Organization $organization, string $email, Role $role, User $inviter): OrganizationInvitation
+    public function inviteUser(Organization $organization, string $email, Role $role): OrganizationInvitation
     {
         if (app(MemberService::class)->isEmailAlreadyMember($organization, $email)) {
             throw new UserIsAlreadyMemberOfOrganizationApiException;
@@ -34,7 +34,7 @@ class InvitationService
             throw new InvitationForTheEmailAlreadyExistsApiException;
         }
 
-        OrganizationInvitationAdding::dispatch($organization, $email, $role, $inviter);
+        InvitingTeamMember::dispatch($organization, $email, $role->value);
 
         $invitation = new OrganizationInvitation;
         $invitation->email = $email;

app/Service/MemberService.php

@@ -23,6 +23,8 @@ use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
 use InvalidArgumentException;
+use Laravel\Jetstream\Events\AddingTeamMember;
+use Laravel\Jetstream\Events\TeamMemberAdded;
 
 class MemberService
 {
@@ -37,6 +39,7 @@ class MemberService
     {
         if (! $asSuperAdmin) {
             MemberAdding::dispatch($user, $organization, $role);
+            AddingTeamMember::dispatch($organization, $user); // Legacy event
         }
 
         $member = new Member;
@@ -53,6 +56,7 @@ class MemberService
 
         if (! $asSuperAdmin) {
             MemberAdded::dispatch($member, $organization, $user);
+            TeamMemberAdded::dispatch($organization, $user); // Legacy event
         }
 
         return $member;

app/Service/TimeEntryFilter.php

@@ -62,7 +62,7 @@ class TimeEntryFilter
         if ($start === null) {
             return $this;
         }
-        $this->builder->where('start', '>=', $start);
+        $this->builder->where('start', '>', $start);
 
         return $this;
     }

composer.json

@@ -18,8 +18,8 @@
         "korridor/laravel-computed-attributes": "^3.1",
         "korridor/laravel-has-many-sync": "^3.1",
         "korridor/laravel-model-validation-rules": "^3.0",
-        "laravel/fortify": "^1.37",
         "laravel/framework": "^12.19.3",
+        "laravel/jetstream": "^5.0",
         "laravel/octane": "^2.3",
         "laravel/passport": "^13.0.5",
         "laravel/tinker": "^2.8",
@@ -27,7 +27,6 @@
         "league/flysystem-aws-s3-v3": "^3.0",
         "league/iso3166": "^4.3",
         "maatwebsite/excel": "^3.1",
-        "mobiledetect/mobiledetectlib": "^4.11",
         "novadaemon/filament-pretty-json": "^2.2",
         "nwidart/laravel-modules": "^12.0.4",
         "owen-it/laravel-auditing": "^14.0.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "897ca7bc13f827db641f7affa54a8523",
+    "content-hash": "4c728f01d2beb426b2d157143618fdae",
     "packages": [
         {
             "name": "anourvalar/eloquent-serialize",
@@ -4413,6 +4413,72 @@
             },
             "time": "2026-05-20T11:48:19+00:00"
         },
+        {
+            "name": "laravel/jetstream",
+            "version": "v5.5.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/jetstream.git",
+                "reference": "61cac5cde455311890f6981fb2da47acd298e4e2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/jetstream/zipball/61cac5cde455311890f6981fb2da47acd298e4e2",
+                "reference": "61cac5cde455311890f6981fb2da47acd298e4e2",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "illuminate/console": "^11.0|^12.0|^13.0",
+                "illuminate/support": "^11.0|^12.0|^13.0",
+                "laravel/fortify": "^1.20",
+                "mobiledetect/mobiledetectlib": "^4.8.08",
+                "php": "^8.2.0",
+                "symfony/console": "^7.0|^8.0"
+            },
+            "require-dev": {
+                "inertiajs/inertia-laravel": "^2.0",
+                "laravel/sanctum": "^4.0",
+                "livewire/livewire": "^3.3",
+                "mockery/mockery": "^1.0",
+                "orchestra/testbench": "^9.15|^10.8|^11.0",
+                "phpstan/phpstan": "^1.10"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Laravel\\Jetstream\\JetstreamServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laravel\\Jetstream\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "Tailwind scaffolding for the Laravel framework.",
+            "keywords": [
+                "auth",
+                "laravel",
+                "tailwind"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/jetstream/issues",
+                "source": "https://github.com/laravel/jetstream"
+            },
+            "time": "2026-05-19T01:30:03+00:00"
+        },
         {
             "name": "laravel/octane",
             "version": "v2.17.4",
@@ -6379,16 +6445,16 @@
         },
         {
             "name": "mobiledetect/mobiledetectlib",
-            "version": "4.11.0",
+            "version": "4.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/serbanghita/Mobile-Detect.git",
-                "reference": "ab39168b7556f44c11c80be1222b44b239f5c2e4"
+                "reference": "1473bd9d6aa40158f75f1e05116e6dd081148b2c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/ab39168b7556f44c11c80be1222b44b239f5c2e4",
-                "reference": "ab39168b7556f44c11c80be1222b44b239f5c2e4",
+                "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/1473bd9d6aa40158f75f1e05116e6dd081148b2c",
+                "reference": "1473bd9d6aa40158f75f1e05116e6dd081148b2c",
                 "shasum": ""
             },
             "require": {
@@ -6431,7 +6497,7 @@
             ],
             "support": {
                 "issues": "https://github.com/serbanghita/Mobile-Detect/issues",
-                "source": "https://github.com/serbanghita/Mobile-Detect/tree/4.11.0"
+                "source": "https://github.com/serbanghita/Mobile-Detect/tree/4.10.0"
             },
             "funding": [
                 {
@@ -6439,7 +6505,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-05-24T12:32:40+00:00"
+            "time": "2026-04-23T13:05:57+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -13737,16 +13803,16 @@
         },
         {
             "name": "web-auth/webauthn-lib",
-            "version": "5.3.5",
+            "version": "5.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-auth/webauthn-lib.git",
-                "reference": "9e0986d999f4102e24ac8a598d3a80d98b56c19f"
+                "reference": "e6f656d6c6b29fa305382fe6a0a3be8177d177df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/9e0986d999f4102e24ac8a598d3a80d98b56c19f",
-                "reference": "9e0986d999f4102e24ac8a598d3a80d98b56c19f",
+                "url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/e6f656d6c6b29fa305382fe6a0a3be8177d177df",
+                "reference": "e6f656d6c6b29fa305382fe6a0a3be8177d177df",
                 "shasum": ""
             },
             "require": {
@@ -13807,7 +13873,7 @@
                 "webauthn"
             ],
             "support": {
-                "source": "https://github.com/web-auth/webauthn-lib/tree/5.3.5"
+                "source": "https://github.com/web-auth/webauthn-lib/tree/5.3.3"
             },
             "funding": [
                 {
@@ -13819,7 +13885,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2026-05-31T15:00:08+00:00"
+            "time": "2026-05-17T19:04:30+00:00"
         },
         {
             "name": "webmozart/assert",

config/app.php

@@ -12,6 +12,7 @@ use App\Providers\AuthServiceProvider;
 use App\Providers\EventServiceProvider;
 use App\Providers\Filament\AdminPanelProvider;
 use App\Providers\FortifyServiceProvider;
+use App\Providers\JetstreamServiceProvider;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Support\Facades\Facade;
 use Illuminate\Support\ServiceProvider;
@@ -202,6 +203,7 @@ return [
         AdminPanelProvider::class,
         RouteServiceProvider::class,
         FortifyServiceProvider::class,
+        JetstreamServiceProvider::class,
         // Warning: Do not add TelescopeServiceProvider here since it is already conditionally registered in AppServiceProvider
         LaravelModulesServiceProvider::class,
     ])->toArray(),

config/jetstream.php

@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+use Laravel\Jetstream\Features;
+use Laravel\Jetstream\Http\Middleware\AuthenticateSession;
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Jetstream Stack
+    |--------------------------------------------------------------------------
+    |
+    | This configuration value informs Jetstream which "stack" you will be
+    | using for your application. In general, this value is set for you
+    | during installation and will not need to be changed after that.
+    |
+    */
+
+    'stack' => 'inertia',
+
+    /*
+     |--------------------------------------------------------------------------
+     | Jetstream Route Middleware
+     |--------------------------------------------------------------------------
+     |
+     | Here you may specify which middleware Jetstream will assign to the routes
+     | that it registers with the application. When necessary, you may modify
+     | these middleware; however, this default value is usually sufficient.
+     |
+     */
+
+    'middleware' => ['web'],
+
+    'auth_session' => AuthenticateSession::class,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Jetstream Guard
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the authentication guard Jetstream will use while
+    | authenticating users. This value should correspond with one of your
+    | guards that is already present in your "auth" configuration file.
+    |
+    */
+
+    'guard' => 'web',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Features
+    |--------------------------------------------------------------------------
+    |
+    | Some of Jetstream's features are optional. You may disable the features
+    | by removing them from this array. You're free to only remove some of
+    | these features or you can even remove all of these if you need to.
+    |
+    */
+
+    'features' => [
+        Features::termsAndPrivacyPolicy(),
+        Features::profilePhotos(),
+        Features::teams(['invitations' => true]),
+        Features::accountDeletion(),
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Profile Photo Disk
+    |--------------------------------------------------------------------------
+    |
+    | This configuration value determines the default disk that will be used
+    | when storing profile photos for your application's users. Typically
+    | this will be the "public" disk but you may adjust this if needed.
+    |
+    */
+
+    'profile_photo_disk' => env('PROFILE_PHOTO_DISK', env('PUBLIC_FILESYSTEM_DISK', 'public')),
+
+];

database/factories/UserFactory.php

@@ -94,7 +94,7 @@ class UserFactory extends Factory
         $profilePhoto = $this->faker->image(null, 500, 500);
         /** @see FileHelpers::hashName */
         $path = 'profile-photos/'.Str::random(40).'.png';
-        Storage::disk(config('filesystems.public'))->put($path, $profilePhoto);
+        Storage::disk(config('jetstream.profile_photo_disk', 'public'))->put($path, $profilePhoto);
 
         return $this->state(function (array $attributes) use ($path): array {
             return [

docker-compose.yml

@@ -107,7 +107,7 @@ services:
             - sail
             - reverse-proxy
     playwright:
-        image: mcr.microsoft.com/playwright:v1.59.1-jammy
+        image: mcr.microsoft.com/playwright:v1.58.1-jammy
         command: ['npx', 'playwright', 'test', '--ui-port=8080', '--ui-host=0.0.0.0']
         working_dir: /src
         extra_hosts:

e2e/members.spec.ts

@@ -907,7 +907,7 @@ test.describe('Employee Sidebar Navigation', () => {
 
         // Visible links
         await expect(employee.page.getByRole('link', { name: 'Dashboard' })).toBeVisible();
-        await expect(employee.page.getByRole('link', { name: 'Time', exact: true })).toBeVisible();
+        await expect(employee.page.getByRole('link', { name: 'Time' })).toBeVisible();
         await expect(employee.page.getByRole('link', { name: 'Calendar' })).toBeVisible();
         await expect(employee.page.getByRole('link', { name: 'Projects' })).toBeVisible();
         await expect(employee.page.getByRole('link', { name: 'Clients' })).toBeVisible();

e2e/projects.spec.ts

@@ -6,7 +6,6 @@ import { formatCentsWithOrganizationDefaults } from './utils/money';
 import {
     createProjectViaApi,
     createPublicProjectViaApi,
-    createProjectMemberViaApi,
     createTaskViaApi,
     createClientViaApi,
     createTimeEntryViaApi,
@@ -218,59 +217,6 @@ test('test that creating a non-billable project works', async ({ page }) => {
     await expect(page.getByTestId('project_table')).toContainText(newProjectName);
 });
 
-test('test that creating a public project via the modal works', async ({ page }) => {
-    const newProjectName = 'Public Project ' + Math.floor(1 + Math.random() * 10000);
-    await goToProjectsOverview(page);
-    await page.getByRole('button', { name: 'Create Project' }).click();
-    await page.getByLabel('Project Name').fill(newProjectName);
-
-    // Visibility defaults to Private — switch it to Public
-    await expect(page.getByRole('dialog').locator('#visibility')).toContainText('Private');
-    await page.getByRole('dialog').locator('#visibility').click();
-    await page.getByRole('option', { name: 'Public' }).click();
-
-    await Promise.all([
-        page.getByRole('button', { name: 'Create Project' }).click(),
-        page.waitForResponse(
-            async (response) =>
-                response.url().includes('/projects') &&
-                response.request().method() === 'POST' &&
-                response.status() === 201 &&
-                (await response.json()).data.is_public === true
-        ),
-    ]);
-
-    await expect(page.getByTestId('project_table')).toContainText(newProjectName);
-});
-
-test('test that changing a project to public via the edit modal works', async ({ page, ctx }) => {
-    const newProjectName = 'Edit Visibility Project ' + Math.floor(1 + Math.random() * 10000);
-    await createProjectViaApi(ctx, { name: newProjectName });
-
-    await goToProjectsOverview(page);
-    await expect(page.getByText(newProjectName)).toBeVisible({ timeout: 10000 });
-
-    const projectRow = page.getByRole('row').filter({ hasText: newProjectName }).first();
-    await projectRow.getByRole('button').click();
-    await page.locator(`[aria-label='Edit Project ${newProjectName}']`).click();
-
-    // Loaded as Private — switch it to Public
-    await expect(page.getByRole('dialog').locator('#visibility')).toContainText('Private');
-    await page.getByRole('dialog').locator('#visibility').click();
-    await page.getByRole('option', { name: 'Public' }).click();
-
-    await Promise.all([
-        page.getByRole('button', { name: 'Update Project' }).click(),
-        page.waitForResponse(
-            async (response) =>
-                response.url().includes('/projects/') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200 &&
-                (await response.json()).data.is_public === true
-        ),
-    ]);
-});
-
 test('test that switching from custom rate to default rate clears billable rate', async ({
     page,
     ctx,
@@ -694,7 +640,7 @@ test('test that creating a project with estimated time in human-readable format
     await page.getByLabel('Project Name').fill(newProjectName);
 
     // Fill in estimated time using human-readable format
-    const estimatedTimeInput = page.getByLabel('Time Estimated');
+    const estimatedTimeInput = page.getByPlaceholder('e.g. 2h 30m or 1.5');
     await estimatedTimeInput.fill('2h 30m');
     await estimatedTimeInput.press('Tab');
 
@@ -722,7 +668,7 @@ test('test that creating a project with estimated time using decimal notation wo
     await page.getByLabel('Project Name').fill(newProjectName);
 
     // Fill in estimated time using decimal notation (1.5 hours = 1h 30m)
-    const estimatedTimeInput = page.getByLabel('Time Estimated');
+    const estimatedTimeInput = page.getByPlaceholder('e.g. 2h 30m or 1.5');
     await estimatedTimeInput.fill('1.5');
     await estimatedTimeInput.press('Tab');
 
@@ -750,7 +696,7 @@ test('test that creating a project with estimated time using comma decimal notat
     await page.getByLabel('Project Name').fill(newProjectName);
 
     // Fill in estimated time using comma decimal notation (2,5 hours = 2h 30m)
-    const estimatedTimeInput = page.getByLabel('Time Estimated');
+    const estimatedTimeInput = page.getByPlaceholder('e.g. 2h 30m or 1.5');
     await estimatedTimeInput.fill('2,5');
     await estimatedTimeInput.press('Tab');
 
@@ -781,7 +727,7 @@ test('test that updating estimated time on existing project works', async ({ pag
     await page.getByRole('menuitem').getByText('Edit').first().click();
 
     // Fill in estimated time
-    const estimatedTimeInput = page.getByLabel('Time Estimated');
+    const estimatedTimeInput = page.getByPlaceholder('e.g. 2h 30m or 1.5');
     await estimatedTimeInput.fill('4h 15m');
     await estimatedTimeInput.press('Tab');
 
@@ -802,7 +748,7 @@ test('test that estimated time input displays formatted value after blur', async
     await goToProjectsOverview(page);
     await page.getByRole('button', { name: 'Create Project' }).click();
 
-    const estimatedTimeInput = page.getByLabel('Time Estimated');
+    const estimatedTimeInput = page.getByPlaceholder('e.g. 2h 30m or 1.5');
 
     // Enter time in various formats and check the displayed value
     await estimatedTimeInput.fill('90');
@@ -979,39 +925,6 @@ test.describe('Employee Projects Restrictions', () => {
             employee.page.locator(`[aria-label='Delete Project ${projectName}']`)
         ).not.toBeVisible();
     });
-
-    test('employee does not see private projects they are not a member of', async ({
-        ctx,
-        employee,
-    }) => {
-        const publicName = 'EmpPublicVisible ' + Math.floor(Math.random() * 10000);
-        const privateName = 'EmpPrivateHidden ' + Math.floor(Math.random() * 10000);
-        await createPublicProjectViaApi(ctx, { name: publicName });
-        // createProjectViaApi defaults to is_public: false (private); the employee is not a member
-        await createProjectViaApi(ctx, { name: privateName });
-
-        await employee.page.goto(PLAYWRIGHT_BASE_URL + '/projects');
-        await expect(employee.page.getByTestId('projects_view')).toBeVisible({ timeout: 10000 });
-
-        // The public project is visible — confirms the list has loaded
-        await expect(employee.page.getByText(publicName)).toBeVisible({ timeout: 10000 });
-
-        // The private project the employee is not a member of must not appear
-        await expect(employee.page.getByText(privateName)).not.toBeVisible();
-    });
-
-    test('employee can see a private project they are a member of', async ({ ctx, employee }) => {
-        const projectName = 'EmpPrivateMember ' + Math.floor(Math.random() * 10000);
-        const project = await createProjectViaApi(ctx, { name: projectName });
-        // Add the employee as a project member so the private project becomes visible to them
-        await createProjectMemberViaApi(ctx, project.id, { member_id: employee.memberId });
-
-        await employee.page.goto(PLAYWRIGHT_BASE_URL + '/projects');
-        await expect(employee.page.getByTestId('projects_view')).toBeVisible({ timeout: 10000 });
-
-        // The private project is visible because the employee is a member
-        await expect(employee.page.getByText(projectName)).toBeVisible({ timeout: 10000 });
-    });
 });
 
 test.describe('Employee Billable Rate Visibility', () => {

e2e/timesheet-overlap.spec.ts

@@ -1,437 +0,0 @@
-/**
- * E2E coverage for the timesheet overlap-prevention logic introduced
- * in `useTimesheetCellMutations` (Phase 1+2+3 of the overlap fix).
- *
- * Each test:
- *   1. Pre-creates entries via the API to set up a deterministic
- *      day-of-work scenario,
- *   2. Triggers ONE cell edit through the UI,
- *   3. Reads the resulting entries back via the API and asserts on
- *      the start/end placement.
- *
- * Pre-creating rows (rather than driving the "Add row" + project picker
- * UI) keeps the tests focused on the placement logic and out of the
- * project-dropdown's flake surface.
- */
-
-import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
-import { test } from '../playwright/fixtures';
-import { expect } from '@playwright/test';
-import type { Page, Request } from '@playwright/test';
-import {
-    createProjectViaApi,
-    createTimeEntryAtHourViaApi,
-    getTimeEntriesViaApi,
-} from './utils/api';
-
-// ──────────────────────────────────────────────────
-// Helpers
-// ──────────────────────────────────────────────────
-
-async function goToTimesheet(page: Page) {
-    await page.addInitScript(() => {
-        window.localStorage.setItem('showReleaseInfo-desktop', 'false');
-    });
-    await page.goto(PLAYWRIGHT_BASE_URL + '/timesheet');
-}
-
-function getMonday(d: Date): Date {
-    const date = new Date(d);
-    const day = date.getUTCDay();
-    const diff = date.getUTCDate() - day + (day === 0 ? -6 : 1);
-    date.setUTCDate(diff);
-    date.setUTCHours(0, 0, 0, 0);
-    return date;
-}
-
-function getCurrentWeekMonday(): Date {
-    return getMonday(new Date());
-}
-
-async function waitForTimesheetLoad(page: Page) {
-    await expect(page.getByTestId('timesheet_view')).toBeVisible();
-    await expect(page.getByTestId('timesheet_week_display')).toBeVisible();
-
-    const timezoneMismatchModal = page
-        .getByRole('dialog')
-        .filter({ hasText: 'Timezone mismatch detected' });
-    if (await timezoneMismatchModal.isVisible().catch(() => false)) {
-        await timezoneMismatchModal.getByRole('button', { name: 'Cancel' }).click();
-        await expect(timezoneMismatchModal).not.toBeVisible();
-    }
-}
-
-const HOUR = 3600;
-
-function utcHourOf(iso: string): number {
-    return new Date(iso).getUTCHours();
-}
-
-function utcMinuteOf(iso: string): number {
-    return new Date(iso).getUTCMinutes();
-}
-
-function sortByStart<T extends { start: string }>(entries: T[]): T[] {
-    return [...entries].sort((a, b) => a.start.localeCompare(b.start));
-}
-
-/**
- * Returns the locator for the row whose project name matches the given
- * substring. Robust against ordering changes.
- */
-function rowByProject(page: Page, projectName: string) {
-    return page.locator('[data-testid="timesheet_row"]').filter({ hasText: projectName });
-}
-
-/**
- * Returns the locator for the input in the (row, dayIndex) cell, where
- * the row is identified by project name.
- */
-function cellInputByProject(page: Page, projectName: string, dayIndex: number) {
-    return rowByProject(page, projectName)
-        .locator('[data-testid="timesheet_cell"]')
-        .nth(dayIndex)
-        .locator('input');
-}
-
-/** Asserts that no entries in the list overlap each other. */
-function expectNoOverlaps(entries: Array<{ start: string; end: string | null }>) {
-    const sorted = sortByStart(entries.filter((e) => e.end !== null));
-    for (let i = 1; i < sorted.length; i++) {
-        const prev = sorted[i - 1]!;
-        const curr = sorted[i]!;
-        expect(
-            curr.start >= prev.end!,
-            `entries overlap: ${prev.start}–${prev.end} vs ${curr.start}–${curr.end}`
-        ).toBe(true);
-    }
-}
-
-// ──────────────────────────────────────────────────
-// Phase 1: createCell — overlap avoidance when cell is empty
-// ──────────────────────────────────────────────────
-
-test('extendCell on a row that has no entries on the day yet places after another row (Scenario #4)', async ({
-    page,
-    ctx,
-}) => {
-    // Setup: project A has Monday 09:00–10:00, project B has Tuesday
-    // 09:00–10:00. The B row is therefore visible on the timesheet but
-    // has an EMPTY cell on Monday. Typing into B's Monday cell exercises
-    // the createCell path (cell empty → place a new entry).
-    const monday = getCurrentWeekMonday();
-    const tuesday = new Date(monday);
-    tuesday.setUTCDate(monday.getUTCDate() + 1);
-
-    const projectA = await createProjectViaApi(ctx, { name: 'OverlapAlpha' });
-    const projectB = await createProjectViaApi(ctx, { name: 'OverlapBravo' });
-
-    await createTimeEntryAtHourViaApi(ctx, {
-        date: monday,
-        startHour: 9,
-        durationSeconds: HOUR,
-        projectId: projectA.id,
-    });
-    await createTimeEntryAtHourViaApi(ctx, {
-        date: tuesday,
-        startHour: 9,
-        durationSeconds: HOUR,
-        projectId: projectB.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-    await expect(page.locator('[data-testid="timesheet_row"]')).toHaveCount(2);
-
-    // Type 1h into project B's Monday cell. The createCell path should
-    // place it AFTER project A's 09:00–10:00 (i.e. at 10:00 or later),
-    // not at 09:00.
-    const input = cellInputByProject(page, 'OverlapBravo', 0);
-    await input.click();
-    await input.fill('1');
-
-    await Promise.all([
-        page.waitForResponse(
-            (resp) =>
-                resp.url().includes('/time-entries') &&
-                resp.request().method() === 'POST' &&
-                resp.status() === 201
-        ),
-        input.press('Enter'),
-    ]);
-
-    const entries = await getTimeEntriesViaApi(ctx);
-    const bMondayEntry = entries.find(
-        (e) =>
-            e.project_id === projectB.id &&
-            new Date(e.start).getTime() >= monday.getTime() &&
-            new Date(e.start).getTime() < tuesday.getTime()
-    )!;
-    expect(bMondayEntry).toBeDefined();
-    // 09:00 is blocked → must be at 10:00 or later.
-    expect(utcHourOf(bMondayEntry.start)).toBeGreaterThanOrEqual(10);
-    expectNoOverlaps(entries);
-});
-
-test('createCell refuses to cross midnight when day is full (Scenario #3)', async ({
-    page,
-    ctx,
-}) => {
-    // Setup: fill Monday 01:00–23:00 (22 hours, leaving 1h before and
-    // 1h after — neither big enough for a 3h ask). Project B is on
-    // Tuesday so the B row exists with an empty Monday cell. Typing 3h
-    // into B's Monday cell should be refused.
-    //
-    // We start at 01:00 (not 00:00) because the API's time-entry
-    // filter excludes entries whose `start` equals the query's `start`
-    // bound exactly. Using 01:00 avoids that boundary condition.
-    const monday = getCurrentWeekMonday();
-    const tuesday = new Date(monday);
-    tuesday.setUTCDate(monday.getUTCDate() + 1);
-
-    const projectFull = await createProjectViaApi(ctx, { name: 'OverlapFull' });
-    const projectNew = await createProjectViaApi(ctx, { name: 'OverlapNoRoom' });
-
-    await createTimeEntryAtHourViaApi(ctx, {
-        date: monday,
-        startHour: 1,
-        durationSeconds: 22 * HOUR,
-        projectId: projectFull.id,
-    });
-    await createTimeEntryAtHourViaApi(ctx, {
-        date: tuesday,
-        startHour: 9,
-        durationSeconds: HOUR,
-        projectId: projectNew.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-    await expect(page.locator('[data-testid="timesheet_row"]')).toHaveCount(2);
-
-    const input = cellInputByProject(page, 'OverlapNoRoom', 0);
-    const seenMutationRequests: string[] = [];
-    const onRequest = (request: Request) => {
-        if (request.url().includes('/time-entries') && request.method() !== 'GET') {
-            seenMutationRequests.push(request.method());
-        }
-    };
-    page.on('request', onRequest);
-    await input.click();
-    await input.fill('3');
-    await input.press('Enter');
-
-    await expect(page.getByText("This day can't fit any more work")).toBeVisible();
-    page.off('request', onRequest);
-
-    const entries = await getTimeEntriesViaApi(ctx);
-    // The new project should still only have its Tuesday entry.
-    const newEntries = entries.filter((e) => e.project_id === projectNew.id);
-    expect(seenMutationRequests).toEqual([]);
-    expect(newEntries).toHaveLength(1);
-    expect(utcHourOf(newEntries[0]!.start)).toBe(9);
-    // The Tuesday entry's date is unchanged (still Tuesday).
-    expect(new Date(newEntries[0]!.start).getUTCDay()).toBe(2);
-});
-
-// ──────────────────────────────────────────────────
-// Phase 2: extendCell — collision detection + split
-// ──────────────────────────────────────────────────
-
-test('extendCell splits the extension when another row blocks the path (Scenario #5)', async ({
-    page,
-    ctx,
-}) => {
-    // Setup:
-    //   - project A on Monday 09:00–10:00 (1h)
-    //   - project B on Monday 10:30–11:30 (1h, blocker)
-    // Bumping A's Monday cell from 1h to 3h (+2h) should:
-    //   - extend A to 09:00–10:30 (filling the 30min gap)
-    //   - place a new A entry at 11:30–13:00 (the remaining 90min)
-    const monday = getCurrentWeekMonday();
-    const projectA = await createProjectViaApi(ctx, { name: 'OverlapExtend' });
-    const projectB = await createProjectViaApi(ctx, { name: 'OverlapBlocker' });
-
-    await createTimeEntryAtHourViaApi(ctx, {
-        date: monday,
-        startHour: 9,
-        durationSeconds: HOUR,
-        projectId: projectA.id,
-    });
-    await createTimeEntryAtHourViaApi(ctx, {
-        date: monday,
-        startHour: 10,
-        startMinute: 30,
-        durationSeconds: HOUR,
-        projectId: projectB.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-    await expect(page.locator('[data-testid="timesheet_row"]')).toHaveCount(2);
-
-    const input = cellInputByProject(page, 'OverlapExtend', 0);
-    await input.click();
-    await input.fill('3');
-    await Promise.all([
-        page.waitForResponse(
-            (resp) =>
-                resp.url().includes('/time-entries') &&
-                resp.request().method() === 'PUT' &&
-                resp.status() === 200
-        ),
-        page.waitForResponse(
-            (resp) =>
-                resp.url().includes('/time-entries') &&
-                resp.request().method() === 'POST' &&
-                resp.status() === 201
-        ),
-        input.press('Enter'),
-    ]);
-
-    const entries = await getTimeEntriesViaApi(ctx);
-    const aEntries = entries.filter((e) => e.project_id === projectA.id);
-    const bEntries = entries.filter((e) => e.project_id === projectB.id);
-
-    // The blocker is unchanged.
-    expect(bEntries).toHaveLength(1);
-    expect(utcHourOf(bEntries[0]!.start)).toBe(10);
-    expect(utcMinuteOf(bEntries[0]!.start)).toBe(30);
-
-    // Project A should now have 2 entries.
-    expect(aEntries).toHaveLength(2);
-    const sortedA = sortByStart(aEntries);
-    // Extended entry: 09:00 → 10:30
-    expect(utcHourOf(sortedA[0]!.start)).toBe(9);
-    expect(utcHourOf(sortedA[0]!.end!)).toBe(10);
-    expect(utcMinuteOf(sortedA[0]!.end!)).toBe(30);
-    // Split remainder: 11:30 → 13:00
-    expect(utcHourOf(sortedA[1]!.start)).toBe(11);
-    expect(utcMinuteOf(sortedA[1]!.start)).toBe(30);
-
-    // No overlaps anywhere on the day.
-    expectNoOverlaps(entries);
-});
-
-test('extendCell prefers latest-end (not latest-start) when nested entries exist (Scenario #6)', async ({
-    page,
-    ctx,
-}) => {
-    // Pre-existing nested overlap on the same project:
-    //   - outer: 09:00 → 12:00 (3h)
-    //   - inner: 10:00 → 11:00 (1h, contained inside outer)
-    // The cell total is 3h + 1h = 4h. Bumping to 5h (+1h) should grow
-    // the OUTER entry's end to 13:00, not the inner.
-    const monday = getCurrentWeekMonday();
-    const project = await createProjectViaApi(ctx, { name: 'OverlapNested' });
-
-    await createTimeEntryAtHourViaApi(ctx, {
-        date: monday,
-        startHour: 9,
-        durationSeconds: 3 * HOUR,
-        projectId: project.id,
-        description: 'outer',
-    });
-    await createTimeEntryAtHourViaApi(ctx, {
-        date: monday,
-        startHour: 10,
-        durationSeconds: HOUR,
-        projectId: project.id,
-        description: 'inner',
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-    await expect(page.locator('[data-testid="timesheet_row"]')).toHaveCount(1);
-
-    const input = cellInputByProject(page, 'OverlapNested', 0);
-    await input.click();
-    await input.fill('5');
-
-    await Promise.all([
-        page.waitForResponse(
-            (resp) =>
-                resp.url().includes('/time-entries') &&
-                resp.request().method() === 'PUT' &&
-                resp.status() === 200
-        ),
-        input.press('Enter'),
-    ]);
-
-    const entries = await getTimeEntriesViaApi(ctx);
-    const outer = entries.find((e) => e.description === 'outer')!;
-    const inner = entries.find((e) => e.description === 'inner')!;
-
-    expect(utcHourOf(outer.start)).toBe(9);
-    expect(utcHourOf(outer.end!)).toBe(13); // extended from 12:00 → 13:00
-    expect(utcHourOf(inner.start)).toBe(10);
-    expect(utcHourOf(inner.end!)).toBe(11); // unchanged
-});
-
-// ──────────────────────────────────────────────────
-// Phase 1+2 spillover from previous day
-// ──────────────────────────────────────────────────
-
-test('createCell handles intra-week spillover from previous day (Scenario #2)', async ({
-    page,
-    ctx,
-}) => {
-    // Setup: an entry that starts on Monday 22:00 and ends Tuesday 03:00
-    // (5h, crosses midnight INTO Tuesday). This spillover starts inside
-    // the loaded week, so the timesheet query loads it.
-    //
-    // Then we try to place 1h on Tuesday for a different project. The
-    // expected behavior: the new entry must NOT overlap the spillover.
-    // Tuesday 09:00 is well clear of the [00:00, 03:00) spillover, so
-    // 09:00 is the correct placement.
-    const monday = getCurrentWeekMonday();
-    const tuesday = new Date(monday);
-    tuesday.setUTCDate(monday.getUTCDate() + 1);
-    const wednesday = new Date(monday);
-    wednesday.setUTCDate(monday.getUTCDate() + 2);
-
-    const projectSpill = await createProjectViaApi(ctx, { name: 'OverlapSpill' });
-    const projectNew = await createProjectViaApi(ctx, { name: 'OverlapToday' });
-
-    // Monday 22:00 → Tuesday 03:00 (5h spillover into Tuesday).
-    await createTimeEntryAtHourViaApi(ctx, {
-        date: monday,
-        startHour: 22,
-        durationSeconds: 5 * HOUR,
-        projectId: projectSpill.id,
-    });
-    // Stub Wednesday entry on the new project so its row is visible
-    // even before we type anything in Tuesday's cell.
-    await createTimeEntryAtHourViaApi(ctx, {
-        date: wednesday,
-        startHour: 9,
-        durationSeconds: HOUR,
-        projectId: projectNew.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-    await expect(page.locator('[data-testid="timesheet_row"]')).toHaveCount(2);
-
-    // Type 1h into the new project's Tuesday cell (day index 1).
-    const input = cellInputByProject(page, 'OverlapToday', 1);
-    await input.click();
-    await input.fill('1');
-
-    await Promise.all([
-        page.waitForResponse(
-            (resp) =>
-                resp.url().includes('/time-entries') &&
-                resp.request().method() === 'POST' &&
-                resp.status() === 201
-        ),
-        input.press('Enter'),
-    ]);
-
-    const entries = await getTimeEntriesViaApi(ctx);
-    const newTuesdayEntry = entries.find(
-        (e) =>
-            e.project_id === projectNew.id &&
-            new Date(e.start).getTime() >= tuesday.getTime() &&
-            new Date(e.start).getTime() < wednesday.getTime()
-    )!;
-    expect(newTuesdayEntry).toBeDefined();
-    // 09:00 is well past the spillover end (03:00) → should land at 09:00.
-    expect(utcHourOf(newTuesdayEntry.start)).toBe(9);
-    expectNoOverlaps(entries);
-});

e2e/timesheet.spec.ts

@@ -1,641 +0,0 @@
-import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
-import { test } from '../playwright/fixtures';
-import { expect } from '@playwright/test';
-import type { Page } from '@playwright/test';
-import { createProjectViaApi, createTaskViaApi, createTimeEntryOnDateViaApi } from './utils/api';
-
-// ──────────────────────────────────────────────────
-// Helpers
-// ──────────────────────────────────────────────────
-
-async function goToTimesheet(page: Page) {
-    await page.addInitScript(() => {
-        window.localStorage.setItem('showReleaseInfo-desktop', 'false');
-    });
-    await page.goto(PLAYWRIGHT_BASE_URL + '/timesheet');
-}
-
-function getMonday(d: Date): Date {
-    const date = new Date(d);
-    const day = date.getUTCDay();
-    const diff = date.getUTCDate() - day + (day === 0 ? -6 : 1);
-    date.setUTCDate(diff);
-    date.setUTCHours(0, 0, 0, 0);
-    return date;
-}
-
-function getCurrentWeekMonday(): Date {
-    return getMonday(new Date());
-}
-
-function getLastWeekMonday(): Date {
-    const monday = getCurrentWeekMonday();
-    monday.setUTCDate(monday.getUTCDate() - 7);
-    return monday;
-}
-
-function getDayOfWeek(weekStart: Date, dayOffset: number): Date {
-    const date = new Date(weekStart);
-    date.setUTCDate(date.getUTCDate() + dayOffset);
-    return date;
-}
-
-async function waitForTimesheetLoad(page: Page) {
-    await page.waitForURL(/\/timesheet(?:$|\?)/);
-    await expect(page.getByTestId('timesheet_view')).toBeVisible();
-    await expect(page.getByTestId('timesheet_week_display')).toBeVisible();
-
-    const timezoneMismatchModal = page
-        .getByRole('dialog')
-        .filter({ hasText: 'Timezone mismatch detected' });
-    if (await timezoneMismatchModal.isVisible().catch(() => false)) {
-        await timezoneMismatchModal.getByRole('button', { name: 'Cancel' }).click();
-        await expect(timezoneMismatchModal).not.toBeVisible();
-    }
-}
-
-function addRowButton(page: Page) {
-    return page.getByRole('button', { name: /Add row/i }).first();
-}
-
-async function chooseRowIdentity(page: Page, optionName: string) {
-    await addRowButton(page).click();
-
-    const dialog = page.getByRole('dialog', { name: /Add row/i });
-    const dialogVisible = await dialog
-        .waitFor({ state: 'visible', timeout: 1000 })
-        .then(() => true)
-        .catch(() => false);
-
-    if (dialogVisible) {
-        await dialog.getByRole('option', { name: optionName }).click();
-        return;
-    }
-
-    if (optionName === 'No Project') return;
-
-    const row = page.locator('[data-testid="timesheet_row"]').first();
-    await row.getByText('No Project').click();
-    await page.getByText(optionName).click();
-}
-
-// ──────────────────────────────────────────────────
-// Navigation & Page Load
-// ──────────────────────────────────────────────────
-
-test('timesheet renders empty with add row + copy last week actions', async ({ page }) => {
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    await expect(page.locator('[data-testid="timesheet_row"]')).toHaveCount(0);
-    await expect(addRowButton(page)).toBeVisible();
-    await expect(page.getByRole('button', { name: /Copy last week/i })).toBeVisible();
-});
-
-// ──────────────────────────────────────────────────
-// Display Existing Time Entries
-// ──────────────────────────────────────────────────
-
-test('timesheet displays existing time entries grouped by project', async ({ page, ctx }) => {
-    const monday = getCurrentWeekMonday();
-    const tuesday = getDayOfWeek(monday, 1);
-    const wednesday = getDayOfWeek(monday, 2);
-
-    const projectA = await createProjectViaApi(ctx, { name: 'Project Alpha' });
-    const projectB = await createProjectViaApi(ctx, { name: 'Project Beta' });
-
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: monday,
-        duration: '2h',
-        projectId: projectA.id,
-    });
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: wednesday,
-        duration: '1h',
-        projectId: projectA.id,
-    });
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: tuesday,
-        duration: '3h',
-        projectId: projectB.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    const rows = page.locator('[data-testid="timesheet_row"]');
-    await expect(rows).toHaveCount(2);
-
-    // Check that the grand total is shown
-    await expect(page.getByTestId('timesheet_grand_total')).toBeVisible();
-});
-
-test('timesheet groups entries by project and task combination', async ({ page, ctx }) => {
-    const monday = getCurrentWeekMonday();
-
-    const project = await createProjectViaApi(ctx, { name: 'Task Project' });
-    const taskA = await createTaskViaApi(ctx, { name: 'Task A', project_id: project.id });
-    const taskB = await createTaskViaApi(ctx, { name: 'Task B', project_id: project.id });
-
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: monday,
-        duration: '1h',
-        projectId: project.id,
-        taskId: taskA.id,
-    });
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: monday,
-        duration: '2h',
-        projectId: project.id,
-        taskId: taskB.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    const rows = page.locator('[data-testid="timesheet_row"]');
-    await expect(rows).toHaveCount(2);
-});
-
-// ──────────────────────────────────────────────────
-// Enter Duration in Cell
-// ──────────────────────────────────────────────────
-
-test('entering duration in empty cell creates a time entry', async ({ page, ctx }) => {
-    await createProjectViaApi(ctx, { name: 'Duration Test' });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    await chooseRowIdentity(page, 'Duration Test');
-
-    const row = page.locator('[data-testid="timesheet_row"]').first();
-
-    // Click the first day cell and enter duration
-    const cells = row.locator('[data-testid="timesheet_cell"]');
-    const mondayCell = cells.first();
-    const mondayInput = mondayCell.locator('input');
-
-    await mondayInput.click();
-    await mondayInput.fill('2');
-
-    // Submit and wait for create response
-    const [response] = await Promise.all([
-        page.waitForResponse(
-            (resp) =>
-                resp.url().includes('/time-entries') &&
-                resp.request().method() === 'POST' &&
-                resp.status() === 201
-        ),
-        mondayInput.press('Enter'),
-    ]);
-
-    expect(response.status()).toBe(201);
-
-    // Verify the cell shows the duration
-    await expect(mondayInput).not.toHaveValue('');
-});
-
-// ──────────────────────────────────────────────────
-// Edit Duration (Increase)
-// ──────────────────────────────────────────────────
-
-test('increasing duration in cell extends the last time entry', async ({ page, ctx }) => {
-    const monday = getCurrentWeekMonday();
-    const project = await createProjectViaApi(ctx, { name: 'Increase Test' });
-
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: monday,
-        duration: '1h',
-        projectId: project.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    const row = page.locator('[data-testid="timesheet_row"]').first();
-    const cells = row.locator('[data-testid="timesheet_cell"]');
-    const mondayInput = cells.first().locator('input');
-
-    // Click and change to 3 hours
-    await mondayInput.click();
-    await mondayInput.fill('3');
-
-    const [response] = await Promise.all([
-        page.waitForResponse(
-            (resp) =>
-                resp.url().includes('/time-entries') &&
-                resp.request().method() === 'PUT' &&
-                resp.status() === 200
-        ),
-        mondayInput.press('Enter'),
-    ]);
-
-    expect(response.status()).toBe(200);
-});
-
-// ──────────────────────────────────────────────────
-// Edit Duration (Decrease)
-// ──────────────────────────────────────────────────
-
-test('decreasing duration in cell shortens the last time entry', async ({ page, ctx }) => {
-    const monday = getCurrentWeekMonday();
-    const project = await createProjectViaApi(ctx, { name: 'Decrease Test' });
-
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: monday,
-        duration: '3h',
-        projectId: project.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    const row = page.locator('[data-testid="timesheet_row"]').first();
-    const cells = row.locator('[data-testid="timesheet_cell"]');
-    const mondayInput = cells.first().locator('input');
-
-    await mondayInput.click();
-    await mondayInput.fill('1');
-
-    const [response] = await Promise.all([
-        page.waitForResponse(
-            (resp) =>
-                resp.url().includes('/time-entries') &&
-                resp.request().method() === 'PUT' &&
-                resp.status() === 200
-        ),
-        mondayInput.press('Enter'),
-    ]);
-
-    expect(response.status()).toBe(200);
-});
-
-// ──────────────────────────────────────────────────
-// Clear Cell
-// ──────────────────────────────────────────────────
-
-test('clearing a cell deletes all time entries for that project+day', async ({ page, ctx }) => {
-    const monday = getCurrentWeekMonday();
-    const project = await createProjectViaApi(ctx, { name: 'Clear Test' });
-
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: monday,
-        duration: '2h',
-        projectId: project.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    const row = page.locator('[data-testid="timesheet_row"]').first();
-    const cells = row.locator('[data-testid="timesheet_cell"]');
-    const mondayInput = cells.first().locator('input');
-
-    await mondayInput.click();
-    await mondayInput.fill('0');
-
-    const [response] = await Promise.all([
-        page.waitForResponse(
-            (resp) =>
-                resp.url().includes('/time-entries') &&
-                resp.request().method() === 'DELETE' &&
-                resp.status() === 200
-        ),
-        mondayInput.press('Enter'),
-    ]);
-
-    expect(response.status()).toBe(200);
-});
-
-test('Escape during cell edit reverts the displayed value without an API call', async ({
-    page,
-    ctx,
-}) => {
-    const monday = getCurrentWeekMonday();
-    const project = await createProjectViaApi(ctx, { name: 'Escape Cancel Test' });
-
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: monday,
-        duration: '2h',
-        projectId: project.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    const row = page.locator('[data-testid="timesheet_row"]').first();
-    const cells = row.locator('[data-testid="timesheet_cell"]');
-    const mondayInput = cells.first().locator('input');
-
-    // Capture the formatted display value before editing.
-    const originalValue = await mondayInput.inputValue();
-    expect(originalValue).toMatch(/2/);
-
-    let mutationFired = false;
-    page.on('request', (req) => {
-        if (req.url().includes('/time-entries') && req.method() !== 'GET') {
-            mutationFired = true;
-        }
-    });
-
-    await mondayInput.click();
-    await mondayInput.fill('5');
-    await mondayInput.press('Escape');
-
-    // The Escape handler reverts the displayed value synchronously, so
-    // once this assertion passes we know the handler ran. Any mutation
-    // request would have been queued by then.
-    await expect(mondayInput).toHaveValue(originalValue);
-    expect(mutationFired).toBe(false);
-});
-
-// ──────────────────────────────────────────────────
-// Week Navigation
-// ──────────────────────────────────────────────────
-
-test('navigating to previous week shows entries from that week', async ({ page, ctx }) => {
-    const lastMonday = getLastWeekMonday();
-    const project = await createProjectViaApi(ctx, { name: 'Last Week Project' });
-
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: lastMonday,
-        duration: '2h',
-        projectId: project.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    // Current week should have no entries
-    await expect(page.locator('[data-testid="timesheet_row"]')).toHaveCount(0);
-
-    // Go to previous week — the row-count assertion below auto-retries
-    // until the new week's data arrives.
-    await page.getByTestId('timesheet_prev_week').click();
-
-    // Should now see the entry
-    const rows = page.locator('[data-testid="timesheet_row"]');
-    await expect(rows).toHaveCount(1);
-});
-
-test('can navigate forward and return to current week', async ({ page }) => {
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    // Should show "This week"
-    await expect(page.getByTestId('timesheet_week_display')).toContainText('This week');
-
-    // Go to next week — the text assertions below auto-retry until the
-    // header label flips.
-    await page.getByTestId('timesheet_next_week').click();
-
-    // Should no longer show "This week"
-    await expect(page.getByTestId('timesheet_week_display')).not.toContainText('This week');
-
-    // Go back to this week
-    await page.getByTestId('timesheet_week_display').click();
-
-    await expect(page.getByTestId('timesheet_week_display')).toContainText('This week');
-});
-
-// ──────────────────────────────────────────────────
-// Copy Last Week
-// ──────────────────────────────────────────────────
-
-test('copy last week adds project rows from previous week without hours', async ({ page, ctx }) => {
-    const lastMonday = getLastWeekMonday();
-    const lastWednesday = getDayOfWeek(lastMonday, 2);
-
-    const projectA = await createProjectViaApi(ctx, { name: 'Copy Project A' });
-    const projectB = await createProjectViaApi(ctx, { name: 'Copy Project B' });
-
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: lastMonday,
-        duration: '2h',
-        projectId: projectA.id,
-    });
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: lastWednesday,
-        duration: '3h',
-        projectId: projectB.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    // Current week should have no populated rows yet.
-    await expect(page.locator('[data-testid="timesheet_row"]')).toHaveCount(0);
-
-    // Open copy last week dropdown and click "Copy rows only"
-    await page.getByRole('button', { name: /Copy last week/i }).click();
-    await page.getByText('Copy rows only').click();
-
-    // Should now show 2 rows (one per project)
-    const rows = page.locator('[data-testid="timesheet_row"]');
-    await expect(rows).toHaveCount(2);
-
-    // All row totals should be 0
-    const rowTotals = page.locator('[data-testid="timesheet_row_total"]');
-    const count = await rowTotals.count();
-    for (let i = 0; i < count; i++) {
-        await expect(rowTotals.nth(i)).toContainText('-');
-    }
-});
-
-test('copy last week does not duplicate rows that already exist', async ({ page, ctx }) => {
-    const lastMonday = getLastWeekMonday();
-    const thisMonday = getCurrentWeekMonday();
-    const thisTuesday = getDayOfWeek(thisMonday, 1);
-
-    const project = await createProjectViaApi(ctx, { name: 'No Dup Project' });
-
-    // Create entry for last week
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: lastMonday,
-        duration: '2h',
-        projectId: project.id,
-    });
-
-    // Create entry for current week
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: thisTuesday,
-        duration: '1h',
-        projectId: project.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    // Should have 1 row (from current week entry)
-    const rows = page.locator('[data-testid="timesheet_row"]');
-    await expect(rows).toHaveCount(1);
-
-    // Open copy last week dropdown and click "Copy rows only"
-    await page.getByRole('button', { name: /Copy last week/i }).click();
-    await page.getByText('Copy rows only').click();
-
-    // Should still have only 1 row (not duplicated)
-    await expect(rows).toHaveCount(1);
-});
-
-test('copy last week with time entries creates rows and entries', async ({ page, ctx }) => {
-    const lastMonday = getLastWeekMonday();
-
-    const project = await createProjectViaApi(ctx, { name: 'Copy Time Project' });
-
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: lastMonday,
-        duration: '2h',
-        projectId: project.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    // Current week should have no populated rows yet.
-    await expect(page.locator('[data-testid="timesheet_row"]')).toHaveCount(0);
-
-    // Open copy last week dropdown and click "Copy rows and time entries"
-    await page.getByRole('button', { name: /Copy last week/i }).click();
-
-    await Promise.all([
-        page.waitForResponse(
-            (resp) =>
-                resp.url().includes('/time-entries') &&
-                resp.request().method() === 'POST' &&
-                resp.status() === 201
-        ),
-        page.getByText('Copy rows and time entries').click(),
-    ]);
-
-    // Should now show 1 row with time entries
-    const rows = page.locator('[data-testid="timesheet_row"]');
-    await expect(rows).toHaveCount(1);
-
-    // Row total should not be 0 (entries were copied)
-    const rowTotal = page.locator('[data-testid="timesheet_row_total"]').first();
-    await expect(rowTotal).not.toContainText('0 h');
-});
-
-// ──────────────────────────────────────────────────
-// Row Removal
-// ──────────────────────────────────────────────────
-
-test('can remove an empty project row without confirmation', async ({ page, ctx }) => {
-    const project = await createProjectViaApi(ctx, { name: 'Empty Remove Project' });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    await chooseRowIdentity(page, project.name);
-
-    const rows = page.locator('[data-testid="timesheet_row"]');
-    await expect(rows).toHaveCount(1);
-
-    // Hover the row to reveal the X button, then click it
-    await rows.first().hover();
-    await rows.first().getByRole('button', { name: 'Remove row' }).click();
-
-    // Row should be removed immediately (no dialog)
-    await expect(rows).toHaveCount(0);
-});
-
-test('removing a row with entries shows confirmation dialog and deletes entries', async ({
-    page,
-    ctx,
-}) => {
-    const monday = getCurrentWeekMonday();
-    const project = await createProjectViaApi(ctx, { name: 'Delete Row Project' });
-
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: monday,
-        duration: '2h',
-        projectId: project.id,
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    const rows = page.locator('[data-testid="timesheet_row"]');
-    await expect(rows).toHaveCount(1);
-
-    // Hover and click X
-    await rows.first().hover();
-    await rows.first().getByRole('button', { name: 'Remove row' }).click();
-
-    // Confirmation dialog should appear
-    await expect(page.getByRole('alertdialog')).toBeVisible();
-    await expect(page.getByText('Remove timesheet row?')).toBeVisible();
-
-    // Click Delete
-    await Promise.all([
-        page.waitForResponse(
-            (resp) =>
-                resp.url().includes('/time-entries') &&
-                resp.request().method() === 'DELETE' &&
-                resp.status() === 200
-        ),
-        page
-            .getByRole('alertdialog')
-            .getByRole('button', { name: /Delete/i })
-            .click(),
-    ]);
-
-    // Row should be gone
-    await expect(rows).toHaveCount(0);
-});
-
-// ──────────────────────────────────────────────────
-// Multiple Entries Same Cell
-// ──────────────────────────────────────────────────
-
-test('cell correctly sums multiple entries for same project+day', async ({ page, ctx }) => {
-    const monday = getCurrentWeekMonday();
-    const project = await createProjectViaApi(ctx, { name: 'Sum Test' });
-
-    // Create 2 entries for the same project on Monday
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: monday,
-        duration: '1h',
-        projectId: project.id,
-        description: 'Entry 1',
-    });
-    await createTimeEntryOnDateViaApi(ctx, {
-        date: monday,
-        duration: '2h',
-        projectId: project.id,
-        description: 'Entry 2',
-    });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    // Should be 1 row (both entries grouped)
-    const rows = page.locator('[data-testid="timesheet_row"]');
-    await expect(rows).toHaveCount(1);
-
-    // The Monday cell should show 3h total
-    const cells = rows.first().locator('[data-testid="timesheet_cell"]');
-    const mondayInput = cells.first().locator('input');
-    // The value should contain "3" (for 3h in some format)
-    await expect(mondayInput).toHaveValue(/3/);
-});
-
-// ──────────────────────────────────────────────────
-// Duration Input Formats
-// ──────────────────────────────────────────────────
-
-test('cell accepts various duration input formats', async ({ page, ctx }) => {
-    await createProjectViaApi(ctx, { name: 'Format Test' });
-
-    await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
-
-    await chooseRowIdentity(page, 'Format Test');
-
-    const row = page.locator('[data-testid="timesheet_row"]').first();
-
-    // Test entering "1.5" (should be 1h 30min)
-    const cells = row.locator('[data-testid="timesheet_cell"]');
-    const mondayInput = cells.first().locator('input');
-
-    await mondayInput.click();
-    await mondayInput.fill('1.5');
-
-    await Promise.all([
-        page.waitForResponse(
-            (resp) =>
-                resp.url().includes('/time-entries') &&
-                resp.request().method() === 'POST' &&
-                resp.status() === 201
-        ),
-        mondayInput.press('Enter'),
-    ]);
-
-    // 1.5 hours = 1h 30min
-    await expect(mondayInput).toHaveValue('1h 30min');
-});

e2e/utils/api.ts

@@ -170,24 +170,10 @@ function parseDurationToSeconds(duration: string): number {
     return totalSeconds;
 }
 
-/**
- * Builds a start/end pair anchored to 09:00 UTC on today's UTC date.
- *
- * Intentionally pinned to UTC (rather than the runner's local time) so
- * the produced timestamps are identical regardless of where the suite
- * runs. Playwright test users default to UTC, so this matches what the
- * app will see and keeps day-of-week / "this week" assertions stable
- * for developers running the suite locally in non-UTC timezones.
- */
 function createTimestamps(duration: string): { start: string; end: string } {
     const durationSeconds = parseDurationToSeconds(duration);
     const now = new Date();
-    const start = createUtcTimestampFromDateParts(
-        now.getUTCFullYear(),
-        now.getUTCMonth(),
-        now.getUTCDate(),
-        9
-    );
+    const start = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 9, 0, 0);
     const end = new Date(start.getTime() + durationSeconds * 1000);
 
     return {
@@ -200,32 +186,6 @@ function formatTimestamp(date: Date): string {
     return date.toISOString().replace(/\.\d{3}Z$/, 'Z');
 }
 
-function createUtcTimestampFromDateParts(
-    year: number,
-    month: number,
-    date: number,
-    hours: number,
-    minutes: number = 0,
-    seconds: number = 0
-): Date {
-    return new Date(Date.UTC(year, month, date, hours, minutes, seconds));
-}
-
-function createTimestampsOnDate(date: Date, duration: string): { start: string; end: string } {
-    const durationSeconds = parseDurationToSeconds(duration);
-    const start = createUtcTimestampFromDateParts(
-        date.getUTCFullYear(),
-        date.getUTCMonth(),
-        date.getUTCDate(),
-        9
-    );
-    const end = new Date(start.getTime() + durationSeconds * 1000);
-    return {
-        start: formatTimestamp(start),
-        end: formatTimestamp(end),
-    };
-}
-
 function randomColor(): string {
     const colors = [
         '#ef5350',
@@ -415,39 +375,6 @@ export async function createTimeEntryViaApi(
     return body.data as { id: string; start: string; end: string; description: string };
 }
 
-export async function createTimeEntryOnDateViaApi(
-    ctx: TestContext,
-    data: {
-        date: Date;
-        duration: string;
-        description?: string;
-        projectId?: string | null;
-        taskId?: string | null;
-        tags?: string[];
-        billable?: boolean;
-    }
-) {
-    const { start, end } = createTimestampsOnDate(data.date, data.duration);
-    const response = await ctx.request.post(
-        `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}/time-entries`,
-        {
-            data: {
-                member_id: ctx.memberId,
-                start,
-                end,
-                description: data.description ?? '',
-                project_id: data.projectId ?? null,
-                task_id: data.taskId ?? null,
-                tags: data.tags ?? [],
-                billable: data.billable ?? false,
-            },
-        }
-    );
-    expect(response.status()).toBe(201);
-    const body = await response.json();
-    return body.data as { id: string; start: string; end: string; description: string };
-}
-
 export async function createProjectMemberViaApi(
     ctx: TestContext,
     projectId: string,
@@ -686,72 +613,6 @@ export async function getInvitationsViaApi(ctx: TestContext) {
 // Timestamp-based time entry helpers
 // ──────────────────────────────────────────────────
 
-/**
- * Creates a time entry on `date` at a specific UTC hour with a duration
- * in seconds. Playwright test users default to the UTC timezone, so this
- * keeps time-placement scenarios stable across runner locales.
- */
-export async function createTimeEntryAtHourViaApi(
-    ctx: TestContext,
-    data: {
-        date: Date;
-        startHour: number;
-        startMinute?: number;
-        durationSeconds: number;
-        projectId?: string | null;
-        taskId?: string | null;
-        description?: string;
-    }
-) {
-    const start = createUtcTimestampFromDateParts(
-        data.date.getUTCFullYear(),
-        data.date.getUTCMonth(),
-        data.date.getUTCDate(),
-        data.startHour,
-        data.startMinute ?? 0
-    );
-    const end = new Date(start.getTime() + data.durationSeconds * 1000);
-    return createTimeEntryWithTimestampsViaApi(ctx, {
-        start: formatTimestamp(start),
-        end: formatTimestamp(end),
-        projectId: data.projectId ?? null,
-        taskId: data.taskId ?? null,
-        description: data.description ?? '',
-    });
-}
-
-/**
- * Reads time entries for the current member, optionally filtered to a
- * date range. Returns the raw API objects (id, start, end, project_id,
- * etc.) so tests can assert on the database state after a UI action.
- */
-export async function getTimeEntriesViaApi(
-    ctx: TestContext,
-    filters: { start?: string; end?: string } = {}
-): Promise<
-    Array<{
-        id: string;
-        start: string;
-        end: string | null;
-        duration: number | null;
-        project_id: string | null;
-        task_id: string | null;
-        description: string;
-    }>
-> {
-    const params = new URLSearchParams();
-    params.set('member_id', ctx.memberId);
-    if (filters.start) params.set('start', filters.start);
-    if (filters.end) params.set('end', filters.end);
-
-    const response = await ctx.request.get(
-        `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}/time-entries?${params.toString()}`
-    );
-    expect(response.status()).toBe(200);
-    const body = await response.json();
-    return body.data;
-}
-
 export async function createTimeEntryWithTimestampsViaApi(
     ctx: TestContext,
     data: {

package.json

@@ -12,17 +12,10 @@
         "lint": "eslint resources/js",
         "lint:fix": "eslint --fix resources/js",
         "type-check": "vue-tsc --noEmit",
-        "test:unit": "vitest run",
-        "test:unit:watch": "vitest",
         "test:e2e": "rm -rf test-results/.auth && npx playwright test",
         "zod:generate": "npx openapi-zod-client http://localhost:80/docs/api.json --output resources/js/packages/api/src/openapi.json.client.ts --base-url /api",
         "format": "prettier --write './**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts,vue}'",
-        "format:check": "prettier --check './**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts,vue}'",
-        "build:ui": "npm run build --workspace=@solidtime/ui",
-        "build:api": "npm run build --workspace=@solidtime/api",
-        "build:packages": "npm run build:api && npm run build:ui",
-        "watch:ui": "npm run watch --workspace=@solidtime/ui",
-        "watch:api": "npm run watch --workspace=@solidtime/api"
+        "format:check": "prettier --check './**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts,vue}'"
     },
     "devDependencies": {
         "@eslint/eslintrc": "^3.3.5",
@@ -34,12 +27,10 @@
         "@types/chroma-js": "^3.1.2",
         "@types/node": "^22.19.19",
         "@vitejs/plugin-vue": "^6.0.6",
-        "@vue/test-utils": "^2.4.6",
         "@vue/tsconfig": "^0.8.1",
         "autoprefixer": "^10.5.0",
         "axios": "^1.16.0",
         "eslint-plugin-unused-imports": "^4.4.1",
-        "happy-dom": "^20.8.9",
         "laravel-vite-plugin": "^2.1.0",
         "openapi-zod-client": "^1.18.3",
         "postcss": "^8.5.14",
@@ -49,7 +40,6 @@
         "typescript": "^5.9.3",
         "vite": "^7.3.3",
         "vite-plugin-checker": "^0.12.0",
-        "vitest": "^4.1.4",
         "vue": "^3.5.34",
         "vue-tsc": "^3.2.8"
     },

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

@@ -19,7 +19,6 @@ import { Field, FieldGroup, FieldLabel } from '@/packages/ui/src/field';
 import ProjectBillableRateModal from '@/packages/ui/src/Project/ProjectBillableRateModal.vue';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import ProjectEditBillableSection from '@/packages/ui/src/Project/ProjectEditBillableSection.vue';
-import ProjectVisibilitySelect from '@/packages/ui/src/Project/ProjectVisibilitySelect.vue';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
 import { getCurrentOrganizationId } from '@/utils/useUser';
@@ -45,7 +44,6 @@ const project = ref<CreateProjectBody>({
     billable_rate: props.originalProject.billable_rate,
     is_billable: props.originalProject.is_billable,
     estimated_time: props.originalProject.estimated_time,
-    is_public: props.originalProject.is_public,
 });
 
 async function submit() {
@@ -128,7 +126,6 @@ async function submitBillableRate() {
                     v-if="isAllowedToPerformPremiumAction()"
                     v-model="project.estimated_time"
                     @submit="submit()"></EstimatedTimeSection>
-                <ProjectVisibilitySelect v-model="project.is_public"></ProjectVisibilitySelect>
             </FieldGroup>
         </template>
         <template #footer>

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

@@ -13,8 +13,7 @@ export type SortColumn =
     | 'spent_time'
     | 'progress'
     | 'billable_rate'
-    | 'status'
-    | 'visibility';
+    | 'status';
 export type SortDirection = 'asc' | 'desc';
 import { canCreateProjects } from '@/utils/permissions';
 import type { CreateProjectBody, Project, Client, CreateClientBody } from '@/packages/api/src';
@@ -103,10 +102,6 @@ const columns = computed(() => [
         id: 'status',
         accessorFn: (row: Project) => (row.is_archived ? 1 : 0),
     },
-    {
-        id: 'visibility',
-        accessorFn: (row: Project) => (row.is_public ? 1 : 0),
-    },
 ]);
 
 // Columns with sortDescFirst get desc as default direction on first click.
@@ -154,7 +149,7 @@ async function createClient(client: CreateClientBody): Promise<Client | undefine
 }
 
 const gridTemplate = computed(() => {
-    return `grid-template-columns: minmax(300px, 1fr) minmax(150px, auto) minmax(140px, auto) minmax(130px, auto) ${props.showBillableRate ? 'minmax(130px, auto)' : ''} minmax(120px, auto) minmax(120px, auto) 80px;`;
+    return `grid-template-columns: minmax(300px, 1fr) minmax(150px, auto) minmax(140px, auto) minmax(130px, auto) ${props.showBillableRate ? 'minmax(130px, auto)' : ''} minmax(120px, auto) 80px;`;
 });
 </script>
 
@@ -176,7 +171,7 @@ const gridTemplate = computed(() => {
                     :sort-direction="props.sortDirection"
                     :desc-first-columns="descFirstColumns"
                     @sort="handleSort"></ProjectTableHeading>
-                <div v-if="sortedProjects.length === 0" class="col-span-full py-24 text-center">
+                <div v-if="sortedProjects.length === 0" class="col-span-5 py-24 text-center">
                     <FolderPlusIcon class="w-8 text-icon-default inline pb-2"></FolderPlusIcon>
                     <h3 class="text-text-primary font-semibold">
                         {{

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

@@ -86,14 +86,6 @@ function isChevronUp(column: SortColumn): boolean {
             <ChevronUpIcon v-else-if="isChevronUp('status')" class="w-4 h-4" />
             <span v-else class="w-4 h-4"></span>
         </div>
-        <div
-            class="px-3 py-1.5 text-left text-text-tertiary cursor-pointer hover:bg-secondary hover:text-text-primary transition-colors select-none flex items-center gap-1"
-            @click="handleSort('visibility')">
-            Visibility
-            <ChevronDownIcon v-if="isChevronDown('visibility')" class="w-4 h-4" />
-            <ChevronUpIcon v-else-if="isChevronUp('visibility')" class="w-4 h-4" />
-            <span v-else class="w-4 h-4"></span>
-        </div>
         <div class="relative py-1.5 pl-3 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
             <span class="sr-only">Edit</span>
         </div>

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

@@ -7,8 +7,6 @@ import {
     PencilSquareIcon,
     ArchiveBoxIcon as ArchiveBoxIconSolid,
     TrashIcon,
-    GlobeAltIcon,
-    LockClosedIcon,
 } from '@heroicons/vue/20/solid';
 import { useClientsQuery } from '@/utils/useClientsQuery';
 import { useTasksQuery } from '@/utils/useTasksQuery';
@@ -143,17 +141,6 @@ const showEditProjectModal = ref(false);
                         <span>Active</span>
                     </template>
                 </div>
-                <div
-                    class="whitespace-nowrap px-3 py-4 text-sm text-text-primary flex space-x-1.5 items-center font-medium">
-                    <template v-if="project.is_public">
-                        <GlobeAltIcon class="w-4 text-icon-default"></GlobeAltIcon>
-                        <span>Public</span>
-                    </template>
-                    <template v-else>
-                        <LockClosedIcon class="w-4 text-icon-default"></LockClosedIcon>
-                        <span>Private</span>
-                    </template>
-                </div>
                 <div
                     class="relative whitespace-nowrap flex items-center pl-3 text-right text-sm font-medium pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
                     <ProjectMoreOptionsDropdown

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

@@ -1,46 +0,0 @@
-<script setup lang="ts">
-import { computed } from 'vue';
-import { GlobeAltIcon } from '@heroicons/vue/16/solid';
-import { DropdownMenuItem } from '@/packages/ui/src';
-import BaseFilterBadge from './BaseFilterBadge.vue';
-
-type VisibilityValue = 'public' | 'private' | 'all';
-
-const props = defineProps<{
-    value: VisibilityValue;
-}>();
-
-const emit = defineEmits<{
-    remove: [];
-    'update:value': [value: VisibilityValue];
-}>();
-
-const visibilityOptions = [
-    { id: 'public' as const, name: 'Public' },
-    { id: 'private' as const, name: 'Private' },
-];
-
-const label = computed(() => {
-    return visibilityOptions.find((opt) => opt.id === props.value)?.name ?? 'Visibility';
-});
-
-function updateVisibility(visibility: VisibilityValue) {
-    emit('update:value', visibility);
-}
-</script>
-
-<template>
-    <BaseFilterBadge
-        :icon="GlobeAltIcon"
-        :label="label"
-        filter-name="Visibility"
-        @remove="emit('remove')">
-        <DropdownMenuItem
-            v-for="option in visibilityOptions"
-            :key="option.id"
-            :class="[value === option.id && 'bg-accent text-accent-foreground']"
-            @click="updateVisibility(option.id)">
-            {{ option.name }}
-        </DropdownMenuItem>
-    </BaseFilterBadge>
-</template>

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

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
-import { UserGroupIcon, CheckCircleIcon, GlobeAltIcon } from '@heroicons/vue/16/solid';
+import { UserGroupIcon, CheckCircleIcon } from '@heroicons/vue/16/solid';
 import ListFilterIcon from '@/packages/ui/src/Icons/ListFilterIcon.vue';
 import {
     DropdownMenu,
@@ -19,7 +19,6 @@ import { NO_CLIENT_ID } from './constants';
 
 export interface ProjectFilters {
     status: 'active' | 'archived' | 'all';
-    visibility: 'public' | 'private' | 'all';
     clientIds: string[];
 }
 
@@ -37,11 +36,6 @@ const statusOptions = [
     { id: 'archived' as const, name: 'Archived' },
 ];
 
-const visibilityOptions = [
-    { id: 'public' as const, name: 'Public' },
-    { id: 'private' as const, name: 'Private' },
-];
-
 const open = ref(false);
 
 function updateStatus(status: 'active' | 'archived' | 'all') {
@@ -52,14 +46,6 @@ function updateStatus(status: 'active' | 'archived' | 'all') {
     open.value = false;
 }
 
-function updateVisibility(visibility: 'public' | 'private' | 'all') {
-    emit('update:filters', {
-        ...props.filters,
-        visibility,
-    });
-    open.value = false;
-}
-
 function toggleClient(clientId: string) {
     const clientIds = props.filters.clientIds.includes(clientId)
         ? props.filters.clientIds.filter((id) => id !== clientId)
@@ -83,11 +69,7 @@ function toggleNoClient() {
 }
 
 const hasActiveFilters = computed(() => {
-    return (
-        props.filters.status !== 'all' ||
-        props.filters.visibility !== 'all' ||
-        props.filters.clientIds.length > 0
-    );
+    return props.filters.status !== 'all' || props.filters.clientIds.length > 0;
 });
 </script>
 
@@ -120,25 +102,6 @@ const hasActiveFilters = computed(() => {
                 </DropdownMenuSubContent>
             </DropdownMenuSub>
 
-            <!-- Visibility Filter -->
-            <DropdownMenuSub>
-                <DropdownMenuSubTrigger class="gap-2">
-                    <GlobeAltIcon class="h-4 w-4 text-icon-default" />
-                    <span>Visibility</span>
-                </DropdownMenuSubTrigger>
-                <DropdownMenuSubContent>
-                    <DropdownMenuItem
-                        v-for="option in visibilityOptions"
-                        :key="option.id"
-                        :class="[
-                            filters.visibility === option.id && 'bg-accent text-accent-foreground',
-                        ]"
-                        @click="updateVisibility(option.id)">
-                        {{ option.name }}
-                    </DropdownMenuItem>
-                </DropdownMenuSubContent>
-            </DropdownMenuSub>
-
             <!-- Client Filter -->
             <DropdownMenuSub v-if="clients.length > 0">
                 <DropdownMenuSubTrigger class="gap-2">

resources/js/Components/OrganizationSwitcher.vue

@@ -20,6 +20,12 @@ import {
 } from '@/packages/ui/src';
 
 const page = usePage<{
+    jetstream: {
+        canCreateTeams: boolean;
+        hasTeamFeatures: boolean;
+        managesProfilePhotos: boolean;
+        hasApiFeatures: boolean;
+    };
     auth: {
         user: User & {
             all_teams: Organization[];
@@ -33,7 +39,7 @@ const switchToTeam = (organization: Organization) => {
 </script>
 
 <template>
-    <DropdownMenu>
+    <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>
@@ -72,7 +78,7 @@ const switchToTeam = (organization: Organization) => {
                     <Link href="/billing" class="inline-flex items-center w-full"> Billing </Link>
                 </DropdownMenuItem>
 
-                <DropdownMenuItem as-child>
+                <DropdownMenuItem v-if="page.props.jetstream.canCreateTeams" as-child>
                     <Link
                         :href="route('teams.create')"
                         class="inline-flex items-center gap-2.5 w-full">

resources/js/Components/Timesheet/RemoveRowDialog.vue

@@ -1,46 +0,0 @@
-<script setup lang="ts">
-import {
-    AlertDialog,
-    AlertDialogAction,
-    AlertDialogCancel,
-    AlertDialogContent,
-    AlertDialogDescription,
-    AlertDialogFooter,
-    AlertDialogHeader,
-    AlertDialogTitle,
-} from '@/Components/ui/alert-dialog';
-
-defineProps<{
-    open: boolean;
-    entryCount: number;
-    projectName: string;
-}>();
-
-defineEmits<{
-    (e: 'update:open', value: boolean): void;
-    (e: 'confirm'): void;
-}>();
-</script>
-
-<template>
-    <AlertDialog :open="open" @update:open="$emit('update:open', $event)">
-        <AlertDialogContent>
-            <AlertDialogHeader>
-                <AlertDialogTitle>Remove timesheet row?</AlertDialogTitle>
-                <AlertDialogDescription>
-                    This will delete {{ entryCount }} time
-                    {{ entryCount === 1 ? 'entry' : 'entries' }}
-                    for "{{ projectName }}". This action cannot be undone.
-                </AlertDialogDescription>
-            </AlertDialogHeader>
-            <AlertDialogFooter>
-                <AlertDialogCancel>Cancel</AlertDialogCancel>
-                <AlertDialogAction
-                    class="bg-destructive text-destructive-foreground hover:bg-destructive/90"
-                    @click="$emit('confirm')">
-                    Delete
-                </AlertDialogAction>
-            </AlertDialogFooter>
-        </AlertDialogContent>
-    </AlertDialog>
-</template>

resources/js/Components/Timesheet/TimesheetCell.test.ts

@@ -1,65 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { mount } from '@vue/test-utils';
-import { nextTick } from 'vue';
-import TimesheetCell from './TimesheetCell.vue';
-import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
-import type { TimesheetCell as TimesheetCellType } from '@/utils/useTimesheetGrid';
-
-function buildCell(totalSeconds: number): TimesheetCellType {
-    return {
-        dayIndex: 0,
-        date: '2026-04-13',
-        entries: [],
-        totalSeconds,
-    };
-}
-
-function mountTimesheetCell(totalSeconds = 2 * 3600) {
-    return mount(TimesheetCell, {
-        props: {
-            cell: buildCell(totalSeconds),
-            dayIndex: 0,
-            date: '2026-04-13',
-            isToday: false,
-            hasRunningEntry: false,
-        },
-    });
-}
-
-describe('TimesheetCell', () => {
-    it('emits 0 when the cleared value is committed on blur', async () => {
-        const wrapper = mountTimesheetCell();
-        const input = wrapper.get('input');
-
-        await input.trigger('focus');
-        await input.setValue('');
-        await input.trigger('blur');
-
-        expect(wrapper.emitted('update')).toEqual([[0]]);
-    });
-
-    it('emits 0 when the cleared value is committed with Enter', async () => {
-        const wrapper = mountTimesheetCell();
-        const input = wrapper.get('input');
-
-        await input.trigger('focus');
-        await input.setValue('');
-        await input.trigger('keydown', { key: 'Enter' });
-
-        expect(wrapper.emitted('update')).toEqual([[0]]);
-    });
-
-    it('restores the previous value and emits nothing on Escape', async () => {
-        const wrapper = mountTimesheetCell();
-        const input = wrapper.get('input');
-        const previousValue = formatHumanReadableDuration(2 * 3600, 'hours-minutes', 'point');
-
-        await input.trigger('focus');
-        await input.setValue('');
-        await input.trigger('keydown', { key: 'Escape' });
-        await nextTick();
-
-        expect(wrapper.emitted('update')).toBeUndefined();
-        expect((input.element as HTMLInputElement).value).toBe(previousValue);
-    });
-});

resources/js/Components/Timesheet/TimesheetCell.vue

@@ -1,63 +0,0 @@
-<script setup lang="ts">
-import DurationSecondsInput from '@/packages/ui/src/Input/DurationSecondsInput.vue';
-import {
-    Tooltip,
-    TooltipContent,
-    TooltipProvider,
-    TooltipTrigger,
-} from '@/packages/ui/src/tooltip';
-import type { TimesheetCell } from '@/utils/useTimesheetGrid';
-
-defineProps<{
-    cell?: TimesheetCell;
-    dayIndex: number;
-    date: string;
-    isToday: boolean;
-    hasRunningEntry: boolean;
-}>();
-
-const emit = defineEmits<{
-    update: [newSeconds: number];
-}>();
-</script>
-
-<template>
-    <div
-        data-testid="timesheet_cell"
-        class="flex items-center justify-center border-t border-default-background-separator"
-        :class="{ 'bg-default-background': isToday }">
-        <TooltipProvider v-if="hasRunningEntry" :delay-duration="100">
-            <Tooltip>
-                <TooltipTrigger as-child>
-                    <span class="inline-block cursor-not-allowed">
-                        <DurationSecondsInput
-                            :model-value="cell?.totalSeconds ?? 0"
-                            disabled
-                            default-unit="hours"
-                            placeholder="-"
-                            size="sm"
-                            input-class="w-[80px] mx-auto text-center font-medium
-                                bg-transparent text-text-primary placeholder:text-text-quaternary
-                                rounded-lg border border-input-border shadow-none
-                                pointer-events-none
-                                disabled:opacity-50 disabled:cursor-not-allowed" />
-                    </span>
-                </TooltipTrigger>
-                <TooltipContent> Stop the running time entry to edit the timesheet </TooltipContent>
-            </Tooltip>
-        </TooltipProvider>
-        <DurationSecondsInput
-            v-else
-            :model-value="cell?.totalSeconds ?? 0"
-            default-unit="hours"
-            placeholder="-"
-            size="sm"
-            input-class="w-[80px] mx-auto text-center font-medium
-                bg-transparent text-text-primary placeholder:text-text-quaternary
-                rounded-lg border border-input-border shadow-none
-                hover:bg-card-background
-                focus-visible:bg-tertiary focus-visible:border-transparent
-                focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none"
-            @commit="(seconds) => emit('update', seconds ?? 0)" />
-    </div>
-</template>

resources/js/Components/Timesheet/TimesheetFooterActions.vue

@@ -1,48 +0,0 @@
-<script setup lang="ts">
-import { Button } from '@/packages/ui/src/Buttons';
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuTrigger,
-} from '@/packages/ui/src/dropdown-menu';
-import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
-import { ChevronDownIcon, ClockIcon, ListBulletIcon } from '@heroicons/vue/20/solid';
-
-defineProps<{
-    busy: boolean;
-}>();
-
-defineEmits<{
-    (e: 'copy-rows'): void;
-    (e: 'copy-with-time'): void;
-}>();
-</script>
-
-<template>
-    <div class="mt-2 flex items-center pl-4 pr-4">
-        <DropdownMenu>
-            <DropdownMenuTrigger as-child>
-                <Button variant="ghost" size="sm" :disabled="busy">
-                    <LoadingSpinner v-if="busy" class="h-3.5 w-3.5 m-0" />
-                    Copy last week
-                    <ChevronDownIcon v-if="!busy" class="h-3.5 w-3.5 ml-1 text-icon-default" />
-                </Button>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent align="start" class="min-w-[220px]">
-                <DropdownMenuItem
-                    class="flex items-center space-x-3 cursor-pointer"
-                    @click="$emit('copy-rows')">
-                    <ListBulletIcon class="w-5 text-icon-default" />
-                    <span>Copy rows only</span>
-                </DropdownMenuItem>
-                <DropdownMenuItem
-                    class="flex items-center space-x-3 cursor-pointer"
-                    @click="$emit('copy-with-time')">
-                    <ClockIcon class="w-5 text-icon-default" />
-                    <span>Copy rows and time entries</span>
-                </DropdownMenuItem>
-            </DropdownMenuContent>
-        </DropdownMenu>
-    </div>
-</template>

resources/js/Components/Timesheet/TimesheetGrid.vue

@@ -1,166 +0,0 @@
-<script setup lang="ts">
-import { inject, type ComputedRef } from 'vue';
-import { Button } from '@/packages/ui/src/Buttons';
-import { PlusIcon } from '@heroicons/vue/20/solid';
-import TimesheetRow from '@/Components/Timesheet/TimesheetRow.vue';
-import TimeTrackerProjectTaskDropdown from '@/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue';
-import { getDayJsInstance } from '@/packages/ui/src/utils/time';
-import type {
-    Client,
-    CreateClientBody,
-    CreateProjectBody,
-    Organization,
-    Project,
-    Tag,
-    Task,
-} from '@/packages/api/src';
-import type { TimesheetRow as TimesheetRowType, TimesheetRowKey } from '@/utils/useTimesheetGrid';
-
-const organization = inject<ComputedRef<Organization>>('organization');
-const dayjs = getDayJsInstance();
-
-defineProps<{
-    rows: TimesheetRowType[];
-    weekDays: string[];
-    todayDate: string;
-    dayTotals: number[];
-    weekTotalFormatted: string;
-    projects: Project[];
-    tasks: Task[];
-    clients: Client[];
-    tags: Tag[];
-    currency: string;
-    canCreateProject: boolean;
-    enableEstimatedTime: boolean;
-    createProject: (project: CreateProjectBody) => Promise<Project | undefined>;
-    createClient: (client: CreateClientBody) => Promise<Client | undefined>;
-    createTag: (name: string) => Promise<Tag | undefined>;
-    formatDuration: (seconds: number) => string;
-}>();
-
-const emit = defineEmits<{
-    (e: 'remove-row', key: TimesheetRowKey): void;
-    (e: 'cell-update', row: TimesheetRowType, dayIndex: number, seconds: number): void;
-    (
-        e: 'project-task-change',
-        row: TimesheetRowType,
-        projectId: string | null,
-        taskId: string | null
-    ): void;
-    (e: 'billable-change', row: TimesheetRowType, billable: boolean): void;
-    (e: 'tags-change', row: TimesheetRowType, tags: string[]): void;
-    (e: 'add-row', projectId: string | null, taskId: string | null): void;
-}>();
-</script>
-
-<template>
-    <div class="flow-root max-w-[100vw] overflow-x-auto">
-        <div class="inline-block min-w-full align-middle">
-            <div
-                class="grid min-w-full w-max border-y border-default-background-separator"
-                style="
-                    grid-template-columns:
-                        minmax(420px, 1fr) repeat(7, minmax(96px, 120px)) minmax(100px, auto)
-                        40px;
-                ">
-                <!-- Header row -->
-                <div
-                    class="bg-background dark:bg-secondary pl-7 pr-3 py-1 text-xs text-text-tertiary md:sticky md:left-0 md:z-10">
-                    Project
-                </div>
-                <div
-                    v-for="day in weekDays"
-                    :key="day"
-                    class="bg-background dark:bg-secondary px-2 py-1 text-center">
-                    <div class="text-xs font-medium text-text-secondary">
-                        {{ dayjs(day).format('ddd D') }}
-                    </div>
-                </div>
-                <div
-                    class="bg-background dark:bg-secondary pl-3 pr-3 py-1 text-right text-xs text-text-tertiary">
-                    Total
-                </div>
-                <div class="bg-background dark:bg-secondary"></div>
-
-                <!-- Data rows -->
-                <TimesheetRow
-                    v-for="row in rows"
-                    :key="row.key"
-                    :row="row"
-                    :week-days="weekDays"
-                    :today-date="todayDate"
-                    :projects="projects"
-                    :tasks="tasks"
-                    :clients="clients"
-                    :tags="tags"
-                    :currency="currency"
-                    :can-create-project="canCreateProject"
-                    :enable-estimated-time="enableEstimatedTime"
-                    :create-project="createProject"
-                    :create-client="createClient"
-                    :create-tag="createTag"
-                    :format-duration="formatDuration"
-                    @remove-row="$emit('remove-row', $event)"
-                    @cell-update="
-                        (dayIndex, seconds) => $emit('cell-update', row, dayIndex, seconds)
-                    "
-                    @project-task-change="(pId, tId) => $emit('project-task-change', row, pId, tId)"
-                    @billable-change="(billable) => $emit('billable-change', row, billable)"
-                    @tags-change="(t) => $emit('tags-change', row, t)" />
-
-                <!-- Add row -->
-                <div
-                    class="col-span-full flex items-center gap-2 border-t border-default-background-separator pl-4 pr-4 py-2">
-                    <TimeTrackerProjectTaskDropdown
-                        :project="null"
-                        :task="null"
-                        :projects="projects"
-                        :tasks="tasks"
-                        :clients="clients"
-                        :currency="currency"
-                        :can-create-project="canCreateProject"
-                        :enable-estimated-time="enableEstimatedTime"
-                        :create-project="createProject"
-                        :create-client="createClient"
-                        :organization-billable-rate="organization?.billable_rate ?? null"
-                        :no-project-value="null"
-                        align="start"
-                        @changed="(p, t) => emit('add-row', p, t)">
-                        <template #trigger>
-                            <Button variant="ghost" size="sm" class="text-text-secondary">
-                                <PlusIcon class="h-4 w-4 mr-1 text-icon-default" />
-                                Add row
-                            </Button>
-                        </template>
-                    </TimeTrackerProjectTaskDropdown>
-                </div>
-
-                <!-- Totals row -->
-                <div
-                    class="border-t border-default-background-separator bg-background dark:bg-secondary pl-7 pr-3 py-1 text-xs text-text-tertiary md:sticky md:left-0 md:z-10">
-                    Total
-                </div>
-                <div
-                    v-for="(total, dayIndex) in dayTotals"
-                    :key="dayIndex"
-                    data-testid="timesheet_day_total"
-                    :class="[
-                        'flex items-center justify-center border-t border-default-background-separator bg-background dark:bg-secondary px-2 py-1 text-xs font-medium',
-                        weekDays[dayIndex] === todayDate
-                            ? 'text-text-primary'
-                            : 'text-text-secondary',
-                    ]">
-                    <span class="w-[80px] text-center">
-                        {{ total > 0 ? formatDuration(total) : '-' }}
-                    </span>
-                </div>
-                <div
-                    class="flex items-center justify-end border-t border-default-background-separator bg-background dark:bg-secondary pl-3 pr-3 py-1 text-xs font-semibold text-text-primary">
-                    {{ weekTotalFormatted }}
-                </div>
-                <div
-                    class="border-t border-default-background-separator bg-background dark:bg-secondary"></div>
-            </div>
-        </div>
-    </div>
-</template>

resources/js/Components/Timesheet/TimesheetHeader.vue

@@ -1,60 +0,0 @@
-<script setup lang="ts">
-import { Button } from '@/packages/ui/src/Buttons';
-import { ChevronLeftIcon, ChevronRightIcon, CalendarIcon } from '@heroicons/vue/20/solid';
-
-defineProps<{
-    isCurrentWeek: boolean;
-    weekNumber: number;
-    weekRangeDisplay: string;
-    weekTotalFormatted: string;
-}>();
-
-defineEmits<{
-    (e: 'previous'): void;
-    (e: 'next'): void;
-    (e: 'current'): void;
-}>();
-</script>
-
-<template>
-    <div class="flex flex-wrap items-center justify-between gap-4 mb-4 px-2 sm:px-4 lg:px-6">
-        <!-- Left: Week navigation -->
-        <div class="flex items-center gap-2">
-            <Button
-                variant="outline"
-                size="icon"
-                class="h-8 w-8"
-                data-testid="timesheet_prev_week"
-                @click="$emit('previous')">
-                <ChevronLeftIcon class="h-4 w-4" />
-            </Button>
-            <button
-                data-testid="timesheet_week_display"
-                class="flex items-center gap-2 px-3 py-1.5 text-sm font-medium text-text-primary hover:bg-card-background rounded-md transition"
-                @click="$emit('current')">
-                <CalendarIcon class="h-4 w-4 text-icon-default" />
-                <span v-if="isCurrentWeek">This week</span>
-                <span v-else>{{ weekRangeDisplay }}</span>
-                <span class="text-text-tertiary">&middot; W{{ weekNumber }}</span>
-            </button>
-            <Button
-                variant="outline"
-                size="icon"
-                class="h-8 w-8"
-                data-testid="timesheet_next_week"
-                @click="$emit('next')">
-                <ChevronRightIcon class="h-4 w-4" />
-            </Button>
-        </div>
-
-        <!-- Right: Week total -->
-        <div class="flex items-center gap-2.5">
-            <span class="text-xs text-text-tertiary uppercase tracking-wider">Week Total</span>
-            <span
-                data-testid="timesheet_grand_total"
-                class="text-sm font-semibold text-text-primary">
-                {{ weekTotalFormatted }}
-            </span>
-        </div>
-    </div>
-</template>

resources/js/Components/Timesheet/TimesheetRow.vue

@@ -1,134 +0,0 @@
-<script setup lang="ts">
-import { computed, inject, type ComputedRef } from 'vue';
-import { XMarkIcon } from '@heroicons/vue/16/solid';
-import TimesheetCell from './TimesheetCell.vue';
-import TimeTrackerProjectTaskDropdown from '@/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue';
-import TimeEntryRowTagDropdown from '@/packages/ui/src/TimeEntry/TimeEntryRowTagDropdown.vue';
-import BillableToggleButton from '@/packages/ui/src/Input/BillableToggleButton.vue';
-import type {
-    CreateClientBody,
-    CreateProjectBody,
-    Project,
-    Task,
-    Client,
-    Tag,
-    Organization,
-} from '@/packages/api/src';
-import type { TimesheetRow, TimesheetRowKey } from '@/utils/useTimesheetGrid';
-import { Button } from '@/packages/ui/src/Buttons';
-
-const organization = inject<ComputedRef<Organization>>('organization');
-
-const props = defineProps<{
-    row: TimesheetRow;
-    weekDays: string[];
-    todayDate: string;
-    projects: Project[];
-    tasks: Task[];
-    clients: Client[];
-    tags: Tag[];
-    currency: string;
-    canCreateProject: boolean;
-    enableEstimatedTime: boolean;
-    createProject: (project: CreateProjectBody) => Promise<Project | undefined>;
-    createClient: (client: CreateClientBody) => Promise<Client | undefined>;
-    createTag: (name: string) => Promise<Tag | undefined>;
-    formatDuration: (seconds: number) => string;
-}>();
-
-const emit = defineEmits<{
-    removeRow: [key: TimesheetRowKey];
-    cellUpdate: [dayIndex: number, newSeconds: number];
-    projectTaskChange: [projectId: string | null, taskId: string | null];
-    billableChange: [billable: boolean];
-    tagsChange: [tags: string[]];
-}>();
-
-const selectedProject = computed({
-    get: () => props.row.projectId,
-    set: (val) => emit('projectTaskChange', val, selectedTask.value),
-});
-
-const selectedTask = computed({
-    get: () => props.row.taskId,
-    set: (val) => emit('projectTaskChange', selectedProject.value, val),
-});
-
-const rowTotalFormatted = computed(() => props.formatDuration(props.row.totalSeconds));
-
-function hasRunningEntry(dayIndex: number): boolean {
-    const cell = props.row.cells.get(dayIndex);
-    if (!cell) return false;
-    return cell.entries.some((e) => e.end === null);
-}
-</script>
-
-<template>
-    <div data-testid="timesheet_row" class="contents group">
-        <!-- Project/Task column -->
-        <div
-            class="flex items-center gap-1 border-t border-default-background-separator bg-default-background pl-4 pr-3 py-2 md:sticky md:left-0 md:z-10">
-            <div class="flex-1 min-w-0">
-                <TimeTrackerProjectTaskDropdown
-                    v-model:project="selectedProject"
-                    v-model:task="selectedTask"
-                    :projects="projects"
-                    :tasks="tasks"
-                    :clients="clients"
-                    :currency="currency"
-                    :can-create-project="canCreateProject"
-                    :enable-estimated-time="enableEstimatedTime"
-                    :create-project="createProject"
-                    :create-client="createClient"
-                    :organization-billable-rate="organization?.billable_rate ?? null"
-                    :no-project-value="null"
-                    variant="ghost"
-                    size="sm"
-                    class="w-full" />
-            </div>
-            <div class="flex items-center gap-1 flex-shrink-0 ml-auto">
-                <TimeEntryRowTagDropdown
-                    :create-tag="createTag"
-                    :tags="tags"
-                    :model-value="row.tags"
-                    @changed="emit('tagsChange', $event)" />
-                <BillableToggleButton
-                    :model-value="row.billable"
-                    size="small"
-                    faded
-                    @changed="emit('billableChange', $event)" />
-            </div>
-        </div>
-
-        <!-- Day cells -->
-        <TimesheetCell
-            v-for="(day, dayIndex) in weekDays"
-            :key="day"
-            :cell="row.cells.get(dayIndex)"
-            :day-index="dayIndex"
-            :date="day"
-            :is-today="day === todayDate"
-            :has-running-entry="hasRunningEntry(dayIndex)"
-            @update="(seconds) => emit('cellUpdate', dayIndex, seconds)" />
-
-        <!-- Row total -->
-        <div
-            data-testid="timesheet_row_total"
-            class="flex items-center justify-end border-t border-default-background-separator pl-3 pr-3 py-3 text-sm font-medium text-text-primary">
-            {{ rowTotalFormatted }}
-        </div>
-
-        <!-- Remove action -->
-        <div
-            class="flex items-center justify-center border-t border-default-background-separator pr-4 py-3">
-            <Button
-                variant="ghost"
-                size="icon"
-                aria-label="Remove row"
-                class="h-6 w-6 flex-shrink-0 opacity-0 group-hover:opacity-100 transition-opacity"
-                @click="emit('removeRow', row.key)">
-                <XMarkIcon class="h-3.5 w-3.5 text-icon-default" />
-            </Button>
-        </div>
-    </div>
-</template>

resources/js/Components/UserSettingsIcon.vue

@@ -10,6 +10,7 @@ import {
 } from '@/packages/ui/src';
 import {
     UserCircleIcon,
+    KeyIcon,
     ArrowLeftOnRectangleIcon,
     ChatBubbleLeftRightIcon,
 } from '@heroicons/vue/24/solid';
@@ -18,6 +19,12 @@ import { openFeedback } from '@/utils/feedback';
 const page = usePage<{
     has_services_extension?: boolean;
     has_billing_extension?: boolean;
+    jetstream: {
+        canCreateTeams: boolean;
+        hasTeamFeatures: boolean;
+        managesProfilePhotos: boolean;
+        hasApiFeatures: boolean;
+    };
     auth: {
         user: User & {
             all_teams: Organization[];
@@ -54,6 +61,15 @@ const logout = () => {
                     </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>
                     <button
                         type="button"

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

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { buttonVariants } from '@/packages/ui/src';
-import { cn } from '@/lib/utils';
 import { AlertDialogAction, type AlertDialogActionProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
+import { cn } from '@/lib/utils';
 const props = defineProps<AlertDialogActionProps & { class?: HTMLAttributes['class'] }>();
 
 const delegatedProps = computed(() => {

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

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { buttonVariants } from '@/packages/ui/src';
-import { cn } from '@/lib/utils';
 import { AlertDialogCancel, type AlertDialogCancelProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
+import { cn } from '@/lib/utils';
 
 const props = defineProps<AlertDialogCancelProps & { class?: HTMLAttributes['class'] }>();
 

resources/js/Layouts/AppLayout.vue

@@ -17,7 +17,6 @@ import {
     UserGroupIcon,
     XMarkIcon,
     DocumentTextIcon,
-    TableCellsIcon,
 } from '@heroicons/vue/20/solid';
 import { PanelLeft } from '@lucide/vue';
 import NavigationSidebarItem from '@/Components/NavigationSidebarItem.vue';
@@ -136,7 +135,7 @@ const page = usePage<{
                     ? 'max-lg:translate-x-0 max-lg:shadow-xl'
                     : 'max-lg:-translate-x-full',
             ]"
-            class="flex-shrink-0 h-screen fixed w-[280px] px-2.5 py-4 hidden lg:flex flex-col justify-between bg-background border-r border-default-background-separator max-lg:z-50 max-lg:transition-transform max-lg:duration-200 max-lg:ease-in-out lg:w-[230px] lg:border-r-0"
+            class="flex-shrink-0 h-screen fixed w-[280px] px-2.5 py-4 hidden lg:flex flex-col justify-between bg-background border-r border-default-background-separator max-lg:z-50 max-lg:transition-transform max-lg:duration-200 max-lg:ease-in-out lg:w-[230px] 2xl:w-[250px] 2xl:px-3 lg:border-r-0"
             :style="showSidebarMenu ? { display: 'flex' } : undefined">
             <div class="flex flex-col h-full">
                 <div
@@ -186,11 +185,6 @@ const page = usePage<{
                                 :icon="CalendarIcon"
                                 :current="route().current('calendar')"
                                 :href="route('calendar')"></NavigationSidebarItem>
-                            <NavigationSidebarItem
-                                title="Timesheet"
-                                :icon="TableCellsIcon"
-                                :current="route().current('timesheet')"
-                                :href="route('timesheet')"></NavigationSidebarItem>
                             <NavigationSidebarItem
                                 title="Reporting"
                                 :icon="ChartBarIcon"
@@ -314,7 +308,7 @@ const page = usePage<{
                 </div>
             </div>
         </div>
-        <div class="flex-1 lg:ml-[230px] min-w-0">
+        <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

resources/js/Pages/API/Index.vue

@@ -0,0 +1,28 @@
+<script setup lang="ts">
+import ApiTokenManager from '@/Pages/API/Partials/ApiTokenManager.vue';
+import AppLayout from '@/Layouts/AppLayout.vue';
+import type { Token } from '@/types/jetstream';
+
+defineProps<{
+    tokens: Token[];
+    availablePermissions: string[];
+    defaultPermissions: string[];
+}>();
+</script>
+
+<template>
+    <AppLayout title="API Tokens">
+        <template #header>
+            <h2 class="font-semibold text-xl text-text-primary leading-tight">API Tokens</h2>
+        </template>
+
+        <div>
+            <div class="max-w-7xl mx-auto py-10 sm:px-6 lg:px-8">
+                <ApiTokenManager
+                    :tokens="tokens"
+                    :available-permissions="availablePermissions"
+                    :default-permissions="defaultPermissions" />
+            </div>
+        </div>
+    </AppLayout>
+</template>

resources/js/Pages/API/Partials/ApiTokenManager.vue

@@ -0,0 +1,263 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+import { useForm, usePage } from '@inertiajs/vue3';
+import ActionMessage from '@/Components/ActionMessage.vue';
+import ActionSection from '@/Components/ActionSection.vue';
+import Checkbox from '@/packages/ui/src/Input/Checkbox.vue';
+import ConfirmationModal from '@/Components/ConfirmationModal.vue';
+import DangerButton from '@/packages/ui/src/Buttons/DangerButton.vue';
+import DialogModal from '@/packages/ui/src/DialogModal.vue';
+import FormSection from '@/Components/FormSection.vue';
+import { Field, FieldLabel, FieldError } from '@/packages/ui/src/field';
+import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
+import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
+import SectionBorder from '@/Components/SectionBorder.vue';
+import TextInput from '@/packages/ui/src/Input/TextInput.vue';
+import type { Token } from '@/types/jetstream';
+
+const props = defineProps<{
+    tokens: Token[];
+    availablePermissions: string[];
+    defaultPermissions: string[];
+}>();
+
+const createApiTokenForm = useForm({
+    name: '',
+    permissions: props.defaultPermissions,
+});
+
+const page = usePage<{
+    jetstream: {
+        flash: {
+            token: string;
+        };
+    };
+}>();
+
+const updateApiTokenForm = useForm<{
+    permissions: string[];
+}>({
+    permissions: [],
+});
+
+const deleteApiTokenForm = useForm({});
+
+const displayingToken = ref(false);
+const managingPermissionsFor = ref<Token | null>(null);
+const apiTokenBeingDeleted = ref<Token | null>(null);
+
+const createApiToken = () => {
+    createApiTokenForm.post(route('api-tokens.store'), {
+        preserveScroll: true,
+        onSuccess: () => {
+            displayingToken.value = true;
+            createApiTokenForm.reset();
+        },
+    });
+};
+
+const manageApiTokenPermissions = (token: Token) => {
+    updateApiTokenForm.permissions = token.abilities;
+    managingPermissionsFor.value = token;
+};
+
+const updateApiToken = () => {
+    updateApiTokenForm.put(route('api-tokens.update', managingPermissionsFor.value?.id), {
+        preserveScroll: true,
+        preserveState: true,
+        onSuccess: () => (managingPermissionsFor.value = null),
+    });
+};
+
+const confirmApiTokenDeletion = (token: Token) => {
+    apiTokenBeingDeleted.value = token;
+};
+
+const deleteApiToken = () => {
+    deleteApiTokenForm.delete(route('api-tokens.destroy', apiTokenBeingDeleted.value?.id), {
+        preserveScroll: true,
+        preserveState: true,
+        onSuccess: () => (apiTokenBeingDeleted.value = null),
+    });
+};
+</script>
+
+<template>
+    <div>
+        <!-- Generate API Token -->
+        <FormSection @submitted="createApiToken">
+            <template #title> Create API Token </template>
+
+            <template #description>
+                API tokens allow third-party services to authenticate with our application on your
+                behalf.
+            </template>
+
+            <template #form>
+                <!-- Token Name -->
+                <Field class="col-span-6 sm:col-span-4">
+                    <FieldLabel for="name">Name</FieldLabel>
+                    <TextInput
+                        id="name"
+                        v-model="createApiTokenForm.name"
+                        type="text"
+                        class="block w-full"
+                        autofocus />
+                    <FieldError v-if="createApiTokenForm.errors.name">{{
+                        createApiTokenForm.errors.name
+                    }}</FieldError>
+                </Field>
+
+                <!-- Token Permissions -->
+                <div v-if="availablePermissions.length > 0" class="col-span-6">
+                    <FieldLabel for="permissions">Permissions</FieldLabel>
+
+                    <div class="mt-2 grid grid-cols-1 md:grid-cols-2 gap-4">
+                        <div v-for="permission in availablePermissions" :key="permission">
+                            <label class="flex items-center">
+                                <Checkbox
+                                    v-model:checked="createApiTokenForm.permissions"
+                                    :value="permission" />
+                                <span class="ms-2 text-sm text-text-secondary">{{
+                                    permission
+                                }}</span>
+                            </label>
+                        </div>
+                    </div>
+                </div>
+            </template>
+
+            <template #actions>
+                <ActionMessage :on="createApiTokenForm.recentlySuccessful" class="me-3">
+                    Created.
+                </ActionMessage>
+
+                <PrimaryButton
+                    :class="{ 'opacity-25': createApiTokenForm.processing }"
+                    :disabled="createApiTokenForm.processing">
+                    Create
+                </PrimaryButton>
+            </template>
+        </FormSection>
+
+        <div v-if="tokens.length > 0">
+            <SectionBorder />
+
+            <!-- Manage API Tokens -->
+            <div class="mt-10 sm:mt-0">
+                <ActionSection>
+                    <template #title> Manage API Tokens </template>
+
+                    <template #description>
+                        You may delete any of your existing tokens if they are no longer needed.
+                    </template>
+
+                    <!-- API Token List -->
+                    <template #content>
+                        <div class="space-y-6">
+                            <div
+                                v-for="token in tokens"
+                                :key="token.id"
+                                class="flex items-center justify-between">
+                                <div class="break-all text-text-primary">
+                                    {{ token.name }}
+                                </div>
+
+                                <div class="flex items-center ms-2">
+                                    <div v-if="token.last_used_ago" class="text-sm text-gray-400">
+                                        Last used {{ token.last_used_ago }}
+                                    </div>
+
+                                    <button
+                                        v-if="availablePermissions.length > 0"
+                                        class="cursor-pointer ms-6 text-sm text-gray-400 underline"
+                                        @click="manageApiTokenPermissions(token)">
+                                        Permissions
+                                    </button>
+
+                                    <button
+                                        class="cursor-pointer ms-6 text-sm text-red-500"
+                                        @click="confirmApiTokenDeletion(token)">
+                                        Delete
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </template>
+                </ActionSection>
+            </div>
+        </div>
+
+        <!-- Token Value Modal -->
+        <DialogModal :show="displayingToken" @close="displayingToken = false">
+            <template #title> API Token </template>
+
+            <template #content>
+                <div>
+                    Please copy your new API token. For your security, it won't be shown again.
+                </div>
+
+                <div
+                    v-if="page.props.jetstream.flash.token"
+                    class="mt-4 bg-card-backgroundpx-4 py-2 rounded font-mono text-sm text-gray-500 break-all">
+                    {{ page.props.jetstream.flash.token }}
+                </div>
+            </template>
+
+            <template #footer>
+                <SecondaryButton @click="displayingToken = false"> Close </SecondaryButton>
+            </template>
+        </DialogModal>
+
+        <!-- API Token Permissions Modal -->
+        <DialogModal :show="managingPermissionsFor != null" @close="managingPermissionsFor = null">
+            <template #title> API Token Permissions </template>
+
+            <template #content>
+                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                    <div v-for="permission in availablePermissions" :key="permission">
+                        <label class="flex items-center">
+                            <Checkbox
+                                v-model:checked="updateApiTokenForm.permissions"
+                                :value="permission" />
+                            <span class="ms-2 text-sm text-muted">{{ permission }}</span>
+                        </label>
+                    </div>
+                </div>
+            </template>
+
+            <template #footer>
+                <SecondaryButton @click="managingPermissionsFor = null"> Cancel </SecondaryButton>
+
+                <PrimaryButton
+                    class="ms-3"
+                    :class="{ 'opacity-25': updateApiTokenForm.processing }"
+                    :disabled="updateApiTokenForm.processing"
+                    @click="updateApiToken">
+                    Save
+                </PrimaryButton>
+            </template>
+        </DialogModal>
+
+        <!-- Delete Token Confirmation Modal -->
+        <ConfirmationModal
+            :show="apiTokenBeingDeleted != null"
+            @close="apiTokenBeingDeleted = null">
+            <template #title> Delete API Token </template>
+
+            <template #content> Are you sure you would like to delete this API token? </template>
+
+            <template #footer>
+                <SecondaryButton @click="apiTokenBeingDeleted = null"> Cancel </SecondaryButton>
+
+                <DangerButton
+                    class="ms-3"
+                    :class="{ 'opacity-25': deleteApiTokenForm.processing }"
+                    :disabled="deleteApiTokenForm.processing"
+                    @click="deleteApiToken">
+                    Delete
+                </DangerButton>
+            </template>
+        </ConfirmationModal>
+    </div>
+</template>

resources/js/Pages/Auth/Register.vue

@@ -30,6 +30,9 @@ const page = usePage<{
     terms_url: string | null;
     privacy_policy_url: string | null;
     newsletter_consent: boolean;
+    jetstream: {
+        hasTermsAndPrivacyPolicyFeature: boolean;
+    };
     flash: {
         message: string;
     };
@@ -114,7 +117,11 @@ const page = usePage<{
             </Field>
 
             <div
-                v-if="page.props.terms_url !== null && page.props.privacy_policy_url !== null"
+                v-if="
+                    page.props.jetstream.hasTermsAndPrivacyPolicyFeature &&
+                    page.props.terms_url !== null &&
+                    page.props.privacy_policy_url !== null
+                "
                 class="mt-4">
                 <Field orientation="horizontal">
                     <Checkbox id="terms" v-model:checked="form.terms" name="terms" />

resources/js/Pages/Calendar.vue

@@ -3,7 +3,6 @@ import AppLayout from '@/Layouts/AppLayout.vue';
 import { useTimeEntriesCalendarQuery } from '@/utils/useTimeEntriesCalendarQuery';
 import { useTimeEntriesMutations } from '@/utils/useTimeEntriesMutations';
 import { computed, ref, onMounted } from 'vue';
-import type { Dayjs } from 'dayjs';
 import { useQueryClient } from '@tanstack/vue-query';
 import {
     type Client,
@@ -28,8 +27,8 @@ import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 
 const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
-const calendarStart = ref<Dayjs | undefined>(undefined);
-const calendarEnd = ref<Dayjs | undefined>(undefined);
+const calendarStart = ref<Date | undefined>(undefined);
+const calendarEnd = ref<Date | undefined>(undefined);
 
 // Test-injectable activity periods (for E2E testing).
 // These hooks are no-ops in production — they only take effect when test code
@@ -100,7 +99,7 @@ const { tags } = useTagsQuery();
 
 const queryClient = useQueryClient();
 
-function onDatesChange({ start, end }: { start: Dayjs; end: Dayjs }) {
+function onDatesChange({ start, end }: { start: Date; end: Date }) {
     calendarStart.value = start;
     calendarEnd.value = end;
 }

resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue

@@ -176,6 +176,7 @@ onBeforeUnmount(() => {
 });
 
 const page = usePage<{
+    jetstream: { managesProfilePhotos: boolean };
     timezones: Record<string, string>;
     weekdays: Record<string, string>;
 }>();
@@ -191,7 +192,7 @@ const page = usePage<{
 
         <template #form>
             <!-- Profile Photo -->
-            <div class="col-span-6 sm:col-span-4">
+            <div v-if="page.props.jetstream.managesProfilePhotos" class="col-span-6 sm:col-span-4">
                 <input
                     id="photo"
                     ref="photoInput"
@@ -282,9 +283,7 @@ const page = usePage<{
                             @click="clickResend">
                             Resend verification email
                         </Button>
-                        <p v-else class="ms-3 font-medium text-green-400">
-                            Verification email sent.
-                        </p>
+                        <p v-else class="ms-3 font-medium text-green-400">Verification email sent.</p>
                         <Button
                             variant="ghost"
                             size="sm"

resources/js/Pages/Profile/Show.vue

@@ -6,6 +6,8 @@ import SectionBorder from '@/Components/SectionBorder.vue';
 import TwoFactorAuthenticationForm from '@/Pages/Profile/Partials/TwoFactorAuthenticationForm.vue';
 import UpdatePasswordForm from '@/Pages/Profile/Partials/UpdatePasswordForm.vue';
 import UpdateProfileInformationForm from '@/Pages/Profile/Partials/UpdateProfileInformationForm.vue';
+import { usePage } from '@inertiajs/vue3';
+import type { User } from '@/types/models';
 import type { Session } from '@/types/jetstream';
 import ApiTokensForm from '@/Pages/Profile/Partials/ApiTokensForm.vue';
 import ThemeForm from '@/Pages/Profile/Partials/ThemeForm.vue';
@@ -14,6 +16,18 @@ defineProps<{
     confirmsTwoFactorAuthentication: boolean;
     sessions: Session[];
 }>();
+
+const page = usePage<{
+    jetstream: {
+        canUpdateProfileInformation: boolean;
+        canUpdatePassword: boolean;
+        canManageTwoFactorAuthentication: boolean;
+        hasAccountDeletionFeatures: boolean;
+    };
+    auth: {
+        user: User;
+    };
+}>();
 </script>
 
 <template>
@@ -24,7 +38,7 @@ defineProps<{
 
         <div>
             <div class="max-w-7xl mx-auto py-10 sm:px-6 lg:px-8">
-                <div>
+                <div v-if="page.props.jetstream.canUpdateProfileInformation">
                     <UpdateProfileInformationForm />
 
                     <SectionBorder />
@@ -36,13 +50,13 @@ defineProps<{
                     <SectionBorder />
                 </div>
 
-                <div>
+                <div v-if="page.props.jetstream.canUpdatePassword">
                     <UpdatePasswordForm class="mt-10 sm:mt-0" />
 
                     <SectionBorder />
                 </div>
 
-                <div>
+                <div v-if="page.props.jetstream.canManageTwoFactorAuthentication">
                     <TwoFactorAuthenticationForm
                         :requires-confirmation="confirmsTwoFactorAuthentication"
                         class="mt-10 sm:mt-0" />
@@ -55,9 +69,11 @@ defineProps<{
 
                 <ApiTokensForm></ApiTokensForm>
 
-                <SectionBorder />
+                <template v-if="page.props.jetstream.hasAccountDeletionFeatures">
+                    <SectionBorder />
 
-                <DeleteUserForm class="mt-10 sm:mt-0" />
+                    <DeleteUserForm class="mt-10 sm:mt-0" />
+                </template>
             </div>
         </div>
     </AppLayout>

resources/js/Pages/ProjectShow.vue

@@ -109,7 +109,7 @@ const shownTasks = computed(() => {
                         </div>
                     </li>
                 </ol>
-                <div class="px-4 space-x-1">
+                <div class="px-4">
                     <Badge v-if="project?.billable_rate">
                         {{ billableRateFormatted }}
                         / h
@@ -118,7 +118,6 @@ const shownTasks = computed(() => {
                         Default Rate
                     </Badge>
                     <Badge v-if="!project?.is_billable"> Non-Billable </Badge>
-                    <Badge>{{ project?.is_public ? 'Public' : 'Private' }}</Badge>
                 </div>
             </nav>
             <div>

resources/js/Pages/Projects.vue

@@ -20,7 +20,6 @@ import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import { useStorage } from '@vueuse/core';
 import ProjectsFilterDropdown from '@/Components/Common/Project/ProjectsFilterDropdown.vue';
 import ProjectStatusFilterBadge from '@/Components/Common/Project/ProjectStatusFilterBadge.vue';
-import ProjectVisibilityFilterBadge from '@/Components/Common/Project/ProjectVisibilityFilterBadge.vue';
 import ProjectClientFilterBadge from '@/Components/Common/Project/ProjectClientFilterBadge.vue';
 import { NO_CLIENT_ID } from '@/Components/Common/Project/constants';
 import type { SortColumn, SortDirection } from '@/Components/Common/Project/ProjectTable.vue';
@@ -37,7 +36,6 @@ interface ProjectTableState {
     filters: {
         clientIds: string[];
         status: 'active' | 'archived' | 'all';
-        visibility: 'public' | 'private' | 'all';
     };
 }
 
@@ -49,17 +47,10 @@ const tableState = useStorage<ProjectTableState>(
         filters: {
             clientIds: [],
             status: 'all',
-            visibility: 'all',
         },
     },
     undefined,
-    {
-        mergeDefaults: (storage, defaults) => ({
-            ...defaults,
-            ...storage,
-            filters: { ...defaults.filters, ...storage.filters },
-        }),
-    }
+    { mergeDefaults: true }
 );
 
 function handleSort(column: SortColumn, direction: SortDirection) {
@@ -78,14 +69,6 @@ const filteredProjects = computed(() => {
             return false;
         }
 
-        // Visibility filter
-        if (tableState.value.filters.visibility === 'public' && !project.is_public) {
-            return false;
-        }
-        if (tableState.value.filters.visibility === 'private' && project.is_public) {
-            return false;
-        }
-
         // Client filter
         const hasClientFilter = tableState.value.filters.clientIds.length > 0;
         if (hasClientFilter) {
@@ -108,10 +91,6 @@ function removeStatusFilter() {
     tableState.value.filters.status = 'all';
 }
 
-function removeVisibilityFilter() {
-    tableState.value.filters.visibility = 'all';
-}
-
 function removeClientFilter() {
     tableState.value.filters.clientIds = [];
 }
@@ -173,15 +152,6 @@ const showBillableRate = computed(() => {
                         tableState.filters.status = $event as 'active' | 'archived' | 'all'
                     " />
 
-                <ProjectVisibilityFilterBadge
-                    v-if="tableState.filters.visibility !== 'all'"
-                    data-testid="visibility-filter-badge"
-                    :value="tableState.filters.visibility"
-                    @remove="removeVisibilityFilter"
-                    @update:value="
-                        tableState.filters.visibility = $event as 'public' | 'private' | 'all'
-                    " />
-
                 <ProjectClientFilterBadge
                     v-if="tableState.filters.clientIds.length > 0"
                     data-testid="client-filter-badge"

resources/js/Pages/Timesheet.vue

@@ -1,196 +0,0 @@
-<script setup lang="ts">
-import { computed, watch } from 'vue';
-import { storeToRefs } from 'pinia';
-import AppLayout from '@/Layouts/AppLayout.vue';
-import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
-import TimesheetHeader from '@/Components/Timesheet/TimesheetHeader.vue';
-import TimesheetGrid from '@/Components/Timesheet/TimesheetGrid.vue';
-import TimesheetFooterActions from '@/Components/Timesheet/TimesheetFooterActions.vue';
-import RemoveRowDialog from '@/Components/Timesheet/RemoveRowDialog.vue';
-import { useTimesheetQuery } from '@/utils/useTimesheetQuery';
-import { useTimesheetGrid } from '@/utils/useTimesheetGrid';
-import { useTimeEntriesMutations } from '@/utils/useTimeEntriesMutations';
-import { useProjectsQuery } from '@/utils/useProjectsQuery';
-import { useTasksQuery } from '@/utils/useTasksQuery';
-import { useClientsQuery } from '@/utils/useClientsQuery';
-import { useTagsQuery } from '@/utils/useTagsQuery';
-import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
-import { useProjectsStore } from '@/utils/useProjects';
-import { useClientsStore } from '@/utils/useClients';
-import { useTagsStore } from '@/utils/useTags';
-import { getCurrentOrganizationId } from '@/utils/useUser';
-import { getOrganizationCurrencyString } from '@/utils/money';
-import { isAllowedToPerformPremiumAction } from '@/utils/billing';
-import { canCreateProjects } from '@/utils/permissions';
-import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
-import { useTimesheetWeek } from '@/utils/timesheet/useTimesheetWeek';
-import { useTimesheetCellMutations } from '@/utils/timesheet/useTimesheetCellMutations';
-import { useTimesheetRowMutations } from '@/utils/timesheet/useTimesheetRowMutations';
-import { useTimesheetRowDeletion } from '@/utils/timesheet/useTimesheetRowDeletion';
-import { useCopyLastWeek } from '@/utils/timesheet/useCopyLastWeek';
-import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
-import type { CreateClientBody, CreateProjectBody, Project, Client, Tag } from '@/packages/api/src';
-
-// ── Week state ────────────────────────────────────────────────────
-const {
-    weekStart,
-    weekEnd,
-    weekDays,
-    weekNumber,
-    isCurrentWeek,
-    todayDate,
-    goToPreviousWeek,
-    goToNextWeek,
-    goToCurrentWeek,
-} = useTimesheetWeek();
-
-// ── Data fetching ─────────────────────────────────────────────────
-const { data, isPending } = useTimesheetQuery(weekStart, weekEnd);
-const timeEntries = computed(() => data.value?.data ?? []);
-
-const { projects } = useProjectsQuery();
-const { tasks } = useTasksQuery();
-const { clients } = useClientsQuery();
-const { tags } = useTagsQuery();
-const { now: currentTimerNow } = storeToRefs(useCurrentTimeEntryStore());
-
-const mutations = useTimeEntriesMutations();
-
-// ── Grid computation ──────────────────────────────────────────────
-const { rows, dayTotals, grandTotal, addSlot, removeSlot, updateSlot, clearSlots } =
-    useTimesheetGrid(timeEntries, weekDays, projects, tasks, currentTimerNow);
-
-// Wipe slots on week navigation so the new week starts fresh — the
-// grid's watcher will reseed from the newly fetched entries.
-watch(weekStart, () => clearSlots());
-
-// ── Formatters ────────────────────────────────────────────────────
-// Pull number/interval format off the org via its query rather than
-// inject('organization'), which is undefined during the page's setup
-// (AppLayout provides it later in the lifecycle).
-const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
-const intervalFormat = computed(() => organization.value?.interval_format ?? 'hours-minutes');
-const numberFormat = computed(() => organization.value?.number_format ?? 'point');
-
-function formatDuration(seconds: number): string {
-    if (seconds === 0) return '-';
-    return formatHumanReadableDuration(seconds, intervalFormat.value, numberFormat.value);
-}
-
-const weekTotalFormatted = computed(() =>
-    formatHumanReadableDuration(grandTotal.value, intervalFormat.value, numberFormat.value)
-);
-
-const weekRangeDisplay = computed(() => {
-    const start = weekStart.value;
-    const end = start.add(6, 'day');
-    return start.month() === end.month()
-        ? `${start.format('MMM D')} - ${end.format('D')}`
-        : `${start.format('MMM D')} - ${end.format('MMM D')}`;
-});
-
-// ── Cell / row mutation handlers ──────────────────────────────────
-const { handleCellUpdate } = useTimesheetCellMutations(weekDays, timeEntries, rows, removeSlot);
-
-const { handleRowIdentityChange, handleAddRow } = useTimesheetRowMutations(
-    mutations,
-    projects,
-    rows,
-    addSlot,
-    updateSlot,
-    removeSlot
-);
-
-const {
-    showDeleteDialog,
-    deleteRowEntryCount,
-    deleteRowProjectName,
-    requestRemoveRow,
-    confirmDeleteRow,
-} = useTimesheetRowDeletion(projects, mutations, removeSlot);
-
-function handleRemoveRow(key: string) {
-    const row = rows.value.find((r) => r.key === key);
-    if (row) requestRemoveRow(row);
-}
-
-// ── Copy last week ────────────────────────────────────────────────
-const { isCopyingLastWeek, copyLastWeekRows, copyLastWeekWithTime } = useCopyLastWeek(
-    weekStart,
-    weekDays,
-    rows,
-    timeEntries,
-    addSlot
-);
-
-// ── Inline creation helpers (passed to TimesheetRow) ──────────────
-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);
-}
-
-async function createTag(name: string): Promise<Tag | undefined> {
-    return await useTagsStore().createTag(name);
-}
-</script>
-
-<template>
-    <AppLayout title="Timesheet" data-testid="timesheet_view">
-        <div class="pt-5 lg:pt-8 pb-4 lg:pb-6">
-            <TimesheetHeader
-                :is-current-week="isCurrentWeek"
-                :week-number="weekNumber"
-                :week-range-display="weekRangeDisplay"
-                :week-total-formatted="weekTotalFormatted"
-                @previous="goToPreviousWeek"
-                @next="goToNextWeek"
-                @current="goToCurrentWeek" />
-
-            <TimesheetGrid
-                v-if="!isPending"
-                :rows="rows"
-                :week-days="weekDays"
-                :today-date="todayDate"
-                :day-totals="dayTotals"
-                :week-total-formatted="weekTotalFormatted"
-                :projects="projects"
-                :tasks="tasks"
-                :clients="clients"
-                :tags="tags"
-                :currency="getOrganizationCurrencyString()"
-                :can-create-project="canCreateProjects()"
-                :enable-estimated-time="isAllowedToPerformPremiumAction()"
-                :create-project="createProject"
-                :create-client="createClient"
-                :create-tag="createTag"
-                :format-duration="formatDuration"
-                @remove-row="handleRemoveRow"
-                @cell-update="handleCellUpdate"
-                @project-task-change="
-                    (row, projectId, taskId) => handleRowIdentityChange(row, { projectId, taskId })
-                "
-                @billable-change="(row, billable) => handleRowIdentityChange(row, { billable })"
-                @tags-change="(row, tags) => handleRowIdentityChange(row, { tags })"
-                @add-row="handleAddRow" />
-
-            <TimesheetFooterActions
-                v-if="!isPending"
-                :busy="isCopyingLastWeek"
-                @copy-rows="copyLastWeekRows"
-                @copy-with-time="copyLastWeekWithTime" />
-
-            <div v-else class="flex justify-center items-center py-12">
-                <LoadingSpinner />
-            </div>
-        </div>
-
-        <RemoveRowDialog
-            v-model:open="showDeleteDialog"
-            :entry-count="deleteRowEntryCount"
-            :project-name="deleteRowProjectName"
-            @confirm="confirmDeleteRow" />
-    </AppLayout>
-</template>

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

@@ -1898,6 +1898,54 @@ const endpoints = makeApi([
             },
         ],
     },
+    {
+        method: 'post',
+        path: '/v1/organizations/:organization/invoices/:invoice/copy',
+        alias: 'copyInvoice',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: z.object({ reference: z.string() }).passthrough(),
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string(),
+            },
+            {
+                name: 'invoice',
+                type: 'Path',
+                schema: z.string(),
+            },
+        ],
+        response: z.object({ data: DetailedInvoiceResource }).passthrough(),
+        errors: [
+            {
+                status: 401,
+                description: `Unauthenticated`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .passthrough(),
+            },
+        ],
+    },
     {
         method: 'get',
         path: '/v1/organizations/:organization/invoices/:invoice',

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

@@ -57,7 +57,7 @@ import type {
 import type { Dayjs } from 'dayjs';
 
 const emit = defineEmits<{
-    (e: 'dates-change', payload: { start: Dayjs; end: Dayjs }): void;
+    (e: 'dates-change', payload: { start: Date; end: Date }): void;
     (e: 'refresh'): void;
 }>();
 

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

@@ -265,9 +265,9 @@ export function useCalendarEvents(params: {
                     'seconds'
                 );
             } else {
-                durationSeconds = Math.max(
-                    0,
-                    params.currentTime.value.diff(getDayJsInstance()(entry.start), 'seconds')
+                durationSeconds = params.currentTime.value.diff(
+                    getDayJsInstance()(entry.start),
+                    'seconds'
                 );
             }
 

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

@@ -1,17 +1,27 @@
 import { computed, ref } from 'vue';
 import type { Dayjs } from 'dayjs';
 import { getLocalizedDayJs } from '../utils/time';
-import { getWeekStartDayNumber } from '../utils/settings';
+import { getWeekStart } from '../utils/settings';
 
 export function useCalendarNavigation(callbacks: {
-    onDatesChange: (payload: { start: Dayjs; end: Dayjs }) => void;
+    onDatesChange: (payload: { start: Date; end: Date }) => void;
     scrollToCurrentTime: () => void;
 }) {
     const activeView = ref('timeGridWeek');
     const currentDate = ref(getLocalizedDayJs());
 
     function getFirstDay(): number {
-        return getWeekStartDayNumber();
+        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;
     }
 
     const viewDays = computed<Dayjs[]>(() => {
@@ -57,8 +67,8 @@ export function useCalendarNavigation(callbacks: {
         const days = viewDays.value;
         if (days.length === 0) return;
 
-        const start = days[0]!;
-        const end = days[days.length - 1]!.add(1, 'day');
+        const start = days[0]!.toDate();
+        const end = days[days.length - 1]!.add(1, 'day').toDate();
         callbacks.onDatesChange({ start, end });
     }
 

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

@@ -1,145 +0,0 @@
-<script setup lang="ts">
-import { computed, inject, ref, type ComputedRef } from 'vue';
-import { formatHumanReadableDuration, parseTimeInput } from '@/packages/ui/src/utils/time';
-import TextInput from '@/packages/ui/src/Input/TextInput.vue';
-import type { Organization } from '@/packages/api/src';
-
-const organization = inject<ComputedRef<Organization>>('organization');
-
-const organizationSettings = computed(() => ({
-    intervalFormat: organization?.value?.interval_format ?? 'hours-minutes',
-    numberFormat: organization?.value?.number_format ?? 'point',
-}));
-
-const props = withDefaults(
-    defineProps<{
-        modelValue?: number | null;
-        placeholder?: string;
-        disabled?: boolean;
-        inputClass?: string;
-        size?: 'sm' | 'base';
-        defaultUnit?: 'auto' | 'hours' | 'minutes';
-    }>(),
-    {
-        modelValue: null,
-        placeholder: '-',
-        disabled: false,
-        inputClass: '',
-        size: 'base',
-        defaultUnit: 'auto',
-    }
-);
-
-const emit = defineEmits<{
-    'update:modelValue': [value: number | null];
-    commit: [value: number | null];
-    submit: [];
-}>();
-
-const temporaryValue = ref('');
-const isEditing = ref(false);
-const hasPendingEdit = ref(false);
-const skipNextCommit = ref(false);
-
-function formatModelValue(value: number | null | undefined): string {
-    if (!value || value === 0) {
-        return '';
-    }
-
-    return formatHumanReadableDuration(
-        value,
-        organizationSettings.value.intervalFormat,
-        organizationSettings.value.numberFormat
-    );
-}
-
-const displayValue = computed({
-    get() {
-        if (isEditing.value) {
-            return temporaryValue.value;
-        }
-        return formatModelValue(props.modelValue);
-    },
-    set(newValue: string) {
-        temporaryValue.value = newValue;
-        hasPendingEdit.value = true;
-    },
-});
-
-function selectInput(event: Event) {
-    isEditing.value = true;
-    hasPendingEdit.value = false;
-    skipNextCommit.value = false;
-    temporaryValue.value = formatModelValue(props.modelValue);
-    const target = event.target as HTMLInputElement;
-    target.select();
-}
-
-function resetEditingState() {
-    temporaryValue.value = '';
-    isEditing.value = false;
-    hasPendingEdit.value = false;
-}
-
-function commitValue() {
-    if (skipNextCommit.value) {
-        skipNextCommit.value = false;
-        return;
-    }
-
-    const input = temporaryValue.value.trim();
-    const shouldCommit = hasPendingEdit.value;
-    resetEditingState();
-
-    if (!shouldCommit) {
-        return;
-    }
-
-    // Blank or literal "0" → null. Consumers decide what null means
-    // (clear estimate, delete cell, etc.) by reading their own emit.
-    if (input === '' || input === '0') {
-        emit('update:modelValue', null);
-        emit('commit', null);
-        return;
-    }
-
-    const defaultUnit =
-        props.defaultUnit === 'auto'
-            ? organizationSettings.value.intervalFormat === 'decimal'
-                ? 'hours'
-                : 'minutes'
-            : props.defaultUnit;
-    const seconds = parseTimeInput(input, organizationSettings.value.numberFormat, defaultUnit);
-
-    if (seconds !== null && seconds >= 0) {
-        emit('update:modelValue', seconds);
-        emit('commit', seconds);
-    }
-}
-
-function cancelEdit(event: Event) {
-    skipNextCommit.value = true;
-    resetEditingState();
-    (event.target as HTMLInputElement).blur();
-}
-
-function commitAndSubmit() {
-    commitValue();
-    emit('submit');
-}
-</script>
-
-<template>
-    <TextInput
-        v-model="displayValue"
-        data-testid="duration_seconds_input"
-        name="Duration"
-        :size="size"
-        :disabled="disabled"
-        :placeholder="isEditing ? '0' : placeholder"
-        :class="inputClass"
-        @focus="selectInput"
-        @blur="commitValue"
-        @keydown.enter.prevent="commitAndSubmit"
-        @keydown.escape="cancelEdit" />
-</template>

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

@@ -1,6 +1,12 @@
 <script setup lang="ts">
-import DurationSecondsInput from '@/packages/ui/src/Input/DurationSecondsInput.vue';
+import { onMounted, ref, watch, inject } from 'vue';
+import { formatHumanReadableDuration, parseTimeInput } from '@/packages/ui/src/utils/time';
 import { twMerge } from 'tailwind-merge';
+import { TextInput } from '@/packages/ui/src';
+import type { Organization } from '@/packages/api/src';
+import { type ComputedRef } from 'vue';
+
+const temporaryInput = ref<string>('');
 
 const model = defineModel<number | null>({
     default: null,
@@ -10,16 +16,64 @@ const emit = defineEmits<{
     submit: [];
 }>();
 
+const organization = inject<ComputedRef<Organization>>('organization');
+
+function updateDuration() {
+    const input = temporaryInput.value.trim();
+
+    if (input === '') {
+        model.value = null;
+        return;
+    }
+
+    const seconds = parseTimeInput(input, organization?.value?.number_format, 'hours');
+    if (seconds !== null && seconds > 0) {
+        model.value = seconds;
+    }
+
+    updateInputDisplay();
+}
+
 const props = defineProps<{
     class?: string;
 }>();
+
+watch(model, updateInputDisplay);
+onMounted(() => updateInputDisplay());
+
+function updateInputDisplay() {
+    if (model.value !== null && model.value > 0) {
+        temporaryInput.value = formatHumanReadableDuration(
+            model.value,
+            organization?.value?.interval_format,
+            organization?.value?.number_format
+        );
+    } else {
+        temporaryInput.value = '';
+    }
+}
+
+function selectInput(event: Event) {
+    const target = event.target as HTMLInputElement;
+    target.select();
+}
+
+function updateAndSubmit() {
+    updateDuration();
+    emit('submit');
+}
 </script>
 
 <template>
-    <DurationSecondsInput
-        v-model="model"
-        :input-class="twMerge('placeholder:text-text-tertiary', props.class)"
+    <TextInput
+        ref="inputField"
+        v-model="temporaryInput"
+        :class="twMerge('text-text-secondary', props.class)"
+        type="text"
         placeholder="e.g. 2h 30m or 1.5"
-        default-unit="hours"
-        @submit="emit('submit')" />
+        @focus="selectInput"
+        @blur="updateDuration"
+        @keydown.enter="updateAndSubmit" />
 </template>
+
+<style scoped></style>

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

@@ -1,15 +1,11 @@
 <script setup lang="ts">
-import { computed, onMounted, ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import { twMerge } from 'tailwind-merge';
 
-const props = withDefaults(
-    defineProps<{
-        name?: string;
-        class?: string;
-        size?: 'sm' | 'base';
-    }>(),
-    { size: 'base' }
-);
+const props = defineProps<{
+    name?: string;
+    class?: string;
+}>();
 
 const input = ref<HTMLInputElement | null>(null);
 
@@ -21,10 +17,6 @@ onMounted(() => {
 
 defineExpose({ focus: () => input.value?.focus() });
 const model = defineModel();
-
-const sizeClasses = computed(() =>
-    props.size === 'sm' ? 'h-7 px-2 py-0.5 text-xs' : 'h-9 px-3 py-1 text-base sm:text-sm'
-);
 </script>
 
 <template>
@@ -33,8 +25,7 @@ const sizeClasses = computed(() =>
         v-model="model"
         :class="
             twMerge(
-                'border-input-border border bg-input-background text-text-primary focus-visible:ring-2 focus-visible:ring-ring focus-visible:border-transparent rounded-md shadow-sm',
-                sizeClasses,
+                'h-9 px-3 py-1 text-base sm:text-sm border-input-border border bg-input-background text-text-primary focus-visible:ring-2 focus-visible:ring-ring focus-visible:border-transparent rounded-md shadow-sm',
                 props.class
             )
         "

resources/js/packages/ui/src/Project/ProjectCreateModal.vue

@@ -15,7 +15,6 @@ import { UserCircleIcon } from '@heroicons/vue/20/solid';
 import EstimatedTimeSection from '@/packages/ui/src/EstimatedTimeSection.vue';
 import { Field, FieldGroup, FieldLabel } from '../field';
 import ProjectEditBillableSection from '@/packages/ui/src/Project/ProjectEditBillableSection.vue';
-import ProjectVisibilitySelect from '@/packages/ui/src/Project/ProjectVisibilitySelect.vue';
 import type { Client } from '@/packages/api/src';
 
 const show = defineModel('show', { default: false });
@@ -42,7 +41,6 @@ const project = ref<CreateProjectBody>({
     billable_rate: null,
     is_billable: false,
     estimated_time: null,
-    is_public: false,
 });
 
 async function submit() {
@@ -55,7 +53,6 @@ async function submit() {
         billable_rate: null,
         is_billable: false,
         estimated_time: null,
-        is_public: false,
     };
 }
 
@@ -126,7 +123,6 @@ const currentClientName = computed(() => {
                     v-if="enableEstimatedTime"
                     v-model="project.estimated_time"
                     @submit="submit()"></EstimatedTimeSection>
-                <ProjectVisibilitySelect v-model="project.is_public"></ProjectVisibilitySelect>
             </FieldGroup>
         </template>
         <template #footer>

resources/js/packages/ui/src/Project/ProjectVisibilitySelect.vue

@@ -1,39 +0,0 @@
-<script setup lang="ts">
-import { computed } from 'vue';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '..';
-import { Field, FieldDescription, FieldLabel } from '../field';
-import { GlobeAltIcon } from '@heroicons/vue/20/solid';
-
-const isPublic = defineModel<boolean>({ default: false });
-
-const visibility = computed({
-    get: () => (isPublic.value ? 'public' : 'private'),
-    set: (value: string) => {
-        isPublic.value = value === 'public';
-    },
-});
-
-const description = computed(() =>
-    isPublic.value
-        ? 'This project is visible to all members of the organization.'
-        : 'This project is only visible to its project members.'
-);
-</script>
-
-<template>
-    <Field>
-        <FieldLabel :icon="GlobeAltIcon" for="visibility">Visibility</FieldLabel>
-        <Select v-model="visibility">
-            <SelectTrigger id="visibility">
-                <SelectValue />
-            </SelectTrigger>
-            <SelectContent>
-                <SelectItem value="private">Private</SelectItem>
-                <SelectItem value="public">Public</SelectItem>
-            </SelectContent>
-        </Select>
-        <FieldDescription>{{ description }}</FieldDescription>
-    </Field>
-</template>
-
-<style scoped></style>

resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.test.ts

@@ -1,90 +0,0 @@
-/* eslint-disable vue/one-component-per-file */
-import { mount } from '@vue/test-utils';
-import { describe, expect, it, vi } from 'vitest';
-import { defineComponent, h, nextTick, onMounted } from 'vue';
-import TimeTrackerProjectTaskDropdown from './TimeTrackerProjectTaskDropdown.vue';
-import type { Client, Project, Task } from '@/packages/api/src';
-
-const DropdownStub = defineComponent({
-    props: {
-        modelValue: {
-            type: Boolean,
-            default: false,
-        },
-    },
-    emits: ['update:modelValue'],
-    setup(_, { emit, slots }) {
-        onMounted(() => emit('update:modelValue', true));
-        return () => h('div', [slots.trigger?.(), slots.content?.()]);
-    },
-});
-
-const FocusTrapStub = defineComponent({
-    setup(_, { slots }) {
-        return () => h('div', slots.default?.());
-    },
-});
-
-function mountDropdown(props: Record<string, unknown> = {}) {
-    return mount(TimeTrackerProjectTaskDropdown, {
-        props: {
-            project: null,
-            task: null,
-            projects: [] as Project[],
-            tasks: [] as Task[],
-            clients: [] as Client[],
-            createProject: vi.fn(),
-            createClient: vi.fn(),
-            currency: 'EUR',
-            enableEstimatedTime: false,
-            organizationBillableRate: null,
-            canCreateProject: false,
-            ...props,
-        },
-        global: {
-            stubs: {
-                Dropdown: DropdownStub,
-                UseFocusTrap: FocusTrapStub,
-            },
-        },
-    });
-}
-
-async function openDropdown() {
-    const wrapper = mountDropdown();
-    await nextTick();
-    await nextTick();
-    return wrapper;
-}
-
-describe('TimeTrackerProjectTaskDropdown', () => {
-    it('keeps the existing empty-string no-project value by default', async () => {
-        const wrapper = await openDropdown();
-
-        await wrapper.find('[data-project-id=""]').trigger('click');
-
-        expect(wrapper.emitted('update:project')?.at(-1)).toEqual(['']);
-        expect(wrapper.emitted('changed')?.at(-1)).toEqual(['', null]);
-    });
-
-    it('can emit null for no-project consumers that use null as the domain value', async () => {
-        const wrapper = mountDropdown({ project: 'p-1', noProjectValue: null });
-        await nextTick();
-        await nextTick();
-
-        await wrapper.find('[data-project-id=""]').trigger('click');
-
-        expect(wrapper.emitted('update:project')?.at(-1)).toEqual([null]);
-        expect(wrapper.emitted('changed')?.at(-1)).toEqual([null, null]);
-    });
-
-    it('still exposes "No Project" when projects are empty and project creation is allowed', async () => {
-        const wrapper = mountDropdown({ canCreateProject: true });
-        await nextTick();
-        await nextTick();
-
-        await wrapper.find('[data-project-id=""]').trigger('click');
-
-        expect(wrapper.emitted('changed')?.at(-1)).toEqual(['', null]);
-    });
-});

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

@@ -11,13 +11,11 @@ import type {
     Client,
 } from '@/packages/api/src';
 
-import { PlusCircleIcon, MinusIcon, XMarkIcon } from '@heroicons/vue/16/solid';
+import { PlusIcon, PlusCircleIcon, MinusIcon, XMarkIcon } from '@heroicons/vue/16/solid';
 import ProjectCreateModal from '@/packages/ui/src/Project/ProjectCreateModal.vue';
 import { twMerge } from 'tailwind-merge';
 import { Button } from '@/packages/ui/src/Buttons';
 
-const NO_PROJECT_ID = '';
-
 const task = defineModel<string | null>('task', {
     default: null,
 });
@@ -59,7 +57,6 @@ const props = withDefaults(
         currency: string;
         emptyPlaceholder?: string;
         allowReset?: boolean;
-        noProjectValue?: string | null;
         enableEstimatedTime: boolean;
         organizationBillableRate: number | null;
         canCreateProject: boolean;
@@ -71,7 +68,6 @@ const props = withDefaults(
     {
         emptyPlaceholder: 'No Project',
         allowReset: false,
-        noProjectValue: NO_PROJECT_ID,
         variant: 'ghost',
         align: 'center',
         size: 'sm',
@@ -168,10 +164,10 @@ function updateFilteredResults() {
             is_archived: false,
             projects: [
                 {
-                    id: NO_PROJECT_ID,
+                    id: '',
                     name: 'No Project',
                     color: 'var(--theme-color-icon-default)',
-                    value: NO_PROJECT_ID,
+                    value: '',
                     client_id: null,
                     billable_rate: null,
                     is_archived: false,
@@ -494,7 +490,7 @@ function selectTask(taskId: string) {
 }
 
 function selectProject(projectId: string) {
-    project.value = projectId === NO_PROJECT_ID ? props.noProjectValue : projectId;
+    project.value = projectId;
     task.value = null;
     open.value = false;
     searchValue.value = '';
@@ -511,35 +507,41 @@ const showCreateProject = ref(false);
 </script>
 
 <template>
-    <Dropdown v-model="open" :close-on-content-click="false" :align="props.align">
+    <template v-if="projects.length === 0 && canCreateProject">
+        <Button
+            :variant="props.variant"
+            :size="props.size"
+            :class="twMerge('w-full justify-start', props.class)"
+            @click="showCreateProject = true">
+            <PlusIcon class="w-4" />
+            <span class="truncate">Add new project</span>
+        </Button>
+    </template>
+    <Dropdown v-else v-model="open" :close-on-content-click="false" :align="props.align">
         <template #trigger>
-            <slot name="trigger">
-                <div class="flex items-center gap-1">
-                    <Button
-                        :variant="props.variant"
-                        :size="props.size"
-                        :class="twMerge('w-full justify-start overflow-hidden', props.class)">
-                        <div
-                            class="w-3 h-3 rounded-full shrink-0"
-                            :style="{ backgroundColor: selectedProjectColor }"></div>
-                        <span class="truncate shrink-[1] text-text-primary pr-1">{{
-                            selectedProjectName
-                        }}</span>
-                        <template v-if="currentTask">
-                            <ChevronRightIcon class="w-4 h-4 text-text-tertiary shrink-0" />
-                            <span class="truncate shrink-[100]">{{ currentTask.name }}</span>
-                        </template>
-                    </Button>
-                    <button
-                        v-if="allowReset && project !== null"
-                        type="button"
-                        data-testid="project_reset_button"
-                        class="p-1 rounded hover:bg-quaternary text-text-tertiary hover:text-text-primary"
-                        @click.stop="resetProject">
-                        <XMarkIcon class="w-4 h-4" />
-                    </button>
-                </div>
-            </slot>
+            <div class="flex items-center gap-1">
+                <Button
+                    :variant="props.variant"
+                    :size="props.size"
+                    :class="twMerge('w-full justify-start overflow-hidden', props.class)">
+                    <div
+                        class="w-3 h-3 rounded-full shrink-0"
+                        :style="{ backgroundColor: selectedProjectColor }"></div>
+                    <span class="truncate shrink-[1] pr-1">{{ selectedProjectName }}</span>
+                    <template v-if="currentTask">
+                        <ChevronRightIcon class="w-4 h-4 text-text-tertiary shrink-0" />
+                        <span class="truncate shrink-[100]">{{ currentTask.name }}</span>
+                    </template>
+                </Button>
+                <button
+                    v-if="allowReset && project !== null"
+                    type="button"
+                    data-testid="project_reset_button"
+                    class="p-1 rounded hover:bg-quaternary text-text-tertiary hover:text-text-primary"
+                    @click.stop="resetProject">
+                    <XMarkIcon class="w-4 h-4" />
+                </button>
+            </div>
         </template>
         <template #content>
             <UseFocusTrap v-if="open" :options="{ immediate: true, allowOutsideClick: true }">

resources/js/packages/ui/src/dialog/DialogContent.vue

@@ -31,7 +31,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);
         <div
             :class="
                 cn(
-                    'fixed top-0 left-0 z-50 pointer-events-none w-screen h-screen flex items-start px-2 pt-3 md:pt-14 xl:pt-24 justify-center overflow-auto'
+                    'fixed top-0 left-0 z-50 pointer-events-none w-screen h-screen flex items-start px-2 pt-3 md:pt-20 xl:pt-32 justify-center overflow-auto'
                 )
             ">
             <DialogContent

resources/js/packages/ui/src/field/FieldGroup.vue

@@ -12,7 +12,7 @@ const props = defineProps<{
         data-slot="field-group"
         :class="
             cn(
-                'group/field-group @container/field-group flex w-full flex-col gap-6 data-[slot=checkbox-group]:gap-3 [&>[data-slot=field-group]]:gap-4',
+                'group/field-group @container/field-group flex w-full flex-col gap-7 data-[slot=checkbox-group]:gap-3 [&>[data-slot=field-group]]:gap-4',
                 props.class
             )
         ">

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

@@ -8,20 +8,6 @@ export function getWeekStart() {
     }
     return weekStart;
 }
-
-const weekStartMap: Record<string, number> = {
-    sunday: 0,
-    monday: 1,
-    tuesday: 2,
-    wednesday: 3,
-    thursday: 4,
-    friday: 5,
-    saturday: 6,
-};
-
-export function getWeekStartDayNumber(): number {
-    return weekStartMap[getWeekStart()] ?? 1;
-}
 export function getUserTimezone() {
     const timezone = window?.getTimezoneSetting() as string;
     if (!timezone) {

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

@@ -1,44 +0,0 @@
-import { describe, expect, test } from 'vitest';
-import { formatHumanReadableDuration, formatReportingDuration } from './time';
-
-const seconds = 14 * 3600 + 45 * 60 + 6; // 14h 45m 06s
-
-describe('formatHumanReadableDuration', () => {
-    test('decimal', () => {
-        expect(formatHumanReadableDuration(seconds, 'decimal', 'comma-point')).toBe('14.75 h');
-    });
-
-    test('hours-minutes', () => {
-        expect(formatHumanReadableDuration(seconds, 'hours-minutes')).toBe('14h 45min');
-    });
-
-    test('hours-minutes-colon-separated', () => {
-        expect(formatHumanReadableDuration(seconds, 'hours-minutes-colon-separated')).toBe('14:45');
-    });
-
-    test('hours-minutes-seconds-colon-separated', () => {
-        expect(formatHumanReadableDuration(seconds, 'hours-minutes-seconds-colon-separated')).toBe(
-            '14:45:06'
-        );
-    });
-});
-
-describe('formatReportingDuration', () => {
-    test('decimal', () => {
-        expect(formatReportingDuration(seconds, 'decimal', 'comma-point')).toBe('14.75 h');
-    });
-
-    test('hours-minutes', () => {
-        expect(formatReportingDuration(seconds, 'hours-minutes')).toBe('14:45:06');
-    });
-
-    test('hours-minutes-colon-separated', () => {
-        expect(formatReportingDuration(seconds, 'hours-minutes-colon-separated')).toBe('14:45:06');
-    });
-
-    test('hours-minutes-seconds-colon-separated', () => {
-        expect(formatReportingDuration(seconds, 'hours-minutes-seconds-colon-separated')).toBe(
-            '14:45:06'
-        );
-    });
-});

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

@@ -3,8 +3,6 @@ import duration from 'dayjs/plugin/duration';
 import relativeTime from 'dayjs/plugin/relativeTime';
 import isToday from 'dayjs/plugin/isToday';
 import isYesterday from 'dayjs/plugin/isYesterday';
-import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
-import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
 import utc from 'dayjs/plugin/utc';
 import timezone from 'dayjs/plugin/timezone';
 import weekOfYear from 'dayjs/plugin/weekOfYear';
@@ -70,8 +68,6 @@ function configureParseLocale(numberFormat?: string) {
 dayjs.extend(relativeTime);
 dayjs.extend(isToday);
 dayjs.extend(isYesterday);
-dayjs.extend(isSameOrBefore);
-dayjs.extend(isSameOrAfter);
 dayjs.extend(duration);
 dayjs.extend(utc);
 dayjs.extend(timezone);
@@ -192,15 +188,6 @@ export function getLocalizedDateFromTimestamp(timestamp: string) {
     return getLocalizedDayJs(timestamp).format('YYYY-MM-DD');
 }
 
-/**
- * Converts a local Date to a UTC-formatted ISO string.
- * Treats the Date as being in the user's timezone and converts to UTC.
- * This is the inverse of getLocalizedDayJs (which goes UTC → local).
- */
-export function localDateToUtc(date: dayjs.Dayjs): string {
-    return date.tz(getUserTimezone(), true).utc().format();
-}
-
 /*
  * Returns a formatted date.
  * @param date - date in the format of 'YYYY-MM-DD'

resources/js/packages/ui/tailwind.theme.js

@@ -104,7 +104,7 @@ export const solidtimeTheme = {
             border: 'var(--popover-border)',
         },
         destructive: {
-            DEFAULT: 'hsl(var(--destructive))',
+            DEFAULT: 'var(--destructive)',
             foreground: 'var(--destructive-foreground)',
         },
         border: 'var(--border)',

resources/js/test-setup.ts

@@ -1,20 +0,0 @@
-// Vitest setup file. Wires up the globals that the production code reads
-// off `window` (`getTimezoneSetting`, `getWeekStartSetting`, `getNumberFormat`,
-// `getIntervalFormat`) so that helpers under test don't crash when imported
-// outside the running app.
-
-import { vi } from 'vitest';
-
-declare global {
-    interface Window {
-        getTimezoneSetting: () => string;
-        getWeekStartSetting: () => string;
-        getNumberFormat: () => string;
-        getIntervalFormat: () => string;
-    }
-}
-
-window.getTimezoneSetting = vi.fn(() => 'UTC');
-window.getWeekStartSetting = vi.fn(() => 'monday');
-window.getNumberFormat = vi.fn(() => 'point');
-window.getIntervalFormat = vi.fn(() => 'hours-minutes');

resources/js/types/inertia.d.ts

@@ -9,6 +9,9 @@ declare global {
                 created_at: Date;
                 updated_at: Date;
             };
+            jetstream: {
+                [key: string]: boolean;
+            };
             errorBags: unknown;
             errors: unknown;
         }

resources/js/types/jetstream.ts

@@ -33,3 +33,10 @@ export interface Role {
 export type JetstreamUser = User & {
     two_factor_enabled: boolean;
 };
+export interface Token {
+    name: string;
+    token: string;
+    abilities: string[];
+    id: string;
+    last_used_ago: string;
+}

resources/js/utils/notification.ts

@@ -57,13 +57,6 @@ export const useNotificationsStore = defineStore('notifications', () => {
                         'organization_has_no_subscription_but_multiple_members'
                     ) {
                         showActionBlockedModal.value = true;
-                    } else if (error?.response?.data?.key === 'overlapping_time_entry') {
-                        addNotification(
-                            'error',
-                            'Overlapping time entries are not allowed',
-                            error.response?.data?.message ??
-                                'This change would overlap with an existing time entry.'
-                        );
                     } else {
                         addNotification(
                             'error',

resources/js/utils/timesheet/cellMath.test.ts

@@ -1,348 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import dayjs from 'dayjs';
-import utc from 'dayjs/plugin/utc';
-import timezone from 'dayjs/plugin/timezone';
-import { findFreeWindowOnDay, freeGapSecondsAfter, NoFreeWindowError } from './cellMath';
-import type { TimeEntry } from '@/packages/api/src';
-
-dayjs.extend(utc);
-dayjs.extend(timezone);
-
-// All times in the tests are in UTC for clarity. The "day" we search is
-// 2026-04-10 in UTC (so we use tz='UTC' to avoid local-machine surprises).
-const TZ = 'UTC';
-const DATE = '2026-04-10';
-
-/** Build a fake TimeEntry from UTC ISO timestamps. */
-function entry(start: string, end: string | null, id = `e-${start}-${end}`): TimeEntry {
-    const startMs = dayjs.utc(start).valueOf();
-    const endMs = end ? dayjs.utc(end).valueOf() : startMs;
-    return {
-        id,
-        start,
-        end,
-        duration: end ? Math.floor((endMs - startMs) / 1000) : null,
-        description: '',
-        member_id: 'm-1',
-        project_id: null,
-        task_id: null,
-        billable: false,
-        tags: [],
-        // The grid only reads the fields above; the rest are placeholders
-        // to satisfy the TimeEntry type without pulling in real fixtures.
-        user_id: 'u-1',
-        organization_id: 'o-1',
-    } as unknown as TimeEntry;
-}
-
-const HOUR = 3600;
-
-describe('findFreeWindowOnDay', () => {
-    // ── Empty / trivial cases ──────────────────────────────────────
-
-    it('returns the start of the day for a totally empty day', () => {
-        const result = findFreeWindowOnDay([], DATE, HOUR, TZ);
-        expect(result).toEqual({
-            start: '2026-04-10T00:00:00Z',
-            end: '2026-04-10T01:00:00Z',
-        });
-    });
-
-    it('returns null for zero or negative required seconds', () => {
-        expect(findFreeWindowOnDay([], DATE, 0, TZ)).toBeNull();
-        expect(findFreeWindowOnDay([], DATE, -1, TZ)).toBeNull();
-    });
-
-    it('refuses any duration > 24h on principle (single-day constraint)', () => {
-        const result = findFreeWindowOnDay([], DATE, 25 * HOUR, TZ);
-        expect(result).toBeNull();
-    });
-
-    // ── Single obstacle, basic gap finding ────────────────────────
-
-    it('finds the gap before a single obstacle if it fits', () => {
-        const obs = [entry('2026-04-10T10:00:00Z', '2026-04-10T11:00:00Z')];
-        const result = findFreeWindowOnDay(obs, DATE, HOUR, TZ);
-        expect(result?.start).toBe('2026-04-10T00:00:00Z');
-        expect(result?.end).toBe('2026-04-10T01:00:00Z');
-    });
-
-    it('finds the gap after a single obstacle when preferredStart skips earlier gaps', () => {
-        const obs = [entry('2026-04-10T10:00:00Z', '2026-04-10T11:00:00Z')];
-        const result = findFreeWindowOnDay(obs, DATE, HOUR, TZ, '2026-04-10T11:00:00Z');
-        expect(result?.start).toBe('2026-04-10T11:00:00Z');
-        expect(result?.end).toBe('2026-04-10T12:00:00Z');
-    });
-
-    // ── Multi-obstacle gap walking ────────────────────────────────
-
-    it('finds a gap between two obstacles', () => {
-        const obs = [
-            entry('2026-04-10T08:00:00Z', '2026-04-10T10:00:00Z'),
-            entry('2026-04-10T12:00:00Z', '2026-04-10T14:00:00Z'),
-        ];
-        // Search for 2h, expecting the [00:00, 08:00) gap (8h available)
-        const result = findFreeWindowOnDay(obs, DATE, 2 * HOUR, TZ);
-        expect(result?.start).toBe('2026-04-10T00:00:00Z');
-    });
-
-    it('walks past gaps that are too small', () => {
-        const obs = [
-            entry('2026-04-10T00:30:00Z', '2026-04-10T10:00:00Z'),
-            entry('2026-04-10T11:00:00Z', '2026-04-10T12:00:00Z'),
-        ];
-        // First gap is 30min, second gap is 1h, third is 12h.
-        // Asking for 90min → first two gaps are too small, third fits.
-        const result = findFreeWindowOnDay(obs, DATE, 90 * 60, TZ);
-        expect(result?.start).toBe('2026-04-10T12:00:00Z');
-    });
-
-    it('uses preferredStart even when it lands inside a gap', () => {
-        const obs = [
-            entry('2026-04-10T00:00:00Z', '2026-04-10T08:00:00Z'),
-            entry('2026-04-10T12:00:00Z', '2026-04-10T14:00:00Z'),
-        ];
-        // preferredStart 09:00 → gap is [09:00, 12:00) = 3h
-        const result = findFreeWindowOnDay(obs, DATE, 2 * HOUR, TZ, '2026-04-10T09:00:00Z');
-        expect(result?.start).toBe('2026-04-10T09:00:00Z');
-        expect(result?.end).toBe('2026-04-10T11:00:00Z');
-    });
-
-    it('skips ahead when preferredStart lands inside an obstacle', () => {
-        const obs = [entry('2026-04-10T08:00:00Z', '2026-04-10T12:00:00Z')];
-        // preferredStart 10:00 lands inside [08:00, 12:00). We must
-        // advance to the next free position (12:00).
-        const result = findFreeWindowOnDay(obs, DATE, HOUR, TZ, '2026-04-10T10:00:00Z');
-        expect(result?.start).toBe('2026-04-10T12:00:00Z');
-    });
-
-    // ── Spillover from previous day ───────────────────────────────
-
-    it('treats an entry that started yesterday but ends today as an obstacle', () => {
-        // Yesterday 23:00 → today 02:00 → blocks the first 2h of today.
-        const obs = [entry('2026-04-09T23:00:00Z', '2026-04-10T02:00:00Z')];
-        const result = findFreeWindowOnDay(obs, DATE, HOUR, TZ);
-        expect(result?.start).toBe('2026-04-10T02:00:00Z');
-    });
-
-    it('ignores an entry that ended exactly at the start of the day', () => {
-        // Yesterday 22:00 → today 00:00 (exclusive) → does NOT block today.
-        const obs = [entry('2026-04-09T22:00:00Z', '2026-04-10T00:00:00Z')];
-        const result = findFreeWindowOnDay(obs, DATE, HOUR, TZ);
-        expect(result?.start).toBe('2026-04-10T00:00:00Z');
-    });
-
-    // ── Running entries ────────────────────────────────────────────
-
-    it('treats a running entry as blocking up to "now"', () => {
-        const obs = [entry('2026-04-10T08:00:00Z', null)];
-        const now = '2026-04-10T10:30:00Z';
-        // The running entry blocks 08:00–10:30 → first free window is
-        // either before 08:00 (8h available, fits a 1h request).
-        const result = findFreeWindowOnDay(obs, DATE, HOUR, TZ, null, now);
-        expect(result?.start).toBe('2026-04-10T00:00:00Z');
-    });
-
-    it('places after a running entry when preferredStart pushes past it', () => {
-        const obs = [entry('2026-04-10T08:00:00Z', null)];
-        const now = '2026-04-10T10:30:00Z';
-        const result = findFreeWindowOnDay(obs, DATE, HOUR, TZ, '2026-04-10T09:00:00Z', now);
-        // preferredStart 09:00 lands inside the running entry's blocked
-        // range [08:00, 10:30) → must skip to 10:30.
-        expect(result?.start).toBe('2026-04-10T10:30:00Z');
-    });
-
-    // ── Midnight refusal ──────────────────────────────────────────
-
-    it('refuses to return a window that would cross midnight', () => {
-        const obs = [entry('2026-04-10T00:00:00Z', '2026-04-10T22:30:00Z')];
-        // Only 90min remain in the day. Asking for 2h → null.
-        const result = findFreeWindowOnDay(obs, DATE, 2 * HOUR, TZ);
-        expect(result).toBeNull();
-    });
-
-    it('accepts a window that ends exactly at midnight', () => {
-        const obs = [entry('2026-04-10T00:00:00Z', '2026-04-10T22:00:00Z')];
-        // Exactly 2h remain → 22:00–00:00.
-        const result = findFreeWindowOnDay(obs, DATE, 2 * HOUR, TZ);
-        expect(result?.start).toBe('2026-04-10T22:00:00Z');
-        expect(result?.end).toBe('2026-04-11T00:00:00Z');
-    });
-
-    // ── Pre-existing overlapping obstacles ────────────────────────
-
-    it('merges overlapping obstacles before computing gaps', () => {
-        const obs = [
-            entry('2026-04-10T09:00:00Z', '2026-04-10T11:00:00Z'),
-            entry('2026-04-10T10:00:00Z', '2026-04-10T13:00:00Z'),
-            entry('2026-04-10T15:00:00Z', '2026-04-10T16:00:00Z'),
-        ];
-        // Effective obstacles: [09:00, 13:00) and [15:00, 16:00)
-        // First gap is [00:00, 09:00) = 9h. Asking for 2h → 00:00.
-        const result = findFreeWindowOnDay(obs, DATE, 2 * HOUR, TZ);
-        expect(result?.start).toBe('2026-04-10T00:00:00Z');
-    });
-
-    // ── Day full ──────────────────────────────────────────────────
-
-    it('returns null when no gap is large enough', () => {
-        const obs = [
-            entry('2026-04-10T00:00:00Z', '2026-04-10T11:00:00Z'),
-            entry('2026-04-10T11:30:00Z', '2026-04-10T22:00:00Z'),
-            entry('2026-04-10T22:30:00Z', '2026-04-10T23:30:00Z'),
-        ];
-        // Gaps: 30min, 30min, 30min. Asking for 1h → null.
-        const result = findFreeWindowOnDay(obs, DATE, HOUR, TZ);
-        expect(result).toBeNull();
-    });
-
-    // ── Timezone awareness ────────────────────────────────────────
-
-    it('respects the user timezone for day boundaries', () => {
-        // In Pacific/Auckland (+13 in April 2026), 2026-04-10 starts at
-        // 2026-04-09T11:00:00Z (NZDT was UTC+13 until April 5 2026, then
-        // NZST UTC+12 — let's pick a date in NZST so the offset is +12).
-        // 2026-04-10 NZST = 2026-04-09T12:00:00Z to 2026-04-10T12:00:00Z
-        const tz = 'Pacific/Auckland';
-        const obs = [
-            // This entry is at 2026-04-10T08:00:00Z = 2026-04-10T20:00 NZ
-            // → falls in the NZ day for 2026-04-10. So it blocks from
-            // 20:00 to 21:00 NZ time.
-            entry('2026-04-10T08:00:00Z', '2026-04-10T09:00:00Z'),
-        ];
-        const result = findFreeWindowOnDay(obs, '2026-04-10', HOUR, tz);
-        // Day starts at 2026-04-09T12:00:00Z in NZST. First gap is the
-        // 20h before the obstacle starts.
-        expect(result?.start).toBe('2026-04-09T12:00:00Z');
-    });
-
-    it('does not place work past local midnight on spring-forward days', () => {
-        const tz = 'Europe/Vienna';
-        const obs = [entry('2026-03-28T23:00:00Z', '2026-03-29T22:00:00Z')];
-
-        const result = findFreeWindowOnDay(obs, '2026-03-29', HOUR, tz);
-
-        expect(result).toBeNull();
-    });
-
-    it('can use the final local hour on fall-back days', () => {
-        const tz = 'Europe/Vienna';
-
-        const result = findFreeWindowOnDay([], '2026-10-25', HOUR, tz, '2026-10-25T22:00:00Z');
-
-        expect(result).toEqual({
-            start: '2026-10-25T22:00:00Z',
-            end: '2026-10-25T23:00:00Z',
-        });
-    });
-});
-
-describe('freeGapSecondsAfter', () => {
-    it('returns the rest of the day for an empty day', () => {
-        const result = freeGapSecondsAfter([], DATE, TZ, '2026-04-10T09:00:00Z');
-        // 09:00 → 24:00 = 15 hours
-        expect(result).toBe(15 * HOUR);
-    });
-
-    it('returns 0 when cursor is at end-of-day', () => {
-        const result = freeGapSecondsAfter([], DATE, TZ, '2026-04-11T00:00:00Z');
-        expect(result).toBe(0);
-    });
-
-    it('returns 0 when cursor is after end-of-day', () => {
-        const result = freeGapSecondsAfter([], DATE, TZ, '2026-04-11T05:00:00Z');
-        expect(result).toBe(0);
-    });
-
-    it('returns 0 when cursor is before the day starts', () => {
-        const result = freeGapSecondsAfter([], DATE, TZ, '2026-04-09T23:00:00Z');
-        expect(result).toBe(0);
-    });
-
-    it('returns the gap to the next obstacle', () => {
-        const obs = [entry('2026-04-10T11:00:00Z', '2026-04-10T12:00:00Z')];
-        // cursor 09:00 → next obstacle 11:00 → 2h gap
-        const result = freeGapSecondsAfter(obs, DATE, TZ, '2026-04-10T09:00:00Z');
-        expect(result).toBe(2 * HOUR);
-    });
-
-    it('returns 0 when cursor sits inside an obstacle', () => {
-        const obs = [entry('2026-04-10T08:00:00Z', '2026-04-10T12:00:00Z')];
-        const result = freeGapSecondsAfter(obs, DATE, TZ, '2026-04-10T10:00:00Z');
-        expect(result).toBe(0);
-    });
-
-    it('returns the rest of the day when no obstacle is ahead', () => {
-        const obs = [entry('2026-04-10T08:00:00Z', '2026-04-10T09:00:00Z')];
-        const result = freeGapSecondsAfter(obs, DATE, TZ, '2026-04-10T09:00:00Z');
-        // 09:00 → 24:00 = 15h
-        expect(result).toBe(15 * HOUR);
-    });
-
-    it('skips obstacles strictly before the cursor', () => {
-        const obs = [
-            entry('2026-04-10T08:00:00Z', '2026-04-10T09:00:00Z'),
-            entry('2026-04-10T15:00:00Z', '2026-04-10T16:00:00Z'),
-        ];
-        // cursor 09:00 → first obstacle (08-09) is behind, next is 15:00 → 6h
-        const result = freeGapSecondsAfter(obs, DATE, TZ, '2026-04-10T09:00:00Z');
-        expect(result).toBe(6 * HOUR);
-    });
-
-    it('treats a running entry as blocking up to "now"', () => {
-        const obs = [entry('2026-04-10T08:00:00Z', null)];
-        const now = '2026-04-10T10:00:00Z';
-        // cursor 11:00 is after the running entry's effective end (10:00),
-        // so the gap is the rest of the day = 13h
-        const result = freeGapSecondsAfter(obs, DATE, TZ, '2026-04-10T11:00:00Z', now);
-        expect(result).toBe(13 * HOUR);
-    });
-
-    it('returns 0 when cursor is inside a running entry (cursor < now)', () => {
-        const obs = [entry('2026-04-10T08:00:00Z', null)];
-        const now = '2026-04-10T12:00:00Z';
-        // cursor 10:00 falls inside [08:00, 12:00) → blocked
-        const result = freeGapSecondsAfter(obs, DATE, TZ, '2026-04-10T10:00:00Z', now);
-        expect(result).toBe(0);
-    });
-
-    it('clips the gap to midnight, never beyond', () => {
-        const obs = [entry('2026-04-10T08:00:00Z', '2026-04-10T09:00:00Z')];
-        // cursor 23:00 → 1h until midnight
-        const result = freeGapSecondsAfter(obs, DATE, TZ, '2026-04-10T23:00:00Z');
-        expect(result).toBe(HOUR);
-    });
-
-    it('clips spring-forward days at the next local midnight', () => {
-        const result = freeGapSecondsAfter(
-            [],
-            '2026-03-29',
-            'Europe/Vienna',
-            '2026-03-29T22:00:00Z'
-        );
-
-        expect(result).toBe(0);
-    });
-
-    it('includes the final local hour on fall-back days', () => {
-        const result = freeGapSecondsAfter(
-            [],
-            '2026-10-25',
-            'Europe/Vienna',
-            '2026-10-25T22:00:00Z'
-        );
-
-        expect(result).toBe(HOUR);
-    });
-});
-
-describe('NoFreeWindowError', () => {
-    it('carries the date and required seconds', () => {
-        const err = new NoFreeWindowError('2026-04-10', 7200);
-        expect(err.code).toBe('no_free_window');
-        expect(err.date).toBe('2026-04-10');
-        expect(err.requiredSeconds).toBe(7200);
-        expect(err.message).toContain('2026-04-10');
-        expect(err instanceof Error).toBe(true);
-    });
-});

resources/js/utils/timesheet/cellMath.ts

@@ -1,212 +0,0 @@
-import { type Dayjs } from 'dayjs';
-import type { TimeEntry } from '@/packages/api/src';
-import { getDayJsInstance } from '@/packages/ui/src/utils/time';
-
-// `getDayJsInstance()` reads window-injected settings (week-start), which
-// aren't available at module load. Each function calls it lazily at use
-// time. The cost is a per-call locale update; cellMath doesn't use any
-// week-start-aware APIs so it's a no-op functionally.
-
-/**
- * UTC ISO of 09:00 local on `date` — the preferred placement for new
- * work when an empty day needs a default start time.
- */
-export function workDayStartOn(date: string, tz: string): string {
-    const dayjs = getDayJsInstance();
-    return dayjs.tz(`${date} 09:00:00`, tz).utc().format();
-}
-
-export interface FreeWindow {
-    start: string;
-    end: string;
-}
-
-interface Interval {
-    start: Dayjs;
-    end: Dayjs;
-}
-
-function localDayBounds(date: string, tz: string): { dayStart: Dayjs; dayEnd: Dayjs } {
-    const dayjs = getDayJsInstance();
-    // `.add(1, 'day')` on a Dayjs instance advances by a fixed 24h, which is
-    // wrong on DST-transition days (the local day is 23h or 25h long). Derive
-    // the next calendar date in UTC (no DST) and take its local midnight, so
-    // `dayEnd` is always the real next local midnight.
-    const nextDate = dayjs.utc(date).add(1, 'day').format('YYYY-MM-DD');
-    return {
-        dayStart: dayjs.tz(`${date} 00:00:00`, tz).utc(),
-        dayEnd: dayjs.tz(`${nextDate} 00:00:00`, tz).utc(),
-    };
-}
-
-/**
- * Collect entries that intersect the day `[dayStart, dayEnd)`, clipped
- * to those bounds. Running entries use `nowDayjs` as their end.
- */
-function collectDayObstacles(
-    entries: TimeEntry[],
-    dayStart: Dayjs,
-    dayEnd: Dayjs,
-    nowDayjs: Dayjs
-): Interval[] {
-    const dayjs = getDayJsInstance();
-    const obstacles: Interval[] = [];
-    for (const entry of entries) {
-        const entryStart = dayjs.utc(entry.start);
-        const entryEnd = entry.end ? dayjs.utc(entry.end) : nowDayjs;
-
-        if (entryEnd.isSameOrBefore(dayStart)) continue;
-        if (entryStart.isSameOrAfter(dayEnd)) continue;
-
-        const clippedStart = entryStart.isBefore(dayStart) ? dayStart : entryStart;
-        const clippedEnd = entryEnd.isAfter(dayEnd) ? dayEnd : entryEnd;
-
-        obstacles.push({ start: clippedStart, end: clippedEnd });
-    }
-    return obstacles;
-}
-
-/**
- * First free window on the local calendar day that fits `requiredSeconds`
- * without colliding with any existing entry. Returns `null` if nothing fits
- * — never crosses midnight.
- *
- * Obstacles include same-day entries, spillovers from adjacent days, and
- * running entries (treated as `end = now`). All are clipped to the day's
- * `[00:00, 24:00)` boundaries.
- *
- * `preferredStart` (UTC ISO) is a hard floor — windows with `start` before
- * it are rejected. Use it to place "after some cursor."
- */
-export function findFreeWindowOnDay(
-    entries: TimeEntry[],
-    date: string,
-    requiredSeconds: number,
-    tz: string,
-    preferredStart?: string | null,
-    now?: string | Dayjs
-): FreeWindow | null {
-    if (requiredSeconds <= 0) return null;
-
-    const dayjs = getDayJsInstance();
-    const { dayStart, dayEnd } = localDayBounds(date, tz);
-
-    if (requiredSeconds > dayEnd.diff(dayStart, 'second')) return null;
-
-    const nowDayjs = now ? dayjs.utc(now) : dayjs.utc();
-
-    const obstacles = collectDayObstacles(entries, dayStart, dayEnd, nowDayjs);
-
-    // Sort + merge so we can walk a clean [gap, obstacle, gap, ...] sequence.
-    obstacles.sort((a, b) => a.start.diff(b.start));
-
-    // merge overlaps
-    const merged: Interval[] = [];
-    for (const obs of obstacles) {
-        const last = merged[merged.length - 1];
-        if (last && obs.start.isSameOrBefore(last.end)) {
-            if (obs.end.isAfter(last.end)) {
-                last.end = obs.end;
-            }
-        } else {
-            merged.push({ start: obs.start, end: obs.end });
-        }
-    }
-
-    let cursor: Dayjs = dayStart;
-    if (preferredStart) {
-        const pref = dayjs.utc(preferredStart);
-        if (pref.isAfter(cursor)) cursor = pref;
-    }
-    if (cursor.isSameOrAfter(dayEnd)) return null;
-
-    for (const obs of merged) {
-        if (obs.end.isSameOrBefore(cursor)) continue;
-
-        if (obs.start.isAfter(cursor)) {
-            const gapSeconds = obs.start.diff(cursor, 'second');
-            if (gapSeconds >= requiredSeconds) {
-                return {
-                    start: cursor.format(),
-                    end: cursor.add(requiredSeconds, 'second').format(),
-                };
-            }
-        }
-
-        if (obs.end.isAfter(cursor)) cursor = obs.end;
-        if (cursor.isSameOrAfter(dayEnd)) return null;
-    }
-
-    const trailingSeconds = dayEnd.diff(cursor, 'second');
-    if (trailingSeconds >= requiredSeconds) {
-        return {
-            start: cursor.format(),
-            end: cursor.add(requiredSeconds, 'second').format(),
-        };
-    }
-
-    return null;
-}
-
-/**
- * Seconds of free space starting at `cursor` until the next obstacle
- * (or end of day). Returns 0 if the cursor is inside an obstacle or past
- * midnight. Used by the extend path: "how far can I push this end forward?"
- */
-export function freeGapSecondsAfter(
-    entries: TimeEntry[],
-    date: string,
-    tz: string,
-    cursor: string,
-    now?: string | Dayjs
-): number {
-    const dayjs = getDayJsInstance();
-    const { dayStart, dayEnd } = localDayBounds(date, tz);
-    const cursorDjs = dayjs.utc(cursor);
-
-    if (cursorDjs.isSameOrAfter(dayEnd)) return 0;
-    if (cursorDjs.isBefore(dayStart)) return 0;
-
-    const nowDayjs = now ? dayjs.utc(now) : dayjs.utc();
-
-    // Drop obstacles ending at/before the cursor — they're behind us.
-    const obstacles = collectDayObstacles(entries, dayStart, dayEnd, nowDayjs).filter((obs) =>
-        obs.end.isAfter(cursorDjs)
-    );
-
-    obstacles.sort((a, b) => a.start.diff(b.start));
-
-    // Cursor inside an obstacle → no gap.
-    for (const obs of obstacles) {
-        if (obs.start.isSameOrBefore(cursorDjs) && obs.end.isAfter(cursorDjs)) {
-            return 0;
-        }
-    }
-
-    // Distance to first obstacle strictly after cursor, or to end of day.
-    for (const obs of obstacles) {
-        if (obs.start.isAfter(cursorDjs)) {
-            return Math.max(0, obs.start.diff(cursorDjs, 'second'));
-        }
-    }
-    return Math.max(0, dayEnd.diff(cursorDjs, 'second'));
-}
-
-/**
- * Thrown when a required duration cannot fit on the target day without
- * introducing an overlap. Callers reformat the message for end users.
- */
-export class NoFreeWindowError extends Error {
-    public readonly code = 'no_free_window' as const;
-    public readonly date: string;
-    public readonly requiredSeconds: number;
-
-    constructor(date: string, requiredSeconds: number) {
-        super(
-            `Cannot fit ${requiredSeconds} seconds on ${date} without overlapping existing time entries.`
-        );
-        this.name = 'NoFreeWindowError';
-        this.date = date;
-        this.requiredSeconds = requiredSeconds;
-    }
-}