prevent billable rate change modals from immediately sumbitting when pressing enter on the previous form

add jetstream permissions, add dynamic inertia module loading, add shadcn components, change modals and dropdowns to shadcn dismissable layer,

.github/workflows/build-private.yml

@@ -107,6 +107,24 @@ jobs:
       - name: "Install npm dependencies in services extension"
         run: cd extensions/Services && npm ci
 
+      - name: "Checkout services extension"
+        uses: actions/checkout@v4
+        with:
+          repository: solidtime-io/extension-invoicing
+          path: extensions/Invoicing
+          ssh-key: ${{ secrets.SSH_PRIVATE_KEY_INVOICING_EXTENSION }}
+
+      - name: "Install composer dependencies in invoicing extension"
+        uses: php-actions/composer@v6
+        with:
+          working_dir: "extensions/Invoicing"
+          command: install
+          only_args: --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
+          php_version: 8.3
+
+      - name: "Install npm dependencies in invoicing extension"
+        run: cd extensions/Invoicing && npm ci
+
       - name: "Setup PHP with PECL extension"
         uses: shivammathur/setup-php@v2
         with:
@@ -127,6 +145,9 @@ jobs:
       - name: "Activate services extension"
         run: php artisan module:enable Services
 
+      - name: "Activate invoicing extension"
+        run: php artisan module:enable Invoicing
+
       - name: "Install npm dependencies"
         run: npm ci
 

app/Actions/Fortify/CreateNewUser.php

@@ -76,6 +76,11 @@ class CreateNewUser implements CreatesNewUsers
         $ipLookupResponse = app(IpLookupServiceContract::class)->lookup(request()->ip());
 
         $startOfWeek = Weekday::Monday;
+        $numberFormat = null;
+        $currencyFormat = null;
+        $dateFormat = null;
+        $intervalFormat = null;
+        $timeFormat = null;
         $currency = null;
         if ($ipLookupResponse !== null) {
             $startOfWeek = $ipLookupResponse->startOfWeek ?? Weekday::Monday;
@@ -85,7 +90,7 @@ class CreateNewUser implements CreatesNewUsers
             $currency = $ipLookupResponse->currency;
         }
         $user = null;
-        DB::transaction(function () use (&$user, $input, $timezone, $startOfWeek, $currency): void {
+        DB::transaction(function () use (&$user, $input, $timezone, $startOfWeek, $currency, $numberFormat, $currencyFormat, $dateFormat, $intervalFormat, $timeFormat): void {
             $userService = app(UserService::class);
             $user = $userService->createUser(
                 $input['name'],
@@ -93,7 +98,12 @@ class CreateNewUser implements CreatesNewUsers
                 $input['password'],
                 $timezone ?? 'UTC',
                 $startOfWeek,
-                $currency ?? 'EUR',
+                $currency,
+                $numberFormat,
+                $currencyFormat,
+                $dateFormat,
+                $intervalFormat,
+                $timeFormat
             );
         });
 

app/Actions/Jetstream/CreateOrganization.php

@@ -4,10 +4,11 @@ declare(strict_types=1);
 
 namespace App\Actions\Jetstream;
 
-use App\Enums\Role;
 use App\Events\AfterCreateOrganization;
 use App\Models\Organization;
 use App\Models\User;
+use App\Service\IpLookup\IpLookupServiceContract;
+use App\Service\OrganizationService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
@@ -33,16 +34,18 @@ class CreateOrganization implements CreatesTeams
             'name' => ['required', 'string', 'max:255'],
         ])->validateWithBag('createTeam');
 
-        $organization = new Organization;
-        $organization->name = $input['name'];
-        $organization->personal_team = false;
-        $organization->owner()->associate($user);
-        $organization->save();
+        $ipLookupResponse = app(IpLookupServiceContract::class)->lookup(request()->ip());
 
-        $organization->users()->attach(
-            $user, [
-                'role' => Role::Owner->value,
-            ]
+        $currency = null;
+        if ($ipLookupResponse !== null) {
+            $currency = $ipLookupResponse->currency;
+        }
+
+        $organization = app(OrganizationService::class)->createOrganization(
+            $input['name'],
+            $user,
+            false,
+            $currency
         );
 
         $user->switchTeam($organization);

app/Console/Commands/Admin/UserCreateCommand.php

@@ -64,8 +64,8 @@ class UserCreateCommand extends Command
                 $password,
                 'UTC',
                 Weekday::Monday,
-                'EUR',
-                $verifyEmail
+                null,
+                verifyEmail: $verifyEmail
             );
         });
         /** @var Organization|null $organization */

app/Enums/CurrencyFormat.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enums;
+
+use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
+
+enum CurrencyFormat: string
+{
+    use LaravelEnumHelper;
+
+    case ISOCodeBeforeWithSpace = 'iso-code-before-with-space';
+    case ISOCodeAfterWithSpace = 'iso-code-after-with-space';
+
+    case SymbolBefore = 'symbol-before';
+
+    case SymbolAfter = 'symbol-after';
+
+    case SymbolBeforeWithSpace = 'symbol-before-with-space';
+
+    case SymbolAfterWithSpace = 'symbol-after-with-space';
+
+    /**
+     * @return array<string, string>
+     */
+    public static function toSelectArray(): array
+    {
+        $selectArray = [];
+        foreach (self::values() as $value) {
+            $selectArray[(string) $value] = (string) __('enum.currency_format.'.$value);
+        }
+
+        return $selectArray;
+    }
+}

app/Enums/DateFormat.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enums;
+
+use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
+
+enum DateFormat: string
+{
+    use LaravelEnumHelper;
+
+    case PointSeperatedDMYYYY = 'point-seperated-d-m-yyyy';
+    case SlashSeperatedMMDDYYYY = 'slash-seperated-mm-dd-yyyy';
+
+    case SlashSeperatedDDMMYYYY = 'slash-seperated-dd-mm-yyyy';
+
+    case HyphenSeperatedDDMMYYY = 'hyphen-seperated-dd-mm-yyyy';
+
+    case HyphenSeperatedMMDDDYYYY = 'hyphen-seperated-mm-dd-yyyy';
+
+    case HyphenSeperatedYYYYMMDD = 'hyphen-seperated-yyyy-mm-dd';
+
+    public function toCarbonFormat(): string
+    {
+        return match ($this->value) {
+            self::PointSeperatedDMYYYY->value => 'j.n.Y',
+            self::SlashSeperatedMMDDYYYY->value => 'm/d/Y',
+            self::SlashSeperatedDDMMYYYY->value => 'd/m/Y',
+            self::HyphenSeperatedDDMMYYY->value => 'd-m-Y',
+            self::HyphenSeperatedMMDDDYYYY->value => 'm-d-Y',
+            self::HyphenSeperatedYYYYMMDD->value => 'Y-m-d',
+        };
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    public static function toSelectArray(): array
+    {
+        $selectArray = [];
+        foreach (self::values() as $value) {
+            $selectArray[(string) $value] = (string) __('enum.date_format.'.$value);
+        }
+
+        return $selectArray;
+    }
+}

app/Enums/IntervalFormat.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enums;
+
+use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
+
+enum IntervalFormat: string
+{
+    use LaravelEnumHelper;
+
+    case Decimal = 'decimal';
+    case HoursMinutes = 'hours-minutes';
+
+    case HoursMinutesColonSeperated = 'hours-minutes-colon-seperated';
+
+    case HoursMinutesSecondsColonSeperated = 'hours-minutes-seconds-colon-seperated';
+
+    /**
+     * @return array<string, string>
+     */
+    public static function toSelectArray(): array
+    {
+        $selectArray = [];
+        foreach (self::values() as $value) {
+            $selectArray[(string) $value] = (string) __('enum.interval_format.'.$value);
+        }
+
+        return $selectArray;
+    }
+}

app/Enums/NumberFormat.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enums;
+
+use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
+
+/**
+ * @info https://en.wikipedia.org/wiki/Decimal_separator
+ */
+enum NumberFormat: string
+{
+    use LaravelEnumHelper;
+
+    case ThousandsPointDecimalComma = 'point-comma';
+
+    case ThousandsCommaDecimalPoint = 'comma-point';
+    case ThousandsSpaceDecimalComma = 'space-comma';
+
+    case ThousandsSpaceDecimalPoint = 'space-point';
+
+    case ThousandsApostropheDecimalPoint = 'apostrophe-point';
+
+    /**
+     * @return array<string, string>
+     */
+    public static function toSelectArray(): array
+    {
+        $selectArray = [];
+        foreach (self::values() as $value) {
+            $selectArray[(string) $value] = (string) __('enum.number_format.'.$value);
+        }
+
+        return $selectArray;
+    }
+}

app/Enums/TimeFormat.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enums;
+
+use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
+
+enum TimeFormat: string
+{
+    use LaravelEnumHelper;
+
+    case TwelveHours = '12-hours';
+    case TwentyFourHours = '24-hours';
+
+    /**
+     * @return array<string, string>
+     */
+    public static function toSelectArray(): array
+    {
+        $selectArray = [];
+        foreach (self::values() as $value) {
+            $selectArray[(string) $value] = (string) __('enum.time_format.'.$value);
+        }
+
+        return $selectArray;
+    }
+}

app/Filament/Resources/OrganizationResource.php

@@ -4,6 +4,11 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources;
 
+use App\Enums\CurrencyFormat;
+use App\Enums\DateFormat;
+use App\Enums\IntervalFormat;
+use App\Enums\NumberFormat;
+use App\Enums\TimeFormat;
 use App\Filament\Resources\OrganizationResource\Pages;
 use App\Filament\Resources\OrganizationResource\RelationManagers\InvitationsRelationManager;
 use App\Filament\Resources\OrganizationResource\RelationManagers\UsersRelationManager;
@@ -56,6 +61,21 @@ class OrganizationResource extends Resource
                     ->searchable(['name', 'email'])
                     ->disabledOn(['edit'])
                     ->required(),
+                Select::make('date_format')
+                    ->options(DateFormat::toSelectArray())
+                    ->required(),
+                Select::make('currency_format')
+                    ->options(CurrencyFormat::toSelectArray())
+                    ->required(),
+                Select::make('interval_format')
+                    ->options(IntervalFormat::toSelectArray())
+                    ->required(),
+                Select::make('number_format')
+                    ->options(NumberFormat::toSelectArray())
+                    ->required(),
+                Select::make('time_format')
+                    ->options(TimeFormat::toSelectArray())
+                    ->required(),
                 Forms\Components\Select::make('currency')
                     ->label('Currency')
                     ->options(function (): array {

app/Filament/Resources/UserResource/Pages/CreateUser.php

@@ -24,7 +24,7 @@ class CreateUser extends CreateRecord
             $data['timezone'],
             Weekday::from($data['week_start']),
             $data['currency'],
-            (bool) $data['is_email_verified']
+            verifyEmail: (bool) $data['is_email_verified']
         );
 
         return $user;

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

@@ -0,0 +1,172 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Enums\Role;
+use App\Models\Organization;
+use App\Service\DashboardService;
+use App\Service\PermissionStore;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\JsonResponse;
+
+class ChartController extends Controller
+{
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId weeklyProjectOverview
+     *
+     * @response array<int, array{value: int, name: string, color: string}>
+     */
+    public function weeklyProjectOverview(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $weeklyProjectOverview = $dashboardService->weeklyProjectOverview($user, $organization);
+
+        return response()->json($weeklyProjectOverview);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId latestTasks
+     *
+     * @response array<int, array{task_id: string, name: string, description: string|null, status: bool, time_entry_id: string|null}>
+     */
+    public function latestTasks(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $latestTasks = $dashboardService->latestTasks($user, $organization);
+
+        return response()->json($latestTasks);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId lastSevenDays
+     *
+     * @response array<int, array{ date: string, duration: int, history: array<int> }>
+     */
+    public function lastSevenDays(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $lastSevenDays = $dashboardService->lastSevenDays($user, $organization);
+
+        return response()->json($lastSevenDays);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId latestTeamActivity
+     *
+     * @response array<int, array{member_id: string, name: string, description: string|null, time_entry_id: string, task_id: string|null, status: bool }>
+     */
+    public function latestTeamActivity(Organization $organization, DashboardService $dashboardService, PermissionStore $permissionStore): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:all');
+
+        $latestTeamActivity = $dashboardService->latestTeamActivity($organization);
+
+        return response()->json($latestTeamActivity);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId dailyTrackedHours
+     *
+     * @response array<int, array{date: string, duration: int}>
+     */
+    public function dailyTrackedHours(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $dailyTrackedHours = $dashboardService->getDailyTrackedHours($user, $organization, 60);
+
+        return response()->json($dailyTrackedHours);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId totalWeeklyTime
+     *
+     * @response int
+     */
+    public function totalWeeklyTime(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $totalWeeklyTime = $dashboardService->totalWeeklyTime($user, $organization);
+
+        return response()->json($totalWeeklyTime);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId totalWeeklyBillableTime
+     *
+     * @response int
+     */
+    public function totalWeeklyBillableTime(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $totalWeeklyBillableTime = $dashboardService->totalWeeklyBillableTime($user, $organization);
+
+        return response()->json($totalWeeklyBillableTime);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId totalWeeklyBillableAmount
+     *
+     * @response array{value: int, currency: string}
+     */
+    public function totalWeeklyBillableAmount(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
+        if (! $showBillableRate) {
+            throw new AuthorizationException('You do not have permission to view billable rates.');
+        }
+
+        $totalWeeklyBillableAmount = $dashboardService->totalWeeklyBillableAmount($user, $organization);
+
+        return response()->json($totalWeeklyBillableAmount);
+    }
+
+    /**
+     * @throws AuthorizationException
+     *
+     * @operationId weeklyHistory
+     *
+     * @response array<int, array{date: string, duration: int}>
+     */
+    public function weeklyHistory(Organization $organization, DashboardService $dashboardService): JsonResponse
+    {
+        $this->checkPermission($organization, 'charts:view:own');
+        $user = $this->user();
+
+        $weeklyHistory = $dashboardService->getWeeklyHistory($user, $organization);
+
+        return response()->json($weeklyHistory);
+    }
+}

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

@@ -136,6 +136,8 @@ class MemberController extends Controller
     }
 
     /**
+     * Merge one member into another
+     *
      * @throws AuthorizationException
      * @throws OnlyPlaceholdersCanBeMergedIntoAnotherMember
      * @throws \Throwable

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

@@ -40,15 +40,35 @@ class OrganizationController extends Controller
     {
         $this->checkPermission($organization, 'organizations:update');
 
-        $organization->name = $request->input('name');
-        $oldBillableRate = $organization->billable_rate;
-        if ($request->has('employees_can_see_billable_rates')) {
-            $organization->employees_can_see_billable_rates = $request->validated('employees_can_see_billable_rates');
+        if ($request->getName() !== null) {
+            $organization->name = $request->getName();
+        }
+        if ($request->getEmployeesCanSeeBillableRates() !== null) {
+            $organization->employees_can_see_billable_rates = $request->getEmployeesCanSeeBillableRates();
+        }
+        if ($request->getNumberFormat() !== null) {
+            $organization->number_format = $request->getNumberFormat();
+        }
+        if ($request->getCurrencyFormat() !== null) {
+            $organization->currency_format = $request->getCurrencyFormat();
+        }
+        if ($request->getDateFormat() !== null) {
+            $organization->date_format = $request->getDateFormat();
+        }
+        if ($request->getIntervalFormat() !== null) {
+            $organization->interval_format = $request->getIntervalFormat();
+        }
+        if ($request->getTimeFormat() !== null) {
+            $organization->time_format = $request->getTimeFormat();
+        }
+        $hasBillableRate = $request->has('billable_rate');
+        if ($hasBillableRate) {
+            $oldBillableRate = $organization->billable_rate;
+            $organization->billable_rate = $request->getBillableRate();
         }
-        $organization->billable_rate = $request->getBillableRate();
         $organization->save();
 
-        if ($oldBillableRate !== $request->getBillableRate()) {
+        if ($hasBillableRate && $oldBillableRate !== $request->getBillableRate()) {
             $billableRateService->updateTimeEntriesBillableRateForOrganization($organization);
         }
 

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

@@ -27,6 +27,7 @@ use App\Models\Organization;
 use App\Models\Project;
 use App\Models\Task;
 use App\Models\TimeEntry;
+use App\Service\LocalizationService;
 use App\Service\ReportExport\TimeEntriesDetailedCsvExport;
 use App\Service\ReportExport\TimeEntriesDetailedExport;
 use App\Service\ReportExport\TimeEntriesReportExport;
@@ -194,6 +195,7 @@ class TimeEntryController extends Controller
         $filename = 'time-entries-export-'.now()->format('Y-m-d_H-i-s').'.'.$format->getFileExtension();
         $folderPath = 'exports';
         $path = $folderPath.'/'.$filename;
+        $localizationService = LocalizationService::forOrganization($organization);
         if ($format === ExportFormat::CSV) {
             $export = new TimeEntriesDetailedCsvExport(config('filesystems.private'), $folderPath, $filename, $timeEntriesQuery, 1000, $timezone);
             $export->export();
@@ -223,6 +225,7 @@ class TimeEntryController extends Controller
                 'currency' => $organization->currency,
                 'start' => $request->getStart()->timezone($timezone),
                 'end' => $request->getEnd()->timezone($timezone),
+                'localization' => $localizationService,
             ]);
             $footerViewFile = file_get_contents(resource_path('views/reports/time-entry-index/pdf-footer.blade.php'));
             if ($footerViewFile === false) {
@@ -257,7 +260,7 @@ class TimeEntryController extends Controller
                 ->putFileAs($folderPath, new File($tempFolder->path($filenameTemp)), $filename);
         } else {
             Excel::store(
-                new TimeEntriesDetailedExport($timeEntriesQuery, $format, $timezone),
+                new TimeEntriesDetailedExport($timeEntriesQuery, $format, $timezone, $localizationService),
                 $path,
                 config('filesystems.private'),
                 $format->getExportPackageType(),
@@ -394,6 +397,7 @@ class TimeEntryController extends Controller
         );
         $currency = $organization->currency;
         $timezone = app(TimezoneService::class)->getTimezoneFromUser($this->user());
+        $localizationService = LocalizationService::forOrganization($organization);
 
         $filename = 'time-entries-report-'.now()->format('Y-m-d_H-i-s').'.'.$format->getFileExtension();
         $folderPath = 'exports';
@@ -419,9 +423,11 @@ class TimeEntryController extends Controller
                 'currency' => $currency,
                 'group' => $group,
                 'subGroup' => $subGroup,
+                'timezone' => $timezone,
                 'start' => $request->getStart()->timezone($timezone),
                 'end' => $request->getEnd()->timezone($timezone),
                 'debug' => $debug,
+                'localization' => $localizationService,
             ]);
             $footerViewFile = file_get_contents(resource_path('views/reports/time-entry-aggregate/pdf-footer.blade.php'));
             if ($footerViewFile === false) {

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

@@ -6,7 +6,6 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Http\Resources\V1\User\UserResource;
 use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Http\Resources\Json\JsonResource;
 
 class UserController extends Controller
 {
@@ -19,7 +18,7 @@ class UserController extends Controller
      *
      * @throws AuthorizationException
      */
-    public function me(): JsonResource
+    public function me(): UserResource
     {
         $user = $this->user();
 

app/Http/Controllers/Web/DashboardController.php

@@ -20,14 +20,6 @@ class DashboardController extends Controller
     {
         $user = $this->user();
         $organization = $this->currentOrganization();
-        $dailyTrackedHours = $dashboardService->getDailyTrackedHours($user, $organization, 60);
-        $weeklyHistory = $dashboardService->getWeeklyHistory($user, $organization);
-        $totalWeeklyTime = $dashboardService->totalWeeklyTime($user, $organization);
-        $totalWeeklyBillableTime = $dashboardService->totalWeeklyBillableTime($user, $organization);
-        $totalWeeklyBillableAmount = $dashboardService->totalWeeklyBillableAmount($user, $organization);
-        $weeklyProjectOverview = $dashboardService->weeklyProjectOverview($user, $organization);
-        $latestTasks = $dashboardService->latestTasks($user, $organization);
-        $lastSevenDays = $dashboardService->lastSevenDays($user, $organization);
 
         $latestTeamActivity = null;
         if ($permissionStore->has($organization, 'time-entries:view:all')) {
@@ -36,16 +28,6 @@ class DashboardController extends Controller
 
         $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
 
-        return Inertia::render('Dashboard', [
-            'weeklyProjectOverview' => $weeklyProjectOverview,
-            'latestTasks' => $latestTasks,
-            'lastSevenDays' => $lastSevenDays,
-            'latestTeamActivity' => $latestTeamActivity,
-            'dailyTrackedHours' => $dailyTrackedHours,
-            'totalWeeklyTime' => $totalWeeklyTime,
-            'totalWeeklyBillableTime' => $totalWeeklyBillableTime,
-            'totalWeeklyBillableAmount' => $showBillableRate ? $totalWeeklyBillableAmount : null,
-            'weeklyHistory' => $weeklyHistory,
-        ]);
+        return Inertia::render('Dashboard');
     }
 }

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

@@ -4,9 +4,14 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Organization;
 
+use App\Enums\CurrencyFormat;
+use App\Enums\DateFormat;
+use App\Enums\IntervalFormat;
+use App\Enums\NumberFormat;
+use App\Enums\TimeFormat;
 use App\Models\Organization;
-use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 
 /**
  * @property Organization $organization Organization from model binding
@@ -16,13 +21,12 @@ class OrganizationUpdateRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule>>
+     * @return array<string, array<string|\Illuminate\Contracts\Validation\Rule>>
      */
     public function rules(): array
     {
         return [
             'name' => [
-                'required',
                 'string',
                 'max:255',
             ],
@@ -35,13 +39,63 @@ class OrganizationUpdateRequest extends FormRequest
             'employees_can_see_billable_rates' => [
                 'boolean',
             ],
+            'number_format' => [
+                Rule::enum(NumberFormat::class),
+            ],
+            'currency_format' => [
+                Rule::enum(CurrencyFormat::class),
+            ],
+            'date_format' => [
+                Rule::enum(DateFormat::class),
+            ],
+            'interval_format' => [
+                Rule::enum(IntervalFormat::class),
+            ],
+            'time_format' => [
+                Rule::enum(TimeFormat::class),
+            ],
         ];
     }
 
+    public function getName(): ?string
+    {
+        return $this->has('name') ? (string) $this->input('name') : null;
+    }
+
+    public function getNumberFormat(): ?NumberFormat
+    {
+        return $this->has('number_format') ? NumberFormat::from($this->input('number_format')) : null;
+    }
+
+    public function getCurrencyFormat(): ?CurrencyFormat
+    {
+        return $this->has('currency_format') ? CurrencyFormat::from($this->input('currency_format')) : null;
+    }
+
+    public function getDateFormat(): ?DateFormat
+    {
+        return $this->has('date_format') ? DateFormat::from($this->input('date_format')) : null;
+    }
+
+    public function getIntervalFormat(): ?IntervalFormat
+    {
+        return $this->has('interval_format') ? IntervalFormat::from($this->input('interval_format')) : null;
+    }
+
+    public function getTimeFormat(): ?TimeFormat
+    {
+        return $this->has('time_format') ? TimeFormat::from($this->input('time_format')) : null;
+    }
+
     public function getBillableRate(): ?int
     {
         $input = $this->input('billable_rate');
 
         return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
     }
+
+    public function getEmployeesCanSeeBillableRates(): ?bool
+    {
+        return $this->has('employees_can_see_billable_rates') ? $this->boolean('employees_can_see_billable_rates') : null;
+    }
 }

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

@@ -47,6 +47,16 @@ class OrganizationResource extends BaseResource
             'employees_can_see_billable_rates' => $this->resource->employees_can_see_billable_rates,
             /** @var string $currency Currency code (ISO 4217) */
             'currency' => $this->resource->currency,
+            /** @var string $number_format Number format */
+            'number_format' => $this->resource->number_format->value,
+            /** @var string $currency_format Currency format */
+            'currency_format' => $this->resource->currency_format->value,
+            /** @var string $date_format Date format */
+            'date_format' => $this->resource->date_format->value,
+            /** @var string $interval_format Interval format */
+            'interval_format' => $this->resource->interval_format->value,
+            /** @var string $time_format Time format */
+            'time_format' => $this->resource->time_format->value,
         ];
     }
 }

app/Http/Resources/V1/Report/DetailedReportResource.php

@@ -30,7 +30,7 @@ class DetailedReportResource extends BaseResource
             /** @var bool $is_public Whether the report can be accessed via an external link */
             'is_public' => $this->resource->is_public,
             /** @var string|null $public_until Date until the report is public */
-            'public_until' => $this->resource->public_until?->toIso8601ZuluString(),
+            'public_until' => $this->formatDateTime($this->resource->public_until),
             /** @var string|null $shareable_link Get link to access the report externally, not set if the report is private */
             'shareable_link' => $this->resource->getShareableLink(),
             'properties' => [
@@ -41,9 +41,9 @@ class DetailedReportResource extends BaseResource
                 /** @var string $history_group Type of grouping of the historic aggregation (time chart) */
                 'history_group' => $this->resource->properties->historyGroup->value,
                 /** @var string $start Start date of the report */
-                'start' => $this->resource->properties->start->toIso8601ZuluString(),
+                'start' => $this->formatDateTime($this->resource->properties->start),
                 /** @var string $end End date of the report */
-                'end' => $this->resource->properties->end->toIso8601ZuluString(),
+                'end' => $this->formatDateTime($this->resource->properties->end),
                 /** @var bool|null $active Whether the report is active */
                 'active' => $this->resource->properties->active,
                 /** @var array<string>|null $member_ids Filter by multiple member IDs, member IDs are OR combined */
@@ -60,9 +60,9 @@ class DetailedReportResource extends BaseResource
                 'task_ids' => $this->resource->properties->taskIds?->toArray(),
             ],
             /** @var string $created_at Date when the report was created */
-            'created_at' => $this->resource->created_at?->toIso8601ZuluString(),
+            'created_at' => $this->formatDateTime($this->resource->created_at),
             /** @var string $updated_at Date when the report was last updated */
-            'updated_at' => $this->resource->updated_at?->toIso8601ZuluString(),
+            'updated_at' => $this->formatDateTime($this->resource->updated_at),
         ];
     }
 }

app/Http/Resources/V1/Report/DetailedWithDataReportResource.php

@@ -70,7 +70,7 @@ class DetailedWithDataReportResource extends BaseResource
             /** @var string|null $email Description */
             'description' => $this->resource->description,
             /** @var string|null $public_until Date until the report is public */
-            'public_until' => $this->resource->public_until?->toIso8601ZuluString(),
+            'public_until' => $this->formatDateTime($this->resource->public_until),
             /** @var string $currency Currency code (ISO 4217) */
             'currency' => $this->resource->organization->currency,
             'properties' => [
@@ -81,9 +81,9 @@ class DetailedWithDataReportResource extends BaseResource
                 /** @var string $history_group Type of grouping of the historic aggregation (time chart) */
                 'history_group' => $this->resource->properties->historyGroup->value,
                 /** @var string $start Start date of the report */
-                'start' => $this->resource->properties->start->toIso8601ZuluString(),
+                'start' => $this->formatDateTime($this->resource->properties->start),
                 /** @var string $end End date of the report */
-                'end' => $this->resource->properties->end->toIso8601ZuluString(),
+                'end' => $this->formatDateTime($this->resource->properties->end),
             ],
             /** @var array{
              *        grouped_type: string|null,

app/Http/Resources/V1/Report/ReportResource.php

@@ -30,13 +30,13 @@ class ReportResource extends BaseResource
             /** @var bool $is_public Whether the report can be accessed via an external link */
             'is_public' => $this->resource->is_public,
             /** @var string|null $public_until Date until the report is public */
-            'public_until' => $this->resource->public_until?->toIso8601ZuluString(),
+            'public_until' => $this->formatDateTime($this->resource->public_until),
             /** @var string|null $shareable_link Get link to access the report externally, not set if the report is private */
             'shareable_link' => $this->resource->getShareableLink(),
             /** @var string $created_at Date when the report was created */
-            'created_at' => $this->resource->created_at?->toIso8601ZuluString(),
+            'created_at' => $this->formatDateTime($this->resource->created_at),
             /** @var string $updated_at Date when the report was last updated */
-            'updated_at' => $this->resource->updated_at?->toIso8601ZuluString(),
+            'updated_at' => $this->formatDateTime($this->resource->updated_at),
         ];
     }
 }

app/Models/Organization.php

@@ -4,6 +4,11 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\Enums\CurrencyFormat;
+use App\Enums\DateFormat;
+use App\Enums\IntervalFormat;
+use App\Enums\NumberFormat;
+use App\Enums\TimeFormat;
 use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\OrganizationFactory;
@@ -18,7 +23,6 @@ use Illuminate\Support\Str;
 use Laravel\Jetstream\Events\TeamCreated;
 use Laravel\Jetstream\Events\TeamDeleted;
 use Laravel\Jetstream\Events\TeamUpdated;
-use Laravel\Jetstream\Jetstream;
 use Laravel\Jetstream\Team as JetstreamTeam;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
@@ -37,6 +41,11 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property Collection<int, User> $realUsers
  * @property-read Collection<int, OrganizationInvitation> $teamInvitations
  * @property Member $membership
+ * @property NumberFormat $number_format
+ * @property CurrencyFormat $currency_format
+ * @property DateFormat $date_format
+ * @property IntervalFormat $interval_format
+ * @property TimeFormat $time_format
  *
  * @method HasMany<OrganizationInvitation> teamInvitations()
  * @method static OrganizationFactory factory()
@@ -60,6 +69,11 @@ class Organization extends JetstreamTeam implements AuditableContract
         'personal_team' => 'boolean',
         'currency' => 'string',
         'employees_can_see_billable_rates' => 'boolean',
+        'number_format' => NumberFormat::class,
+        'currency_format' => CurrencyFormat::class,
+        'date_format' => DateFormat::class,
+        'interval_format' => IntervalFormat::class,
+        'time_format' => TimeFormat::class,
     ];
 
     /**
@@ -89,7 +103,6 @@ class Organization extends JetstreamTeam implements AuditableContract
      * @var array<string, mixed>
      */
     protected $attributes = [
-        'currency' => 'EUR',
     ];
 
     /**

app/Providers/JetstreamServiceProvider.php

@@ -80,6 +80,8 @@ class JetstreamServiceProvider extends ServiceProvider
         Jetstream::defaultApiTokenPermissions([]);
 
         Jetstream::role(Role::Owner->value, 'Owner', [
+            'charts:view:own',
+            'charts:view:all',
             'projects:view',
             'projects:view:all',
             'projects:create',
@@ -131,9 +133,18 @@ class JetstreamServiceProvider extends ServiceProvider
             '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',
@@ -181,9 +192,18 @@ class JetstreamServiceProvider extends ServiceProvider
             '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',
@@ -221,9 +241,17 @@ class JetstreamServiceProvider extends ServiceProvider
             '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',

app/Service/CurrencyService.php

@@ -0,0 +1,377 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use Brick\Money\Money;
+
+class CurrencyService
+{
+    /**
+     * @source https://gist.github.com/stephenfrank/a8245c2486f3e546107c5363706ac93e
+     *
+     * @const array<string, array<{ symbol: string }>>
+     */
+    private const array CURRENCIES = [
+        'ALL' => [
+            'symbol' => 'L',
+        ],
+        'AFN' => [
+            'symbol' => '؋',
+        ],
+        'ARS' => [
+            'symbol' => '$',
+        ],
+        'AWG' => [
+            'symbol' => 'ƒ',
+        ],
+        'AUD' => [
+            'symbol' => '$',
+        ],
+        'AZN' => [
+            'symbol' => '₼',
+        ],
+        'BSD' => [
+            'symbol' => '$',
+        ],
+        'BBD' => [
+            'symbol' => '$',
+        ],
+        'BDT' => [
+            'symbol' => '৳',
+        ],
+        'BYR' => [
+            'symbol' => 'Br',
+        ],
+        'BZD' => [
+            'symbol' => 'BZ$',
+        ],
+        'BMD' => [
+            'symbol' => '$',
+        ],
+        'BOB' => [
+            'symbol' => '$b',
+        ],
+        'BAM' => [
+            'symbol' => 'KM',
+        ],
+        'BWP' => [
+            'symbol' => 'P',
+        ],
+        'BGN' => [
+            'symbol' => 'лв',
+        ],
+        'BRL' => [
+            'symbol' => 'R$',
+        ],
+        'BND' => [
+            'symbol' => '$',
+        ],
+        'KHR' => [
+            'symbol' => '៛',
+        ],
+        'CAD' => [
+            'symbol' => '$',
+        ],
+        'KYD' => [
+            'symbol' => '$',
+        ],
+        'CLP' => [
+            'symbol' => '$',
+        ],
+        'CNY' => [
+            'symbol' => '¥',
+        ],
+        'COP' => [
+            'symbol' => '$',
+        ],
+        'CRC' => [
+            'symbol' => '₡',
+        ],
+        'HRK' => [
+            'symbol' => 'kn',
+        ],
+        'CUP' => [
+            'symbol' => '₱',
+        ],
+        'CZK' => [
+            'symbol' => 'Kč',
+        ],
+        'DKK' => [
+            'symbol' => 'kr',
+        ],
+        'DOP' => [
+            'symbol' => 'RD$',
+        ],
+        'XCD' => [
+            'symbol' => '$',
+        ],
+        'EGP' => [
+            'symbol' => '£',
+        ],
+        'SVC' => [
+            'symbol' => '$',
+        ],
+        'EEK' => [
+            'symbol' => 'kr',
+        ],
+        'EUR' => [
+            'symbol' => '€',
+        ],
+        'FKP' => [
+            'symbol' => '£',
+        ],
+        'FJD' => [
+            'symbol' => '$',
+        ],
+        'GHC' => [
+            'symbol' => '₵',
+        ],
+        'GIP' => [
+            'symbol' => '£',
+        ],
+        'GTQ' => [
+            'symbol' => 'Q',
+        ],
+        'GGP' => [
+            'symbol' => '£',
+        ],
+        'GYD' => [
+            'symbol' => '$',
+        ],
+        'HNL' => [
+            'symbol' => 'L',
+        ],
+        'HKD' => [
+            'symbol' => '$',
+        ],
+        'HUF' => [
+            'symbol' => 'Ft',
+        ],
+        'ISK' => [
+            'symbol' => 'kr',
+        ],
+        'INR' => [
+            'symbol' => '₹',
+        ],
+        'IDR' => [
+            'symbol' => 'Rp',
+        ],
+        'IRR' => [
+            'symbol' => '﷼',
+        ],
+        'IMP' => [
+            'symbol' => '£',
+        ],
+        'ILS' => [
+            'symbol' => '₪',
+        ],
+        'JMD' => [
+            'symbol' => 'J$',
+        ],
+        'JPY' => [
+            'symbol' => '¥',
+        ],
+        'JEP' => [
+            'symbol' => '£',
+        ],
+        'KZT' => [
+            'symbol' => 'лв',
+        ],
+        'KPW' => [
+            'symbol' => '₩',
+        ],
+        'KRW' => [
+            'symbol' => '₩',
+        ],
+        'KGS' => [
+            'symbol' => 'лв',
+        ],
+        'LAK' => [
+            'symbol' => '₭',
+        ],
+        'LVL' => [
+            'symbol' => 'Ls',
+        ],
+        'LBP' => [
+            'symbol' => '£',
+        ],
+        'LRD' => [
+            'symbol' => '$',
+        ],
+        'LTL' => [
+            'symbol' => 'Lt',
+        ],
+        'MKD' => [
+            'symbol' => 'ден',
+        ],
+        'MYR' => [
+            'symbol' => 'RM',
+        ],
+        'MUR' => [
+            'symbol' => '₨',
+        ],
+        'MXN' => [
+            'symbol' => '$',
+        ],
+        'MNT' => [
+            'symbol' => '₮',
+        ],
+        'MZN' => [
+            'symbol' => 'MT',
+        ],
+        'NAD' => [
+            'symbol' => '$',
+        ],
+        'NPR' => [
+            'symbol' => '₨',
+        ],
+        'ANG' => [
+            'symbol' => 'ƒ',
+        ],
+        'NZD' => [
+            'symbol' => '$',
+        ],
+        'NIO' => [
+            'symbol' => 'C$',
+        ],
+        'NGN' => [
+            'symbol' => '₦',
+        ],
+        'NOK' => [
+            'symbol' => 'kr',
+        ],
+        'OMR' => [
+            'symbol' => '﷼',
+        ],
+        'PKR' => [
+            'symbol' => '₨',
+        ],
+        'PAB' => [
+            'symbol' => 'B/.',
+        ],
+        'PYG' => [
+            'symbol' => 'Gs',
+        ],
+        'PEN' => [
+            'symbol' => 'S/.',
+        ],
+        'PHP' => [
+            'symbol' => '₱',
+        ],
+        'PLN' => [
+            'symbol' => 'zł',
+        ],
+        'QAR' => [
+            'symbol' => '﷼',
+        ],
+        'RON' => [
+            'symbol' => 'lei',
+        ],
+        'RUB' => [
+            'symbol' => '₽',
+        ],
+        'SHP' => [
+            'symbol' => '£',
+        ],
+        'SAR' => [
+            'symbol' => '﷼',
+        ],
+        'RSD' => [
+            'symbol' => 'Дин.',
+        ],
+        'SCR' => [
+            'symbol' => '₨',
+        ],
+        'SGD' => [
+            'symbol' => '$',
+        ],
+        'SBD' => [
+            'symbol' => '$',
+        ],
+        'SOS' => [
+            'symbol' => 'S',
+        ],
+        'ZAR' => [
+            'symbol' => 'R',
+        ],
+        'LKR' => [
+            'symbol' => '₨',
+        ],
+        'SEK' => [
+            'symbol' => 'kr',
+        ],
+        'CHF' => [
+            'symbol' => 'CHF',
+        ],
+        'SRD' => [
+            'symbol' => '$',
+        ],
+        'SYP' => [
+            'symbol' => '£',
+        ],
+        'TWD' => [
+            'symbol' => 'NT$',
+        ],
+        'THB' => [
+            'symbol' => '฿',
+        ],
+        'TTD' => [
+            'symbol' => 'TT$',
+        ],
+        'TRY' => [
+            'symbol' => '₺',
+        ],
+        'TRL' => [
+            'symbol' => '₤',
+        ],
+        'TVD' => [
+            'symbol' => '$',
+        ],
+        'UAH' => [
+            'symbol' => '₴',
+        ],
+        'GBP' => [
+            'symbol' => '£',
+        ],
+        'UGX' => [
+            'symbol' => 'USh',
+        ],
+        'USD' => [
+            'symbol' => '$',
+        ],
+        'UYU' => [
+            'symbol' => '$U',
+        ],
+        'UZS' => [
+            'symbol' => 'лв',
+        ],
+        'VEF' => [
+            'symbol' => 'Bs',
+        ],
+        'VND' => [
+            'symbol' => '₫',
+        ],
+        'YER' => [
+            'symbol' => '﷼',
+        ],
+        'ZWD' => [
+            'symbol' => 'Z$',
+        ],
+    ];
+
+    public function getCurrencySymbolForMoney(Money $money): string
+    {
+        return $this->getCurrencySymbol($money->getCurrency()->getCurrencyCode());
+    }
+
+    public function getCurrencySymbol(string $currencyCode): string
+    {
+        if (isset(self::CURRENCIES[$currencyCode]['symbol'])) {
+            return self::CURRENCIES[$currencyCode]['symbol'];
+        }
+
+        return $currencyCode;
+    }
+}

app/Service/LocalizationService.php

@@ -0,0 +1,155 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use App\Enums\CurrencyFormat;
+use App\Enums\DateFormat;
+use App\Enums\IntervalFormat;
+use App\Enums\NumberFormat;
+use App\Enums\TimeFormat;
+use App\Models\Organization;
+use Brick\Math\BigDecimal;
+use Brick\Money\Money;
+use Carbon\CarbonInterface;
+use Carbon\CarbonInterval;
+
+class LocalizationService
+{
+    private CurrencyFormat $currencyFormat;
+
+    private IntervalFormat $intervalFormat;
+
+    private DateFormat $dateFormat;
+
+    private TimeFormat $timeFormat;
+
+    private NumberFormat $numberFormat;
+
+    public function __construct(CurrencyFormat $currencyFormat, DateFormat $dateFormat, TimeFormat $timeFormat, NumberFormat $numberFormat, IntervalFormat $intervalFormat)
+    {
+        $this->currencyFormat = $currencyFormat;
+        $this->dateFormat = $dateFormat;
+        $this->timeFormat = $timeFormat;
+        $this->numberFormat = $numberFormat;
+        $this->intervalFormat = $intervalFormat;
+    }
+
+    public static function forOrganization(Organization $organization): self
+    {
+        return new LocalizationService(
+            $organization->currency_format,
+            $organization->date_format,
+            $organization->time_format,
+            $organization->number_format,
+            $organization->interval_format
+        );
+    }
+
+    public function formatNumber(BigDecimal|float $number): string
+    {
+        $numberFloat = $number instanceof BigDecimal ? $number->toFloat() : $number;
+
+        if ($this->numberFormat === NumberFormat::ThousandsPointDecimalComma) {
+            return number_format($numberFloat, 2, ',', '.');
+        } elseif ($this->numberFormat === NumberFormat::ThousandsSpaceDecimalPoint) {
+            return number_format($numberFloat, 2, '.', ' ');
+        } elseif ($this->numberFormat === NumberFormat::ThousandsCommaDecimalPoint) {
+            return number_format($numberFloat, 2, '.', ',');
+        } elseif ($this->numberFormat === NumberFormat::ThousandsSpaceDecimalComma) {
+            return number_format($numberFloat, 2, ',', ' ');
+        } elseif ($this->numberFormat === NumberFormat::ThousandsApostropheDecimalPoint) {
+            return number_format($numberFloat, 2, '.', '\'');
+        }
+    }
+
+    public function formatNumberWithoutTrailingZeros(BigDecimal|float $number): string
+    {
+        $number = $this->formatNumber($number);
+
+        $number = rtrim($number, '0');
+        $number = rtrim($number, '.');
+        $number = rtrim($number, ',');
+
+        return $number;
+    }
+
+    public function formatInterval(CarbonInterval $interval): string
+    {
+        if ($this->intervalFormat === IntervalFormat::Decimal) {
+            $interval->cascade();
+
+            return $this->formatNumber($interval->totalHours);
+        } elseif ($this->intervalFormat === IntervalFormat::HoursMinutes) {
+            $interval->cascade();
+
+            return ((int) floor($interval->totalHours)).'h '.$interval->format('%I').'m';
+        } elseif ($this->intervalFormat === IntervalFormat::HoursMinutesColonSeperated) {
+            $interval->cascade();
+
+            return ((int) floor($interval->totalHours)).':'.$interval->format('%I');
+        } elseif ($this->intervalFormat === IntervalFormat::HoursMinutesSecondsColonSeperated) {
+            $interval->cascade();
+
+            return ((int) floor($interval->totalHours)).':'.$interval->format('%I:%S');
+        }
+    }
+
+    public function formatCurrency(Money $money): string
+    {
+        $currencyService = app(CurrencyService::class);
+        if ($this->currencyFormat === CurrencyFormat::ISOCodeAfterWithSpace) {
+            return $this->formatNumber($money->getAmount()).' '.$money->getCurrency()->getCurrencyCode();
+        } elseif ($this->currencyFormat === CurrencyFormat::ISOCodeBeforeWithSpace) {
+            return $money->getCurrency()->getCurrencyCode().' '.$this->formatNumber($money->getAmount());
+        } elseif ($this->currencyFormat === CurrencyFormat::SymbolAfter) {
+            return $this->formatNumber($money->getAmount()).$currencyService->getCurrencySymbolForMoney($money);
+        } elseif ($this->currencyFormat === CurrencyFormat::SymbolBefore) {
+            return $currencyService->getCurrencySymbolForMoney($money).$this->formatNumber($money->getAmount());
+        } elseif ($this->currencyFormat === CurrencyFormat::SymbolBeforeWithSpace) {
+            return $currencyService->getCurrencySymbolForMoney($money).' '.$this->formatNumber($money->getAmount());
+        } elseif ($this->currencyFormat === CurrencyFormat::SymbolAfterWithSpace) {
+            return $this->formatNumber($money->getAmount()).' '.$currencyService->getCurrencySymbolForMoney($money);
+        }
+    }
+
+    public function formatTime(CarbonInterface $time): string
+    {
+        if ($this->timeFormat === TimeFormat::TwelveHours) {
+            return $time->format('h:i a'); // Examples: "11:01 am", "1:02 am"
+        } elseif ($this->timeFormat === TimeFormat::TwentyFourHours) {
+            return $time->format('H:i'); // Examples: "23:01", "01:02"
+        }
+    }
+
+    public function formatDate(CarbonInterface $date): string
+    {
+        return $date->format($this->dateFormat->toCarbonFormat());
+    }
+
+    public function setDateFormat(DateFormat $dateFormat): void
+    {
+        $this->dateFormat = $dateFormat;
+    }
+
+    public function setCurrencyFormat(CurrencyFormat $currencyFormat): void
+    {
+        $this->currencyFormat = $currencyFormat;
+    }
+
+    public function setIntervalFormat(IntervalFormat $intervalFormat): void
+    {
+        $this->intervalFormat = $intervalFormat;
+    }
+
+    public function setTimeFormat(TimeFormat $timeFormat): void
+    {
+        $this->timeFormat = $timeFormat;
+    }
+
+    public function setNumberFormat(NumberFormat $numberFormat): void
+    {
+        $this->numberFormat = $numberFormat;
+    }
+}

app/Service/OrganizationService.php

@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use App\Enums\CurrencyFormat;
+use App\Enums\DateFormat;
+use App\Enums\IntervalFormat;
+use App\Enums\NumberFormat;
+use App\Enums\Role;
+use App\Enums\TimeFormat;
+use App\Models\Organization;
+use App\Models\User;
+
+class OrganizationService
+{
+    public function createOrganization(
+        string $name,
+        User $owner,
+        bool $personalOrganization,
+        ?string $currency = null,
+        ?NumberFormat $numberFormat = null,
+        ?CurrencyFormat $currencyFormat = null,
+        ?DateFormat $dateFormat = null,
+        ?IntervalFormat $intervalFormat = null,
+        ?TimeFormat $timeFormat = null,
+    ): Organization {
+
+        $organization = new Organization;
+        $organization->name = $name;
+        $organization->personal_team = $personalOrganization;
+        if ($currency === null) {
+            $currency = config('app.localization.default_currency');
+        }
+        $organization->currency = $currency;
+        if ($numberFormat === null) {
+            $numberFormat = NumberFormat::from(config('app.localization.default_number_format'));
+        }
+        $organization->number_format = $numberFormat;
+        if ($currencyFormat === null) {
+            $currencyFormat = CurrencyFormat::from(config('app.localization.default_currency_format'));
+        }
+        $organization->currency_format = $currencyFormat;
+        if ($dateFormat === null) {
+            $dateFormat = DateFormat::from(config('app.localization.default_date_format'));
+        }
+        $organization->date_format = $dateFormat;
+        if ($intervalFormat === null) {
+            $intervalFormat = IntervalFormat::from(config('app.localization.default_interval_format'));
+        }
+        $organization->interval_format = $intervalFormat;
+        if ($timeFormat === null) {
+            $timeFormat = TimeFormat::from(config('app.localization.default_time_format'));
+        }
+        $organization->time_format = $timeFormat;
+        $organization->owner()->associate($owner);
+        $organization->save();
+
+        $organization->users()->attach(
+            $owner, [
+                'role' => Role::Owner->value,
+            ]
+        );
+
+        return $organization;
+    }
+}

app/Service/ReportExport/TimeEntriesDetailedExport.php

@@ -6,7 +6,7 @@ namespace App\Service\ReportExport;
 
 use App\Enums\ExportFormat;
 use App\Models\TimeEntry;
-use App\Service\IntervalService;
+use App\Service\LocalizationService;
 use Illuminate\Database\Eloquent\Builder;
 use LogicException;
 use Maatwebsite\Excel\Concerns\Exportable;
@@ -37,14 +37,17 @@ class TimeEntriesDetailedExport implements FromQuery, ShouldAutoSize, WithColumn
 
     private string $timezone;
 
+    private LocalizationService $localizationService;
+
     /**
      * @param  Builder<TimeEntry>  $builder
      */
-    public function __construct(Builder $builder, ExportFormat $exportFormat, string $timezone)
+    public function __construct(Builder $builder, ExportFormat $exportFormat, string $timezone, LocalizationService $localizationService)
     {
         $this->builder = $builder;
         $this->exportFormat = $exportFormat;
         $this->timezone = $timezone;
+        $this->localizationService = $localizationService;
     }
 
     /**
@@ -113,7 +116,6 @@ class TimeEntriesDetailedExport implements FromQuery, ShouldAutoSize, WithColumn
      */
     public function map($model): array
     {
-        $interval = app(IntervalService::class);
         $duration = $model->getDuration();
 
         if ($this->exportFormat === ExportFormat::XLSX) {
@@ -125,7 +127,7 @@ class TimeEntriesDetailedExport implements FromQuery, ShouldAutoSize, WithColumn
                 $model->user->name,
                 Date::dateTimeToExcel($model->start->timezone($this->timezone)),
                 $model->end !== null ? Date::dateTimeToExcel($model->end->timezone($this->timezone)) : null,
-                $duration !== null ? $interval->format($duration) : null,
+                $duration !== null ? $this->localizationService->formatInterval($duration) : null,
                 $duration?->totalHours,
                 $model->billable ? 'Yes' : 'No',
                 $model->tagsRelation->pluck('name')->implode(', '),
@@ -139,7 +141,7 @@ class TimeEntriesDetailedExport implements FromQuery, ShouldAutoSize, WithColumn
                 $model->user->name,
                 $model->start->timezone($this->timezone)->format('Y-m-d H:i:s'),
                 $model->end?->timezone($this->timezone)?->format('Y-m-d H:i:s'),
-                $duration !== null ? (int) floor($duration->totalHours).':'.$duration->format('%I:%S') : null,
+                $duration !== null ? $this->localizationService->formatInterval($duration) : null,
                 $duration?->totalHours,
                 $model->billable ? 'Yes' : 'No',
                 $model->tagsRelation->pluck('name')->implode(', '),

app/Service/UserService.php

@@ -4,7 +4,12 @@ declare(strict_types=1);
 
 namespace App\Service;
 
+use App\Enums\CurrencyFormat;
+use App\Enums\DateFormat;
+use App\Enums\IntervalFormat;
+use App\Enums\NumberFormat;
 use App\Enums\Role;
+use App\Enums\TimeFormat;
 use App\Enums\Weekday;
 use App\Events\AfterCreateOrganization;
 use App\Models\Member;
@@ -17,8 +22,20 @@ use Illuminate\Support\Facades\Hash;
 
 class UserService
 {
-    public function createUser(string $name, string $email, string $password, string $timezone, Weekday $weekStart, string $currency, bool $verifyEmail = false): User
-    {
+    public function createUser(
+        string $name,
+        string $email,
+        string $password,
+        string $timezone,
+        Weekday $weekStart,
+        ?string $currency,
+        ?NumberFormat $numberFormat = null,
+        ?CurrencyFormat $currencyFormat = null,
+        ?DateFormat $dateFormat = null,
+        ?IntervalFormat $intervalFormat = null,
+        ?TimeFormat $timeFormat = null,
+        bool $verifyEmail = false
+    ): User {
         $user = new User;
         $user->name = $name;
         $user->email = $email;
@@ -30,17 +47,16 @@ class UserService
         }
         $user->save();
 
-        $organization = new Organization;
-        $organization->name = explode(' ', $user->name, 2)[0]."'s Organization";
-        $organization->personal_team = true;
-        $organization->currency = $currency;
-        $organization->owner()->associate($user);
-        $organization->save();
-
-        $organization->users()->attach(
-            $user, [
-                'role' => Role::Owner->value,
-            ]
+        $organization = app(OrganizationService::class)->createOrganization(
+            $this->getOrganizationNameForUserName($user->name),
+            $user,
+            true,
+            $currency,
+            $numberFormat,
+            $currencyFormat,
+            $dateFormat,
+            $intervalFormat,
+            $timeFormat,
         );
 
         $user->ownedTeams()->save($organization);
@@ -78,14 +94,11 @@ class UserService
         }
 
         // Create a new organization
-        $organization = new Organization;
-        $organization->name = $user->name."'s Organization";
-        $organization->personal_team = true;
-        $organization->user_id = $user->id;
-        $organization->save();
-
-        // Attach the user to the organization
-        $organization->users()->attach($user, ['role' => Role::Owner->value]);
+        $organization = app(OrganizationService::class)->createOrganization(
+            $this->getOrganizationNameForUserName($user->name),
+            $user,
+            true
+        );
 
         // Set the organization as the user's current organization
         $user->currentOrganization()->associate($organization);
@@ -94,6 +107,11 @@ class UserService
         AfterCreateOrganization::dispatch($organization);
     }
 
+    public function getOrganizationNameForUserName(string $username): string
+    {
+        return explode(' ', $username, 2)[0]."'s Organization";
+    }
+
     public function makeSureUserHasCurrentOrganization(User $user): void
     {
         if ($user->currentOrganization !== null) {

components.json

@@ -0,0 +1,20 @@
+{
+  "$schema": "https://shadcn-vue.com/schema.json",
+  "style": "new-york",
+  "typescript": true,
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "resources/css/app.css",
+    "baseColor": "neutral",
+    "cssVariables": true,
+    "prefix": ""
+  },
+  "aliases": {
+    "components": "@/components",
+    "composables": "@/composables",
+    "utils": "@/lib/utils",
+    "ui": "@/components/ui",
+    "lib": "@/lib"
+  },
+  "iconLibrary": "lucide"
+}

composer.json

@@ -16,6 +16,7 @@
         "guzzlehttp/guzzle": "^7.2",
         "inertiajs/inertia-laravel": "^1.0",
         "korridor/laravel-computed-attributes": "^3.1",
+        "korridor/laravel-has-many-sync": "^3.1",
         "korridor/laravel-model-validation-rules": "^3.0",
         "laravel/framework": "^11.16.0",
         "laravel/jetstream": "^5.0",
@@ -24,6 +25,7 @@
         "laravel/tinker": "^2.8",
         "league/csv": "^9.16.0",
         "league/flysystem-aws-s3-v3": "^3.0",
+        "league/iso3166": "^4.3",
         "maatwebsite/excel": "^3.1",
         "novadaemon/filament-pretty-json": "^2.2",
         "nwidart/laravel-modules": "^11.0.11",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e02eaa279f99a886be314748daa0b234",
+    "content-hash": "33dc60657e6702ebd5e19f19d86a64b4",
     "packages": [
         {
             "name": "anourvalar/eloquent-serialize",
@@ -3780,6 +3780,73 @@
             },
             "time": "2024-03-01T14:15:47+00:00"
         },
+        {
+            "name": "korridor/laravel-has-many-sync",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/korridor/laravel-has-many-sync.git",
+                "reference": "32344956730d306d9753f5d3c455650ed828fd4e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/korridor/laravel-has-many-sync/zipball/32344956730d306d9753f5d3c455650ed828fd4e",
+                "reference": "32344956730d306d9753f5d3c455650ed828fd4e",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/database": "^10|^11|^12",
+                "illuminate/support": "^10|^11|^12",
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3",
+                "larastan/larastan": "^2|^3.0",
+                "orchestra/testbench": "^8|^9|^10",
+                "phpunit/phpunit": "^10.0|^11.5",
+                "squizlabs/php_codesniffer": "^3.5"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Korridor\\LaravelHasManySync\\ServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Korridor\\LaravelHasManySync\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "korridor",
+                    "email": "26689068+korridor@users.noreply.github.com"
+                },
+                {
+                    "name": "Alfa Adhitya",
+                    "email": "alfa2159@gmail.com"
+                }
+            ],
+            "description": "Laravel has many sync",
+            "homepage": "https://github.com/korridor/laravel-has-many-sync",
+            "keywords": [
+                "eloquent",
+                "has-many",
+                "laravel",
+                "relations",
+                "sync"
+            ],
+            "support": {
+                "source": "https://github.com/korridor/laravel-has-many-sync/tree/3.1.0"
+            },
+            "time": "2025-03-03T20:58:17+00:00"
+        },
         {
             "name": "korridor/laravel-model-validation-rules",
             "version": "3.2.0",
@@ -5415,6 +5482,73 @@
             },
             "time": "2024-08-09T21:24:39+00:00"
         },
+        {
+            "name": "league/iso3166",
+            "version": "4.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/alcohol/iso3166.git",
+                "reference": "5133fed7d54728222f4058702487dccedda20472"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/alcohol/iso3166/zipball/5133fed7d54728222f4058702487dccedda20472",
+                "reference": "5133fed7d54728222f4058702487dccedda20472",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.12.6",
+                "phpstan/phpstan-deprecation-rules": "^1.2.1",
+                "phpstan/phpstan-strict-rules": "^1.6.1",
+                "phpunit/phpunit": "^9.6.21"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\ISO3166\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com"
+                }
+            ],
+            "description": "ISO 3166-1 PHP Library",
+            "homepage": "https://github.com/alcohol/iso3166",
+            "keywords": [
+                "3166",
+                "3166-1",
+                "ISO 3166",
+                "countries",
+                "iso",
+                "library"
+            ],
+            "support": {
+                "issues": "https://github.com/alcohol/iso3166/issues",
+                "source": "https://github.com/alcohol/iso3166"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/alcohol",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-10-10T07:39:24+00:00"
+        },
         {
             "name": "league/mime-type-detection",
             "version": "1.16.0",

config/app.php

@@ -2,6 +2,11 @@
 
 declare(strict_types=1);
 
+use App\Enums\CurrencyFormat;
+use App\Enums\DateFormat;
+use App\Enums\IntervalFormat;
+use App\Enums\NumberFormat;
+use App\Enums\TimeFormat;
 use Illuminate\Support\Facades\Facade;
 use Illuminate\Support\ServiceProvider;
 
@@ -138,6 +143,15 @@ return [
 
     'cipher' => 'AES-256-CBC',
 
+    'localization' => [
+        'default_currency' => env('LOCALIZATION_DEFAULT_CURRENCY', 'EUR'),
+        'default_number_format' => env('LOCALIZATION_DEFAULT_NUMBER_FORMAT', NumberFormat::ThousandsPointDecimalComma->value),
+        'default_currency_format' => env('LOCALIZATION_DEFAULT_CURRENCY_FORMAT', CurrencyFormat::ISOCodeAfterWithSpace->value),
+        'default_date_format' => env('LOCALIZATION_DEFAULT_DATE_FORMAT', DateFormat::HyphenSeperatedYYYYMMDD->value),
+        'default_time_format' => env('LOCALIZATION_DEFAULT_TIME_FORMAT', TimeFormat::TwentyFourHours->value),
+        'default_interval_format' => env('LOCALIZATION_DEFAULT_INTERVAL_FORMAT', IntervalFormat::HoursMinutes->value),
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Maintenance Mode Driver

database/factories/OrganizationFactory.php

@@ -4,6 +4,11 @@ declare(strict_types=1);
 
 namespace Database\Factories;
 
+use App\Enums\CurrencyFormat;
+use App\Enums\DateFormat;
+use App\Enums\IntervalFormat;
+use App\Enums\NumberFormat;
+use App\Enums\TimeFormat;
 use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
@@ -27,6 +32,11 @@ class OrganizationFactory extends Factory
             'user_id' => User::factory(),
             'personal_team' => true,
             'employees_can_see_billable_rates' => false,
+            'number_format' => $this->faker->randomElement(NumberFormat::values()),
+            'currency_format' => $this->faker->randomElement(CurrencyFormat::values()),
+            'date_format' => $this->faker->randomElement(DateFormat::values()),
+            'interval_format' => $this->faker->randomElement(IntervalFormat::values()),
+            'time_format' => $this->faker->randomElement(TimeFormat::values()),
         ];
     }
 

database/migrations/2025_04_03_101827_add_localization_columns_to_organizations_table.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('organizations', function (Blueprint $table): void {
+            $table->string('number_format')->default(config('app.localization.default_number_format'))->nullable(false);
+            $table->string('currency_format')->default(config('app.localization.default_currency_format'))->nullable(false);
+            $table->string('date_format')->default(config('app.localization.default_date_format'))->nullable(false);
+            $table->string('interval_format')->default(config('app.localization.default_interval_format'))->nullable(false);
+            $table->string('time_format')->default(config('app.localization.default_time_format'))->nullable(false);
+        });
+
+        Schema::table('organizations', function (Blueprint $table): void {
+            $table->string('number_format')->default(null)->nullable(false)->change();
+            $table->string('currency_format')->default(null)->nullable(false)->change();
+            $table->string('date_format')->default(null)->nullable(false)->change();
+            $table->string('interval_format')->default(null)->nullable(false)->change();
+            $table->string('time_format')->default(null)->nullable(false)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('organizations', function (Blueprint $table): void {
+            $table->dropColumn('number_format');
+            $table->dropColumn('currency_format');
+            $table->dropColumn('date_format');
+            $table->dropColumn('interval_format');
+            $table->dropColumn('time_format');
+        });
+    }
+};

docker-compose.yml

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

e2e/auth.spec.ts

@@ -36,7 +36,7 @@ test('can register and delete account', async ({ page }) => {
     await page.goto(PLAYWRIGHT_BASE_URL + '/user/profile');
     await page.getByRole('button', { name: 'Delete Account' }).click();
     await page.getByPlaceholder('Password').fill(password);
-    await page.getByRole('button', { name: 'Delete Account' }).nth(1).click();
+    await page.getByRole('button', { name: 'Delete Account' }).click();
     await page.waitForURL(PLAYWRIGHT_BASE_URL + '/login');
     await page.goto(PLAYWRIGHT_BASE_URL + '/login');
     await page.getByLabel('Email').fill(email);

e2e/clients.spec.ts

@@ -16,7 +16,7 @@ test('test that creating and deleting a new client via the modal works', async (
     await page.getByRole('button', { name: 'Create Client' }).click();
     await page.getByPlaceholder('Client Name').fill(newClientName);
     await Promise.all([
-        page.getByRole('button', { name: 'Create Client' }).nth(1).click(),
+        page.getByRole('button', { name: 'Create Client' }).click(),
         page.waitForResponse(
             async (response) =>
                 response.url().includes('/clients') &&
@@ -56,12 +56,12 @@ test('test that archiving and unarchiving clients works', async ({ page }) => {
     await page.getByRole('button', { name: 'Create Client' }).click();
     await page.getByLabel('Client Name').fill(newClientName);
 
-    await page.getByRole('button', { name: 'Create Client' }).nth(1).click();
+    await page.getByRole('button', { name: 'Create Client' }).click();
     await expect(page.getByText(newClientName)).toBeVisible();
 
     await page.getByRole('row').first().getByRole('button').click();
     await Promise.all([
-        page.getByRole('button').getByText('Archive').first().click(),
+        page.getByRole('menuitem').getByText('Archive').click(),
         expect(page.getByText(newClientName)).not.toBeVisible(),
     ]);
     await Promise.all([
@@ -71,7 +71,7 @@ test('test that archiving and unarchiving clients works', async ({ page }) => {
 
     await page.getByRole('row').first().getByRole('button').click();
     await Promise.all([
-        page.getByRole('button').getByText('Unarchive').first().click(),
+        page.getByRole('menuitem').getByText('Unarchive').click(),
         expect(page.getByText(newClientName)).not.toBeVisible(),
     ]);
     await Promise.all([

e2e/members.spec.ts

@@ -82,7 +82,7 @@ test('test that organization billable rate can be updated with all existing time
     await goToMembersPage(page);
     const newBillableRate = Math.round(Math.random() * 10000);
     await page.getByRole('row').first().getByRole('button').click();
-    await page.getByRole('button').getByText('Edit').first().click();
+    await page.getByRole('menuitem').getByText('Edit').click();
     await page.getByText('Organization Default Rate').click();
     await page.getByText('Custom Rate').click();
     await page

e2e/project-members.spec.ts

@@ -17,7 +17,7 @@ test('test that updating project member billable rate works for existing time en
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
 
-    await page.getByRole('button', { name: 'Create Project' }).nth(1).click();
+    await page.getByRole('button', { name: 'Create Project' }).click();
     await expect(page.getByText(newProjectName)).toBeVisible();
 
     await page.getByText(newProjectName).click();
@@ -35,8 +35,7 @@ test('test that updating project member billable rate works for existing time en
         .getByRole('button')
         .click();
     await page
-        .getByRole('button', { name: 'Edit Project Member' })
-        .first()
+        .getByRole('menuitem', { name: 'Edit Project Member' })
         .click();
     await page.getByLabel('Billable Rate').fill(newBillableRate.toString());
     await page.getByRole('button', { name: 'Update Project Member' }).click();

e2e/projects.spec.ts

@@ -17,7 +17,7 @@ test('test that creating and deleting a new project via the modal works', async
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
     await Promise.all([
-        page.getByRole('button', { name: 'Create Project' }).nth(1).click(),
+        page.getByRole('button', { name: 'Create Project' }).click(),
         page.waitForResponse(
             async (response) =>
                 response.url().includes('/projects') &&
@@ -62,12 +62,12 @@ test('test that archiving and unarchiving projects works', async ({ page }) => {
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
 
-    await page.getByRole('button', { name: 'Create Project' }).nth(1).click();
+    await page.getByRole('button', { name: 'Create Project' }).click();
     await expect(page.getByText(newProjectName)).toBeVisible();
 
     await page.getByRole('row').first().getByRole('button').click();
     await Promise.all([
-        page.getByRole('button').getByText('Archive').first().click(),
+        page.getByRole('menuitem').getByText('Archive').first().click(),
         expect(page.getByText(newProjectName)).not.toBeVisible(),
     ]);
     await Promise.all([
@@ -77,7 +77,7 @@ test('test that archiving and unarchiving projects works', async ({ page }) => {
 
     await page.getByRole('row').first().getByRole('button').click();
     await Promise.all([
-        page.getByRole('button').getByText('Unarchive').first().click(),
+        page.getByRole('menuitem').getByText('Unarchive').first().click(),
         expect(page.getByText(newProjectName)).not.toBeVisible(),
     ]);
     await Promise.all([
@@ -96,11 +96,11 @@ test('test that updating billable rate works with existing time entries', async
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
 
-    await page.getByRole('button', { name: 'Create Project' }).nth(1).click();
+    await page.getByRole('button', { name: 'Create Project' }).click();
     await expect(page.getByText(newProjectName)).toBeVisible();
 
     await page.getByRole('row').first().getByRole('button').click();
-    await page.getByRole('button').getByText('Edit').first().click(),
+    await page.getByRole('menuitem').getByText('Edit').first().click();
         await page.getByText('Non-Billable').click();
     await page.getByText('Custom Rate').click();
     await page

e2e/tags.spec.ts

@@ -15,7 +15,7 @@ test('test that creating and deleting a new client via the modal works', async (
     await page.getByRole('button', { name: 'Create Tag' }).click();
     await page.getByPlaceholder('Tag Name').fill(newTagName);
     await Promise.all([
-        page.getByRole('button', { name: 'Create Tag' }).nth(1).click(),
+        page.getByRole('button', { name: 'Create Tag' }).click(),
         page.waitForResponse(
             async (response) =>
                 response.url().includes('/tags') &&

e2e/tasks.spec.ts

@@ -16,7 +16,7 @@ test('test that creating and deleting a new tag in a new project works', async (
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
     await Promise.all([
-        page.getByRole('button', { name: 'Create Project' }).nth(1).click(),
+        page.getByRole('button', { name: 'Create Project' }).click(),
         page.waitForResponse(
             async (response) =>
                 response.url().includes('/projects') &&
@@ -41,7 +41,7 @@ test('test that creating and deleting a new tag in a new project works', async (
     await page.getByPlaceholder('Task Name').fill(newTaskName);
 
     await Promise.all([
-        page.getByRole('button', { name: 'Create Task' }).nth(1).click(),
+        page.getByRole('button', { name: 'Create Task' }).click(),
         page.waitForResponse(
             async (response) =>
                 response.url().includes('/tasks') &&
@@ -107,20 +107,20 @@ test('test that archiving and unarchiving tasks works', async ({ page }) => {
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
 
-    await page.getByRole('button', { name: 'Create Project' }).nth(1).click();
+    await page.getByRole('button', { name: 'Create Project' }).click();
     await expect(page.getByText(newProjectName)).toBeVisible();
 
     await page.getByText(newProjectName).click();
 
     await page.getByRole('button', { name: 'Create Task' }).click();
     await page.getByPlaceholder('Task Name').fill(newTaskName);
-    await page.getByRole('button', { name: 'Create Task' }).nth(1).click();
+    await page.getByRole('button', { name: 'Create Task' }).click();
 
     await expect(page.getByRole('table')).toContainText(newTaskName);
 
     await page.getByRole('row').first().getByRole('button').click();
     await Promise.all([
-        page.getByRole('button').getByText('Mark as done').first().click(),
+        page.getByRole('menuitem').getByText('Mark as done').first().click(),
         expect(page.getByText(newTaskName)).not.toBeVisible(),
     ]);
     await Promise.all([
@@ -130,7 +130,7 @@ test('test that archiving and unarchiving tasks works', async ({ page }) => {
 
     await page.getByRole('row').first().getByRole('button').click();
     await Promise.all([
-        page.getByRole('button').getByText('Mark as active').first().click(),
+        page.getByRole('menuitem').getByText('Mark as active').first().click(),
         expect(page.getByText(newTaskName)).not.toBeVisible(),
     ]);
     await Promise.all([

e2e/timetracker.spec.ts

@@ -136,6 +136,7 @@ test('test that starting and updating the time while running works', async ({
     await Promise.all([
         page.waitForResponse(async (response) => {
             return (
+                response.url().includes('/time-entries') &&
                 response.status() === 200 &&
                 (await response.headerValue('Content-Type')) ===
                     'application/json' &&

e2e/utils/currentTimeEntry.ts

@@ -18,6 +18,7 @@ export function newTimeEntryResponse(
 ) {
     return page.waitForResponse(async (response) => {
         return (
+            response.url().includes('/time-entries') &&
             response.status() === status &&
             (await response.headerValue('Content-Type')) ===
                 'application/json' &&

eslint.config.mjs

@@ -29,7 +29,12 @@ export default typescriptEslint.config(
             "vue/multi-word-component-names": "off",
             "@typescript-eslint/no-unused-vars": "off",
             "unused-imports/no-unused-imports": "error",
-            "unused-imports/no-unused-vars": "error",
+            "unused-imports/no-unused-vars": ["error", {
+                "vars": "all",
+                "varsIgnorePattern": "^_",
+                "args": "after-used",
+                "argsIgnorePattern": "^_",
+            }],
         },
     },
     eslintConfigPrettier

lang/en/enum.php

@@ -2,6 +2,11 @@
 
 declare(strict_types=1);
 
+use App\Enums\CurrencyFormat;
+use App\Enums\DateFormat;
+use App\Enums\IntervalFormat;
+use App\Enums\NumberFormat;
+use App\Enums\TimeFormat;
 use App\Enums\Weekday;
 
 return [
@@ -16,4 +21,42 @@ return [
         Weekday::Sunday->value => 'Sunday',
     ],
 
+    'number_format' => [
+        NumberFormat::ThousandsPointDecimalComma->value => '1.111,11',
+        NumberFormat::ThousandsCommaDecimalPoint->value => '1,111.11',
+        NumberFormat::ThousandsSpaceDecimalComma->value => '1 111,11',
+        NumberFormat::ThousandsSpaceDecimalPoint->value => '1 111.11',
+        NumberFormat::ThousandsApostropheDecimalPoint->value => '1\'111.11',
+    ],
+
+    'date_format' => [
+        DateFormat::PointSeperatedDMYYYY->value => 'D.M.YYYY',
+        DateFormat::SlashSeperatedMMDDYYYY->value => 'MM/DD/YYYY',
+        DateFormat::SlashSeperatedDDMMYYYY->value => 'DD/MM/YYYY',
+        DateFormat::HyphenSeperatedDDMMYYY->value => 'DD-MM-YYYY',
+        DateFormat::HyphenSeperatedMMDDDYYYY->value => 'MM-DD-YYYY',
+        DateFormat::HyphenSeperatedYYYYMMDD->value => 'YYYY-MM-DD',
+    ],
+
+    'time_format' => [
+        TimeFormat::TwelveHours->value => '12-hour clock',
+        TimeFormat::TwentyFourHours->value => '24-hour clock',
+    ],
+
+    'interval_format' => [
+        IntervalFormat::Decimal->value => 'Decimal',
+        IntervalFormat::HoursMinutes->value => '12h 3m',
+        IntervalFormat::HoursMinutesColonSeperated->value => '12:03',
+        IntervalFormat::HoursMinutesSecondsColonSeperated->value => '12:03:45',
+    ],
+
+    'currency_format' => [
+        CurrencyFormat::ISOCodeBeforeWithSpace->value => 'EUR 111',
+        CurrencyFormat::ISOCodeAfterWithSpace->value => '111 EUR',
+        CurrencyFormat::SymbolBefore->value => '€111',
+        CurrencyFormat::SymbolAfter->value => '111€',
+        CurrencyFormat::SymbolBeforeWithSpace->value => '€ 111',
+        CurrencyFormat::SymbolAfterWithSpace->value => '111 €',
+    ],
+
 ];

package.json

@@ -40,19 +40,26 @@
         "@heroicons/vue": "^2.1.1",
         "@rushstack/eslint-patch": "^1.10.5",
         "@tailwindcss/container-queries": "^0.1.1",
+        "@tanstack/vue-form": "^1.3.1",
         "@tanstack/vue-query": "^5.56.2",
         "@tanstack/vue-query-devtools": "^5.58.0",
+        "@tanstack/vue-table": "^8.21.2",
         "@vue/eslint-config-prettier": "^10.2.0",
         "@vue/eslint-config-typescript": "^14.3.0",
         "@vueuse/core": "^12.5.0",
         "@vueuse/integrations": "^12.5.0",
+        "class-variance-authority": "^0.7.1",
+        "clsx": "^2.1.1",
         "dayjs": "^1.11.11",
         "echarts": "^5.5.0",
         "focus-trap": "^7.6.0",
+        "lucide-vue-next": "^0.487.0",
         "parse-duration": "^2.0.1",
         "pinia": "^2.1.7",
         "radix-vue": "^1.9.6",
-        "tailwind-merge": "^2.2.1",
+        "reka-ui": "^2.2.0",
+        "tailwind-merge": "^2.6.0",
+        "tailwindcss-animate": "^1.0.7",
         "vue-echarts": "^7.0.3"
     },
     "overrides": {

resources/css/app.css

@@ -1,49 +1,123 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
-
-:root {
-    --color-bg-primary: #0f1011;
-    --color-bg-secondary: #17181a;
+:root.dark {
+    --color-bg-primary: #101012;
+    --color-bg-secondary: #17181B;
     --color-bg-tertiary: #2A2C32;
     --color-bg-quaternary: #141518;
-    --color-bg-background: #080808;
+    --color-bg-background: #090909;
     --color-text-primary: #ffffff;
     --color-text-secondary: #e3e4e6;
     --color-text-tertiary: #969799;
     --color-text-quaternary: #595a5c;
+
     --color-border-primary: #191b1f;
     --color-border-secondary: #23252a;
     --color-border-tertiary: #2c2e33;
     --color-border-quaternary: #393B42;
     --color-input-border-active: rgba(255,255,255,0.3);
 
-    --color-accent-primary: 14, 165, 233;  /* sky-500 */
-    --color-accent-secondary: 56, 189, 248;
-    --color-accent-tertiary: 125, 211, 252;
-    --color-accent-quaternary: 186, 230, 253;
+    --theme-color-chart: var(--color-accent-200);
 
-    --theme-color-default-background: var(--color-bg-primary);
-    --theme-color-icon-default: var(--color-text-tertiary);
-    --theme-color-icon-active: rgb(var(--color-text-tertiary));
+    --theme-color-menu-active: var(--color-bg-secondary);
     --theme-color-card-background: var(--color-bg-secondary);
+    --theme-shadow-card: 0 4px 7px 0px rgb(0 0 0 / 15%);
+    --theme-shadow-dropdown: 0 4px 7px 0px rgb(0 0 0 / 40%);
+
     --theme-color-card-background-active: var(--color-bg-tertiary);
+
+    --theme-color-row-background: var(--color-bg-primary);
+    --theme-color-row-heading-background: var(--theme-color-card-background);
+    --theme-color-row-heading-border: var(--theme-color-card-border);
+    --theme-color-icon-default: var(--color-text-tertiary);
+
+    --theme-color-ring: rgba(255,255,255,0.5);
+
+    --theme-color-button-primary-background: rgba(var(--color-accent-300), 0.1);
+    --theme-color-button-primary-background-hover: rgba(var(--color-accent-300), 0.2);
+    --theme-color-button-primary-border: rgba(var(--color-accent-300), 0.2);
+    --theme-color-button-primary-text: var(--color-text-primary);
+
+    --theme-color-input-background: var(--color-bg-secondary);
+
+    --theme-color-input-select-active: rgb(var(--color-accent-300));
+    --theme-color-input-select-active-hover: rgb(var(--color-accent-200));
+}
+
+:root.light {
+    --color-bg-primary: #F5F5F5;
+    --color-bg-secondary: #f7f7f8;
+    --color-bg-tertiary: #e1e1e3;
+    --color-bg-quaternary: #ffffff;
+    --color-bg-background: #ffffff;
+    --color-text-primary: #18181b;
+    --color-text-secondary: #3f3f46;
+    --color-text-tertiary: #57575C;
+    --color-text-quaternary: #a1a1aa;
+    --color-border-primary: #e7e7e7;
+    --color-border-secondary: #e5e5e5;
+    --color-border-tertiary: #dfdfdf;
+    --color-border-quaternary: #d1d1d1;
+    --color-input-border-active: rgba(0,0,0,0.3);
+    --theme-color-menu-active: var(--color-bg-tertiary);
+
+    --theme-color-card-background: var(--color-bg-quaternary);
+    --theme-color-card-background-active: var(--color-bg-primary);
+
+    --theme-color-chart: var(--color-accent-400);
+
+    --theme-shadow-card: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+    --theme-shadow-dropdown: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
+
+    --theme-color-row-background: var(--theme-color-card-background);
+    --theme-color-row-heading-background: var(--color-bg-secondary);
+    --theme-color-row-heading-border: var(--color-border-tertiary);
+    --theme-color-icon-default: var(--color-text-quaternary);
+
+    --theme-color-ring: rgba(0,0,0, 0.7);
+
+    --theme-color-button-primary-background: rgba(var(--color-accent-600), 0.9);
+    --theme-color-button-primary-background-hover: rgba(var(--color-accent-600), 1);
+    --theme-color-button-primary-border: rgba(var(--color-accent-600), 1);
+    --theme-color-button-primary-text: #FFFFFF;
+
+    --theme-color-input-background: var(--color-bg-quaternary);
+
+    --theme-color-input-select-active: rgb(var(--color-accent-400));
+    --theme-color-input-select-active-hover: rgb(var(--color-accent-500));
+}
+
+:root {
+    --theme-color-default-background: var(--color-bg-primary);
+    --theme-color-icon-active: rgb(var(--color-text-tertiary));
     --theme-color-card-background-separator: var(--color-border-tertiary);
     --theme-color-card-border: var(--color-border-secondary);
     --theme-color-card-border-active: var(--color-border-tertiary);
     --theme-color-default-background-separator: var(--color-border-primary);
     --theme-color-primary-text: var(--color-text-primary);
-    --theme-color-muted-text: var(--color-text-secondary);
-    --theme-color-menu-active: var(--color-bg-secondary);
     --theme-color-input-border: var(--color-border-quaternary);
-    --theme-color-input-background: var(--color-bg-secondary);
     --theme-color-tab-background: var(--theme-color-card-background);
     --theme-color-tab-background-active: var(--theme-color-card-background-active);
     --theme-color-tab-border: var(--theme-color-card-border);
     --theme-color-row-separator-background: var(--theme-color-default-background-separator);
-    --theme-color-row-heading-background: var(--theme-color-card-background);
     --theme-color-row-border: var(--theme-color-card-border);
-    --theme-color-row-heading-border: var(--theme-color-card-border);
+
+    --color-accent-50: 240, 249, 255;    /* sky-50 */
+    --color-accent-100: 224, 242, 254;   /* sky-100 */
+    --color-accent-200: 186, 230, 253;   /* sky-200 */
+    --color-accent-300: 125, 211, 252;   /* sky-300 */
+    --color-accent-400: 56, 189, 248;    /* sky-400 */
+    --color-accent-500: 14, 165, 233;    /* sky-500 */
+    --color-accent-600: 2, 132, 199;     /* sky-600 */
+    --color-accent-700: 3, 105, 161;     /* sky-700 */
+    --color-accent-800: 7, 89, 133;      /* sky-800 */
+    --color-accent-900: 12, 74, 110;     /* sky-900 */
+    --color-accent-950: 8, 47, 73;       /* sky-950 */
+
+    --theme-button-secondary-background: var(--theme-color-card-background);
+    --theme-button-secondary-background-active: var(--theme-color-card-background-active);
+    --popover-border: var(--color-border-secondary);
 }
 
 * {
@@ -105,3 +179,68 @@ body {
     src: url('/fonts/Outfit-ExtraBold.ttf');
     font-weight: 800;
 }
+
+@layer base {
+  :root {
+        --background: var(--color-bg-background);
+        --foreground: var(--color-text-primary);
+        --card: var(--theme-color-card-background);
+        --card-foreground: var(--color-text-primary);
+        --popover: var(--theme-color-card-background);
+        --popover-foreground: var(--color-text-primary);
+        --primary: var(--theme-color-button-primary-background);
+        --primary-foreground: var(--theme-color-button-primary-text);
+        --secondary: var(--color-bg-secondary);
+        --secondary-foreground: var(--color-text-primary);
+        --muted: var(--color-bg-tertiary);
+        --muted-foreground: var(--color-text-tertiary);
+        --accent: var(--theme-color-button-primary-background);
+        --accent-foreground: var(--theme-color-button-primary-text);
+        --destructive: 0 84.2% 60.2%;
+        --destructive-foreground: var(--color-text-primary);
+        --border: var(--color-border-primary);
+        --input: var(--theme-color-input-background);
+        --ring: var(--theme-color-ring);
+        --chart-1: var(--color-accent-400);
+        --chart-2: var(--color-accent-500);
+        --chart-3: var(--color-accent-600);
+        --chart-4: var(--color-accent-700);
+        --chart-5: var(--color-accent-800);
+        --radius: 0.5rem;
+    }
+  .dark {
+        --background: var(--color-bg-background);
+        --foreground: var(--color-text-primary);
+        --card: var(--theme-color-card-background);
+        --card-foreground: var(--color-text-primary);
+        --popover: var(--theme-color-card-background);
+        --popover-foreground: var(--color-text-primary);
+        --primary: var(--theme-color-button-primary-background);
+        --primary-foreground: var(--theme-color-button-primary-text);
+        --secondary: var(--color-bg-secondary);
+        --secondary-foreground: var(--color-text-primary);
+        --muted: var(--color-bg-tertiary);
+        --muted-foreground: var(--color-text-tertiary);
+        --accent: var(--theme-color-button-primary-background);
+        --accent-foreground: var(--theme-color-button-primary-text);
+        --destructive: 0 62.8% 30.6%;
+        --destructive-foreground: var(--color-text-primary);
+        --border: var(--color-border-primary);
+        --input: var(--theme-color-input-background);
+        --ring: var(--theme-color-ring);
+        --chart-1: var(--color-accent-200);
+        --chart-2: var(--color-accent-300);
+        --chart-3: var(--color-accent-400);
+        --chart-4: var(--color-accent-500);
+        --chart-5: var(--color-accent-600);
+    }
+}
+
+@layer base {
+  * {
+    @apply border-border;
+    }
+  body {
+    @apply bg-background text-foreground;
+    }
+}

resources/js/Components/ActionMessage.vue

@@ -10,7 +10,7 @@ defineProps({
             leave-active-class="transition ease-in duration-1000"
             leave-from-class="opacity-100"
             leave-to-class="opacity-0">
-            <div v-show="on" class="text-sm text-muted">
+            <div v-show="on" class="text-sm text-text-secondary">
                 <slot />
             </div>
         </transition>

resources/js/Components/AuthenticationCard.vue

@@ -1,3 +1,16 @@
+<script setup lang="ts">
+import { onMounted, watch } from "vue";
+import { theme } from "@/utils/theme.js";
+
+onMounted(async () => {
+    document.documentElement.classList.add(theme.value);
+    watch(theme, (newTheme, oldTheme) => {
+        document.documentElement.classList.remove(oldTheme);
+        document.documentElement.classList.add(newTheme);
+    });
+});
+</script>
+
 <template>
     <div
         class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0 bg-default-background">

resources/js/Components/AuthenticationCardLogo.vue

@@ -5,37 +5,37 @@ import { Link } from '@inertiajs/vue3';
 <template>
     <Link :href="'/'">
         <svg
-            class="h-12 py-2"
+            class="h-12 py-2 text-text-primary"
             viewBox="0 0 168 30"
             fill="none"
             xmlns="http://www.w3.org/2000/svg">
             <path
                 d="M54.4081 6.78783C55.0812 7.46093 55.9225 7.79748 56.9322 7.79748C57.9936 7.79748 58.8479 7.46093 59.4951 6.78783C60.1682 6.08885 60.5048 5.22159 60.5048 4.18606C60.5048 3.17642 60.1682 2.3221 59.4951 1.62312C58.8479 0.924138 57.9936 0.574646 56.9322 0.574646C55.9225 0.574646 55.0812 0.924138 54.4081 1.62312C53.735 2.3221 53.3984 3.17642 53.3984 4.18606C53.3984 5.22159 53.735 6.08885 54.4081 6.78783Z"
-                fill="white" />
+                fill="currentColor" />
             <path
                 d="M158.028 29.4272C155.905 29.4272 154.028 29.0129 152.397 28.1845C150.766 27.3302 149.485 26.1523 148.553 24.6508C147.621 23.1492 147.155 21.4277 147.155 19.4861C147.155 17.5703 147.608 15.8746 148.514 14.399C149.42 12.8975 150.65 11.7196 152.203 10.8653C153.782 9.98505 155.556 9.54495 157.523 9.54495C159.439 9.54495 161.134 9.95916 162.61 10.7876C164.112 11.5901 165.277 12.7163 166.105 14.166C166.959 15.5899 167.386 17.2208 167.386 19.0589C167.386 19.4472 167.361 19.8485 167.309 20.2627C167.283 20.651 167.205 21.1041 167.076 21.6218L150.339 21.6995V17.3503L164.396 17.2338L161.367 19.1366C161.342 18.0751 161.186 17.2079 160.901 16.5348C160.617 15.8358 160.202 15.3051 159.659 14.9427C159.115 14.5802 158.429 14.399 157.601 14.399C156.746 14.399 156.009 14.6061 155.387 15.0203C154.766 15.4345 154.287 16.017 153.95 16.7678C153.614 17.5185 153.446 18.4246 153.446 19.4861C153.446 20.5734 153.627 21.5053 153.989 22.282C154.352 23.0327 154.869 23.6023 155.543 23.9906C156.216 24.3789 157.044 24.5731 158.028 24.5731C158.96 24.5731 159.775 24.4178 160.474 24.1071C161.199 23.7964 161.846 23.3175 162.416 22.6703L165.95 26.2041C165.018 27.2655 163.879 28.068 162.532 28.6117C161.212 29.1553 159.711 29.4272 158.028 29.4272Z"
-                fill="white" />
+                fill="currentColor" />
             <path
                 d="M114.306 29V10.0109H121.063V29H114.306ZM126.228 29V18.0104C126.228 17.2079 125.982 16.5866 125.49 16.1465C124.998 15.6805 124.39 15.4475 123.665 15.4475C123.147 15.4475 122.694 15.551 122.306 15.7581C121.917 15.9652 121.607 16.263 121.374 16.6513C121.167 17.0137 121.063 17.4668 121.063 18.0104L118.422 16.9619C118.422 15.4345 118.759 14.1272 119.432 13.0399C120.105 11.9526 121.011 11.1112 122.15 10.5158C123.289 9.92034 124.584 9.62262 126.034 9.62262C127.328 9.62262 128.493 9.93328 129.528 10.5546C130.59 11.15 131.431 11.9914 132.053 13.0787C132.674 14.166 132.985 15.4475 132.985 16.9231V29H126.228ZM138.149 29V18.0104C138.149 17.2079 137.903 16.5866 137.411 16.1465C136.92 15.6805 136.311 15.4475 135.586 15.4475C135.094 15.4475 134.641 15.551 134.227 15.7581C133.839 15.9652 133.528 16.263 133.295 16.6513C133.088 17.0137 132.985 17.4668 132.985 18.0104L129.024 17.8163C129.075 16.1076 129.451 14.6449 130.15 13.4282C130.849 12.2114 131.807 11.2795 133.023 10.6323C134.266 9.95917 135.664 9.62262 137.217 9.62262C138.693 9.62262 140.013 9.93328 141.178 10.5546C142.343 11.1759 143.249 12.082 143.896 13.2729C144.57 14.4378 144.906 15.8358 144.906 17.4668V29H138.149Z"
-                fill="white" />
-            <path d="M103.573 29V10.011H110.369V29H103.573Z" fill="white" />
+                fill="currentColor" />
+            <path d="M103.573 29V10.011H110.369V29H103.573Z" fill="currentColor" />
             <path
                 d="M104.428 6.78783C105.101 7.46093 105.942 7.79748 106.952 7.79748C108.013 7.79748 108.867 7.46093 109.515 6.78783C110.188 6.08885 110.524 5.22159 110.524 4.18606C110.524 3.17642 110.188 2.3221 109.515 1.62312C108.867 0.924138 108.013 0.574646 106.952 0.574646C105.942 0.574646 105.101 0.924138 104.428 1.62312C103.755 2.3221 103.418 3.17642 103.418 4.18606C103.418 5.22159 103.755 6.08885 104.428 6.78783Z"
-                fill="white" />
+                fill="currentColor" />
             <path
                 d="M90.2867 29V2.16681H97.0435V29H90.2867ZM86.0928 15.6417V10.011H101.237V15.6417H86.0928Z"
-                fill="white" />
+                fill="currentColor" />
             <path
                 d="M72.4414 29.3883C70.6033 29.3883 68.9853 28.9612 67.5873 28.1068C66.1893 27.2525 65.0891 26.0876 64.2866 24.6119C63.5099 23.1104 63.1216 21.4147 63.1216 19.5249C63.1216 17.6091 63.5099 15.9005 64.2866 14.399C65.0891 12.8975 66.1764 11.7325 67.5485 10.9041C68.9464 10.0498 70.5774 9.62262 72.4414 9.62262C73.6322 9.62262 74.7454 9.84267 75.781 10.2828C76.8165 10.697 77.6837 11.2924 78.3827 12.0691C79.0817 12.8457 79.4959 13.7259 79.6254 14.7097V23.9906C79.4959 24.9744 79.0817 25.8805 78.3827 26.7089C77.6837 27.5373 76.8165 28.1975 75.781 28.6893C74.7454 29.1553 73.6322 29.3883 72.4414 29.3883ZM73.6452 23.3693C74.3959 23.3693 75.0431 23.214 75.5868 22.9033C76.1304 22.5668 76.5576 22.1137 76.8683 21.5442C77.2048 20.9487 77.3731 20.2627 77.3731 19.4861C77.3731 18.7353 77.2177 18.0751 76.9071 17.5056C76.5964 16.9361 76.1563 16.483 75.5868 16.1465C75.0431 15.8099 74.4089 15.6416 73.684 15.6416C72.9591 15.6416 72.3119 15.8099 71.7424 16.1465C71.1987 16.483 70.7586 16.949 70.4221 17.5444C70.1114 18.114 69.9561 18.7612 69.9561 19.4861C69.9561 20.2368 70.1114 20.9099 70.4221 21.5053C70.7327 22.0749 71.1728 22.5279 71.7424 22.8645C72.3119 23.201 72.9462 23.3693 73.6452 23.3693ZM83.7416 29H77.1012V23.9129L78.0721 19.2531L76.9848 14.6708V0.691162H83.7416V29Z"
-                fill="white" />
-            <path d="M53.5537 29V10.011H60.3494V29H53.5537Z" fill="white" />
-            <path d="M42.8608 29V0.691162H49.6177V29H42.8608Z" fill="white" />
+                fill="currentColor" />
+            <path d="M53.5537 29V10.011H60.3494V29H53.5537Z" fill="currentColor" />
+            <path d="M42.8608 29V0.691162H49.6177V29H42.8608Z" fill="currentColor" />
             <path
                 d="M29.6176 29.4272C27.5724 29.4272 25.7473 29 24.1423 28.1457C22.5631 27.2655 21.3075 26.0746 20.3755 24.5731C19.4435 23.0457 18.9775 21.3371 18.9775 19.4472C18.9775 17.5574 19.4306 15.8746 20.3367 14.399C21.2687 12.8975 22.5372 11.7196 24.1423 10.8653C25.7473 9.98505 27.5595 9.54495 29.5788 9.54495C31.5981 9.54495 33.3973 9.98505 34.9765 10.8653C36.5816 11.7196 37.8501 12.8975 38.7821 14.399C39.714 15.8746 40.18 17.5574 40.18 19.4472C40.18 21.3371 39.714 23.0457 38.7821 24.5731C37.876 26.0746 36.6204 27.2655 35.0153 28.1457C33.4361 29 31.6369 29.4272 29.6176 29.4272ZM29.5788 23.4081C30.3295 23.4081 30.9768 23.2528 31.5204 22.9421C32.09 22.6056 32.5301 22.1396 32.8407 21.5442C33.1514 20.9487 33.3067 20.2627 33.3067 19.4861C33.3067 18.7094 33.1384 18.0363 32.8019 17.4668C32.4912 16.8713 32.0641 16.4183 31.5204 16.1076C30.9768 15.7711 30.3295 15.6028 29.5788 15.6028C28.8539 15.6028 28.2067 15.7711 27.6372 16.1076C27.0676 16.4442 26.6275 16.9102 26.3169 17.5056C26.0062 18.0751 25.8509 18.7482 25.8509 19.5249C25.8509 20.2756 26.0062 20.9487 26.3169 21.5442C26.6275 22.1396 27.0676 22.6056 27.6372 22.9421C28.2067 23.2528 28.8539 23.4081 29.5788 23.4081Z"
-                fill="white" />
+                fill="currentColor" />
             <path
                 d="M9.20323 29.5437C8.03825 29.5437 6.88622 29.3883 5.74714 29.0777C4.63394 28.767 3.58547 28.3528 2.60172 27.835C1.64385 27.2914 0.828369 26.6701 0.155273 25.9711L3.84435 22.2043C4.46567 22.8515 5.20349 23.3564 6.0578 23.7188C6.938 24.0812 7.86998 24.2624 8.85373 24.2624C9.42328 24.2624 9.85043 24.1848 10.1352 24.0295C10.4459 23.8741 10.6012 23.6541 10.6012 23.3693C10.6012 22.9551 10.3811 22.6444 9.94104 22.4373C9.52683 22.2043 8.97023 22.0102 8.27125 21.8548C7.59815 21.6736 6.88623 21.4665 6.13547 21.2335C5.38471 20.9746 4.65983 20.6381 3.96085 20.2239C3.26187 19.8097 2.69232 19.2272 2.25222 18.4764C1.83801 17.7257 1.63091 16.7678 1.63091 15.6028C1.63091 14.3861 1.95451 13.3247 2.60172 12.4186C3.27481 11.4866 4.20679 10.7617 5.39765 10.2439C6.58851 9.70029 7.98648 9.42847 9.59155 9.42847C11.2225 9.42847 12.7758 9.71324 14.2514 10.2828C15.7271 10.8264 16.9179 11.6549 17.824 12.7681L14.0961 16.5348C13.4748 15.8358 12.7888 15.3569 12.038 15.098C11.2872 14.8132 10.6012 14.6708 9.97987 14.6708C9.38444 14.6708 8.95729 14.7615 8.6984 14.9427C8.43952 15.098 8.31008 15.318 8.31008 15.6028C8.31008 15.9394 8.51719 16.2112 8.9314 16.4183C9.3715 16.6254 9.9281 16.8196 10.6012 17.0008C11.3002 17.1561 12.0121 17.3632 12.737 17.6221C13.4877 17.881 14.1997 18.2434 14.8728 18.7094C15.5717 19.1495 16.1283 19.7449 16.5426 20.4957C16.9827 21.2465 17.2027 22.2173 17.2027 23.4081C17.2027 25.298 16.4778 26.7995 15.0281 27.9127C13.5783 29 11.6367 29.5437 9.20323 29.5437Z"
-                fill="white" />
+                fill="currentColor" />
         </svg>
     </Link>
 </template>

resources/js/Components/Banner.vue

@@ -47,7 +47,7 @@ watchEffect(async () => {
 
                             <svg
                                 v-if="style == 'danger'"
-                                class="h-5 w-5 text-white"
+                                class="h-5 w-5 text-text-primary"
                                 xmlns="http://www.w3.org/2000/svg"
                                 fill="none"
                                 viewBox="0 0 24 24"
@@ -60,7 +60,7 @@ watchEffect(async () => {
                             </svg>
                         </span>
 
-                        <p class="ms-3 font-medium text-sm text-white truncate">
+                        <p class="ms-3 font-medium text-sm text-text-primary truncate">
                             {{ message }}
                         </p>
                     </div>
@@ -72,7 +72,7 @@ watchEffect(async () => {
                             aria-label="Dismiss"
                             @click.prevent="show = false">
                             <svg
-                                class="h-5 w-5 text-white"
+                                class="h-5 w-5 text-text-primary"
                                 xmlns="http://www.w3.org/2000/svg"
                                 fill="none"
                                 viewBox="0 0 24 24"

resources/js/Components/Billing/BillingBanner.vue

@@ -108,7 +108,7 @@ const showBlackFridayBanner = computed(() => {
             <div class="flex items-center space-x-2">
                 <Link v-if="canManageBilling()" href="/billing">
                     <div
-                        class="text-white font-semibold uppercase text-xs flex space-x-1 items-center hover:bg-white/10 rounded-lg px-2 py-1.5">
+                        class="text-text-primary font-semibold uppercase text-xs flex space-x-1 items-center hover:bg-white/10 rounded-lg px-2 py-1.5">
                         <span>Upgrade now</span>
                     </div>
                 </Link>
@@ -124,7 +124,7 @@ const showBlackFridayBanner = computed(() => {
         class="bg-accent-600/50 text-xs lg:text-sm py-0.5 border-b border-border-secondary">
         <MainContainer class="flex items-center justify-between">
             <div class="flex items-center space-x-1.5">
-                <CheckBadgeIcon class="w-4 text-white/50"></CheckBadgeIcon>
+                <CheckBadgeIcon class="w-4 text-text-primary/50"></CheckBadgeIcon>
                 <div class="flex-1 space-x-1">
                     <span class="font-medium">
                         Your trial expires in {{ daysLeftInTrial() }} days.
@@ -138,7 +138,7 @@ const showBlackFridayBanner = computed(() => {
             <div class="flex items-center space-x-2">
                 <Link v-if="canManageBilling()" href="/billing">
                     <div
-                        class="text-white font-semibold uppercase text-xs flex space-x-1 items-center hover:bg-white/10 rounded-lg px-2 py-1.5">
+                        class="text-text-primary font-semibold uppercase text-xs flex space-x-1 items-center hover:bg-white/10 rounded-lg px-2 py-1.5">
                         <span>Upgrade now</span>
                     </div>
                 </Link>
@@ -154,7 +154,7 @@ const showBlackFridayBanner = computed(() => {
         class="bg-red-600/50 text-xs lg:text-sm py-0.5 border-b border-border-secondary">
         <MainContainer class="flex items-center justify-between">
             <div class="flex items-center space-x-1.5">
-                <XCircleIcon class="w-4 text-white/50"></XCircleIcon>
+                <XCircleIcon class="w-4 text-text-primary/50"></XCircleIcon>
                 <div class="flex-1 space-x-1">
                     <span class="font-medium">
                         Your organization is currently blocked.
@@ -170,7 +170,7 @@ const showBlackFridayBanner = computed(() => {
                     v-if="isBillingActivated() && canManageBilling()"
                     href="/billing">
                     <div
-                        class="text-white font-semibold uppercase text-xs flex space-x-1 items-center hover:bg-white/10 rounded-lg px-2 py-1.5">
+                        class="text-text-primary font-semibold uppercase text-xs flex space-x-1 items-center hover:bg-white/10 rounded-lg px-2 py-1.5">
                         <span>Upgrade now</span>
                     </div>
                 </Link>
@@ -186,7 +186,7 @@ const showBlackFridayBanner = computed(() => {
         class="bg-tertiary text-xs lg:text-sm py-0.5 border-b border-border-secondary">
         <MainContainer class="flex items-center justify-between">
             <div class="flex items-center space-x-1.5">
-                <XCircleIcon class="w-4 text-white/50"></XCircleIcon>
+                <XCircleIcon class="w-4 text-text-primary/50"></XCircleIcon>
                 <div class="flex-1 space-x-1">
                     <span class="font-medium">
                         You are currently using the Free Plan.
@@ -202,7 +202,7 @@ const showBlackFridayBanner = computed(() => {
                     v-if="isBillingActivated() && canManageBilling()"
                     href="/billing">
                     <div
-                        class="text-white font-semibold uppercase text-xs flex space-x-1 items-center hover:bg-white/10 rounded-lg px-2 py-1.5">
+                        class="text-text-primary font-semibold uppercase text-xs flex space-x-1 items-center hover:bg-white/10 rounded-lg px-2 py-1.5">
                         <span>Upgrade now</span>
                     </div>
                 </Link>

resources/js/Components/Common/Card.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts"></script>
 
 <template>
-    <div class="rounded-lg border border-card-border">
+    <div class="rounded-lg border overflow-hidden border-card-border bg-card-background shadow-card">
         <slot></slot>
     </div>
 </template>

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

@@ -6,7 +6,12 @@ import {
 } from '@heroicons/vue/20/solid';
 import type { Client } from '@/packages/api/src';
 import { canDeleteClients, canUpdateClients } from '@/utils/permissions';
-import MoreOptionsDropdown from '@/packages/ui/src/MoreOptionsDropdown.vue';
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuItem,
+    DropdownMenuTrigger,
+} from '@/Components/ui/dropdown-menu';
 
 const emit = defineEmits<{
     delete: [];
@@ -19,37 +24,54 @@ const props = defineProps<{
 </script>
 
 <template>
-    <MoreOptionsDropdown :label="'Actions for Client ' + props.client.name">
-        <div class="min-w-[150px]">
+    <DropdownMenu>
+        <DropdownMenuTrigger as-child>
             <button
+                class="focus-visible:outline-none focus-visible:bg-card-background rounded-full focus-visible:ring-2 focus-visible:ring-ring focus-visible:opacity-100 hover:bg-card-background group-hover:opacity-100 opacity-20 transition-opacity text-text-secondary"
+                :aria-label="'Actions for Client ' + props.client.name">
+                <svg
+                    class="h-8 w-8 p-1 rounded-full"
+                    viewBox="0 0 24 24"
+                    xmlns="http://www.w3.org/2000/svg">
+                    <path
+                        fill="none"
+                        stroke="currentColor"
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                        stroke-width="1.5"
+                        d="M12 5.92A.96.96 0 1 0 12 4a.96.96 0 0 0 0 1.92m0 7.04a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92M12 20a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92" />
+                </svg>
+            </button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent class="min-w-[150px]" align="end">
+            <DropdownMenuItem
                 v-if="canUpdateClients()"
                 :aria-label="'Edit Client ' + props.client.name"
                 data-testid="client_edit"
-                class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
+                class="flex items-center space-x-3 cursor-pointer"
                 @click="emit('edit')">
-                <PencilSquareIcon
-                    class="w-5 text-icon-active"></PencilSquareIcon>
+                <PencilSquareIcon class="w-5 text-icon-active" />
                 <span>Edit</span>
-            </button>
-            <button
+            </DropdownMenuItem>
+            <DropdownMenuItem
                 v-if="canUpdateClients()"
                 :aria-label="'Archive Client ' + props.client.name"
-                class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
+                class="flex items-center space-x-3 cursor-pointer"
                 @click.prevent="emit('archive')">
-                <ArchiveBoxIcon class="w-5 text-icon-active"></ArchiveBoxIcon>
+                <ArchiveBoxIcon class="w-5 text-icon-active" />
                 <span>{{ client.is_archived ? 'Unarchive' : 'Archive' }}</span>
-            </button>
-            <button
+            </DropdownMenuItem>
+            <DropdownMenuItem
                 v-if="canDeleteClients()"
                 :aria-label="'Delete Client ' + props.client.name"
                 data-testid="client_delete"
-                class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
+                class="flex items-center space-x-3 cursor-pointer text-destructive focus:text-destructive"
                 @click="emit('delete')">
-                <TrashIcon class="w-5 text-icon-active"></TrashIcon>
+                <TrashIcon class="w-5" />
                 <span>Delete</span>
-            </button>
-        </div>
-    </MoreOptionsDropdown>
+            </DropdownMenuItem>
+        </DropdownMenuContent>
+    </DropdownMenu>
 </template>
 
 <style scoped></style>

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

@@ -29,7 +29,7 @@ const createClient = ref(false);
                     class="col-span-2 py-24 text-center">
                     <UserCircleIcon
                         class="w-8 text-icon-default inline pb-2"></UserCircleIcon>
-                    <h3 class="text-white font-semibold">No clients found</h3>
+                    <h3 class="text-text-primary font-semibold">No clients found</h3>
                     <p v-if="canCreateClients()" class="pb-5">
                         Create your first client now!
                     </p>

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

@@ -5,11 +5,11 @@ import TableHeading from '@/Components/Common/TableHeading.vue';
 <template>
     <TableHeading>
         <div
-            class="py-1.5 pr-3 text-left font-semibold text-white pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            class="py-1.5 pr-3 text-left font-semibold text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
             Name
         </div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white"></div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">Status</div>
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary"></div>
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">Status</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/Client/ClientTableRow.vue

@@ -41,17 +41,17 @@ const showEditModal = ref(false);
             v-model:show="showEditModal"
             :client="client"></ClientEditModal>
         <div
-            class="whitespace-nowrap flex items-center space-x-5 3xl:pl-12 py-4 pr-3 text-sm font-medium text-white pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            class="whitespace-nowrap flex items-center space-x-5 3xl:pl-12 py-4 pr-3 text-sm font-medium text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
             <span>
                 {{ client.name }}
             </span>
         </div>
         <div
-            class="whitespace-nowrap flex items-center space-x-5 3xl:pl-12 py-4 pr-3 text-sm font-medium text-white pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
-            <span class="text-muted"> {{ projectCount }} Projects </span>
+            class="whitespace-nowrap flex items-center space-x-5 3xl:pl-12 py-4 pr-3 text-sm font-medium text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            <span class="text-text-secondary"> {{ projectCount }} Projects </span>
         </div>
         <div
-            class="whitespace-nowrap px-3 py-4 text-sm text-muted flex space-x-1 items-center font-medium">
+            class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary flex space-x-1 items-center font-medium">
             <CheckCircleIcon class="w-5"></CheckCircleIcon>
             <span>Active</span>
         </div>

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

@@ -1,6 +1,12 @@
 <script setup lang="ts">
 import { TrashIcon, ArrowPathIcon } from '@heroicons/vue/20/solid';
-import MoreOptionsDropdown from '@/packages/ui/src/MoreOptionsDropdown.vue';
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuItem,
+    DropdownMenuTrigger,
+} from '@/Components/ui/dropdown-menu';
+
 const emit = defineEmits<{
     delete: [];
     resend: [];
@@ -8,22 +14,42 @@ const emit = defineEmits<{
 </script>
 
 <template>
-    <MoreOptionsDropdown label="Actions for the invitation">
-        <button
-            data-testid="invitation_delete"
-            class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
-            @click="emit('resend')">
-            <ArrowPathIcon class="w-5 text-icon-active"></ArrowPathIcon>
-            <span>Resend Invitation</span>
-        </button>
-        <button
-            data-testid="invitation_delete"
-            class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
-            @click="emit('delete')">
-            <TrashIcon class="w-5 text-icon-active"></TrashIcon>
-            <span>Delete</span>
-        </button>
-    </MoreOptionsDropdown>
+    <DropdownMenu>
+        <DropdownMenuTrigger as-child>
+            <button
+                class="focus-visible:outline-none focus-visible:bg-card-background rounded-full focus-visible:ring-2 focus-visible:ring-ring focus-visible:opacity-100 hover:bg-card-background group-hover:opacity-100 opacity-20 transition-opacity text-text-secondary"
+                aria-label="Actions for the invitation">
+                <svg
+                    class="h-8 w-8 p-1 rounded-full"
+                    viewBox="0 0 24 24"
+                    xmlns="http://www.w3.org/2000/svg">
+                    <path
+                        fill="none"
+                        stroke="currentColor"
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                        stroke-width="1.5"
+                        d="M12 5.92A.96.96 0 1 0 12 4a.96.96 0 0 0 0 1.92m0 7.04a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92M12 20a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92" />
+                </svg>
+            </button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent class="min-w-[150px]" align="end">
+            <DropdownMenuItem
+                data-testid="invitation_delete"
+                class="flex items-center space-x-3 cursor-pointer"
+                @click="emit('resend')">
+                <ArrowPathIcon class="w-5 text-icon-active" />
+                <span>Resend Invitation</span>
+            </DropdownMenuItem>
+            <DropdownMenuItem
+                data-testid="invitation_delete"
+                class="flex items-center space-x-3 cursor-pointer text-destructive focus:text-destructive"
+                @click="emit('delete')">
+                <TrashIcon class="w-5" />
+                <span>Delete</span>
+            </DropdownMenuItem>
+        </DropdownMenuContent>
+    </DropdownMenu>
 </template>
 
 <style scoped></style>

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

@@ -5,10 +5,10 @@ import TableHeading from '@/Components/Common/TableHeading.vue';
 <template>
     <TableHeading>
         <div
-            class="px-3 py-1.5 text-left font-semibold text-white pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            class="px-3 py-1.5 text-left font-semibold text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
             Email
         </div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">Role</div>
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">Role</div>
         <div
             class="relative py-1.5 pl-3 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12 bg-row-heading-background">
             <span class="sr-only">Edit</span>

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

@@ -57,10 +57,10 @@ async function resendInvitation() {
 <template>
     <TableRow>
         <div
-            class="whitespace-nowrap px-3 py-4 text-sm text-muted pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
             {{ invitation.email }}
         </div>
-        <div class="whitespace-nowrap px-3 py-4 text-sm text-muted">
+        <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
             {{ capitalizeFirstLetter(invitation.role) }}
         </div>
         <div

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

@@ -49,7 +49,7 @@ function getNameForKey(key: BillableKey | undefined) {
                 <span>
                     {{ getNameForKey(model) }}
                 </span>
-                <ChevronDownIcon class="text-muted w-5"></ChevronDownIcon>
+                <ChevronDownIcon class="text-text-secondary w-5"></ChevronDownIcon>
             </Badge>
         </template>
     </SelectDropdown>

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

@@ -63,13 +63,13 @@ const currentValue = computed(() => {
         <template #trigger>
             <Badge
                 tag="button"
-                class="flex w-full text-base text-left space-x-3 px-3 text-text-secondary font-normal cursor py-1.5">
-                <UserIcon class="relative z-10 w-4 text-muted"></UserIcon>
+                class="flex w-full text-base text-left space-x-3 px-3 text-text-secondary bg-input-background font-normal cursor py-1.5">
+                <UserIcon class="relative z-10 w-4 text-text-secondary"></UserIcon>
                 <div v-if="currentValue" class="flex-1 truncate">
                     {{ currentValue }}
                 </div>
                 <div v-else class="flex-1">Select a member...</div>
-                <ChevronDownIcon class="w-4 text-muted"></ChevronDownIcon>
+                <ChevronDownIcon class="w-4 text-text-secondary"></ChevronDownIcon>
             </Badge>
         </template>
     </SelectDropdown>

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

@@ -49,7 +49,10 @@ const showOwnershipTransferConfirmModal = ref(false);
 
 function saveWithChecks() {
     if (memberBody.value.billable_rate !== props.member.billable_rate) {
-        showBillableRateModal.value = true;
+        // make sure that the alert modal is not immediately submitted when user presses enter
+        setTimeout(() => {
+            showBillableRateModal.value = true;
+        }, 0);
         show.value = false;
     } else if (
         memberBody.value.role === 'owner' &&

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

@@ -145,7 +145,7 @@ useFocus(clientNameInput, { initialValue: true });
                     <InputError :message="errors.role" class="mt-2" />
 
                     <div
-                        class="relative z-0 mt-1 border border-card-border rounded-lg cursor-pointer">
+                        class="relative z-0 mt-1 border border-card-border rounded-lg bg-card-background cursor-pointer">
                         <button
                             v-for="(role, i) in filterRoles(availableRoles)"
                             :key="role.key"
@@ -167,7 +167,7 @@ useFocus(clientNameInput, { initialValue: true });
                                 <!-- Role Name -->
                                 <div class="flex items-center">
                                     <div
-                                        class="text-sm text-white"
+                                        class="text-sm text-text-primary"
                                         :class="{
                                             'font-semibold':
                                                 addTeamMemberForm.role ==
@@ -194,7 +194,7 @@ useFocus(clientNameInput, { initialValue: true });
                                 </div>
 
                                 <!-- Role Description -->
-                                <div class="mt-2 text-xs text-muted text-start">
+                                <div class="mt-2 text-xs text-text-secondary text-start">
                                     {{ role.description }}
                                 </div>
                             </div>

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

@@ -76,7 +76,7 @@ async function submit() {
             <div class="py-5 flex flex-col md:flex-row gap-6 items-center">
                 <div class="flex-1">
                     <Badge class="flex w-full text-base text-left space-x-3 px-3 text-text-secondary font-normal cursor py-1.5">
-                        <UserIcon class="relative z-10 w-4 text-muted"></UserIcon>
+                        <UserIcon class="relative z-10 w-4 text-text-secondary"></UserIcon>
                         <div class="flex-1 font-medium truncate">
                             {{ member.name }}
                         </div>

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

@@ -2,7 +2,12 @@
 import { TrashIcon, UserCircleIcon, PencilSquareIcon, ArrowDownOnSquareStackIcon } from '@heroicons/vue/20/solid';
 import type { Member } from '@/packages/api/src';
 import {canDeleteMembers, canMakeMembersPlaceholders, canMergeMembers, canUpdateMembers} from '@/utils/permissions';
-import MoreOptionsDropdown from '@/packages/ui/src/MoreOptionsDropdown.vue';
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuItem,
+    DropdownMenuTrigger,
+} from '@/Components/ui/dropdown-menu';
 
 const emit = defineEmits<{
     delete: [];
@@ -13,51 +18,65 @@ const emit = defineEmits<{
 const props = defineProps<{
     member: Member;
 }>();
-
 </script>
 
 <template>
-    <MoreOptionsDropdown
-        v-if="canUpdateMembers() || canDeleteMembers()"
-        :label="'Actions for Member ' + props.member.name">
-        <div class="min-w-[150px]">
+    <DropdownMenu v-if="canUpdateMembers() || canDeleteMembers()">
+        <DropdownMenuTrigger as-child>
             <button
+                class="focus-visible:outline-none focus-visible:bg-card-background rounded-full focus-visible:ring-2 focus-visible:ring-ring focus-visible:opacity-100 hover:bg-card-background group-hover:opacity-100 opacity-20 transition-opacity text-text-secondary"
+                :aria-label="'Actions for Member ' + props.member.name">
+                <svg
+                    class="h-8 w-8 p-1 rounded-full"
+                    viewBox="0 0 24 24"
+                    xmlns="http://www.w3.org/2000/svg">
+                    <path
+                        fill="none"
+                        stroke="currentColor"
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                        stroke-width="1.5"
+                        d="M12 5.92A.96.96 0 1 0 12 4a.96.96 0 0 0 0 1.92m0 7.04a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92M12 20a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92" />
+                </svg>
+            </button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent class="min-w-[150px]" align="end">
+            <DropdownMenuItem
                 v-if="canUpdateMembers()"
                 :aria-label="'Edit Member ' + props.member.name"
-                class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
+                class="flex items-center space-x-3 cursor-pointer"
                 @click="emit('edit')">
-                <PencilSquareIcon
-                    class="w-5 text-icon-active"></PencilSquareIcon>
+                <PencilSquareIcon class="w-5 text-icon-active" />
                 <span>Edit</span>
-            </button>
-            <button
+            </DropdownMenuItem>
+            <DropdownMenuItem
                 v-if="canDeleteMembers()"
                 :aria-label="'Delete Member ' + props.member.name"
                 data-testid="member_delete"
-                class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
+                class="flex items-center space-x-3 cursor-pointer text-destructive focus:text-destructive"
                 @click="emit('delete')">
-                <TrashIcon class="w-5 text-icon-active"></TrashIcon>
+                <TrashIcon class="w-5" />
                 <span>Delete</span>
-            </button>
-            <button
+            </DropdownMenuItem>
+            <DropdownMenuItem
                 v-if="props.member.role === 'placeholder' && canMergeMembers()"
                 :aria-label="'Merge Member ' + props.member.name"
                 data-testid="member_merge"
-                class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
+                class="flex items-center space-x-3 cursor-pointer"
                 @click="emit('merge')">
-                <ArrowDownOnSquareStackIcon class="w-5 text-icon-active"></ArrowDownOnSquareStackIcon>
+                <ArrowDownOnSquareStackIcon class="w-5 text-icon-active" />
                 <span>Merge</span>
-            </button>
-            <button
+            </DropdownMenuItem>
+            <DropdownMenuItem
                 v-if="props.member.role !== 'placeholder' && canMakeMembersPlaceholders()"
                 :aria-label="'Make Member ' + props.member.name + ' a placeholder'"
-                class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
+                class="flex items-center space-x-3 cursor-pointer"
                 @click="emit('makePlaceholder')">
-                <UserCircleIcon class="w-5 text-icon-active"></UserCircleIcon>
+                <UserCircleIcon class="w-5 text-icon-active" />
                 <span>Deactivate</span>
-            </button>
-        </div>
-    </MoreOptionsDropdown>
+            </DropdownMenuItem>
+        </DropdownMenuContent>
+    </DropdownMenu>
 </template>
 
 <style scoped></style>

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

@@ -43,7 +43,7 @@ function getNameForKey(key: string | undefined) {
                 <span>
                     {{ getNameForKey(model) }}
                 </span>
-                <ChevronDownIcon class="text-muted w-5"></ChevronDownIcon>
+                <ChevronDownIcon class="text-text-secondary w-5"></ChevronDownIcon>
             </Badge>
         </template>
     </SelectDropdown>

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

@@ -5,15 +5,15 @@ import TableHeading from '@/Components/Common/TableHeading.vue';
 <template>
     <TableHeading>
         <div
-            class="py-1.5 pr-3 text-left font-semibold text-white pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            class="py-1.5 pr-3 text-left font-semibold text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
             Name
         </div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">Email</div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">Role</div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">Email</div>
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">Role</div>
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">
             Billable Rate
         </div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">Status</div>
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">Status</div>
         <div
             class="relative py-1.5 pl-3 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12 bg-row-heading-background">
             <span class="sr-only">Edit</span>

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

@@ -59,18 +59,18 @@ const userHasValidMailAddress = computed(() => {
 <template>
     <TableRow>
         <div
-            class="whitespace-nowrap flex items-center space-x-5 py-4 pr-3 text-sm font-medium text-white pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            class="whitespace-nowrap flex items-center space-x-5 py-4 pr-3 text-sm font-medium text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
             <span>
                 {{ member.name }}
             </span>
         </div>
-        <div class="whitespace-nowrap px-3 py-4 text-sm text-muted">
+        <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
             {{ member.email }}
         </div>
-        <div class="whitespace-nowrap px-3 py-4 text-sm text-muted">
+        <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
             {{ capitalizeFirstLetter(member.role) }}
         </div>
-        <div class="whitespace-nowrap px-3 py-4 text-sm text-muted">
+        <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
             {{
                 member.billable_rate
                     ? formatCents(
@@ -81,7 +81,7 @@ const userHasValidMailAddress = computed(() => {
             }}
         </div>
         <div
-            class="whitespace-nowrap px-3 py-4 text-sm text-muted flex space-x-1 items-center font-medium">
+            class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary flex space-x-1 items-center font-medium">
             <CheckCircleIcon
                 v-if="member.is_placeholder === false"
                 class="w-5"></CheckCircleIcon>

resources/js/Components/Common/Notification/Notification.vue

@@ -10,7 +10,7 @@
         leave-to-class="opacity-0">
         <div
             v-if="show"
-            class="pointer-events-auto w-full max-w-sm overflow-hidden rounded-lg border border-card-border bg-card-background shadow-lg ring-1 ring-black text-white ring-opacity-5">
+            class="pointer-events-auto w-full max-w-sm overflow-hidden rounded-lg border border-card-border bg-card-background shadow-lg ring-1 ring-black text-text-primary ring-opacity-5">
             <div class="p-4">
                 <div class="flex items-start">
                     <div class="flex-shrink-0">
@@ -24,17 +24,17 @@
                             aria-hidden="true" />
                     </div>
                     <div class="ml-3 w-0 flex-1 pt-0.5">
-                        <p class="text-sm font-medium text-white">
+                        <p class="text-sm font-medium text-text-primary">
                             {{ title }}
                         </p>
-                        <p v-if="message" class="mt-1 text-sm text-muted">
+                        <p v-if="message" class="mt-1 text-sm text-text-secondary">
                             {{ message }}
                         </p>
                     </div>
                     <div class="ml-4 flex flex-shrink-0">
                         <button
                             type="button"
-                            class="inline-flex rounded-md bg-card-background text-muted hover:text-white focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
+                            class="inline-flex rounded-md bg-card-background text-text-secondary hover:text-text-primary focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
                             @click="show = false">
                             <span class="sr-only">Close</span>
                             <XMarkIcon class="h-5 w-5" aria-hidden="true" />

resources/js/Components/Common/PageTitle.vue

@@ -9,7 +9,7 @@ defineProps<{
 
 <template>
     <h3
-        class="text-white font-bold text-sm sm:text-base flex items-center space-x-2 sm:space-x-2.5">
+        class="text-text-primary font-semibold text-sm sm:text-base flex items-center space-x-2 sm:space-x-2.5">
         <component :is="icon" class="w-5 sm:w-6 text-icon-default"></component>
         <span> {{ title }} </span>
     </h3>

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

@@ -1,32 +1,33 @@
 <script setup lang="ts">
-import ProjectBadge from '@/packages/ui/src/Project/ProjectBadge.vue';
-import { computed, nextTick, ref, watch } from 'vue';
-import { useProjectsStore } from '@/utils/useProjects';
-import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
+import ProjectBadge from "@/packages/ui/src/Project/ProjectBadge.vue";
+import { computed, nextTick, ref, watch } from "vue";
+import { useProjectsStore } from "@/utils/useProjects";
+import Dropdown from "@/packages/ui/src/Input/Dropdown.vue";
 import {
     ComboboxAnchor,
     ComboboxContent,
     ComboboxInput,
     ComboboxItem,
     ComboboxRoot,
-    ComboboxViewport,
-} from 'radix-vue';
-import { PlusCircleIcon } from '@heroicons/vue/20/solid';
-import { storeToRefs } from 'pinia';
-import { api } from '@/packages/api/src';
-import { usePage } from '@inertiajs/vue3';
-import { getRandomColor } from '@/packages/ui/src/utils/color';
-import type { Project } from '@/packages/api/src';
-import ProjectDropdownItem from '@/packages/ui/src/Project/ProjectDropdownItem.vue';
+    ComboboxViewport
+} from "radix-vue";
+import { PlusCircleIcon } from "@heroicons/vue/20/solid";
+import { storeToRefs } from "pinia";
+import { api } from "@/packages/api/src";
+import { usePage } from "@inertiajs/vue3";
+import { getRandomColor } from "@/packages/ui/src/utils/color";
+import type { Project } from "@/packages/api/src";
+import ProjectDropdownItem from "@/packages/ui/src/Project/ProjectDropdownItem.vue";
+import { UseFocusTrap } from "@vueuse/integrations/useFocusTrap/component";
 
-const searchValue = ref('');
+const searchValue = ref("");
 const searchInput = ref<HTMLElement | null>(null);
 const model = defineModel<string | null>({
-    default: null,
+    default: null
 });
 const open = ref(false);
 const projectsStore = useProjectsStore();
-const emit = defineEmits(['update:modelValue', 'changed']);
+const emit = defineEmits(["update:modelValue", "changed"]);
 
 const { projects } = storeToRefs(projectsStore);
 const projectDropdownTrigger = ref<HTMLElement | null>(null);
@@ -34,7 +35,7 @@ const shownProjects = computed(() => {
     return projects.value.filter((project) => {
         return project.name
             .toLowerCase()
-            .includes(searchValue.value?.toLowerCase()?.trim() || '');
+            .includes(searchValue.value?.toLowerCase()?.trim() || "");
     });
 });
 
@@ -43,7 +44,7 @@ withDefaults(
         border?: boolean;
     }>(),
     {
-        border: true,
+        border: true
     }
 );
 
@@ -61,13 +62,13 @@ async function addProjectIfNoneExists() {
             {
                 name: searchValue.value,
                 color: getRandomColor(),
-                is_billable: false,
+                is_billable: false
             },
             { params: { organization: page.props.auth.user.current_team_id } }
         );
         projects.value.unshift(response.data);
         model.value = response.data.id;
-        searchValue.value = '';
+        searchValue.value = "";
         open.value = false;
     }
 }
@@ -94,95 +95,85 @@ function isProjectSelected(project: Project) {
 }
 
 const selectedProjectName = computed(() => {
-    return currentProject.value?.name || 'No Project';
+    return currentProject.value?.name || "No Project";
 });
 
 const selectedProjectColor = computed(() => {
-    return currentProject.value?.color || 'var(--theme-color-icon-default)';
+    return currentProject.value?.color || "var(--theme-color-icon-default)";
 });
 
 function updateValue(project: Project) {
     model.value = project.id;
-    emit('changed');
+    emit("changed");
 }
 </script>
 
 <template>
-    <Dropdown v-model="open" align="bottom-start" width="60">
+    <Dropdown v-model="open" align="start" width="60">
         <template #trigger>
             <ProjectBadge
                 ref="projectDropdownTrigger"
                 :color="selectedProjectColor"
-                size="large"
+                size="xlarge"
                 :border
                 tag="button"
                 :name="selectedProjectName"
-                class="focus:border-input-border-active focus:outline-0 focus:bg-card-background-separator hover:bg-card-background-separator"></ProjectBadge>
+                class="focus:border-input-border-active bg-input-background focus:outline-0 focus:bg-card-background-separator hover:bg-card-background-separator"></ProjectBadge>
         </template>
 
         <template #content>
-            <ComboboxRoot
-                :open="open"
-                :model-value="currentProject"
-                :search-term="searchValue"
-                class="relative"
-                @update:model-value="updateValue"
-                @update:search-term="(e) => console.log(e)">
-                <ComboboxAnchor>
-                    <ComboboxInput
-                        ref="searchInput"
-                        class="bg-card-background border-0 placeholder-muted text-sm text-white py-2.5 focus:ring-0 border-b border-card-background-separator focus:border-card-background-separator w-full"
-                        placeholder="Search for a project..."
-                        @keydown.enter="addProjectIfNoneExists" />
-                </ComboboxAnchor>
-                <ComboboxContent>
-                    <ComboboxViewport
-                        ref="dropdownViewport"
-                        class="w-60 max-h-60 overflow-y-scroll">
-                        <ComboboxItem
-                            v-if="searchValue === ''"
-                            class="data-[highlighted]:bg-card-background-active"
-                            :data-project-id="null"
-                            :value="{
-                                id: null,
-                                name: 'No Project',
-                                color: 'var(--theme-color-icon-default)',
-                            }">
-                            <ProjectDropdownItem
-                                name="No Project"
-                                color="var(--theme-color-icon-default)"
-                                selected></ProjectDropdownItem>
-                        </ComboboxItem>
-                        <ComboboxItem
-                            v-for="project in shownProjects"
-                            :key="project.id"
-                            :value="project"
-                            class="data-[highlighted]:bg-card-background-active"
-                            :data-project-id="project.id">
-                            <ProjectDropdownItem
-                                :selected="isProjectSelected(project)"
-                                :color="project.color"
-                                :name="project.name"></ProjectDropdownItem>
-                        </ComboboxItem>
-                        <div
-                            v-if="
+            <UseFocusTrap
+                v-if="open"
+                :options="{ immediate: true, allowOutsideClick: true }">
+                <ComboboxRoot
+                    v-model:search-term="searchValue"
+                    :open="open"
+                    :model-value="currentProject"
+                    class="relative"
+                    @update:model-value="updateValue"
+                    >
+                    <ComboboxAnchor>
+                        <ComboboxInput
+                            ref="searchInput"
+                            class="bg-card-background border-0 placeholder-muted text-sm text-text-primary py-2.5 focus:ring-0 border-b border-card-background-separator focus:border-card-background-separator w-full"
+                            placeholder="Search for a project..."
+                            @keydown.enter="addProjectIfNoneExists" />
+                    </ComboboxAnchor>
+                    <ComboboxContent>
+                        <ComboboxViewport
+                            ref="dropdownViewport"
+                            class="w-60 max-h-60 overflow-y-scroll">
+                            <ComboboxItem
+                                v-for="project in shownProjects"
+                                :key="project.id"
+                                :value="project"
+                                class="data-[highlighted]:bg-card-background-active"
+                                :data-project-id="project.id">
+                                <ProjectDropdownItem
+                                    :selected="isProjectSelected(project)"
+                                    :color="project.color"
+                                    :name="project.name"></ProjectDropdownItem>
+                            </ComboboxItem>
+                            <div
+                                v-if="
                                 searchValue.length > 0 &&
                                 shownProjects.length === 0
                             "
-                            class="bg-card-background-active">
-                            <div
-                                class="flex space-x-3 items-center px-4 py-3 text-xs font-medium border-t rounded-b-lg border-card-background-separator">
-                                <PlusCircleIcon
-                                    class="w-5 flex-shrink-0"></PlusCircleIcon>
-                                <span
+                                class="bg-card-background-active">
+                                <div
+                                    class="flex space-x-3 items-center px-4 py-3 text-xs font-medium border-t rounded-b-lg border-card-background-separator">
+                                    <PlusCircleIcon
+                                        class="w-5 flex-shrink-0"></PlusCircleIcon>
+                                    <span
                                     >Add "{{ searchValue }}" as a new
                                     Project</span
-                                >
+                                    >
+                                </div>
                             </div>
-                        </div>
-                    </ComboboxViewport>
-                </ComboboxContent>
-            </ComboboxRoot>
+                        </ComboboxViewport>
+                    </ComboboxContent>
+                </ComboboxRoot>
+            </UseFocusTrap>
         </template>
     </Dropdown>
 </template>

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

@@ -48,7 +48,10 @@ const project = ref<CreateProjectBody>({
 
 async function submit() {
     if (props.originalProject.billable_rate !== project.value.billable_rate) {
-        showBillableRateModal.value = true;
+        // 
+        setTimeout(() => {
+            showBillableRateModal.value = true;
+        }, 0);
         return;
     }
     await updateProject(props.originalProject.id, project.value);

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

@@ -6,7 +6,13 @@ import {
 } from '@heroicons/vue/20/solid';
 import type { Project } from '@/packages/api/src';
 import { canDeleteProjects, canUpdateProjects } from '@/utils/permissions';
-import MoreOptionsDropdown from '@/packages/ui/src/MoreOptionsDropdown.vue';
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuItem,
+    DropdownMenuTrigger,
+} from '@/Components/ui/dropdown-menu';
+
 const emit = defineEmits<{
     delete: [];
     edit: [];
@@ -18,37 +24,54 @@ const props = defineProps<{
 </script>
 
 <template>
-    <MoreOptionsDropdown :label="'Actions for Project ' + props.project.name">
-        <div class="min-w-[150px]">
+    <DropdownMenu>
+        <DropdownMenuTrigger as-child>
             <button
+                class="focus-visible:outline-none focus-visible:bg-card-background rounded-full focus-visible:ring-2 focus-visible:ring-ring focus-visible:opacity-100 hover:bg-card-background group-hover:opacity-100 opacity-20 transition-opacity text-text-secondary"
+                :aria-label="'Actions for Project ' + props.project.name">
+                <svg
+                    class="h-8 w-8 p-1 rounded-full"
+                    viewBox="0 0 24 24"
+                    xmlns="http://www.w3.org/2000/svg">
+                    <path
+                        fill="none"
+                        stroke="currentColor"
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                        stroke-width="1.5"
+                        d="M12 5.92A.96.96 0 1 0 12 4a.96.96 0 0 0 0 1.92m0 7.04a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92M12 20a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92" />
+                </svg>
+            </button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent class="min-w-[150px]" align="end">
+            <DropdownMenuItem
                 v-if="canUpdateProjects()"
                 :aria-label="'Edit Project ' + props.project.name"
                 data-testid="project_edit"
-                class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
+                class="flex items-center space-x-3 cursor-pointer"
                 @click.prevent="emit('edit')">
-                <PencilSquareIcon
-                    class="w-5 text-icon-active"></PencilSquareIcon>
+                <PencilSquareIcon class="w-5 text-icon-active" />
                 <span>Edit</span>
-            </button>
-            <button
+            </DropdownMenuItem>
+            <DropdownMenuItem
                 v-if="canUpdateProjects()"
                 :aria-label="'Archive Project ' + props.project.name"
-                class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
+                class="flex items-center space-x-3 cursor-pointer"
                 @click.prevent="emit('archive')">
-                <ArchiveBoxIcon class="w-5 text-icon-active"></ArchiveBoxIcon>
+                <ArchiveBoxIcon class="w-5 text-icon-active" />
                 <span>{{ project.is_archived ? 'Unarchive' : 'Archive' }}</span>
-            </button>
-            <button
+            </DropdownMenuItem>
+            <DropdownMenuItem
                 v-if="canDeleteProjects()"
                 :aria-label="'Delete Project ' + props.project.name"
                 data-testid="project_delete"
-                class="border-b border-card-background-separator flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
+                class="flex items-center space-x-3 cursor-pointer text-destructive focus:text-destructive"
                 @click.prevent="emit('delete')">
-                <TrashIcon class="w-5 text-icon-active"></TrashIcon>
+                <TrashIcon class="w-5" />
                 <span>Delete</span>
-            </button>
-        </div>
-    </MoreOptionsDropdown>
+            </DropdownMenuItem>
+        </DropdownMenuContent>
+    </DropdownMenu>
 </template>
 
 <style scoped></style>

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

@@ -65,7 +65,7 @@ import { isAllowedToPerformPremiumAction } from '@/utils/billing';
                     class="col-span-5 py-24 text-center">
                     <FolderPlusIcon
                         class="w-8 text-icon-default inline pb-2"></FolderPlusIcon>
-                    <h3 class="text-white font-semibold">
+                    <h3 class="text-text-primary font-semibold">
                         {{
                             canCreateProjects()
                                 ? 'No projects found'

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

@@ -8,22 +8,22 @@ defineProps<{
 <template>
     <TableHeading>
         <div
-            class="py-1.5 pr-3 text-left font-semibold text-white pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            class="py-1.5 pr-3 text-left font-semibold text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
             Name
         </div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">Client</div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">Client</div>
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">
             Total Time
         </div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">
             Progress
         </div>
         <div
             v-if="showBillableRate"
-            class="px-3 py-1.5 text-left font-semibold text-white">
+            class="px-3 py-1.5 text-left font-semibold text-text-primary">
             Billable Rate
         </div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">Status</div>
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">Status</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

@@ -69,7 +69,7 @@ const showEditProjectModal = ref(false);
         :original-project="project"></ProjectEditModal>
     <TableRow :href="route('projects.show', { project: project.id })">
         <div
-            class="whitespace-nowrap min-w-0 flex items-center space-x-5 3xl:pl-12 py-4 pr-3 text-sm font-medium text-white pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            class="whitespace-nowrap min-w-0 flex items-center space-x-5 3xl:pl-12 py-4 pr-3 text-sm font-medium text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
             <div
                 :style="{
                     backgroundColor: project.color,
@@ -79,9 +79,9 @@ const showEditProjectModal = ref(false);
             <span class="overflow-ellipsis overflow-hidden">
                 {{ project.name }}
             </span>
-            <span class="text-muted"> {{ projectTasksCount }} Tasks </span>
+            <span class="text-text-secondary"> {{ projectTasksCount }} Tasks </span>
         </div>
-        <div class="whitespace-nowrap min-w-0 px-3 py-4 text-sm text-muted">
+        <div class="whitespace-nowrap min-w-0 px-3 py-4 text-sm text-text-secondary">
             <div
                 v-if="project.client_id"
                 class="overflow-ellipsis overflow-hidden">
@@ -89,14 +89,14 @@ const showEditProjectModal = ref(false);
             </div>
             <div v-else>No client</div>
         </div>
-        <div class="whitespace-nowrap px-3 py-4 text-sm text-muted">
+        <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
             <div v-if="project.spent_time">
                 {{ formatHumanReadableDuration(project.spent_time) }}
             </div>
             <div v-else>--</div>
         </div>
         <div
-            class="whitespace-nowrap px-3 flex items-center text-sm text-muted">
+            class="whitespace-nowrap px-3 flex items-center text-sm text-text-secondary">
             <UpgradeBadge
                 v-if="!isAllowedToPerformPremiumAction()"></UpgradeBadge>
             <EstimatedTimeProgress
@@ -107,11 +107,11 @@ const showEditProjectModal = ref(false);
         </div>
         <div
             v-if="showBillableRate"
-            class="whitespace-nowrap px-3 py-4 text-sm text-muted">
+            class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
             {{ billableRateInfo }}
         </div>
         <div
-            class="whitespace-nowrap px-3 py-4 text-sm text-muted flex space-x-1 items-center font-medium">
+            class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary flex space-x-1 items-center font-medium">
             <CheckCircleIcon class="w-5"></CheckCircleIcon>
             <span>Active</span>
         </div>

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

@@ -33,7 +33,10 @@ async function submit() {
         props.projectMember.billable_rate !==
         projectMemberBody.value.billable_rate
     ) {
-        showBillableRateModal.value = true;
+        // make sure that the alert modal is not immediately submitted when user presses enter
+        setTimeout(() => {
+            showBillableRateModal.value = true;
+        }, 0);
         return;
     }
     await updateProjectMember(props.projectMember.id, projectMemberBody.value);
@@ -83,7 +86,7 @@ useFocus(projectNameInput, { initialValue: true });
             <div class="grid grid-cols-3 items-center space-x-4">
                 <div
                     class="col-span-3 sm:col-span-2 space-x-2 flex items-center">
-                    <UserIcon class="w-4 text-muted"></UserIcon>
+                    <UserIcon class="w-4 text-text-secondary"></UserIcon>
                     <span>{{ props.name }}</span>
                 </div>
                 <div class="col-span-3 sm:col-span-1 flex-1">

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

@@ -4,7 +4,12 @@ import type { ProjectMember } from '@/packages/api/src';
 import { useMembersStore } from '@/utils/useMembers';
 import { storeToRefs } from 'pinia';
 import { computed } from 'vue';
-import MoreOptionsDropdown from '@/packages/ui/src/MoreOptionsDropdown.vue';
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuItem,
+    DropdownMenuTrigger,
+} from '@/Components/ui/dropdown-menu';
 
 const emit = defineEmits<{
     delete: [];
@@ -24,24 +29,43 @@ const currentMember = computed(() => {
 </script>
 
 <template>
-    <MoreOptionsDropdown
-        :label="'Actions for Project Member ' + currentMember?.name">
-        <button
-            :aria-label="'Edit Project Member ' + currentMember?.name"
-            class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
-            @click.prevent="emit('edit')">
-            <PencilSquareIcon class="w-5 text-icon-active"></PencilSquareIcon>
-            <span>Edit</span>
-        </button>
-        <button
-            :aria-label="'Delete Project Member ' + currentMember?.name"
-            data-testid="project_delete"
-            class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
-            @click.prevent="emit('delete')">
-            <TrashIcon class="w-5 text-icon-active"></TrashIcon>
-            <span>Remove from Team</span>
-        </button>
-    </MoreOptionsDropdown>
+    <DropdownMenu>
+        <DropdownMenuTrigger as-child>
+            <button
+                class="focus-visible:outline-none focus-visible:bg-card-background rounded-full focus-visible:ring-2 focus-visible:ring-ring focus-visible:opacity-100 hover:bg-card-background group-hover:opacity-100 opacity-20 transition-opacity text-text-secondary"
+                :aria-label="'Actions for Project Member ' + currentMember?.name">
+                <svg
+                    class="h-8 w-8 p-1 rounded-full"
+                    viewBox="0 0 24 24"
+                    xmlns="http://www.w3.org/2000/svg">
+                    <path
+                        fill="none"
+                        stroke="currentColor"
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                        stroke-width="1.5"
+                        d="M12 5.92A.96.96 0 1 0 12 4a.96.96 0 0 0 0 1.92m0 7.04a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92M12 20a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92" />
+                </svg>
+            </button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent class="min-w-[150px]" align="end">
+            <DropdownMenuItem
+                :aria-label="'Edit Project Member ' + currentMember?.name"
+                class="flex items-center space-x-3 cursor-pointer"
+                @click.prevent="emit('edit')">
+                <PencilSquareIcon class="w-5 text-icon-active" />
+                <span>Edit</span>
+            </DropdownMenuItem>
+            <DropdownMenuItem
+                :aria-label="'Delete Project Member ' + currentMember?.name"
+                data-testid="project_delete"
+                class="flex items-center space-x-3 cursor-pointer text-destructive focus:text-destructive"
+                @click.prevent="emit('delete')">
+                <TrashIcon class="w-5" />
+                <span>Remove from Team</span>
+            </DropdownMenuItem>
+        </DropdownMenuContent>
+    </DropdownMenu>
 </template>
 
 <style scoped></style>

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

@@ -33,7 +33,7 @@ const createProjectMember = ref(false);
                     class="col-span-5 py-24 text-center">
                     <UserGroupIcon
                         class="w-8 text-icon-default inline pb-2"></UserGroupIcon>
-                    <h3 class="text-white font-semibold">No project members</h3>
+                    <h3 class="text-text-primary font-semibold">No project members</h3>
                     <p class="pb-5">Add the first project member!</p>
                     <SecondaryButton
                         :icon="PlusIcon"

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

@@ -5,13 +5,13 @@ import TableHeading from '@/Components/Common/TableHeading.vue';
 <template>
     <TableHeading>
         <div
-            class="py-1.5 pr-3 text-left font-semibold text-white pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            class="py-1.5 pr-3 text-left font-semibold text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
             Name
         </div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">
             Billable Rate
         </div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">Role</div>
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">Role</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/ProjectMember/ProjectMemberTableRow.vue

@@ -41,12 +41,12 @@ const showEditModal = ref(false);
             :name="member?.name"
             :project-member="projectMember"></ProjectMemberEditModal>
         <div
-            class="whitespace-nowrap flex items-center space-x-5 3xl:pl-12 py-4 pr-3 text-sm font-medium text-white pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            class="whitespace-nowrap flex items-center space-x-5 3xl:pl-12 py-4 pr-3 text-sm font-medium text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
             <span>
                 {{ member?.name }}
             </span>
         </div>
-        <div class="whitespace-nowrap px-3 py-4 text-sm text-muted">
+        <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
             {{
                 projectMember.billable_rate
                     ? formatCents(
@@ -56,7 +56,7 @@ const showEditModal = ref(false);
                     : '--'
             }}
         </div>
-        <div class="whitespace-nowrap px-3 py-4 text-sm text-muted">
+        <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
             {{ capitalizeFirstLetter(member?.role ?? '') }}
         </div>
         <div

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

@@ -1,8 +1,14 @@
 <script setup lang="ts">
 import { TrashIcon, PencilSquareIcon } from '@heroicons/vue/20/solid';
 import type { Report } from '@/packages/api/src';
-import MoreOptionsDropdown from '@/packages/ui/src/MoreOptionsDropdown.vue';
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuItem,
+    DropdownMenuTrigger,
+} from '@/Components/ui/dropdown-menu';
 import { canDeleteReport, canUpdateReport } from '@/utils/permissions';
+
 const emit = defineEmits<{
     delete: [];
     edit: [];
@@ -14,27 +20,44 @@ const props = defineProps<{
 </script>
 
 <template>
-    <MoreOptionsDropdown :label="'Actions for Project ' + props.report.name">
-        <div class="min-w-[150px]">
+    <DropdownMenu>
+        <DropdownMenuTrigger as-child>
             <button
+                class="focus-visible:outline-none focus-visible:bg-card-background rounded-full focus-visible:ring-2 focus-visible:ring-ring focus-visible:opacity-100 hover:bg-card-background group-hover:opacity-100 opacity-20 transition-opacity text-text-secondary"
+                :aria-label="'Actions for Project ' + props.report.name">
+                <svg
+                    class="h-8 w-8 p-1 rounded-full"
+                    viewBox="0 0 24 24"
+                    xmlns="http://www.w3.org/2000/svg">
+                    <path
+                        fill="none"
+                        stroke="currentColor"
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                        stroke-width="1.5"
+                        d="M12 5.92A.96.96 0 1 0 12 4a.96.96 0 0 0 0 1.92m0 7.04a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92M12 20a.96.96 0 1 0 0-1.92a.96.96 0 0 0 0 1.92" />
+                </svg>
+            </button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent class="min-w-[150px]" align="end">
+            <DropdownMenuItem
                 v-if="canUpdateReport()"
                 :aria-label="'Edit Report ' + props.report.name"
-                class="flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
+                class="flex items-center space-x-3 cursor-pointer"
                 @click.prevent="emit('edit')">
-                <PencilSquareIcon
-                    class="w-5 text-icon-active"></PencilSquareIcon>
+                <PencilSquareIcon class="w-5 text-icon-active" />
                 <span>Edit</span>
-            </button>
-            <button
+            </DropdownMenuItem>
+            <DropdownMenuItem
                 v-if="canDeleteReport()"
                 :aria-label="'Delete Report ' + props.report.name"
-                class="border-b border-card-background-separator flex items-center space-x-3 w-full px-3 py-2.5 text-start text-sm font-medium leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out"
+                class="flex items-center space-x-3 cursor-pointer text-destructive focus:text-destructive"
                 @click.prevent="emit('delete')">
-                <TrashIcon class="w-5 text-icon-active"></TrashIcon>
+                <TrashIcon class="w-5" />
                 <span>Delete</span>
-            </button>
-        </div>
-    </MoreOptionsDropdown>
+            </DropdownMenuItem>
+        </DropdownMenuContent>
+    </DropdownMenu>
 </template>
 
 <style scoped></style>

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

@@ -31,16 +31,16 @@ const gridTemplate = computed(() => {
                     class="col-span-5 py-24 text-center">
                     <FolderPlusIcon
                         class="w-8 text-icon-default inline pb-2"></FolderPlusIcon>
-                    <h3 class="text-white font-semibold">
+                    <h3 class="text-text-primary font-semibold">
                         No shared reports found
                     </h3>
                     <p v-if="canCreateProjects()" class="pb-5">
-                        Create your first project now!
+                        Go to the overview to create a report
                     </p>
                     <SecondaryButton
                         :icon="PlusIcon"
                         @click="router.visit(route('reporting'))"
-                        >Go to the overview to create a report
+                        >Go to overview
                     </SecondaryButton>
                 </div>
                 <template v-for="report in reports" :key="report.id">

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

@@ -5,16 +5,16 @@ import TableHeading from '@/Components/Common/TableHeading.vue';
 <template>
     <TableHeading>
         <div
-            class="py-1.5 pr-3 text-left font-semibold text-white pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            class="py-1.5 pr-3 text-left font-semibold text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
             Name
         </div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">
             Description
         </div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">
             Visibility
         </div>
-        <div class="px-3 py-1.5 text-left font-semibold text-white">
+        <div class="px-3 py-1.5 text-left font-semibold text-text-primary">
             Public URL
         </div>
         <div class="relative py-1.5 pl-3 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">

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

@@ -62,21 +62,21 @@ async function deleteReport() {
         :original-report="report"></ReportEditModal>
     <TableRow>
         <div
-            class="whitespace-nowrap min-w-0 flex items-center space-x-5 3xl:pl-12 py-4 pr-3 text-sm font-medium text-white pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
+            class="whitespace-nowrap min-w-0 flex items-center space-x-5 3xl:pl-12 py-4 pr-3 text-sm font-medium text-text-primary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
             <span class="overflow-ellipsis overflow-hidden">
                 {{ report.name }}
             </span>
         </div>
-        <div class="whitespace-nowrap min-w-0 px-3 py-4 text-sm text-muted">
+        <div class="whitespace-nowrap min-w-0 px-3 py-4 text-sm text-text-secondary">
             <span class="overflow-ellipsis overflow-hidden">
                 {{ report.description }}
             </span>
         </div>
-        <div class="whitespace-nowrap px-3 py-4 text-sm text-muted">
+        <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
             {{ report.is_public ? 'Public' : 'Private' }}
         </div>
         <div
-            class="whitespace-nowrap px-3 flex items-center text-sm text-muted">
+            class="whitespace-nowrap px-3 flex items-center text-sm text-text-secondary">
             <div
                 v-if="report.shareable_link"
                 class="space-x-2 flex items-center">

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

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import VChart, { THEME_KEY } from 'vue-echarts';
-import { computed, provide, ref } from 'vue';
+import { computed, provide } from 'vue';
 import LinearGradient from 'zrender/lib/graphic/LinearGradient';
 import {
     formatDate,
@@ -43,7 +43,8 @@ const xAxisLabels = computed(() => {
     }
     return props?.groupedData?.map((el) => formatDate(el.key ?? ''));
 });
-const accentColor = useCssVar('--color-accent-quaternary');
+const accentColor = useCssVar('--theme-color-chart', null, { observe: true });
+const labelColor = useCssVar('--color-text-secondary', null, { observe: true });
 
 const seriesData = computed(() => {
     return props?.groupedData?.map((el) => {
@@ -90,7 +91,7 @@ const seriesData = computed(() => {
     });
 });
 
-const option = ref({
+const option = computed(() => ({
     tooltip: {
         trigger: 'item',
     },
@@ -103,7 +104,7 @@ const option = ref({
     backgroundColor: 'transparent',
     xAxis: {
         type: 'category',
-        data: xAxisLabels,
+        data: xAxisLabels.value,
         markLine: {
             lineStyle: {
                 color: 'rgba(125,156,188,0.1)',
@@ -118,7 +119,7 @@ const option = ref({
         axisLabel: {
             fontSize: 12,
             fontWeight: 600,
-            color: 'rgba(255,255,255,0.7)',
+            color: labelColor.value,
             margin: 16,
             fontFamily: 'Outfit, sans-serif',
         },
@@ -138,7 +139,7 @@ const option = ref({
     },
     series: [
         {
-            data: seriesData,
+            data: seriesData.value,
             type: 'bar',
             tooltip: {
                 valueFormatter: (value: number) => {
@@ -147,7 +148,7 @@ const option = ref({
             },
         },
     ],
-});
+}));
 </script>
 
 <template>
@@ -158,7 +159,7 @@ const option = ref({
             class="chart"
             :option="option" />
         <div v-else class="chart flex flex-col items-center justify-center">
-            <p class="text-lg text-white font-semibold">
+            <p class="text-lg text-text-primary font-semibold">
                 No time entries found
             </p>
             <p>Try to change the filters and time range</p>

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

@@ -25,7 +25,7 @@ function triggerDownload(format: ExportFormat) {
 </script>
 
 <template>
-    <Dropdown align="bottom-end">
+    <Dropdown align="end">
         <template #trigger>
             <SecondaryButton :icon="ArrowDownTrayIcon" :loading>
                 Export

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

@@ -24,11 +24,11 @@ const activeClass = computed(() => {
         tag="button"
         :class="
             twMerge(
-                'cursor-pointer hover:bg-card-background transition flex',
+                'cursor-pointer bg-input-background hover:bg-card-background transition flex',
                 activeClass
             )
         ">
-        <component :is="icon" class="h-4 text-muted"></component>
+        <component :is="icon" class="-ml-0.5 h-4 w-4 text-text-quaternary"></component>
         <span> {{ title }} </span>
         <div
             v-if="count"

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

@@ -26,8 +26,9 @@ const title = computed(() => {
         <template #trigger>
             <Badge
                 size="large"
+                tag="button"
                 class="cursor-pointer hover:bg-card-background transition space-x-5 flex">
-                <component :is="icon" class="h-4 text-muted"></component>
+                <component :is="icon" class="h-4 text-text-secondary"></component>
                 <span> {{ title }} </span>
             </Badge>
         </template>

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

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import VChart, { THEME_KEY } from 'vue-echarts';
-import { computed, provide, ref } from 'vue';
+import { computed, provide } from 'vue';
 import { use } from 'echarts/core';
 import { CanvasRenderer } from 'echarts/renderers';
 import { PieChart } from 'echarts/charts';
@@ -11,6 +11,7 @@ import {
     TooltipComponent,
 } from 'echarts/components';
 import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
+import { useCssVar } from "@vueuse/core";
 
 use([
     CanvasRenderer,
@@ -32,6 +33,7 @@ type ReportingChartDataEntry = {
 const props = defineProps<{
     data: ReportingChartDataEntry | null;
 }>();
+const labelColor = useCssVar('--color-text-secondary', null, { observe: true });
 
 const seriesData = computed(() => {
     return props.data?.map((el) => {
@@ -50,13 +52,16 @@ const seriesData = computed(() => {
         };
     });
 });
-const option = ref({
+const option = computed(() => ({
     tooltip: {
         trigger: 'item',
     },
     legend: {
         show: true,
         top: '250px',
+        textStyle: {
+            color: labelColor.value,
+        },
     },
     backgroundColor: 'transparent',
     series: [
@@ -69,13 +74,13 @@ const option = ref({
                     return formatHumanReadableDuration(value);
                 },
             },
-            data: seriesData,
+            data: seriesData.value,
             radius: ['30%', '60%'],
             top: '-45%',
             type: 'pie',
         },
     ],
-});
+}));
 </script>
 
 <template>

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

@@ -26,7 +26,7 @@ const expanded = ref(false);
 
 <template>
     <div
-        class="contents text-white [&>*]:transition [&>*]:border-card-background-separator [&>*]:border-b [&>*]:h-[50px]">
+        class="contents text-text-primary [&>*]:transition [&>*]:border-card-background-separator [&>*]:border-b [&>*]:h-[50px]">
         <div
             :class="
                 twMerge(

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

@@ -12,20 +12,22 @@ const showSharedReports = computed(() => canViewReport());
 </script>
 
 <template>
-    <TabBar>
+    <TabBar
+    :model-value="active"
+    >
         <TabBarItem
-            :active="active === 'reporting'"
+            value="reporting"
             @click="router.visit(route('reporting'))"
             >Overview</TabBarItem
         >
         <TabBarItem
-            :active="active === 'detailed'"
+            value="detailed"
             @click="router.visit(route('reporting.detailed'))"
             >Detailed</TabBarItem
         >
         <TabBarItem
             v-if="showSharedReports"
-            :active="active === 'shared'"
+            value="shared"
             @click="router.visit(route('reporting.shared'))"
             >Shared</TabBarItem
         >

resources/js/Components/Common/StatCard.vue

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

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

@@ -1,9 +1,17 @@
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import { Tabs, TabsList } from '@/Components/ui/tabs'
+
+defineProps<{
+    defaultValue?: string
+}>()
+</script>
 
 <template>
-    <div class="flex items-center space-x-0.5 sm:space-x-1">
-        <slot></slot>
-    </div>
+    <Tabs :default-value="defaultValue" class="w-full">
+        <TabsList class="flex items-center space-x-0.5 sm:space-x-1">
+            <slot></slot>
+        </TabsList>
+    </Tabs>
 </template>
 
 <style scoped></style>

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

@@ -1,30 +1,22 @@
 <script setup lang="ts">
-import { twMerge } from 'tailwind-merge';
-import { computed } from 'vue';
+import { TabsTrigger } from '@/Components/ui/tabs'
+import { twMerge } from 'tailwind-merge'
+import type { Component } from 'vue'
 
 const props = defineProps<{
-    active?: boolean;
-}>();
-
-const activeClass = computed(() => {
-    if (props.active) {
-        return 'bg-tab-background border border-tab-border text-white font-semibold';
-    }
-    return '';
-});
+    value: string
+    class?: string
+    icon?: Component
+}>()
 </script>
 
 <template>
-    <button
-        role="tab"
-        :class="
-            twMerge(
-                'rounded-md px-2 sm:px-3 py-1 sm:py-1.5 text-xs sm:text-sm font-medium hover:text-white focus-visible:outline-none',
-                activeClass
-            )
-        ">
+    <TabsTrigger
+        :value="value"
+        :icon="icon"
+        :class="twMerge('rounded-md px-2 sm:px-3 py-1 border sm:py-1.5 text-xs sm:text-sm font-medium text-text-tertiary hover:text-text-primary focus-visible:outline-none data-[state=active]:bg-tab-background data-[state=active]:border-input-border data-[state=active]:text-text-primary border-tab-border', props.class)">
         <slot></slot>
-    </button>
+    </TabsTrigger>
 </template>
 
 <style scoped></style>