Add migration to lower case the user emails

invite was accepted

.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

.gitignore

@@ -42,3 +42,4 @@ yarn-error.log
 /data
 /config/caddy
 /config/composer
+/AGENTS.md

.npmrc

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

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -5,9 +5,12 @@ declare(strict_types=1);
 namespace App\Actions\Fortify;
 
 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;
@@ -24,6 +27,10 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
      */
     public function update(User $user, array $input): void
     {
+        if (isset($input['email']) && is_string($input['email'])) {
+            $input['email'] = Str::lower($input['email']);
+        }
+
         Validator::make($input, [
             'name' => [
                 'required',
@@ -58,16 +65,17 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
             $user->updateProfilePhoto($input['photo']);
         }
 
-        if ($input['email'] !== $user->email) {
+        $email = Str::lower((string) $input['email']);
+
+        if ($email !== Str::lower($user->email)) {
             $user->forceFill([
                 'name' => $input['name'],
-                'email' => $input['email'],
+                'pending_email' => $email,
-                'email_verified_at' => null,
                 'timezone' => $input['timezone'],
                 'week_start' => $input['week_start'],
             ])->save();
 
-            $user->sendEmailVerificationNotification();
+            Mail::to($email)->send(new VerifyUpdatedEmailMail($user, $email));
         } else {
             $user->forceFill([
                 'name' => $input['name'],

app/Actions/Jetstream/AddOrganizationMember.php

@@ -4,18 +4,9 @@ declare(strict_types=1);
 
 namespace App\Actions\Jetstream;
 
-use App\Enums\Role;
+use App\Exceptions\MovedToApiException;
 use App\Models\Organization;
 use App\Models\User;
-use App\Service\MemberService;
-use Closure;
-use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Gate;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
-use Illuminate\Validation\Rules\In;
-use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 use Laravel\Jetstream\Contracts\AddsTeamMembers;
 
 class AddOrganizationMember implements AddsTeamMembers
@@ -25,70 +16,6 @@ class AddOrganizationMember implements AddsTeamMembers
      */
     public function add(User $owner, Organization $organization, string $email, ?string $role = null): void
     {
-        Gate::forUser($owner)->authorize('addTeamMember', $organization); // TODO: refactor after owner refactoring
+        throw new MovedToApiException;
-
-        $this->validate($organization, $email, $role);
-
-        $newOrganizationMember = User::query()
-            ->where('email', $email)
-            ->where('is_placeholder', '=', false)
-            ->firstOrFail();
-
-        app(MemberService::class)->addMember($newOrganizationMember, $organization, Role::from($role));
-    }
-
-    /**
-     * Validate the add member operation.
-     */
-    protected function validate(Organization $organization, string $email, ?string $role): void
-    {
-        Validator::make([
-            'email' => $email,
-            'role' => $role,
-        ], $this->rules())->after(
-            $this->ensureUserIsNotAlreadyOnTeam($organization, $email)
-        )->validateWithBag('addTeamMember');
-    }
-
-    /**
-     * Get the validation rules for adding a team member.
-     *
-     * @return array<string, array<ValidationRule|Rule|string|In>>
-     */
-    protected function rules(): array
-    {
-        return [
-            'email' => [
-                'required',
-                'email',
-                ExistsEloquent::make(User::class, 'email', function (Builder $builder) {
-                    /** @var Builder<User> $builder */
-                    return $builder->where('is_placeholder', '=', false);
-                })->withMessage(__('We were unable to find a registered user with this email address.')),
-            ],
-            'role' => [
-                'required',
-                'string',
-                Rule::in([
-                    Role::Admin->value,
-                    Role::Manager->value,
-                    Role::Employee->value,
-                ]),
-            ],
-        ];
-    }
-
-    /**
-     * Ensure that the user is not already on the team.
-     */
-    protected function ensureUserIsNotAlreadyOnTeam(Organization $team, string $email): Closure
-    {
-        return function ($validator) use ($team, $email): void {
-            $validator->errors()->addIf(
-                $team->hasRealUserWithEmail($email),
-                'email',
-                __('This user already belongs to the team.')
-            );
-        };
     }
 }

app/Actions/Jetstream/CreateOrganization.php

@@ -25,6 +25,8 @@ class CreateOrganization implements CreatesTeams
      *
      * @throws AuthorizationException
      * @throws ValidationException
+     *
+     * @deprecated Use REST endpoint instead
      */
     public function create(User $user, array $input): Organization
     {

app/Actions/Jetstream/DeleteOrganization.php

@@ -12,6 +12,8 @@ class DeleteOrganization implements DeletesTeams
 {
     /**
      * Delete the given team.
+     *
+     * @deprecated Use REST endpoint instead
      */
     public function delete(Organization $organization): void
     {

app/Actions/Jetstream/DeleteUser.php

@@ -16,6 +16,8 @@ class DeleteUser implements DeletesUsers
      * Delete the given user.
      *
      * @throws ValidationException
+     *
+     * @deprecated Use REST endpoint instead
      */
     public function delete(User $user): void
     {

app/Actions/Jetstream/ValidateOrganizationDeletion.php

@@ -18,6 +18,8 @@ class ValidateOrganizationDeletion
      * @param  Organization  $organization  Organization to be deleted
      *
      * @throws AuthorizationException
+     *
+     * @deprecated Use REST endpoint instead
      */
     public function validate(User $user, Organization $organization): void
     {

app/Events/MemberAdded.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Events;
+
+use App\Models\Member;
+use App\Models\Organization;
+use App\Models\User;
+use Illuminate\Foundation\Events\Dispatchable;
+
+class MemberAdded
+{
+    use Dispatchable;
+
+    public Member $member;
+
+    public Organization $organization;
+
+    public User $user;
+
+    public function __construct(Member $member, Organization $organization, User $user)
+    {
+        $this->member = $member;
+        $this->organization = $organization;
+        $this->user = $user;
+    }
+}

app/Events/MemberAdding.php

@@ -0,0 +1,28 @@
+<?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 MemberAdding
+{
+    use Dispatchable;
+
+    public User $user;
+
+    public Organization $organization;
+
+    public Role $role;
+
+    public function __construct(User $user, Organization $organization, Role $role)
+    {
+        $this->user = $user;
+        $this->organization = $organization;
+        $this->role = $role;
+    }
+}

app/Exceptions/Api/UserResendEmailVerificationNoPendingEmailApiException.php

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

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

@@ -20,7 +20,7 @@ class ApiTokenController extends Controller
     /**
      * List all api token of the currently authenticated user
      *
-     * This endpoint is independent of organization.
+     * This endpoint is independent of the organization.
      *
      * @operationId getApiTokens
      *

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

@@ -5,11 +5,17 @@ declare(strict_types=1);
 namespace App\Http\Controllers\Api\V1;
 
 use App\Enums\Role;
+use App\Events\AfterCreateOrganization;
+use App\Http\Requests\V1\Organization\OrganizationStoreRequest;
 use App\Http\Requests\V1\Organization\OrganizationUpdateRequest;
 use App\Http\Resources\V1\Organization\OrganizationResource;
 use App\Models\Organization;
 use App\Service\BillableRateService;
+use App\Service\DeletionService;
+use App\Service\IpLookup\IpLookupServiceContract;
+use App\Service\OrganizationService;
 use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\JsonResponse;
 
 class OrganizationController extends Controller
 {
@@ -80,4 +86,48 @@ class OrganizationController extends Controller
 
         return new OrganizationResource($organization, true);
     }
+
+    /**
+     * Create organization
+     *
+     * @operationId createOrganization
+     */
+    public function store(OrganizationStoreRequest $request, OrganizationService $organizationService): OrganizationResource
+    {
+        $user = $this->user();
+        $ipLookupResponse = app(IpLookupServiceContract::class)->lookup($request->ip());
+
+        $currency = $ipLookupResponse?->currency;
+
+        $organization = $organizationService->createOrganization(
+            $request->getName(),
+            $user,
+            false,
+            $currency
+        );
+
+        $user->switchTeam($organization);
+
+        // Note: The refresh is necessary for currently unknown reasons. Do not remove it.
+        $organization = $organization->refresh();
+        AfterCreateOrganization::dispatch($organization);
+
+        return new OrganizationResource($organization, true);
+    }
+
+    /**
+     * Delete organization
+     *
+     * @operationId deleteOrganization
+     *
+     * @throws AuthorizationException
+     */
+    public function destroy(Organization $organization, DeletionService $deletionService): JsonResponse
+    {
+        $this->checkPermission($organization, 'organizations:delete');
+
+        $deletionService->deleteOrganization($organization);
+
+        return response()->json(null, 204);
+    }
 }

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

@@ -4,15 +4,26 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Exceptions\Api\CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers;
+use App\Exceptions\Api\UserResendEmailVerificationNoPendingEmailApiException;
+use App\Http\Requests\V1\User\UserUpdateRequest;
 use App\Http\Resources\V1\User\UserResource;
+use App\Mail\VerifyUpdatedEmailMail;
+use App\Models\User;
+use App\Service\DeletionService;
+use App\Support\Base64File;
 use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 class UserController extends Controller
 {
     /**
      * Get the current user
      *
-     * This endpoint is independent of organization.
+     * This endpoint is independent of the organization.
      *
      * @operationId getMe
      *
@@ -24,4 +35,114 @@ class UserController extends Controller
 
         return new UserResource($user);
     }
+
+    /**
+     * Update the current user
+     *
+     * This endpoint is independent of the organization.
+     *
+     * @operationId updateUser
+     */
+    public function update(User $user, UserUpdateRequest $request): UserResource
+    {
+        if ($user->getKey() !== $this->user()->getKey()) {
+            throw new AuthorizationException;
+        }
+
+        if ($request->getPhoto() !== null) {
+            $photo = Base64File::decode($request->getPhoto());
+            assert($photo !== null);
+            $extension = Base64File::extension($photo['mime_type']);
+            assert($extension !== null);
+
+            $previousPhotoPath = $user->profile_photo_path;
+            $photoPath = 'profile-photos/'.Str::uuid().'.'.$extension;
+            $photoDisk = (string) config('jetstream.profile_photo_disk', 'public');
+
+            Storage::disk($photoDisk)->put($photoPath, $photo['data'], 'public');
+            $user->profile_photo_path = $photoPath;
+
+            if ($previousPhotoPath !== null) {
+                Storage::disk($photoDisk)->delete($previousPhotoPath);
+            }
+        }
+
+        $emailToVerify = null;
+        $email = $request->getEmail();
+        if ($email !== null && $email !== Str::lower($user->email)) {
+            $emailToVerify = $email;
+            $user->pending_email = $email;
+        }
+
+        if ($request->getName() !== null) {
+            $user->name = $request->getName();
+        }
+
+        if ($request->getTimezone() !== null) {
+            $user->timezone = $request->getTimezone();
+        }
+
+        if ($request->getWeekStart() !== null) {
+            $user->week_start = $request->getWeekStart();
+        }
+
+        $user->save();
+
+        if ($emailToVerify !== null) {
+            Mail::to($emailToVerify)->send(new VerifyUpdatedEmailMail($user, $emailToVerify));
+        }
+
+        return new UserResource($user);
+    }
+
+    /**
+     * Resend the pending email update verification email.
+     *
+     * This endpoint is independent of the organization.
+     *
+     * @operationId resendUserEmailVerification
+     *
+     * @throws AuthorizationException Thrown when the authenticated user does not match the user whose email is pending verification.
+     * @throws UserResendEmailVerificationNoPendingEmailApiException Thrown when the user does not have a pending email to verify.
+     */
+    public function resendEmailVerification(User $user): JsonResponse
+    {
+        if ($user->getKey() !== $this->user()->getKey()) {
+            throw new AuthorizationException;
+        }
+
+        if ($user->pending_email === null) {
+            throw new UserResendEmailVerificationNoPendingEmailApiException;
+        }
+
+        Mail::to($user->pending_email)
+            ->queue(new VerifyUpdatedEmailMail($user, $user->pending_email));
+
+        return response()->json(null, 204);
+    }
+
+    /**
+     * Handles the deletion of a user.
+     *
+     * This endpoint is independent of the organization.
+     *
+     * @operationId deleteUser
+     *
+     * @param  User  $user  The user instance to be deleted.
+     * @param  DeletionService  $deletionService  The service responsible for performing the user deletion.
+     * @return JsonResponse A JSON response with a 204 No Content status upon successful deletion.
+     *
+     * @throws AuthorizationException Thrown when the authenticated user does not match the user to be deleted.
+     * @throws CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers Thrown when the user to be deleted is the owner of an organization with multiple members.
+     */
+    public function destroy(User $user, DeletionService $deletionService): JsonResponse
+    {
+        if ($user->getKey() !== $this->user()->getKey()) {
+            throw new AuthorizationException;
+        }
+
+        $deletionService->deleteUser($user);
+
+        return response()->json(null, 204);
+    }
 }

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

@@ -14,7 +14,7 @@ class UserMembershipController extends Controller
     /**
      * Get the memberships of the current user
      *
-     * This endpoint is independent of organization.
+     * This endpoint is independent of the organization.
      *
      * @operationId getMyMemberships
      *

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

@@ -17,7 +17,7 @@ class UserTimeEntryController extends Controller
     /**
      * Get the active time entry of the current user
      *
-     * This endpoint is independent of organization.
+     * This endpoint is independent of the organization.
      *
      * @operationId getMyActiveTimeEntry
      */

app/Http/Controllers/Web/DashboardController.php

@@ -4,30 +4,13 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Web;
 
-use App\Enums\Role;
-use App\Service\DashboardService;
-use App\Service\PermissionStore;
-use Illuminate\Auth\Access\AuthorizationException;
 use Inertia\Inertia;
 use Inertia\Response;
 
 class DashboardController extends Controller
 {
-    /**
+    public function dashboard(): Response
-     * @throws AuthorizationException
-     */
-    public function dashboard(DashboardService $dashboardService, PermissionStore $permissionStore): Response
     {
-        $user = $this->user();
-        $organization = $this->currentOrganization();
-
-        $latestTeamActivity = null;
-        if ($permissionStore->has($organization, 'time-entries:view:all')) {
-            $latestTeamActivity = $dashboardService->latestTeamActivity($organization);
-        }
-
-        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
-
         return Inertia::render('Dashboard');
     }
 }

app/Http/Controllers/Web/OrganizationInvitationController.php

@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Web;
+
+use App\Enums\Role;
+use App\Models\OrganizationInvitation;
+use App\Models\User;
+use App\Service\MemberService;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Auth;
+use RuntimeException;
+
+class OrganizationInvitationController extends Controller
+{
+    public function accept(OrganizationInvitation $invitation, MemberService $memberService): RedirectResponse
+    {
+        $email = strtolower($invitation->email);
+        $role = Role::tryFrom($invitation->role);
+        if ($role === null || $role === Role::Owner || $role === Role::Placeholder) {
+            throw new RuntimeException('Invalid role');
+        }
+
+        $organization = $invitation->organization;
+        $invitee = User::query()
+            ->where('email', $email)
+            ->where('is_placeholder', '=', false)
+            ->first();
+
+        // No account yet — finish on registration.
+        if ($invitee === null) {
+            if ($invitation->accepted_at === null) {
+                $invitation->accepted_at = now();
+                $invitation->save();
+            }
+
+            return redirect(route('register'))
+                ->with('bannerText', __('Please create an account to finish joining the :organization organization.', [
+                    'organization' => $organization->name,
+                ]))
+                ->with('bannerStyle', 'info');
+        }
+
+        $alreadyMember = $memberService->isEmailAlreadyMember($organization, $email);
+        if (! $alreadyMember) {
+            $memberService->addMember($invitee, $organization, $role);
+            $invitation->delete();
+        }
+
+        // Logged out — banner on /login.
+        if (! Auth::check()) {
+            return redirect(route('login'))
+                ->with('bannerText', __('Great! You have accepted the invitation to join the :organization organization. Please log in to access it.', [
+                    'organization' => $organization->name,
+                ]))
+                ->with('bannerStyle', 'success');
+        }
+
+        // Logged in — banner on /dashboard.
+        if ($alreadyMember) {
+            return redirect(route('dashboard'))
+                ->with('bannerText', __('You are already a member of the :organization organization.', [
+                    'organization' => $organization->name,
+                ]))
+                ->with('bannerStyle', 'danger');
+        }
+
+        return redirect(route('dashboard'))
+            ->with('bannerText', __('Great! You have accepted the invitation to join the :organization organization.', [
+                'organization' => $organization->name,
+            ]))
+            ->with('bannerStyle', 'success');
+    }
+}

app/Http/Controllers/Web/UserController.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Web;
+
+use App\Models\User;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Str;
+
+class UserController extends Controller
+{
+    public function verifyEmailChange(Request $request, User $user): RedirectResponse
+    {
+        if ($request->user()?->getAuthIdentifier() !== $user->getKey()) {
+            abort(403);
+        }
+
+        $email = $request->query('email');
+        if (! is_string($email)) {
+            abort(403);
+        }
+
+        $email = Str::lower($email);
+
+        if ($user->pending_email !== $email) {
+            abort(403);
+        }
+
+        $emailAlreadyInUse = User::query()
+            ->where('email', '=', $email)
+            ->where('is_placeholder', '=', false)
+            ->whereKeyNot($user->getKey())
+            ->exists();
+
+        if ($emailAlreadyInUse) {
+            return redirect(route('dashboard', [
+                'bannerStyle' => 'danger',
+                'bannerText' => __('The email address is already in use.'),
+            ]));
+        }
+
+        $user->email = $email;
+        $user->pending_email = null;
+        $user->email_verified_at = Carbon::now();
+        $user->save();
+
+        return redirect(route('dashboard', [
+            'bannerStyle' => 'success',
+            'bannerText' => __('Your email address has been updated successfully.'),
+        ]));
+    }
+}

app/Http/Middleware/HandleInertiaRequests.php

@@ -60,6 +60,8 @@ class HandleInertiaRequests extends Middleware
             ] : null,
             'flash' => [
                 'message' => fn () => $request->session()->get('message'),
+                'bannerText' => fn () => $request->session()->get('bannerText'),
+                'bannerStyle' => fn () => $request->session()->get('bannerStyle'),
             ],
         ]);
     }

app/Http/Middleware/ShareInertiaData.php

@@ -39,7 +39,6 @@ class ShareInertiaData
                     'canUpdatePassword' => Features::enabled(Features::updatePasswords()),
                     'canUpdateProfileInformation' => Features::canUpdateProfileInformation(),
                     'hasEmailVerification' => Features::enabled(Features::emailVerification()),
-                    'flash' => $request->session()->get('flash', []),
                     'hasAccountDeletionFeatures' => Jetstream::hasAccountDeletionFeatures(),
                     'hasApiFeatures' => Jetstream::hasApiFeatures(),
                     'hasTeamFeatures' => Jetstream::hasTeamFeatures(),

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

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\Organization;
+
+use App\Http\Requests\V1\BaseFormRequest;
+use App\Models\Organization;
+
+/**
+ * @property Organization $organization Organization from model binding
+ */
+class OrganizationStoreRequest extends BaseFormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string|\Illuminate\Contracts\Validation\Rule>>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => [
+                'required',
+                'string',
+                'max:255',
+            ],
+        ];
+    }
+
+    public function getName(): string
+    {
+        return (string) $this->input('name');
+    }
+}

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

@@ -0,0 +1,88 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\User;
+
+use App\Enums\Weekday;
+use App\Http\Requests\V1\BaseFormRequest;
+use App\Models\User;
+use App\Rules\Base64ImageRule;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Str;
+use Illuminate\Validation\Rule;
+use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
+
+/**
+ * @property User $user User from model binding
+ */
+class UserUpdateRequest extends BaseFormRequest
+{
+    protected function prepareForValidation(): void
+    {
+        if ($this->has('email') && is_string($this->input('email'))) {
+            $this->merge([
+                'email' => Str::lower((string) $this->input('email')),
+            ]);
+        }
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string|\Illuminate\Contracts\Validation\Rule|ValidationRule>>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => [
+                'string',
+                'max:255',
+            ],
+            'email' => [
+                'email',
+                'max:255',
+                UniqueEloquent::make(User::class, 'email')->ignore($this->user->id)->query(function (Builder $query) {
+                    /** @var Builder<User> $query */
+                    return $query->where('is_placeholder', '=', false);
+                }),
+            ],
+            'photo' => [
+                'nullable',
+                new Base64ImageRule,
+            ],
+            'timezone' => [
+                'timezone:all',
+            ],
+            'week_start' => [
+                Rule::enum(Weekday::class),
+            ],
+        ];
+    }
+
+    public function getName(): ?string
+    {
+        return $this->has('name') ? (string) $this->input('name') : null;
+    }
+
+    public function getEmail(): ?string
+    {
+        return $this->has('email') ? Str::lower((string) $this->input('email')) : null;
+    }
+
+    public function getTimezone(): ?string
+    {
+        return $this->has('timezone') ? (string) $this->input('timezone') : null;
+    }
+
+    public function getWeekStart(): ?Weekday
+    {
+        return $this->has('week_start') ? Weekday::from($this->input('week_start')) : null;
+    }
+
+    public function getPhoto(): ?string
+    {
+        return $this->has('photo') ? (string) $this->input('photo') : null;
+    }
+}

app/Listeners/RemovePlaceholder.php

@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Listeners;
-
-use App\Models\Member;
-use App\Models\User;
-use App\Service\MemberService;
-use Illuminate\Database\Eloquent\Builder;
-use Laravel\Jetstream\Events\TeamMemberAdded;
-
-class RemovePlaceholder
-{
-    /**
-     * Handle the event.
-     */
-    public function handle(TeamMemberAdded $event): void
-    {
-        $memberService = app(MemberService::class);
-        $member = Member::query()
-            ->whereBelongsTo($event->team, 'organization')
-            ->whereBelongsTo($event->user, 'user')
-            ->firstOrFail();
-        $placeholders = Member::query()
-            ->whereHas('user', function (Builder $query) use ($event): void {
-                /** @var Builder<User> $query */
-                $query->where('is_placeholder', '=', true)
-                    ->where('email', '=', $event->user->email);
-            })
-            ->whereBelongsTo($event->team, 'organization')
-            ->with(['user'])
-            ->get();
-
-        foreach ($placeholders as $placeholder) {
-            /** @var Member $placeholder */
-            $placeholderUser = $placeholder->user;
-            $memberService->assignOrganizationEntitiesToDifferentMember($event->team, $placeholder, $member);
-            $placeholder->delete();
-            $placeholderUser->delete();
-        }
-    }
-}

app/Mail/OrganizationInvitationMail.php

@@ -8,6 +8,7 @@ use App\Models\OrganizationInvitation;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\URL;
 
 class OrganizationInvitationMail extends Mailable
@@ -32,9 +33,12 @@ class OrganizationInvitationMail extends Mailable
     public function build(): self
     {
         return $this->markdown('emails.organization-invitation', [
-            'acceptUrl' => URL::signedRoute('team-invitations.accept', [
+            'acceptUrl' => URL::to(URL::signedRoute(
-                'invitation' => $this->invitation,
+                'organization-invitations.accept',
-            ]),
+                ['invitation' => $this->invitation->getKey()],
+                Carbon::now()->addDays(90),
+                false
+            )),
         ])->subject(__('Organization Invitation'));
     }
 }

app/Mail/VerifyUpdatedEmailMail.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Mail;
+
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\URL;
+use Illuminate\Support\Str;
+
+class VerifyUpdatedEmailMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public User $user;
+
+    public string $email;
+
+    public function __construct(User $user, string $email)
+    {
+        $this->user = $user;
+        $this->email = Str::lower($email);
+    }
+
+    /**
+     * Build the message.
+     */
+    public function build(): self
+    {
+        $verificationUrl = URL::temporarySignedRoute(
+            'users.verify-email-change',
+            Carbon::now()->addMinutes((int) config('auth.verification.expire', 60)),
+            [
+                'user' => $this->user->getKey(),
+                'email' => $this->email,
+            ],
+            false
+        );
+
+        return $this->markdown('emails.verify-updated-email', [
+            'verificationUrl' => URL::to($verificationUrl),
+        ])->subject(__('Verify Email Address'));
+    }
+}

app/Models/Organization.php

@@ -36,6 +36,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property string $user_id
  * @property bool $employees_can_see_billable_rates
  * @property bool $employees_can_manage_tasks
+ * @property bool $prevent_overlapping_time_entries
  * @property User $owner
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at

app/Models/OrganizationInvitation.php

@@ -18,6 +18,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property string $email
  * @property string $role
  * @property string $organization_id
+ * @property Carbon|null $accepted_at
  * @property Carbon|null $updated_at
  * @property Carbon|null $created_at
  * @property-read Organization $organization
@@ -41,14 +42,16 @@ class OrganizationInvitation extends JetstreamTeamInvitation implements Auditabl
     protected $table = 'organization_invitations';
 
     /**
-     * The attributes that are mass assignable.
+     * Get the attributes that should be cast.
      *
-     * @var array<int, string>
+     * @return array<string, string>
      */
-    protected $fillable = [
+    public function casts(): array
-        'email',
+    {
-        'role',
+        return [
-    ];
+            'accepted_at' => 'datetime',
+        ];
+    }
 
     /**
      * Get the organization that the invitation belongs to.

app/Models/User.php

@@ -36,6 +36,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property string $id
  * @property string $name
  * @property string $email
+ * @property string|null $pending_email
  * @property Carbon|null $email_verified_at
  * @property string|null $password
  * @property string|null $two_factor_secret
@@ -105,6 +106,7 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
     protected $casts = [
         'name' => 'string',
         'email' => 'string',
+        'pending_email' => 'string',
         'email_verified_at' => 'datetime',
         'is_admin' => 'boolean',
         'is_placeholder' => 'boolean',

app/Policies/OrganizationPolicy.php

@@ -62,18 +62,6 @@ class OrganizationPolicy
         return app(PermissionStore::class)->userHas($organization, $user, 'organizations:update');
     }
 
-    /**
-     * Determine whether the user can add team members.
-     */
-    public function addTeamMember(User $user, Organization $organization): bool
-    {
-        if (Filament::isServing()) {
-            return true;
-        }
-
-        return true;
-    }
-
     /**
      * Determine whether the user can update team member permissions.
      */

app/Providers/EventServiceProvider.php

@@ -4,11 +4,9 @@ declare(strict_types=1);
 
 namespace App\Providers;
 
-use App\Listeners\RemovePlaceholder;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Laravel\Jetstream\Events\TeamMemberAdded;
 
 class EventServiceProvider extends ServiceProvider
 {
@@ -21,9 +19,6 @@ class EventServiceProvider extends ServiceProvider
         Registered::class => [
             SendEmailVerificationNotification::class,
         ],
-        TeamMemberAdded::class => [
-            RemovePlaceholder::class,
-        ],
     ];
 
     /**

app/Providers/FortifyServiceProvider.php

@@ -17,6 +17,7 @@ use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
+use Inertia\Inertia;
 use Laravel\Fortify\Contracts\TwoFactorLoginResponse;
 use Laravel\Fortify\Fortify;
 use Laravel\Fortify\Http\Responses\LoginResponse;
@@ -41,6 +42,14 @@ class FortifyServiceProvider extends ServiceProvider
         Fortify::updateUserPasswordsUsing(UpdateUserPassword::class);
         Fortify::resetUserPasswordsUsing(ResetUserPassword::class);
 
+        Fortify::registerView(function () {
+            return Inertia::render('Auth/Register', [
+                'terms_url' => config('auth.terms_url'),
+                'privacy_policy_url' => config('auth.privacy_policy_url'),
+                'newsletter_consent' => config('auth.newsletter_consent'),
+            ]);
+        });
+
         Fortify::authenticateUsing(function (Request $request): ?User {
             /** @var User|null $user */
             $user = User::query()

app/Providers/JetstreamServiceProvider.php

@@ -13,20 +13,18 @@ use App\Actions\Jetstream\RemoveOrganizationMember;
 use App\Actions\Jetstream\UpdateMemberRole;
 use App\Actions\Jetstream\UpdateOrganization;
 use App\Actions\Jetstream\ValidateOrganizationDeletion;
-use App\Enums\Role;
 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 Inertia\Inertia;
-use Laravel\Fortify\Fortify;
 use Laravel\Jetstream\Actions\UpdateTeamMemberRole;
 use Laravel\Jetstream\Actions\ValidateTeamDeletion;
 use Laravel\Jetstream\Jetstream;
@@ -60,13 +58,6 @@ class JetstreamServiceProvider extends ServiceProvider
         Jetstream::useTeamInvitationModel(OrganizationInvitation::class);
         app()->singleton(UpdateTeamMemberRole::class, UpdateMemberRole::class);
         app()->singleton(ValidateTeamDeletion::class, ValidateOrganizationDeletion::class);
-        Fortify::registerView(function () {
-            return Inertia::render('Auth/Register', [
-                'terms_url' => config('auth.terms_url'),
-                'privacy_policy_url' => config('auth.privacy_policy_url'),
-                'newsletter_consent' => config('auth.newsletter_consent'),
-            ]);
-        });
         Gate::define('removeTeamMember', function (User $user, Organization $team) {
             return false;
         });
@@ -79,205 +70,10 @@ class JetstreamServiceProvider extends ServiceProvider
     {
         Jetstream::defaultApiTokenPermissions([]);
 
-        Jetstream::role(Role::Owner->value, 'Owner', [
+        foreach (PermissionStore::roleDefinitions() as $role => $definition) {
-            'charts:view:own',
+            Jetstream::role($role, $definition['name'], $definition['permissions'])
-            'charts:view:all',
+                ->description($definition['description']);
-            'projects:view',
+        }
-            'projects:view:all',
-            'projects:create',
-            'projects:update',
-            'projects:delete',
-            'project-members:view',
-            'project-members:create',
-            'project-members:update',
-            'project-members:delete',
-            'tasks:view',
-            'tasks:view:all',
-            'tasks:create',
-            'tasks:create:all',
-            'tasks:update',
-            'tasks:update:all',
-            'tasks:delete',
-            'tasks:delete:all',
-            'time-entries:view:all',
-            'time-entries:create:all',
-            'time-entries:update:all',
-            'time-entries:delete:all',
-            'time-entries:view:own',
-            'time-entries:create:own',
-            'time-entries:update:own',
-            'time-entries:delete:own',
-            'tags:view',
-            'tags:create',
-            'tags:update',
-            'tags:delete',
-            'clients:view',
-            'clients:view:all',
-            'clients:create',
-            'clients:update',
-            'clients:delete',
-            'organizations:view',
-            'organizations:update',
-            'organizations:delete',
-            'import',
-            'export',
-            'invitations:view',
-            'invitations:create',
-            'invitations:resend',
-            'invitations:remove',
-            'members:view',
-            'members:invite-placeholder',
-            'members:change-ownership',
-            'members:make-placeholder',
-            'members:merge-into',
-            'members:update',
-            'members:delete',
-            'billing',
-            'reports:view',
-            'reports:create',
-            'reports:update',
-            'reports:delete',
-            'invoices:view',
-            'invoices:create',
-            'invoices:update',
-            'invoices:download',
-            'invoices:delete',
-            'invoice-settings:view',
-            'invoice-settings:update',
-        ])->description('Owner users can perform any action. There is only one owner per organization.');
-
-        Jetstream::role(Role::Admin->value, 'Administrator', [
-            'charts:view:own',
-            'charts:view:all',
-            'projects:view',
-            'projects:view:all',
-            'projects:create',
-            'projects:update',
-            'projects:delete',
-            'project-members:view',
-            'project-members:create',
-            'project-members:update',
-            'project-members:delete',
-            'tasks:view',
-            'tasks:view:all',
-            'tasks:create',
-            'tasks:create:all',
-            'tasks:update',
-            'tasks:update:all',
-            'tasks:delete',
-            'tasks:delete:all',
-            'time-entries:view:all',
-            'time-entries:create:all',
-            'time-entries:update:all',
-            'time-entries:delete:all',
-            'time-entries:view:own',
-            'time-entries:create:own',
-            'time-entries:update:own',
-            'time-entries:delete:own',
-            'tags:view',
-            'tags:create',
-            'tags:update',
-            'tags:delete',
-            'clients:view',
-            'clients:view:all',
-            'clients:create',
-            'clients:update',
-            'clients:delete',
-            'organizations:view',
-            'organizations:update',
-            'import',
-            'export',
-            'invitations:view',
-            'invitations:create',
-            'invitations:resend',
-            'invitations:remove',
-            'members:view',
-            'members:invite-placeholder',
-            'members:make-placeholder',
-            'members:merge-into',
-            'members:delete',
-            'members:update',
-            'reports:view',
-            'reports:create',
-            'reports:update',
-            'reports:delete',
-            'invoices:view',
-            'invoices:create',
-            'invoices:update',
-            'invoices:download',
-            'invoices:delete',
-            'invoice-settings:view',
-            'invoice-settings:update',
-        ])->description('Administrator users can perform any action, except accessing the billing dashboard.');
-
-        Jetstream::role(Role::Manager->value, 'Manager', [
-            'charts:view:own',
-            'charts:view:all',
-            'projects:view',
-            'projects:view:all',
-            'projects:create',
-            'projects:update',
-            'projects:delete',
-            'project-members:view',
-            'project-members:create',
-            'project-members:update',
-            'project-members:delete',
-            'tasks:view',
-            'tasks:view:all',
-            'tasks:create',
-            'tasks:create:all',
-            'tasks:update',
-            'tasks:update:all',
-            'tasks:delete',
-            'tasks:delete:all',
-            'time-entries:view:all',
-            'time-entries:create:all',
-            'time-entries:update:all',
-            'time-entries:delete:all',
-            'time-entries:view:own',
-            'time-entries:create:own',
-            'time-entries:update:own',
-            'time-entries:delete:own',
-            'tags:view',
-            'tags:create',
-            'tags:update',
-            'tags:delete',
-            'clients:view',
-            'clients:view:all',
-            'clients:create',
-            'clients:update',
-            'clients:delete',
-            'organizations:view',
-            'invitations:view',
-            'members:view',
-            'reports:view',
-            'reports:create',
-            'reports:update',
-            'reports:delete',
-            'invoices:view',
-            'invoices:create',
-            'invoices:update',
-            'invoices:download',
-            'invoices:delete',
-            'invoice-settings:view',
-            'invoice-settings:update',
-        ])->description('Managers have full access to all projects, time entries, ect. but cannot manage the organization (add/remove member, edit the organization, ect.).');
-
-        Jetstream::role(Role::Employee->value, 'Employee', [
-            'charts:view:own',
-            'projects:view',
-            'tags:view',
-            'tasks:view',
-            'clients:view',
-            'time-entries:view:own',
-            'time-entries:create:own',
-            'time-entries:update:own',
-            'time-entries:delete:own',
-            'organizations:view',
-        ])->description('Employees have the ability to read, create, and update their own time entries, they can see the projects that they are members of and the clients they are assigned to.');
-
-        Jetstream::role(Role::Placeholder->value, 'Placeholder', [
-        ])->description('Placeholders are used for importing data. They cannot log in and have no permissions.');
 
         Jetstream::inertia()
             ->whenRendering(

app/Rules/Base64ImageRule.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Rules;
+
+use App\Support\Base64File;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Translation\PotentiallyTranslatedString;
+
+class Base64ImageRule implements ValidationRule
+{
+    private const array ALLOWED_MIME_TYPES = [
+        'image/jpeg',
+        'image/png',
+    ];
+
+    /**
+     * Run the validation rule.
+     *
+     * @param  Closure(string): PotentiallyTranslatedString  $fail
+     */
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        if (! is_string($value)) {
+            $fail(__('validation.string'));
+
+            return;
+        }
+
+        $file = Base64File::decode($value);
+        if ($file === null || ! in_array($file['mime_type'], self::ALLOWED_MIME_TYPES, true)) {
+            $fail(__('validation.mimes', ['values' => 'jpg, png']));
+        }
+    }
+}

app/Service/InvitationService.php

@@ -8,9 +8,11 @@ use App\Enums\Role;
 use App\Exceptions\Api\InvitationForTheEmailAlreadyExistsApiException;
 use App\Exceptions\Api\UserIsAlreadyMemberOfOrganizationApiException;
 use App\Mail\OrganizationInvitationMail;
-use App\Models\Member;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
+use App\Models\User;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Laravel\Jetstream\Events\InvitingTeamMember;
 
@@ -21,11 +23,7 @@ class InvitationService
      */
     public function inviteUser(Organization $organization, string $email, Role $role): OrganizationInvitation
     {
-        if (Member::query()
+        if (app(MemberService::class)->isEmailAlreadyMember($organization, $email)) {
-            ->whereBelongsTo($organization, 'organization')
-            ->whereRelation('user', 'email', '=', $email)
-            ->where('role', '!=', Role::Placeholder->value)
-            ->exists()) {
             throw new UserIsAlreadyMemberOfOrganizationApiException;
         }
 
@@ -48,4 +46,37 @@ class InvitationService
 
         return $invitation;
     }
+
+    /**
+     * @return Collection<int, Organization>
+     */
+    public function processAcceptedInvitations(User $user): Collection
+    {
+        $organizations = new Collection;
+
+        $invitations = OrganizationInvitation::query()
+            ->where('email', $user->email)
+            ->whereNotNull('accepted_at')
+            ->get();
+
+        foreach ($invitations as $invitation) {
+            $organization = $invitation->organization;
+            $role = Role::tryFrom($invitation->role);
+            if ($role === null) {
+                Log::error('Invalid role in invitation', [
+                    'invitation' => $invitation->getKey(),
+                    'role' => $invitation->role,
+                ]);
+
+                continue;
+            }
+            app(MemberService::class)->addMember($user, $organization, $role);
+
+            $invitation->delete();
+
+            $organizations->push($organization);
+        }
+
+        return $organizations;
+    }
 }

app/Service/MemberService.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace App\Service;
 
 use App\Enums\Role;
+use App\Events\MemberAdded;
+use App\Events\MemberAdding;
 use App\Events\MemberRemoved;
 use App\Exceptions\Api\CanNotRemoveOwnerFromOrganization;
 use App\Exceptions\Api\ChangingRoleOfPlaceholderIsNotAllowed;
@@ -36,7 +38,8 @@ class MemberService
     public function addMember(User $user, Organization $organization, Role $role, bool $asSuperAdmin = false): Member
     {
         if (! $asSuperAdmin) {
-            AddingTeamMember::dispatch($organization, $user);
+            MemberAdding::dispatch($user, $organization, $role);
+            AddingTeamMember::dispatch($organization, $user); // Legacy event
         }
 
         $member = new Member;
@@ -49,14 +52,37 @@ class MemberService
             $user->currentOrganization()->associate($organization);
             $user->save();
         });
+        $this->mergePlaceholderMembersIntoExistingMember($member, $organization, $user);
 
         if (! $asSuperAdmin) {
-            TeamMemberAdded::dispatch($organization, $user);
+            MemberAdded::dispatch($member, $organization, $user);
+            TeamMemberAdded::dispatch($organization, $user); // Legacy event
         }
 
         return $member;
     }
 
+    private function mergePlaceholderMembersIntoExistingMember(Member $member, Organization $organization, User $user): void
+    {
+        $placeholders = Member::query()
+            ->whereHas('user', function (Builder $query) use ($user): void {
+                /** @var Builder<User> $query */
+                $query->where('is_placeholder', '=', true)
+                    ->where('email', '=', $user->email);
+            })
+            ->whereBelongsTo($organization, 'organization')
+            ->with(['user'])
+            ->get();
+
+        foreach ($placeholders as $placeholder) {
+            /** @var Member $placeholder */
+            $placeholderUser = $placeholder->user;
+            $this->assignOrganizationEntitiesToDifferentMember($organization, $placeholder, $member);
+            $placeholder->delete();
+            $placeholderUser->delete();
+        }
+    }
+
     /**
      * @throws CanNotRemoveOwnerFromOrganization
      * @throws EntityStillInUseApiException
@@ -209,4 +235,13 @@ class MemberService
             $this->userService->makeSureUserHasCurrentOrganization($user);
         }
     }
+
+    public function isEmailAlreadyMember(Organization $organization, string $email): bool
+    {
+        return Member::query()
+            ->whereBelongsTo($organization, 'organization')
+            ->whereRelation('user', 'email', '=', $email)
+            ->where('role', '!=', Role::Placeholder->value)
+            ->exists();
+    }
 }

app/Service/PermissionStore.php

@@ -4,14 +4,238 @@ declare(strict_types=1);
 
 namespace App\Service;
 
+use App\Enums\Role;
 use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
-use Laravel\Jetstream\Jetstream;
-use Laravel\Jetstream\Role;
 
 class PermissionStore
 {
+    /**
+     * @var array<string, array{name: string, permissions: array<string>, description: string}>
+     */
+    private const array ROLE_DEFINITIONS = [
+        'owner' => [
+            'name' => 'Owner',
+            'permissions' => [
+                'charts:view:own',
+                'charts:view:all',
+                'projects:view',
+                'projects:view:all',
+                'projects:create',
+                'projects:update',
+                'projects:delete',
+                'project-members:view',
+                'project-members:create',
+                'project-members:update',
+                'project-members:delete',
+                'tasks:view',
+                'tasks:view:all',
+                'tasks:create',
+                'tasks:create:all',
+                'tasks:update',
+                'tasks:update:all',
+                'tasks:delete',
+                'tasks:delete:all',
+                'time-entries:view:all',
+                'time-entries:create:all',
+                'time-entries:update:all',
+                'time-entries:delete:all',
+                'time-entries:view:own',
+                'time-entries:create:own',
+                'time-entries:update:own',
+                'time-entries:delete:own',
+                'tags:view',
+                'tags:create',
+                'tags:update',
+                'tags:delete',
+                'clients:view',
+                'clients:view:all',
+                'clients:create',
+                'clients:update',
+                'clients:delete',
+                'organizations:view',
+                'organizations:update',
+                'organizations:delete',
+                'import',
+                'export',
+                'invitations:view',
+                'invitations:create',
+                'invitations:resend',
+                'invitations:remove',
+                'members:view',
+                'members:invite-placeholder',
+                'members:change-ownership',
+                'members:make-placeholder',
+                'members:merge-into',
+                'members:update',
+                'members:delete',
+                'billing',
+                'reports:view',
+                'reports:create',
+                'reports:update',
+                'reports:delete',
+                'invoices:view',
+                'invoices:create',
+                'invoices:update',
+                'invoices:download',
+                'invoices:delete',
+                'invoice-settings:view',
+                'invoice-settings:update',
+            ],
+            'description' => 'Owner users can perform any action. There is only one owner per organization.',
+        ],
+        'admin' => [
+            'name' => 'Administrator',
+            'permissions' => [
+                'charts:view:own',
+                'charts:view:all',
+                'projects:view',
+                'projects:view:all',
+                'projects:create',
+                'projects:update',
+                'projects:delete',
+                'project-members:view',
+                'project-members:create',
+                'project-members:update',
+                'project-members:delete',
+                'tasks:view',
+                'tasks:view:all',
+                'tasks:create',
+                'tasks:create:all',
+                'tasks:update',
+                'tasks:update:all',
+                'tasks:delete',
+                'tasks:delete:all',
+                'time-entries:view:all',
+                'time-entries:create:all',
+                'time-entries:update:all',
+                'time-entries:delete:all',
+                'time-entries:view:own',
+                'time-entries:create:own',
+                'time-entries:update:own',
+                'time-entries:delete:own',
+                'tags:view',
+                'tags:create',
+                'tags:update',
+                'tags:delete',
+                'clients:view',
+                'clients:view:all',
+                'clients:create',
+                'clients:update',
+                'clients:delete',
+                'organizations:view',
+                'organizations:update',
+                'import',
+                'export',
+                'invitations:view',
+                'invitations:create',
+                'invitations:resend',
+                'invitations:remove',
+                'members:view',
+                'members:invite-placeholder',
+                'members:make-placeholder',
+                'members:merge-into',
+                'members:delete',
+                'members:update',
+                'reports:view',
+                'reports:create',
+                'reports:update',
+                'reports:delete',
+                'invoices:view',
+                'invoices:create',
+                'invoices:update',
+                'invoices:download',
+                'invoices:delete',
+                'invoice-settings:view',
+                'invoice-settings:update',
+            ],
+            'description' => 'Administrator users can perform any action, except accessing the billing dashboard.',
+        ],
+        'manager' => [
+            'name' => 'Manager',
+            'permissions' => [
+                'charts:view:own',
+                'charts:view:all',
+                'projects:view',
+                'projects:view:all',
+                'projects:create',
+                'projects:update',
+                'projects:delete',
+                'project-members:view',
+                'project-members:create',
+                'project-members:update',
+                'project-members:delete',
+                'tasks:view',
+                'tasks:view:all',
+                'tasks:create',
+                'tasks:create:all',
+                'tasks:update',
+                'tasks:update:all',
+                'tasks:delete',
+                'tasks:delete:all',
+                'time-entries:view:all',
+                'time-entries:create:all',
+                'time-entries:update:all',
+                'time-entries:delete:all',
+                'time-entries:view:own',
+                'time-entries:create:own',
+                'time-entries:update:own',
+                'time-entries:delete:own',
+                'tags:view',
+                'tags:create',
+                'tags:update',
+                'tags:delete',
+                'clients:view',
+                'clients:view:all',
+                'clients:create',
+                'clients:update',
+                'clients:delete',
+                'organizations:view',
+                'invitations:view',
+                'members:view',
+                'reports:view',
+                'reports:create',
+                'reports:update',
+                'reports:delete',
+                'invoices:view',
+                'invoices:create',
+                'invoices:update',
+                'invoices:download',
+                'invoices:delete',
+                'invoice-settings:view',
+                'invoice-settings:update',
+            ],
+            'description' => 'Managers have full access to all projects, time entries, ect. but cannot manage the organization (add/remove member, edit the organization, ect.).',
+        ],
+        'employee' => [
+            'name' => 'Employee',
+            'permissions' => [
+                'charts:view:own',
+                'projects:view',
+                'tags:view',
+                'tasks:view',
+                'clients:view',
+                'time-entries:view:own',
+                'time-entries:create:own',
+                'time-entries:update:own',
+                'time-entries:delete:own',
+                'organizations:view',
+            ],
+            'description' => 'Employees have the ability to read, create, and update their own time entries, they can see the projects that they are members of and the clients they are assigned to.',
+        ],
+        'placeholder' => [
+            'name' => 'Placeholder',
+            'permissions' => [],
+            'description' => 'Placeholders are used for importing data. They cannot log in and have no permissions.',
+        ],
+    ];
+
+    /**
+     * @var array<string, array<string>>
+     */
+    private static array $customRolePermissions = [];
+
     /**
      * @var array<string, array<string>>
      */
@@ -22,6 +246,37 @@ class PermissionStore
         $this->permissionCache = [];
     }
 
+    /**
+     * @return array<string, array{name: string, permissions: array<string>, description: string}>
+     */
+    public static function roleDefinitions(): array
+    {
+        return self::ROLE_DEFINITIONS;
+    }
+
+    /**
+     * @param  array<string>  $permissions
+     */
+    public static function registerCustomRole(string $role, array $permissions): void
+    {
+        self::$customRolePermissions[$role] = $permissions;
+    }
+
+    public static function resetCustomRoles(): void
+    {
+        self::$customRolePermissions = [];
+    }
+
+    /**
+     * @return array<string>
+     */
+    public static function permissionsForRole(string $role): array
+    {
+        return self::$customRolePermissions[$role]
+            ?? self::ROLE_DEFINITIONS[$role]['permissions']
+            ?? [];
+    }
+
     public function has(Organization $organization, string $permission): bool
     {
         /** @var User|null $user */
@@ -68,14 +323,11 @@ class PermissionStore
             return [];
         }
 
-        /** @var Role|null $roleObj */
+        $permissions = self::permissionsForRole($role);
-        $roleObj = Jetstream::findRole($role);
-
-        $permissions = $roleObj->permissions ?? [];
 
         // If the organization allows employees to manage tasks and the user is an employee,
         // add the task management permissions for accessible projects
-        if ($role === \App\Enums\Role::Employee->value && $organization->employees_can_manage_tasks) {
+        if ($role === Role::Employee->value && $organization->employees_can_manage_tasks) {
             $permissions = array_merge($permissions, [
                 'tasks:create',
                 'tasks:update',

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

app/Service/UserService.php

@@ -38,7 +38,7 @@ class UserService
     ): User {
         $user = new User;
         $user->name = $name;
-        $user->email = $email;
+        $user->email = strtolower($email);
         $user->password = Hash::make($password);
         $user->timezone = $timezone;
         $user->week_start = $weekStart;
@@ -47,19 +47,22 @@ class UserService
         }
         $user->save();
 
-        $organization = app(OrganizationService::class)->createOrganization(
+        $organizations = app(InvitationService::class)->processAcceptedInvitations($user);
-            $this->getOrganizationNameForUserName($user->name),
-            $user,
-            true,
-            $currency,
-            $numberFormat,
-            $currencyFormat,
-            $dateFormat,
-            $intervalFormat,
-            $timeFormat,
-        );
 
-        $user->ownedTeams()->save($organization);
+        if ($organizations->isEmpty()) {
+            $organization = app(OrganizationService::class)->createOrganization(
+                $this->getOrganizationNameForUserName($user->name),
+                $user,
+                true,
+                $currency,
+                $numberFormat,
+                $currencyFormat,
+                $dateFormat,
+                $intervalFormat,
+                $timeFormat,
+            );
+            $user->ownedTeams()->save($organization);
+        }
 
         return $user;
     }

app/Support/Base64File.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Support;
+
+use Symfony\Component\Mime\MimeTypes;
+
+class Base64File
+{
+    /**
+     * @return array{data: string, mime_type: string}|null
+     */
+    public static function decode(string $value): ?array
+    {
+        if (str_contains($value, ',')) {
+            [, $value] = explode(',', $value, 2);
+        }
+
+        $value = preg_replace('/\s+/', '', $value);
+        if ($value === null || $value === '') {
+            return null;
+        }
+
+        $decoded = base64_decode($value, true);
+        if ($decoded === false) {
+            return null;
+        }
+
+        $mimeType = (new \finfo(FILEINFO_MIME_TYPE))->buffer($decoded);
+        if ($mimeType === false) {
+            return null;
+        }
+
+        return [
+            'data' => $decoded,
+            'mime_type' => $mimeType,
+        ];
+    }
+
+    public static function extension(string $mimeType): ?string
+    {
+        return MimeTypes::getDefault()->getExtensions($mimeType)[0] ?? null;
+    }
+}

database/factories/OrganizationInvitationFactory.php

@@ -25,9 +25,24 @@ class OrganizationInvitationFactory extends Factory
             'email' => $this->faker->unique()->safeEmail(),
             'role' => Role::Employee->value,
             'organization_id' => Organization::factory(),
+            'accepted_at' => null,
         ];
     }
 
+    public function role(Role $role): self
+    {
+        return $this->state(fn (array $attributes) => [
+            'role' => $role->value,
+        ]);
+    }
+
+    public function accepted(): self
+    {
+        return $this->state(fn (array $attributes): array => [
+            'accepted_at' => $this->faker->dateTime(),
+        ]);
+    }
+
     public function forOrganization(Organization $organization): self
     {
         return $this->state(fn (array $attributes) => [

database/migrations/2026_02_11_143746_add_accepted_at_to_organization_invitations_table.php

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

database/migrations/2026_05_21_000001_add_pending_email_to_users_table.php

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

database/migrations/2026_05_21_000002_lowercase_user_emails.php

@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @throws RuntimeException
+     */
+    public function up(): void
+    {
+        $duplicateEmails = DB::table('users')
+            ->selectRaw('LOWER(email) as normalized_email')
+            ->selectRaw('COUNT(*) as user_count')
+            ->selectRaw("STRING_AGG(id::text || ' <' || email || '>', ', ' ORDER BY email) as users")
+            ->where('is_placeholder', false)
+            ->groupByRaw('LOWER(email)')
+            ->havingRaw('COUNT(*) > 1')
+            ->orderBy('normalized_email')
+            ->get();
+
+        if ($duplicateEmails->isNotEmpty()) {
+            $duplicateEmailMessage = $duplicateEmails
+                ->take(20)
+                ->map(fn (\stdClass $duplicateEmail): string => sprintf(
+                    '%s (%d users: %s)',
+                    $duplicateEmail->normalized_email,
+                    $duplicateEmail->user_count,
+                    $duplicateEmail->users,
+                ))
+                ->implode('; ');
+
+            $remainingDuplicateCount = $duplicateEmails->count() - 20;
+            $remainingDuplicateMessage = $remainingDuplicateCount > 0
+                ? sprintf('; and %d more duplicate normalized emails', $remainingDuplicateCount)
+                : '';
+
+            throw new RuntimeException(
+                'Cannot lowercase users.email because doing so would create duplicate non-placeholder user emails and violate the unique index on users.email for non-placeholder users. Resolve these case-insensitive duplicates first: '.
+                $duplicateEmailMessage.
+                $remainingDuplicateMessage
+            );
+        }
+
+        DB::table('users')
+            ->whereRaw('email <> LOWER(email)')
+            ->update([
+                'email' => DB::raw('LOWER(email)'),
+            ]);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //
+    }
+};

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/invitation-accept.spec.ts

@@ -0,0 +1,158 @@
+import { expect, test } from '../playwright/fixtures';
+import { PLAYWRIGHT_BASE_URL, TEST_USER_PASSWORD } from '../playwright/config';
+import { getInvitationAcceptUrl } from './utils/mailpit';
+import { registerUser } from './utils/members';
+
+// Invitation acceptance flows touch mail delivery + redirects.
+test.describe.configure({ timeout: 45000 });
+
+test.describe('invitation accept banners', () => {
+    test('shows success banner on dashboard when a logged-in registered user accepts an invitation', async ({
+        page,
+        browser,
+    }) => {
+        const memberId = Math.floor(Math.random() * 100000);
+        const memberEmail = `success+${memberId}@invite-banner.test`;
+
+        // Invitee already has an account and is logged in.
+        const invitee = await registerUser(browser, 'Banner Success', memberEmail);
+
+        // Owner sends the invitation.
+        await page.goto(PLAYWRIGHT_BASE_URL + '/members');
+        await page.getByRole('button', { name: 'Invite Member' }).click();
+        await expect(page.getByPlaceholder('Member Email')).toBeVisible();
+        await page.getByLabel('Email').fill(memberEmail);
+        await page.getByRole('button', { name: 'Employee' }).click();
+        await Promise.all([
+            page.waitForResponse(
+                (response) =>
+                    response.url().includes('/invitations') &&
+                    response.request().method() === 'POST' &&
+                    response.status() === 204
+            ),
+            page.getByRole('button', { name: 'Invite Member', exact: true }).click(),
+        ]);
+
+        // Invitee clicks the email link.
+        const acceptUrl = await getInvitationAcceptUrl(invitee.page.request, memberEmail);
+        await invitee.page.goto(acceptUrl);
+        await invitee.page.waitForURL(/\/dashboard$/);
+
+        const banner = invitee.page.getByTestId('banner');
+        await expect(banner).toBeVisible();
+        await expect(banner).toContainText(
+            /Great! You have accepted the invitation to join the .* organization\./
+        );
+
+        await invitee.close();
+    });
+
+    test('shows info banner on login screen when a registered-but-logged-out invitee clicks the accept link', async ({
+        page,
+        browser,
+    }) => {
+        const memberId = Math.floor(Math.random() * 100000);
+        const memberEmail = `loggedout+${memberId}@invite-banner.test`;
+
+        // Invitee has an account, but the context that clicks the link has no session.
+        const invitee = await registerUser(browser, 'Banner Loggedout', memberEmail);
+        await invitee.close();
+
+        // Owner sends the invitation.
+        await page.goto(PLAYWRIGHT_BASE_URL + '/members');
+        await page.getByRole('button', { name: 'Invite Member' }).click();
+        await expect(page.getByPlaceholder('Member Email')).toBeVisible();
+        await page.getByLabel('Email').fill(memberEmail);
+        await page.getByRole('button', { name: 'Employee' }).click();
+        await Promise.all([
+            page.waitForResponse(
+                (response) =>
+                    response.url().includes('/invitations') &&
+                    response.request().method() === 'POST' &&
+                    response.status() === 204
+            ),
+            page.getByRole('button', { name: 'Invite Member', exact: true }).click(),
+        ]);
+
+        // Open the accept link in a fresh browser context (no session).
+        const context = await browser.newContext();
+        const inviteePage = await context.newPage();
+        const acceptUrl = await getInvitationAcceptUrl(inviteePage.request, memberEmail);
+        await inviteePage.goto(acceptUrl);
+        await inviteePage.waitForURL(/\/login$/);
+
+        const banner = inviteePage.getByTestId('banner');
+        await expect(banner).toBeVisible();
+        await expect(banner).toContainText(
+            /Great! You have accepted the invitation to join the .* organization\. Please log in to access it\./
+        );
+
+        // Logging in lands the invitee on the dashboard — they were already added silently
+        // by the accept controller, so the inviter's members list shows them.
+        await inviteePage.getByLabel('Email').fill(memberEmail);
+        await inviteePage.getByLabel('Password', { exact: true }).fill(TEST_USER_PASSWORD);
+        await inviteePage.getByRole('button', { name: 'Log in' }).click();
+        await inviteePage.waitForURL(/\/dashboard/);
+
+        await page.goto(PLAYWRIGHT_BASE_URL + '/members');
+        const memberRow = page.getByRole('row').filter({ hasText: 'Banner Loggedout' });
+        await expect(memberRow).toBeVisible();
+        await expect(memberRow.getByText('Employee', { exact: true })).toBeVisible();
+
+        await context.close();
+    });
+
+    test('shows info banner on register screen when an unregistered email accepts an invitation, then auto-joins on registration', async ({
+        page,
+        browser,
+    }) => {
+        const memberId = Math.floor(Math.random() * 100000);
+        const memberEmail = `info+${memberId}@invite-banner.test`;
+
+        // Owner invites an email that has no account yet.
+        await page.goto(PLAYWRIGHT_BASE_URL + '/members');
+        await page.getByRole('button', { name: 'Invite Member' }).click();
+        await expect(page.getByPlaceholder('Member Email')).toBeVisible();
+        await page.getByLabel('Email').fill(memberEmail);
+        await page.getByRole('button', { name: 'Employee' }).click();
+        await Promise.all([
+            page.waitForResponse(
+                (response) =>
+                    response.url().includes('/invitations') &&
+                    response.request().method() === 'POST' &&
+                    response.status() === 204
+            ),
+            page.getByRole('button', { name: 'Invite Member', exact: true }).click(),
+        ]);
+
+        // Open the accept link in a fresh browser context (no session).
+        const context = await browser.newContext();
+        const inviteePage = await context.newPage();
+        const acceptUrl = await getInvitationAcceptUrl(inviteePage.request, memberEmail);
+        await inviteePage.goto(acceptUrl);
+        await inviteePage.waitForURL(/\/register$/);
+
+        const banner = inviteePage.getByTestId('banner');
+        await expect(banner).toBeVisible();
+        await expect(banner).toContainText(
+            /Please create an account to finish joining the .* organization\./
+        );
+
+        // Complete registration — the invitee should auto-join the inviter's org
+        // (no fresh personal organization is created on top).
+        await inviteePage.getByLabel('Name').fill('Banner Info');
+        await inviteePage.getByLabel('Email').fill(memberEmail);
+        await inviteePage.getByLabel('Password', { exact: true }).fill(TEST_USER_PASSWORD);
+        await inviteePage.getByLabel('Confirm Password').fill(TEST_USER_PASSWORD);
+        await inviteePage.getByLabel('I agree to the Terms of').click();
+        await inviteePage.getByRole('button', { name: 'Register' }).click();
+        await inviteePage.waitForURL(/\/dashboard/);
+
+        await page.goto(PLAYWRIGHT_BASE_URL + '/members');
+        const memberRow = page.getByRole('row').filter({ hasText: 'Banner Info' });
+        await expect(memberRow).toBeVisible();
+        await expect(memberRow.getByText('Employee', { exact: true })).toBeVisible();
+
+        await context.close();
+    });
+});

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(
+    const start = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 9, 0, 0);
-        now.getUTCFullYear(),
-        now.getUTCMonth(),
-        now.getUTCDate(),
-        9
-    );
     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: {

e2e/utils/mailpit.ts

@@ -46,7 +46,9 @@ export async function getInvitationAcceptUrl(
     expect(searchResult.messages.length).toBeGreaterThan(0);
 
     const message = await getMessage(request, searchResult.messages[0].ID);
-    const acceptUrlMatch = message.HTML.match(/href="([^"]*team-invitations[^"]*)"/);
+    const acceptUrlMatch = message.HTML.match(
+        /href="([^"]*(?:organization-invitations|team-invitations)[^"]*)"/
+    );
     expect(acceptUrlMatch).toBeTruthy();
 
     return acceptUrlMatch![1].replace(/&/g, '&');

lang/en/exceptions.php

@@ -23,6 +23,7 @@ use App\Exceptions\Api\TimeEntryStillRunningApiException;
 use App\Exceptions\Api\UserIsAlreadyMemberOfOrganizationApiException;
 use App\Exceptions\Api\UserIsAlreadyMemberOfProjectApiException;
 use App\Exceptions\Api\UserNotPlaceholderApiException;
+use App\Exceptions\Api\UserResendEmailVerificationNoPendingEmailApiException;
 use App\Service\Export\ExportException;
 
 return [
@@ -49,6 +50,7 @@ return [
         ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException::KEY => 'This placeholder can not be invited use the merge tool instead',
         InvitationForTheEmailAlreadyExistsApiException::KEY => 'The email has already been invited to the organization. Please wait for the user to accept the invitation or resend the invitation email.',
         OverlappingTimeEntryApiException::KEY => 'Overlapping time entries are not allowed.',
+        UserResendEmailVerificationNoPendingEmailApiException::KEY => 'Resend email not possible, no pending email.',
     ],
     'unknown_error_in_admin_panel' => 'An unknown error occurred. Please check the logs.',
 ];

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}'",
+        "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"
     },
     "devDependencies": {
         "@eslint/eslintrc": "^3.2.0",
@@ -34,12 +27,10 @@
         "@types/chroma-js": "^3.1.0",
         "@types/node": "^22.10.10",
         "@vitejs/plugin-vue": "^6.0.3",
-        "@vue/test-utils": "^2.4.6",
         "@vue/tsconfig": "^0.8.0",
         "autoprefixer": "^10.4.20",
         "axios": "^1.6.4",
         "eslint-plugin-unused-imports": "^4.1.4",
-        "happy-dom": "^20.8.9",
         "laravel-vite-plugin": "^2.1.0",
         "openapi-zod-client": "^1.16.2",
         "postcss": "^8.4.47",
@@ -49,7 +40,6 @@
         "typescript": "^5.7.3",
         "vite": "^7.0.0",
         "vite-plugin-checker": "^0.12.0",
-        "vitest": "^4.1.4",
         "vue": "^3.5.0",
         "vue-tsc": "^3.0.0"
     },
@@ -78,7 +68,7 @@
         "parse-duration": "^2.0.1",
         "pinia": "^3.0.0",
         "radix-vue": "^1.9.6",
-        "reka-ui": "2.8.2",
+        "reka-ui": "^2.8.2",
         "tailwind-merge": "^2.6.0",
         "tailwindcss-animate": "^1.0.7",
         "vue-echarts": "^8.0.0",

resources/js/Components/Banner.vue

@@ -1,36 +1,38 @@
 <script setup lang="ts">
-import { ref, watchEffect } from 'vue';
+import { ref } from 'vue';
 import { usePage } from '@inertiajs/vue3';
 
+const ALLOWED_STYLES = ['success', 'danger', 'info', 'warning'] as const;
+type BannerStyle = (typeof ALLOWED_STYLES)[number];
+
 const page = usePage<{
-    jetstream: {
+    flash: {
-        flash: {
+        bannerText?: string;
-            banner: string;
+        bannerStyle?: string;
-            bannerStyle: string;
-        };
     };
 }>();
 
-const show = ref(true);
+const rawStyle = page.props.flash?.bannerStyle;
-const style = ref('success');
+const message = page.props.flash?.bannerText ?? '';
-const message = ref('');
+const style: BannerStyle = (ALLOWED_STYLES as readonly string[]).includes(rawStyle ?? '')
+    ? (rawStyle as BannerStyle)
+    : 'success';
 
-watchEffect(async () => {
+const show = ref(true);
-    style.value = page.props.jetstream.flash?.bannerStyle || 'success';
-    message.value = page.props.jetstream.flash?.banner || '';
-    show.value = true;
-});
 </script>
 
 <template>
     <div>
-        <div v-if="show && message" class="bg-secondary border-b border-border-secondary">
+        <div
+            v-if="show && message"
+            data-testid="banner"
+            class="bg-secondary border-b border-border-secondary">
             <div class="mx-auto py-1 px-3 sm:px-6 lg:px-8">
                 <div class="flex items-center justify-between flex-wrap">
                     <div class="w-0 flex-1 flex items-center min-w-0">
                         <span class="flex">
                             <svg
-                                v-if="style == 'success'"
+                                v-if="style === 'success'"
                                 class="h-6 w-6 text-text-secondary"
                                 xmlns="http://www.w3.org/2000/svg"
                                 fill="none"
@@ -44,7 +46,7 @@ watchEffect(async () => {
                             </svg>
 
                             <svg
-                                v-if="style == 'danger'"
+                                v-if="style === 'danger'"
                                 class="h-5 w-5 text-text-primary"
                                 xmlns="http://www.w3.org/2000/svg"
                                 fill="none"
@@ -56,6 +58,20 @@ watchEffect(async () => {
                                     stroke-linejoin="round"
                                     d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z" />
                             </svg>
+
+                            <svg
+                                v-if="style === 'info'"
+                                class="h-6 w-6 text-text-secondary"
+                                xmlns="http://www.w3.org/2000/svg"
+                                fill="none"
+                                viewBox="0 0 24 24"
+                                stroke-width="1.5"
+                                stroke="currentColor">
+                                <path
+                                    stroke-linecap="round"
+                                    stroke-linejoin="round"
+                                    d="M11.25 11.25l.041-.02a.75.75 0 011.063.852l-.708 2.836a.75.75 0 001.063.853l.041-.021M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-9-3.75h.008v.008H12V8.25z" />
+                            </svg>
                         </span>
 
                         <p class="ms-3 font-medium text-sm text-text-primary truncate">

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'
+    | 'status';
-    | 'visibility';
 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 (
+    return props.filters.status !== 'all' || props.filters.clientIds.length > 0;
-        props.filters.status !== 'all' ||
-        props.filters.visibility !== '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/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,96 +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);
-    });
-
-    it('shows a pending 0 (delete in flight) over the cell total', () => {
-        const wrapper = mount(TimesheetCell, {
-            props: {
-                cell: buildCell(2 * 3600),
-                dayIndex: 0,
-                date: '2026-04-13',
-                isToday: false,
-                hasRunningEntry: false,
-                pendingSeconds: 0,
-            },
-        });
-
-        // `??` (not `||`): a pending 0 must win over the 2h cell total.
-        expect((wrapper.get('input').element as HTMLInputElement).value).toBe('');
-    });
-
-    it('disables editing while the cell is saving', () => {
-        const wrapper = mount(TimesheetCell, {
-            props: {
-                cell: buildCell(2 * 3600),
-                dayIndex: 0,
-                date: '2026-04-13',
-                isToday: false,
-                hasRunningEntry: false,
-                saveStatus: 'saving',
-            },
-        });
-
-        expect((wrapper.get('input').element as HTMLInputElement).disabled).toBe(true);
-    });
-});

resources/js/Components/Timesheet/TimesheetCell.vue

@@ -1,96 +0,0 @@
-<script setup lang="ts">
-import { computed } from 'vue';
-import { CheckIcon } from '@heroicons/vue/16/solid';
-import DurationSecondsInput from '@/packages/ui/src/Input/DurationSecondsInput.vue';
-import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
-import {
-    Tooltip,
-    TooltipContent,
-    TooltipProvider,
-    TooltipTrigger,
-} from '@/packages/ui/src/tooltip';
-import type { TimesheetCell } from '@/utils/useTimesheetGrid';
-import type { CellSaveStatus } from '@/utils/timesheet/useTimesheetCellMutations';
-
-const props = defineProps<{
-    cell?: TimesheetCell;
-    dayIndex: number;
-    date: string;
-    isToday: boolean;
-    hasRunningEntry: boolean;
-    saveStatus?: CellSaveStatus;
-    pendingSeconds?: number;
-}>();
-
-const emit = defineEmits<{
-    update: [newSeconds: number];
-}>();
-
-// Show the optimistic value while saving; `??` (not `||`) so a pending 0 (delete) wins.
-const displaySeconds = computed(() => props.pendingSeconds ?? props.cell?.totalSeconds ?? 0);
-const isSaving = computed(() => props.saveStatus === 'saving');
-
-// Swap the border color (don't layer) to avoid same-specificity fights.
-const inputClass = computed(() => {
-    const border = props.saveStatus === 'error' ? 'border-red-500/70' : 'border-input-border';
-    return [
-        'w-[80px] mx-auto text-center font-medium',
-        'bg-transparent text-text-primary placeholder:text-text-quaternary',
-        'rounded-lg border shadow-none',
-        border,
-        'hover:bg-card-background',
-        'focus-visible:bg-tertiary focus-visible:border-transparent',
-        'focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none',
-        'disabled:cursor-wait disabled:opacity-70',
-    ].join(' ');
-});
-</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>
-        <template v-else>
-            <span class="relative inline-flex items-center">
-                <DurationSecondsInput
-                    :model-value="displaySeconds"
-                    default-unit="hours"
-                    placeholder="-"
-                    size="sm"
-                    :disabled="isSaving"
-                    :input-class="inputClass"
-                    @commit="(seconds) => emit('update', seconds ?? 0)" />
-                <span
-                    v-if="saveStatus === 'saving' || saveStatus === 'saved'"
-                    class="pointer-events-none absolute left-full top-1/2 ml-1.5 flex -translate-y-1/2 items-center"
-                    :aria-label="saveStatus === 'saving' ? 'Saving' : 'Saved'">
-                    <LoadingSpinner
-                        v-if="saveStatus === 'saving'"
-                        class="h-3 w-3 m-0 text-text-tertiary" />
-                    <CheckIcon v-else class="h-3 w-3 text-text-tertiary" />
-                </span>
-            </span>
-        </template>
-    </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,171 +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';
-import type { CellSaveStatus } from '@/utils/timesheet/useTimesheetCellMutations';
-
-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;
-    cellStatuses: Record<string, CellSaveStatus>;
-    cellPendingSeconds: Record<string, number>;
-}>();
-
-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(116px, 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"
-                    :cell-statuses="cellStatuses"
-                    :cell-pending-seconds="cellPendingSeconds"
-                    @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,142 +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 {
-    makeCellStatusKey,
-    type CellSaveStatus,
-} from '@/utils/timesheet/useTimesheetCellMutations';
-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;
-    cellStatuses: Record<string, CellSaveStatus>;
-    cellPendingSeconds: Record<string, number>;
-}>();
-
-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)"
-            :save-status="cellStatuses[makeCellStatusKey(row.key, dayIndex)]"
-            :pending-seconds="cellPendingSeconds[makeCellStatusKey(row.key, 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/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 { twMerge } from 'tailwind-merge';
 const props = defineProps<AlertDialogActionProps & { class?: HTMLAttributes['class'] }>();
 
 const delegatedProps = computed(() => {
@@ -13,7 +13,7 @@ const delegatedProps = computed(() => {
 </script>
 
 <template>
-    <AlertDialogAction v-bind="delegatedProps" :class="cn(buttonVariants(), props.class)">
+    <AlertDialogAction v-bind="delegatedProps" :class="twMerge(buttonVariants(), props.class)">
         <slot />
     </AlertDialogAction>
 </template>

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 { twMerge } from 'tailwind-merge';
 
 const props = defineProps<AlertDialogCancelProps & { class?: HTMLAttributes['class'] }>();
 
@@ -16,7 +16,7 @@ const delegatedProps = computed(() => {
 <template>
     <AlertDialogCancel
         v-bind="delegatedProps"
-        :class="cn(buttonVariants({ variant: 'outline' }), 'mt-2 sm:mt-0', props.class)">
+        :class="twMerge(buttonVariants({ variant: 'outline' }), 'mt-2 sm:mt-0', props.class)">
         <slot />
     </AlertDialogCancel>
 </template>

resources/js/Layouts/AppLayout.vue

@@ -17,7 +17,6 @@ import {
     UserGroupIcon,
     XMarkIcon,
     DocumentTextIcon,
-    TableCellsIcon,
 } from '@heroicons/vue/20/solid';
 import { PanelLeft } from 'lucide-vue-next';
 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"
@@ -293,7 +287,7 @@ const page = usePage<{
                 <div class="justify-self-end">
                     <UpdateSidebarNotification></UpdateSidebarNotification>
                     <ul
-                        class="border-t border-default-background-separator pt-3 gap-1 flex justify-between items-center">
+                        class="border-t border-default-background-separator pt-3 gap-1 pr-2 flex justify-between items-center">
                         <UserSettingsIcon></UserSettingsIcon>
 
                         <NavigationSidebarItem
@@ -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/Auth/Login.vue

@@ -2,6 +2,7 @@
 import { Head, Link, useForm, usePage } from '@inertiajs/vue3';
 import AuthenticationCard from '@/Components/AuthenticationCard.vue';
 import AuthenticationCardLogo from '@/Components/AuthenticationCardLogo.vue';
+import Banner from '@/Components/Banner.vue';
 import { Field, FieldLabel, FieldError } from '@/packages/ui/src/field';
 import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
 import TextInput from '@/packages/ui/src/Input/TextInput.vue';
@@ -36,6 +37,8 @@ const page = usePage<{
 <template>
     <Head title="Log in" />
 
+    <Banner />
+
     <AuthenticationCard>
         <template #logo>
             <AuthenticationCardLogo />

resources/js/Pages/Auth/Register.vue

@@ -2,6 +2,7 @@
 import { Head, Link, useForm, usePage } from '@inertiajs/vue3';
 import AuthenticationCard from '@/Components/AuthenticationCard.vue';
 import AuthenticationCardLogo from '@/Components/AuthenticationCardLogo.vue';
+import Banner from '@/Components/Banner.vue';
 import Checkbox from '@/packages/ui/src/Input/Checkbox.vue';
 import { Field, FieldLabel, FieldError } from '@/packages/ui/src/field';
 import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
@@ -41,6 +42,8 @@ const page = usePage<{
 <template>
     <Head title="Register" />
 
+    <Banner />
+
     <AuthenticationCard>
         <template #logo>
             <AuthenticationCardLogo />

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 calendarStart = ref<Date | undefined>(undefined);
-const calendarEnd = ref<Dayjs | 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/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: true }
-        mergeDefaults: (storage, defaults) => ({
-            ...defaults,
-            ...storage,
-            filters: { ...defaults.filters, ...storage.filters },
-        }),
-    }
 );
 
 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,203 +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, cellStatus, cellPendingSeconds } = 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"
-                :cell-statuses="cellStatus"
-                :cell-pending-seconds="cellPendingSeconds"
-                @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/index.ts

@@ -114,8 +114,6 @@ export type ApiToken = ApiTokenIndexResponse['data'][0];
 
 export type DetailedInvoiceResponse = ZodiosResponseByAlias<SolidTimeApi, 'getInvoice'>;
 
-export type DetailedInvoice = DetailedInvoiceResponse['data'];
-
 export type InvoiceIndexEntry = ZodiosResponseByAlias<SolidTimeApi, 'getInvoices'>['data'][0];
 
 export type UpdateInvoiceSettings = ZodiosBodyByAlias<SolidTimeApi, 'updateInvoiceSettings'>;

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

@@ -1886,54 +1886,6 @@ 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(
+                durationSeconds = params.currentTime.value.diff(
-                    0,
+                    getDayJsInstance()(entry.start),
-                    params.currentTime.value.diff(getDayJsInstance()(entry.start), 'seconds')
+                    '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 start = days[0]!.toDate();
-        const end = days[days.length - 1]!.add(1, 'day');
+        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
+    <TextInput
-        v-model="model"
+        ref="inputField"
-        :input-class="twMerge('placeholder:text-text-tertiary', props.class)"
+        v-model="temporaryInput"
+        :class="twMerge('text-text-secondary', props.class)"
+        type="text"
         placeholder="e.g. 2h 30m or 1.5"
-        default-unit="hours"
+        @focus="selectInput"
-        @submit="emit('submit')" />
+        @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(
+const props = defineProps<{
-    defineProps<{
+    name?: string;
-        name?: string;
+    class?: string;
-        class?: string;
+}>();
-        size?: 'sm' | 'base';
-    }>(),
-    { size: 'base' }
-);
 
 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',
+                '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',
-                sizeClasses,
                 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">
-                <div class="flex items-center gap-1">
+                <Button
-                    <Button
+                    :variant="props.variant"
-                        :variant="props.variant"
+                    :size="props.size"
-                        :size="props.size"
+                    :class="twMerge('w-full justify-start overflow-hidden', props.class)">
-                        :class="twMerge('w-full justify-start overflow-hidden', props.class)">
+                    <div
-                        <div
+                        class="w-3 h-3 rounded-full shrink-0"
-                            class="w-3 h-3 rounded-full shrink-0"
+                        :style="{ backgroundColor: selectedProjectColor }"></div>
-                            :style="{ backgroundColor: selectedProjectColor }"></div>
+                    <span class="truncate shrink-[1] pr-1">{{ selectedProjectName }}</span>
-                        <span class="truncate shrink-[1] text-text-primary pr-1">{{
+                    <template v-if="currentTask">
-                            selectedProjectName
+                        <ChevronRightIcon class="w-4 h-4 text-text-tertiary shrink-0" />
-                        }}</span>
+                        <span class="truncate shrink-[100]">{{ currentTask.name }}</span>
-                        <template v-if="currentTask">
+                    </template>
-                            <ChevronRightIcon class="w-4 h-4 text-text-tertiary shrink-0" />
+                </Button>
-                            <span class="truncate shrink-[100]">{{ currentTask.name }}</span>
+                <button
-                        </template>
+                    v-if="allowReset && project !== null"
-                    </Button>
+                    type="button"
-                    <button
+                    data-testid="project_reset_button"
-                        v-if="allowReset && project !== null"
+                    class="p-1 rounded hover:bg-quaternary text-text-tertiary hover:text-text-primary"
-                        type="button"
+                    @click.stop="resetProject">
-                        data-testid="project_reset_button"
+                    <XMarkIcon class="w-4 h-4" />
-                        class="p-1 rounded hover:bg-quaternary text-text-tertiary hover:text-text-primary"
+                </button>
-                        @click.stop="resetProject">
+            </div>
-                        <XMarkIcon class="w-4 h-4" />
-                    </button>
-                </div>
-            </slot>
         </template>
         <template #content>
             <UseFocusTrap v-if="open" :options="{ immediate: true, allowOutsideClick: true }">

resources/js/packages/ui/src/calendar/CalendarCell.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { CalendarCell, type CalendarCellProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
-import { cn } from '../utils/cn';
+import { twMerge } from 'tailwind-merge';
 
 const props = defineProps<CalendarCellProps & { class?: HTMLAttributes['class'] }>();
 
@@ -17,7 +17,7 @@ const forwardedProps = useForwardProps(delegatedProps);
 <template>
     <CalendarCell
         :class="
-            cn(
+            twMerge(
                 'relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([data-selected])]:rounded-md [&:has([data-selected])]:bg-accent [&:has([data-selected][data-outside-view])]:bg-accent/50',
                 props.class
             )

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