From b74e14f06ff90e63a0f5de833e1da52aab480b27 Mon Sep 17 00:00:00 2001
From: korridor <26689068+korridor@users.noreply.github.com>
Date: Tue, 5 Mar 2024 19:19:07 +0100
Subject: [PATCH 01/20] Added import system

---
 .../Resources/OrganizationResource.php        |  54 +++++
 .../Controllers/Api/V1/ImportController.php   |  64 ++++++
 app/Http/Middleware/ValidateSignature.php     |   2 +-
 app/Http/Requests/V1/Import/ImportRequest.php |  30 +++
 .../V1/Project/ProjectStoreRequest.php        |   1 +
 .../V1/Project/ProjectUpdateRequest.php       |   1 +
 app/Http/Requests/V1/Tag/TagStoreRequest.php  |   1 +
 app/Http/Requests/V1/Tag/TagUpdateRequest.php |   1 +
 app/Models/Organization.php                   |   2 +
 app/Models/User.php                           |   3 +
 app/Providers/AppServiceProvider.php          |   1 +
 app/Providers/JetstreamServiceProvider.php    |   1 +
 app/Service/ColorService.php                  |  38 ++++
 app/Service/Import/ImportDatabaseHelper.php   | 132 ++++++++++++
 app/Service/Import/ImportService.php          |  30 +++
 .../Import/Importers/ImportException.php      |   9 +
 .../Import/Importers/ImporterContract.php     |  16 ++
 .../Import/Importers/ImporterProvider.php     |  37 ++++
 app/Service/Import/Importers/ReportDto.php    |  76 +++++++
 .../Importers/TogglTimeEntriesImporter.php    | 189 ++++++++++++++++++
 config/telescope.php                          |   1 -
 .../2014_10_12_000000_create_users_table.php  |   8 +-
 routes/api.php                                |   6 +
 storage/tests/clockify_import_test_1.csv      |   1 +
 storage/tests/toggl_import_test_1.csv         |   3 +
 .../Endpoint/Api/V1/ImportEndpointTest.php    |  58 ++++++
 .../Import/ImportDatabaseHelperTest.php       |  71 +++++++
 .../Import/Importer/ImporterTestAbstract.php  |  53 +++++
 .../Importer/TogglTimeEntriesImporterTest.php |  61 ++++++
 29 files changed, 946 insertions(+), 4 deletions(-)
 create mode 100644 app/Http/Controllers/Api/V1/ImportController.php
 create mode 100644 app/Http/Requests/V1/Import/ImportRequest.php
 create mode 100644 app/Service/ColorService.php
 create mode 100644 app/Service/Import/ImportDatabaseHelper.php
 create mode 100644 app/Service/Import/ImportService.php
 create mode 100644 app/Service/Import/Importers/ImportException.php
 create mode 100644 app/Service/Import/Importers/ImporterContract.php
 create mode 100644 app/Service/Import/Importers/ImporterProvider.php
 create mode 100644 app/Service/Import/Importers/ReportDto.php
 create mode 100644 app/Service/Import/Importers/TogglTimeEntriesImporter.php
 create mode 100644 storage/tests/clockify_import_test_1.csv
 create mode 100644 storage/tests/toggl_import_test_1.csv
 create mode 100644 tests/Unit/Endpoint/Api/V1/ImportEndpointTest.php
 create mode 100644 tests/Unit/Service/Import/ImportDatabaseHelperTest.php
 create mode 100644 tests/Unit/Service/Import/Importer/ImporterTestAbstract.php
 create mode 100644 tests/Unit/Service/Import/Importer/TogglTimeEntriesImporterTest.php

diff --git a/app/Filament/Resources/OrganizationResource.php b/app/Filament/Resources/OrganizationResource.php
index 07664a41..3c14a313 100644
--- a/app/Filament/Resources/OrganizationResource.php
+++ b/app/Filament/Resources/OrganizationResource.php
@@ -6,11 +6,19 @@
 
 use App\Filament\Resources\OrganizationResource\Pages;
 use App\Models\Organization;
+use App\Service\Import\Importers\ImporterProvider;
+use App\Service\Import\Importers\ImportException;
+use App\Service\Import\Importers\ReportDto;
+use App\Service\Import\ImportService;
 use Filament\Forms;
+use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
+use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
 use Filament\Tables;
+use Filament\Tables\Actions\Action;
 use Filament\Tables\Table;
+use Illuminate\Support\Facades\Storage;
 
 class OrganizationResource extends Resource
 {
@@ -60,6 +68,52 @@ public static function table(Table $table): Table
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),
+                Action::make('Import')
+                    ->icon('heroicon-o-inbox-arrow-down')
+                    ->action(function (Organization $record, array $data) {
+                        // TODO: different disk!
+                        try {
+                            /** @var ReportDto $report */
+                            $report = app(ImportService::class)->import($record, $data['type'], Storage::disk('public')->get($data['file']), []);
+                            Notification::make()
+                                ->title('Import successful')
+                                ->success()
+                                ->body(
+                                    'Imported time entries: '.$report->timeEntriesCreated.'<br>'.
+                                    'Imported clients: '.$report->clientsCreated.'<br>'.
+                                    'Imported projects: '.$report->projectsCreated.'<br>'.
+                                    'Imported tasks: '.$report->tasksCreated.'<br>'.
+                                    'Imported tags: '.$report->tagsCreated.'<br>'.
+                                    'Imported users: '.$report->usersCreated
+                                )
+                                ->persistent()
+                                ->send();
+                        } catch (ImportException $exception) {
+                            report($exception);
+                            Notification::make()
+                                ->title('Import failed, changes rolled back')
+                                ->danger()
+                                ->body('Message: '.$exception->getMessage())
+                                ->persistent()
+                                ->send();
+                        }
+                    })
+                    ->tooltip(fn (Organization $record): string => "Import into {$record->name}")
+                    ->form([
+                        Forms\Components\FileUpload::make('file')
+                            ->label('File')
+                            ->required(),
+                        Select::make('type')
+                            ->required()
+                            ->options(function (): array {
+                                $select = [];
+                                foreach (app(ImporterProvider::class)->getImporterKeys() as $key) {
+                                    $select[$key] = $key;
+                                }
+
+                                return $select;
+                            }),
+                    ]),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([
diff --git a/app/Http/Controllers/Api/V1/ImportController.php b/app/Http/Controllers/Api/V1/ImportController.php
new file mode 100644
index 00000000..877c8c61
--- /dev/null
+++ b/app/Http/Controllers/Api/V1/ImportController.php
@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Http\Requests\V1\Import\ImportRequest;
+use App\Models\Organization;
+use App\Service\Import\Importers\ImportException;
+use App\Service\Import\ImportService;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\JsonResponse;
+
+class ImportController extends Controller
+{
+    /**
+     * Import data into the organization
+     *
+     * @throws AuthorizationException
+     */
+    public function import(Organization $organization, ImportRequest $request, ImportService $importService): JsonResponse
+    {
+        $this->checkPermission($organization, 'import');
+
+        try {
+            $report = $importService->import(
+                $organization,
+                $request->input('type'),
+                $request->input('data'),
+                $request->input('options')
+            );
+
+            return new JsonResponse([
+                /** @var array{
+                 *   clients: array{
+                 *     created: int,
+                 *   },
+                 *   projects: array{
+                 *     created: int,
+                 *   },
+                 *   tasks: array{
+                 *     created: int,
+                 *   },
+                 *   time-entries: array{
+                 *     created: int,
+                 *   },
+                 *   tags: array{
+                 *     created: int,
+                 *   },
+                 *   users: array{
+                 *     created: int,
+                 *   }
+                 * } $report Import report */
+                'report' => $report->toArray(),
+            ], 200);
+        } catch (ImportException $exception) {
+            report($exception);
+
+            return new JsonResponse([
+                'message' => $exception->getMessage(),
+            ], 400);
+        }
+    }
+}
diff --git a/app/Http/Middleware/ValidateSignature.php b/app/Http/Middleware/ValidateSignature.php
index 0b3a971f..d979b895 100644
--- a/app/Http/Middleware/ValidateSignature.php
+++ b/app/Http/Middleware/ValidateSignature.php
@@ -13,7 +13,7 @@ class ValidateSignature extends Middleware
      *
      * @var array<int, string>
      */
-    protected $except = [
+    protected array $except = [
         // 'fbclid',
         // 'utm_campaign',
         // 'utm_content',
diff --git a/app/Http/Requests/V1/Import/ImportRequest.php b/app/Http/Requests/V1/Import/ImportRequest.php
new file mode 100644
index 00000000..523324b7
--- /dev/null
+++ b/app/Http/Requests/V1/Import/ImportRequest.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\Import;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ImportRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string|ValidationRule>>
+     */
+    public function rules(): array
+    {
+        return [
+            'type' => [
+                'required',
+                'string',
+            ],
+            'data' => [
+                'required',
+                'string',
+            ],
+        ];
+    }
+}
diff --git a/app/Http/Requests/V1/Project/ProjectStoreRequest.php b/app/Http/Requests/V1/Project/ProjectStoreRequest.php
index d608e0c4..09bf72dc 100644
--- a/app/Http/Requests/V1/Project/ProjectStoreRequest.php
+++ b/app/Http/Requests/V1/Project/ProjectStoreRequest.php
@@ -25,6 +25,7 @@ public function rules(): array
     {
         return [
             'name' => [
+                // TODO: unique
                 'required',
                 'string',
                 'min:1',
diff --git a/app/Http/Requests/V1/Project/ProjectUpdateRequest.php b/app/Http/Requests/V1/Project/ProjectUpdateRequest.php
index 69b6661e..28ed09ad 100644
--- a/app/Http/Requests/V1/Project/ProjectUpdateRequest.php
+++ b/app/Http/Requests/V1/Project/ProjectUpdateRequest.php
@@ -25,6 +25,7 @@ public function rules(): array
     {
         return [
             'name' => [
+                // TODO: unique
                 'required',
                 'string',
                 'max:255',
diff --git a/app/Http/Requests/V1/Tag/TagStoreRequest.php b/app/Http/Requests/V1/Tag/TagStoreRequest.php
index 27955e19..07373f3e 100644
--- a/app/Http/Requests/V1/Tag/TagStoreRequest.php
+++ b/app/Http/Requests/V1/Tag/TagStoreRequest.php
@@ -18,6 +18,7 @@ public function rules(): array
     {
         return [
             'name' => [
+                // TODO: unique
                 'required',
                 'string',
                 'min:1',
diff --git a/app/Http/Requests/V1/Tag/TagUpdateRequest.php b/app/Http/Requests/V1/Tag/TagUpdateRequest.php
index a0f5a1db..a54a31ee 100644
--- a/app/Http/Requests/V1/Tag/TagUpdateRequest.php
+++ b/app/Http/Requests/V1/Tag/TagUpdateRequest.php
@@ -18,6 +18,7 @@ public function rules(): array
     {
         return [
             'name' => [
+                // TODO: unique
                 'required',
                 'string',
                 'min:1',
diff --git a/app/Models/Organization.php b/app/Models/Organization.php
index c44a485f..62bd33b7 100644
--- a/app/Models/Organization.php
+++ b/app/Models/Organization.php
@@ -5,6 +5,7 @@
 namespace App\Models;
 
 use Database\Factories\OrganizationFactory;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -18,6 +19,7 @@
  * @property string $name
  * @property bool $personal_team
  * @property User $owner
+ * @property Collection<User> $users
  *
  * @method HasMany<OrganizationInvitation> teamInvitations()
  * @method static OrganizationFactory factory()
diff --git a/app/Models/User.php b/app/Models/User.php
index 891b3be0..19e6bc8f 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -64,8 +64,11 @@ class User extends Authenticatable
      * @var array<string, string>
      */
     protected $casts = [
+        'name' => 'string',
+        'email' => 'string',
         'email_verified_at' => 'datetime',
         'is_admin' => 'boolean',
+        'is_placeholder' => 'boolean',
     ];
 
     /**
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index b027f23f..1aa92645 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -74,6 +74,7 @@ public function boot(): void
 
         if (config('app.force_https', false) || App::isProduction()) {
             URL::forceScheme('https');
+            request()->server->set('HTTPS', request()->header('X-Forwarded-Proto', 'https') === 'https' ? 'on' : 'off');
         }
     }
 }
diff --git a/app/Providers/JetstreamServiceProvider.php b/app/Providers/JetstreamServiceProvider.php
index e8e5bfb0..1de94d23 100644
--- a/app/Providers/JetstreamServiceProvider.php
+++ b/app/Providers/JetstreamServiceProvider.php
@@ -74,6 +74,7 @@ protected function configurePermissions(): void
             'clients:delete',
             'organizations:view',
             'organizations:update',
+            'import',
         ])->description('Administrator users can perform any action.');
 
         Jetstream::role('manager', 'Manager', [
diff --git a/app/Service/ColorService.php b/app/Service/ColorService.php
new file mode 100644
index 00000000..a58e459b
--- /dev/null
+++ b/app/Service/ColorService.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+class ColorService
+{
+    /**
+     * @var array<string>
+     */
+    private const array COLORS = [
+        '#ef5350',
+        '#ec407a',
+        '#ab47bc',
+        '#7e57c2',
+        '#5c6bc0',
+        '#42a5f5',
+        '#29b6f6',
+        '#26c6da',
+        '#26a69a',
+        '#66bb6a',
+        '#9ccc65',
+        '#d4e157',
+        '#ffee58',
+        '#ffca28',
+        '#ffa726',
+        '#ff7043',
+        '#8d6e63',
+        '#bdbdbd',
+        '#78909c',
+    ];
+
+    public function getRandomColor(): string
+    {
+        return self::COLORS[array_rand(self::COLORS)];
+    }
+}
diff --git a/app/Service/Import/ImportDatabaseHelper.php b/app/Service/Import/ImportDatabaseHelper.php
new file mode 100644
index 00000000..fa5551ae
--- /dev/null
+++ b/app/Service/Import/ImportDatabaseHelper.php
@@ -0,0 +1,132 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Import;
+
+use Closure;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @template TModel of Model
+ */
+class ImportDatabaseHelper
+{
+    /**
+     * @var class-string<TModel>
+     */
+    private string $model;
+
+    /**
+     * @var string[]
+     */
+    private array $identifiers;
+
+    private ?array $mapIdentifierToKey = null;
+
+    private array $mapNewAttach = [];
+
+    private bool $attachToExisting;
+
+    private ?Closure $queryModifier;
+
+    private ?Closure $afterCreate;
+
+    private int $createdCount;
+
+    /**
+     * @param  class-string<TModel>  $model
+     * @param  array<string>  $identifiers
+     */
+    public function __construct(string $model, array $identifiers, bool $attachToExisting = false, ?Closure $queryModifier = null, ?Closure $afterCreate = null)
+    {
+        $this->model = $model;
+        $this->identifiers = $identifiers;
+        $this->attachToExisting = $attachToExisting;
+        $this->queryModifier = $queryModifier;
+        $this->afterCreate = $afterCreate;
+        $this->createdCount = 0;
+    }
+
+    /**
+     * @return Builder<TModel>
+     */
+    private function getModelInstance(): Builder
+    {
+        return (new $this->model)->query();
+    }
+
+    private function createEntity(array $identifierData, array $createValues): string
+    {
+        $model = new $this->model();
+        foreach ($identifierData as $identifier => $identifierValue) {
+            $model->{$identifier} = $identifierValue;
+        }
+        foreach ($createValues as $key => $value) {
+            $model->{$key} = $value;
+        }
+        $model->save();
+
+        if ($this->afterCreate !== null) {
+            ($this->afterCreate)($model);
+        }
+
+        $this->mapIdentifierToKey[$this->getHash($identifierData)] = $model->getKey();
+        $this->createdCount++;
+
+        return $model->getKey();
+    }
+
+    private function getHash(array $data): string
+    {
+        return md5(json_encode($data));
+    }
+
+    public function getKey(array $identifierData, array $createValues = []): string
+    {
+        $this->checkMap();
+
+        $hash = $this->getHash($identifierData);
+        if ($this->attachToExisting) {
+            $key = $this->mapIdentifierToKey[$hash] ?? null;
+            if ($key !== null) {
+                return $key;
+            }
+
+            return $this->createEntity($identifierData, $createValues);
+        } else {
+            throw new \RuntimeException('Not implemented');
+        }
+    }
+
+    private function checkMap(): void
+    {
+        if ($this->mapIdentifierToKey === null) {
+            $select = $this->identifiers;
+            $select[] = (new $this->model())->getKeyName();
+            $builder = $this->getModelInstance();
+
+            if ($this->queryModifier !== null) {
+                $builder = ($this->queryModifier)($builder);
+            }
+
+            $databaseEntries = $builder->select($select)
+                ->get();
+            $this->mapIdentifierToKey = [];
+            foreach ($databaseEntries as $databaseEntry) {
+                $identifierData = [];
+                foreach ($this->identifiers as $identifier) {
+                    $identifierData[$identifier] = $databaseEntry->{$identifier};
+                }
+                $hash = $this->getHash($identifierData);
+                $this->mapIdentifierToKey[$hash] = $databaseEntry->getKey();
+            }
+        }
+    }
+
+    public function getCreatedCount(): int
+    {
+        return $this->createdCount;
+    }
+}
diff --git a/app/Service/Import/ImportService.php b/app/Service/Import/ImportService.php
new file mode 100644
index 00000000..0c442c15
--- /dev/null
+++ b/app/Service/Import/ImportService.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Import;
+
+use App\Models\Organization;
+use App\Service\Import\Importers\ImporterContract;
+use App\Service\Import\Importers\ImporterProvider;
+use App\Service\Import\Importers\ImportException;
+use App\Service\Import\Importers\ReportDto;
+use Illuminate\Support\Facades\DB;
+
+class ImportService
+{
+    /**
+     * @throws ImportException
+     */
+    public function import(Organization $organization, string $importerType, string $data, array $options): ReportDto
+    {
+        /** @var ImporterContract $importer */
+        $importer = app(ImporterProvider::class)->getImporter($importerType);
+        $importer->init($organization);
+        DB::transaction(function () use (&$importer, &$data, &$options, &$organization) {
+            $importer->importData($data, $options);
+        });
+
+        return $importer->getReport();
+    }
+}
diff --git a/app/Service/Import/Importers/ImportException.php b/app/Service/Import/Importers/ImportException.php
new file mode 100644
index 00000000..00588701
--- /dev/null
+++ b/app/Service/Import/Importers/ImportException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Import\Importers;
+
+class ImportException extends \Exception
+{
+}
diff --git a/app/Service/Import/Importers/ImporterContract.php b/app/Service/Import/Importers/ImporterContract.php
new file mode 100644
index 00000000..65ca1bb6
--- /dev/null
+++ b/app/Service/Import/Importers/ImporterContract.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Import\Importers;
+
+use App\Models\Organization;
+
+interface ImporterContract
+{
+    public function init(Organization $organization): void;
+
+    public function importData(string $data, array $options): void;
+
+    public function getReport(): ReportDto;
+}
diff --git a/app/Service/Import/Importers/ImporterProvider.php b/app/Service/Import/Importers/ImporterProvider.php
new file mode 100644
index 00000000..4ed1033f
--- /dev/null
+++ b/app/Service/Import/Importers/ImporterProvider.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Import\Importers;
+
+class ImporterProvider
+{
+    private array $importers = [
+        'toggl_time_entries' => TogglTimeEntriesImporter::class,
+    ];
+
+    /**
+     * @param  class-string<ImporterContract>  $importer
+     */
+    public function registerImporter(string $type, string $importer): void
+    {
+        $this->importers[$type] = $importer;
+    }
+
+    /**
+     * @return array<string>
+     */
+    public function getImporterKeys(): array
+    {
+        return array_keys($this->importers);
+    }
+
+    public function getImporter(string $type): ImporterContract
+    {
+        if (! array_key_exists($type, $this->importers)) {
+            throw new \InvalidArgumentException('Invalid importer type');
+        }
+
+        return new $this->importers[$type];
+    }
+}
diff --git a/app/Service/Import/Importers/ReportDto.php b/app/Service/Import/Importers/ReportDto.php
new file mode 100644
index 00000000..5f4748af
--- /dev/null
+++ b/app/Service/Import/Importers/ReportDto.php
@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Import\Importers;
+
+class ReportDto
+{
+    public int $clientsCreated;
+
+    public int $projectsCreated;
+
+    public int $tasksCreated;
+
+    public int $timeEntriesCreated;
+
+    public int $tagsCreated;
+
+    public int $usersCreated;
+
+    public function __construct(int $clientsCreated, int $projectsCreated, int $tasksCreated, int $timeEntriesCreated, int $tagsCreated, int $usersCreated)
+    {
+        $this->clientsCreated = $clientsCreated;
+        $this->projectsCreated = $projectsCreated;
+        $this->tasksCreated = $tasksCreated;
+        $this->timeEntriesCreated = $timeEntriesCreated;
+        $this->tagsCreated = $tagsCreated;
+        $this->usersCreated = $usersCreated;
+    }
+
+    /**
+     * @return array{
+     *    clients: array{
+     *       created: int,
+     *    },
+     *    projects: array{
+     *       created: int,
+     *    },
+     *    tasks: array{
+     *       created: int,
+     *    },
+     *    time-entries: array{
+     *       created: int,
+     *    },
+     *    tags: array{
+     *       created: int,
+     *    },
+     *    users: array{
+     *       created: int,
+     *    }
+     * }
+     */
+    public function toArray(): array
+    {
+        return [
+            'clients' => [
+                'created' => $this->clientsCreated,
+            ],
+            'projects' => [
+                'created' => $this->projectsCreated,
+            ],
+            'tasks' => [
+                'created' => $this->tasksCreated,
+            ],
+            'time-entries' => [
+                'created' => $this->timeEntriesCreated,
+            ],
+            'tags' => [
+                'created' => $this->tagsCreated,
+            ],
+            'users' => [
+                'created' => $this->usersCreated,
+            ],
+        ];
+    }
+}
diff --git a/app/Service/Import/Importers/TogglTimeEntriesImporter.php b/app/Service/Import/Importers/TogglTimeEntriesImporter.php
new file mode 100644
index 00000000..0021bfb6
--- /dev/null
+++ b/app/Service/Import/Importers/TogglTimeEntriesImporter.php
@@ -0,0 +1,189 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Import\Importers;
+
+use App\Models\Client;
+use App\Models\Organization;
+use App\Models\Project;
+use App\Models\Tag;
+use App\Models\Task;
+use App\Models\TimeEntry;
+use App\Models\User;
+use App\Service\ColorService;
+use App\Service\Import\ImportDatabaseHelper;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+use League\Csv\Exception as CsvException;
+use League\Csv\Reader;
+
+class TogglTimeEntriesImporter implements ImporterContract
+{
+    private Organization $organization;
+
+    private ImportDatabaseHelper $userImportHelper;
+
+    private ImportDatabaseHelper $projectImportHelper;
+
+    private ImportDatabaseHelper $tagImportHelper;
+
+    private ImportDatabaseHelper $clientImportHelper;
+
+    private ImportDatabaseHelper $taskImportHelper;
+
+    private int $timeEntriesCreated;
+
+    #[\Override]
+    public function init(Organization $organization): void
+    {
+        $this->organization = $organization;
+        $this->userImportHelper = new ImportDatabaseHelper(User::class, ['email'], true, function (Builder $builder) {
+            return $builder->whereHas('organizations', function (Builder $builder): Builder {
+                /** @var Builder<Organization> $builder */
+                return $builder->whereKey($this->organization->getKey());
+            });
+        }, function (User $user) {
+            $user->organizations()->attach([$this->organization->id]);
+        });
+        // TODO: user special after import
+        $this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+        $this->tagImportHelper = new ImportDatabaseHelper(Tag::class, ['name', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+        $this->clientImportHelper = new ImportDatabaseHelper(Client::class, ['name', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+        $this->taskImportHelper = new ImportDatabaseHelper(Task::class, ['name', 'project_id', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+        $this->timeEntriesCreated = 0;
+    }
+
+    private function getTags(string $tags): array
+    {
+        if (trim($tags) === '') {
+            return [];
+        }
+        $tagsParsed = explode(', ', $tags);
+        $tagIds = [];
+        foreach ($tagsParsed as $tagParsed) {
+            if (strlen($tagParsed) > 255) {
+                throw new ImportException('Tag is too long');
+            }
+            $tagId = $this->tagImportHelper->getKey([
+                'name' => $tagParsed,
+                'organization_id' => $this->organization->id,
+            ]);
+            $tagIds[] = $tagId;
+        }
+
+        return $tagIds;
+    }
+
+    /**
+     * @throws ImportException
+     */
+    #[\Override]
+    public function importData(string $data, array $options): void
+    {
+        try {
+            $colorService = app(ColorService::class);
+            $reader = Reader::createFromString($data);
+            $reader->setHeaderOffset(0);
+            $reader->setDelimiter(',');
+            $header = $reader->getHeader();
+            $this->validateHeader($header);
+            $records = $reader->getRecords();
+            foreach ($records as $record) {
+                $userId = $this->userImportHelper->getKey([
+                    'email' => $record['Email'],
+                ], [
+                    'name' => $record['User'],
+                    'is_placeholder' => true,
+                ]);
+                $clientId = null;
+                if ($record['Client'] !== '') {
+                    $clientId = $this->clientImportHelper->getKey([
+                        'name' => $record['Client'],
+                        'organization_id' => $this->organization->id,
+                    ]);
+                }
+                $projectId = null;
+                if ($record['Project'] !== '') {
+                    $projectId = $this->projectImportHelper->getKey([
+                        'name' => $record['Project'],
+                        'organization_id' => $this->organization->id,
+                    ], [
+                        'client_id' => $clientId,
+                        'color' => $colorService->getRandomColor(),
+                    ]);
+                }
+                $taskId = null;
+                if ($record['Task'] !== '') {
+                    $taskId = $this->taskImportHelper->getKey([
+                        'name' => $record['Task'],
+                        'project_id' => $projectId,
+                        'organization_id' => $this->organization->id,
+                    ]);
+                }
+                $timeEntry = new TimeEntry();
+                $timeEntry->user_id = $userId;
+                $timeEntry->task_id = $taskId;
+                $timeEntry->project_id = $projectId;
+                $timeEntry->organization_id = $this->organization->id;
+                $timeEntry->description = $record['Description'];
+                if (! in_array($record['Billable'], ['Yes', 'No'], true)) {
+                    throw new ImportException('Invalid billable value');
+                }
+                $timeEntry->billable = $record['Billable'] === 'Yes';
+                $timeEntry->tags = $this->getTags($record['Tags']);
+                $timeEntry->start = Carbon::createFromFormat('Y-m-d H:i:s', $record['Start date'].' '.$record['Start time'], 'UTC');
+                $timeEntry->end = Carbon::createFromFormat('Y-m-d H:i:s', $record['End date'].' '.$record['End time'], 'UTC');
+                $timeEntry->save();
+                $this->timeEntriesCreated++;
+            }
+        } catch (CsvException $exception) {
+            throw new ImportException('Invalid CSV data');
+        }
+
+    }
+
+    private function validateHeader(array $header): void
+    {
+        $requiredFields = [
+            'User',
+            'Email',
+            'Client',
+            'Project',
+            'Task',
+            'Description',
+            'Billable',
+            'Start date',
+            'Start time',
+            'End date',
+            'End time',
+            'Tags',
+        ];
+        foreach ($requiredFields as $requiredField) {
+            if (! in_array($requiredField, $header, true)) {
+                throw new ImportException('Invalid CSV header, missing field: '.$requiredField);
+            }
+        }
+    }
+
+    #[\Override]
+    public function getReport(): ReportDto
+    {
+        return new ReportDto(
+            clientsCreated: $this->clientImportHelper->getCreatedCount(),
+            projectsCreated: $this->projectImportHelper->getCreatedCount(),
+            tasksCreated: $this->taskImportHelper->getCreatedCount(),
+            timeEntriesCreated: $this->timeEntriesCreated,
+            tagsCreated: $this->tagImportHelper->getCreatedCount(),
+            usersCreated: $this->userImportHelper->getCreatedCount(),
+        );
+    }
+}
diff --git a/config/telescope.php b/config/telescope.php
index 312fdf26..21d8ddda 100644
--- a/config/telescope.php
+++ b/config/telescope.php
@@ -98,7 +98,6 @@
     ],
 
     'ignore_paths' => [
-        'livewire*',
         'nova-api*',
         'pulse*',
     ],
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 490d4d25..ffa23ea9 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -16,13 +16,17 @@ public function up(): void
         Schema::create('users', function (Blueprint $table) {
             $table->uuid('id')->primary();
             $table->string('name');
-            $table->string('email')->unique();
+            $table->string('email');
             $table->timestamp('email_verified_at')->nullable();
-            $table->string('password');
+            $table->string('password')->nullable();
             $table->rememberToken();
+            $table->boolean('is_placeholder')->default(false);
             $table->foreignUuid('current_team_id')->nullable();
             $table->string('profile_photo_path', 2048)->nullable();
             $table->timestamps();
+
+            $table->uniqueIndex('email')
+                ->where('is_placeholder = false');
         });
     }
 
diff --git a/routes/api.php b/routes/api.php
index cccee762..a75683a9 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use App\Http\Controllers\Api\V1\ClientController;
+use App\Http\Controllers\Api\V1\ImportController;
 use App\Http\Controllers\Api\V1\OrganizationController;
 use App\Http\Controllers\Api\V1\ProjectController;
 use App\Http\Controllers\Api\V1\TagController;
@@ -60,6 +61,11 @@
         Route::put('/organizations/{organization}/clients/{client}', [ClientController::class, 'update'])->name('update');
         Route::delete('/organizations/{organization}/clients/{client}', [ClientController::class, 'destroy'])->name('destroy');
     });
+
+    // Import routes
+    Route::name('import.')->group(static function () {
+        Route::post('/organizations/{organization}/import', [ImportController::class, 'import'])->name('import');
+    });
 });
 
 /**
diff --git a/storage/tests/clockify_import_test_1.csv b/storage/tests/clockify_import_test_1.csv
new file mode 100644
index 00000000..66b59c18
--- /dev/null
+++ b/storage/tests/clockify_import_test_1.csv
@@ -0,0 +1 @@
+"Project","Client","Description","Task","User","Group","Email","Tags","Billable","Start Date","Start Time","End Date","End Time","Duration (h)","Duration (decimal)","Billable Rate (USD)","Billable Amount (USD)"
diff --git a/storage/tests/toggl_import_test_1.csv b/storage/tests/toggl_import_test_1.csv
new file mode 100644
index 00000000..1fdfc8d6
--- /dev/null
+++ b/storage/tests/toggl_import_test_1.csv
@@ -0,0 +1,3 @@
+User,Email,Client,Project,Task,Description,Billable,Start date,Start time,End date,End time,Duration,Tags,Amount (EUR)
+Peter Tester,peter.test@email.test,,Project without Client,,"",No,2024-03-04,10:23:52,2024-03-04,10:23:52,00:00:00,Development,
+Peter Tester,peter.test@email.test,Big Company,Project for Big Company,Task 1,Working hard,Yes,2024-03-04,10:23:00,2024-03-04,11:23:01,01:00:01,,111.11
diff --git a/tests/Unit/Endpoint/Api/V1/ImportEndpointTest.php b/tests/Unit/Endpoint/Api/V1/ImportEndpointTest.php
new file mode 100644
index 00000000..c53b2fde
--- /dev/null
+++ b/tests/Unit/Endpoint/Api/V1/ImportEndpointTest.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Endpoint\Api\V1;
+
+use App\Models\Organization;
+use App\Service\Import\ImportService;
+use Laravel\Passport\Passport;
+use Mockery\MockInterface;
+
+class ImportEndpointTest extends ApiEndpointTestAbstract
+{
+    public function test_import_fails_if_user_does_not_have_permission()
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+        ]);
+
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->postJson(route('api.v1.import', ['organization' => $data->organization->id]), [
+            'type' => 'toggl_time_entries',
+            'data' => 'some data',
+            'options' => [],
+        ]);
+
+        // Assert
+        $response->assertStatus(403);
+    }
+
+    public function test_import_calls_import_service_if_user_has_permission(): void
+    {
+        // Arrange
+        $user = $this->createUserWithPermission([
+            'import',
+        ]);
+        $this->mock(ImportService::class, function (MockInterface $mock) use (&$user): void {
+            $mock->shouldReceive('import')
+                ->withArgs(function (Organization $organization, string $importerType, string $data, array $options) use (&$user): bool {
+                    return $organization->is($user->organization) && $importerType === 'toggl_time_entries' && $data === 'some data' && $options === [];
+                })
+                ->once();
+        });
+        Passport::actingAs($user->user);
+
+        // Act
+        $response = $this->postJson(route('api.v1.import.import', ['organization' => $user->organization->id]), [
+            'type' => 'toggl_time_entries',
+            'data' => 'some data',
+            'options' => [],
+        ]);
+
+        // Assert
+        $response->assertStatus(200);
+    }
+}
diff --git a/tests/Unit/Service/Import/ImportDatabaseHelperTest.php b/tests/Unit/Service/Import/ImportDatabaseHelperTest.php
new file mode 100644
index 00000000..f0a03d9b
--- /dev/null
+++ b/tests/Unit/Service/Import/ImportDatabaseHelperTest.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Service\Import;
+
+use App\Models\Project;
+use App\Models\User;
+use App\Service\Import\ImportDatabaseHelper;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class ImportDatabaseHelperTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_get_key_attach_to_existing_returns_key_for_identifier_without_creating_model(): void
+    {
+        // Arrange
+        $user = User::factory()->create();
+        $helper = new ImportDatabaseHelper(User::class, ['email'], true);
+
+        // Act
+        $key = $helper->getKey([
+            'email' => $user->email,
+        ], [
+            'name' => 'Test',
+        ]);
+
+        // Assert
+        $this->assertSame($user->getKey(), $key);
+    }
+
+    public function test_get_key_attach_to_existing_creates_model_if_not_existing(): void
+    {
+        // Arrange
+        $helper = new ImportDatabaseHelper(User::class, ['email'], true);
+
+        // Act
+        $key = $helper->getKey([
+            'email' => 'test@mail.test',
+        ], [
+            'name' => 'Test',
+        ]);
+
+        // Assert
+        $this->assertNotNull($key);
+        $this->assertDatabaseHas(User::class, [
+            'email' => 'test@mail.test',
+            'name' => 'Test',
+        ]);
+    }
+
+    public function test_get_key_not_attach_to_existing_returns_key_for_identifier_without_creating_model(): void
+    {
+        // Arrange
+        $project = Project::factory()->create();
+        $helper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], false);
+
+        // Act
+        $key = $helper->getKey([
+            'name' => $project->name,
+            'organization_id' => $project->organization_id,
+        ], [
+            'color' => '#000000',
+        ]);
+
+        // Assert
+        $this->assertNotSame($project->getKey(), $key);
+    }
+}
diff --git a/tests/Unit/Service/Import/Importer/ImporterTestAbstract.php b/tests/Unit/Service/Import/Importer/ImporterTestAbstract.php
new file mode 100644
index 00000000..7b9c44ab
--- /dev/null
+++ b/tests/Unit/Service/Import/Importer/ImporterTestAbstract.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Service\Import\Importer;
+
+use App\Models\Project;
+use App\Models\Tag;
+use App\Models\Task;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class ImporterTestAbstract extends TestCase
+{
+    use RefreshDatabase;
+
+    /**
+     * @return object{user1: User, project1: Project, project2: Project, tag1: Tag}
+     */
+    protected function checkTestScenarioAfterImportExcludingTimeEntries(): object
+    {
+        $users = User::all();
+        $this->assertCount(2, $users);
+        $user1 = $users->firstWhere('name', 'Peter Tester');
+        $this->assertNotNull($user1);
+        $this->assertSame(null, $user1->password);
+        $this->assertSame('Peter Tester', $user1->name);
+        $this->assertSame('peter.test@email.test', $user1->email);
+        $projects = Project::all();
+        $this->assertCount(2, $projects);
+        $project1 = $projects->firstWhere('name', 'Project without Client');
+        $this->assertNotNull($project1);
+        $project2 = $projects->firstWhere('name', 'Project for Big Company');
+        $this->assertNotNull($project2);
+        $tasks = Task::all();
+        $this->assertCount(1, $tasks);
+        $task1 = $tasks->firstWhere('name', 'Task 1');
+        $this->assertNotNull($task1);
+        $this->assertSame($project2->getKey(), $task1->project_id);
+        $tags = Tag::all();
+        $this->assertCount(1, $tags);
+        $tag1 = $tags->firstWhere('name', 'Development');
+        $this->assertNotNull($tag1);
+
+        return (object) [
+            'user1' => $user1,
+            'project1' => $project1,
+            'project2' => $project2,
+            'tag1' => $tag1,
+        ];
+    }
+}
diff --git a/tests/Unit/Service/Import/Importer/TogglTimeEntriesImporterTest.php b/tests/Unit/Service/Import/Importer/TogglTimeEntriesImporterTest.php
new file mode 100644
index 00000000..0e0f9ccf
--- /dev/null
+++ b/tests/Unit/Service/Import/Importer/TogglTimeEntriesImporterTest.php
@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Service\Import\Importer;
+
+use App\Models\Organization;
+use App\Models\TimeEntry;
+use App\Service\Import\Importers\TogglTimeEntriesImporter;
+
+class TogglTimeEntriesImporterTest extends ImporterTestAbstract
+{
+    public function test_import_of_test_file_succeeds(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $importer = new TogglTimeEntriesImporter();
+        $importer->init($organization);
+        $data = file_get_contents(storage_path('tests/toggl_import_test_1.csv'));
+
+        // Act
+        $importer->importData($data, []);
+
+        // Assert
+        $this->checkTestScenarioAfterImportExcludingTimeEntries();
+    }
+
+    public function test_import_of_test_file_twice_succeeds(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $importer = new TogglTimeEntriesImporter();
+        $importer->init($organization);
+        $data = file_get_contents(storage_path('tests/toggl_import_test_1.csv'));
+        $importer->importData($data, []);
+        $importer = new TogglTimeEntriesImporter();
+        $importer->init($organization);
+
+        // Act
+        $importer->importData($data, []);
+
+        // Assert
+        $testScenario = $this->checkTestScenarioAfterImportExcludingTimeEntries();
+        $timeEntries = TimeEntry::all();
+        $this->assertCount(4, $timeEntries);
+        $timeEntry1 = $timeEntries->firstWhere('description', '');
+        $this->assertNotNull($timeEntry1);
+        $this->assertSame('', $timeEntry1->description);
+        $this->assertSame('2024-03-04 10:23:52', $timeEntry1->start->toDateTimeString());
+        $this->assertSame('2024-03-04 10:23:52', $timeEntry1->end->toDateTimeString());
+        $this->assertFalse($timeEntry1->billable);
+        $this->assertSame([$testScenario->tag1->getKey()], $timeEntry1->tags);
+        $timeEntry2 = $timeEntries->firstWhere('description', 'Working hard');
+        $this->assertNotNull($timeEntry2);
+        $this->assertSame('Working hard', $timeEntry2->description);
+        $this->assertSame('2024-03-04 10:23:00', $timeEntry2->start->toDateTimeString());
+        $this->assertSame('2024-03-04 11:23:01', $timeEntry2->end->toDateTimeString());
+        $this->assertTrue($timeEntry2->billable);
+        $this->assertSame([], $timeEntry2->tags);
+    }
+}

From 14e3017cb245e50d733c0e432d17d9f58ab1609d Mon Sep 17 00:00:00 2001
From: korridor <26689068+korridor@users.noreply.github.com>
Date: Fri, 8 Mar 2024 13:31:49 +0100
Subject: [PATCH 02/20] Added placeholder users; Better exception handling;
 Enhanced local setup

---
 .env.example                                  |   2 +-
 .gitignore                                    |   1 +
 README.md                                     |   1 +
 app/Actions/Fortify/CreateNewUser.php         |  22 ++-
 .../Jetstream/AddOrganizationMember.php       |  31 ++--
 .../Jetstream/InviteOrganizationMember.php    |  11 +-
 app/Exceptions/Api/ApiException.php           |  46 ++++++
 .../Api/TimeEntryStillRunningApiException.php |  10 ++
 .../Api/UserNotPlaceholderApiException.php    |  10 ++
 app/Exceptions/ApiException.php               |  24 ---
 app/Exceptions/TimeEntryStillRunning.php      |   9 --
 .../Api/V1/TimeEntryController.php            |   7 +-
 .../Controllers/Api/V1/UserController.php     |  56 +++++++
 .../Requests/V1/User/UserIndexRequest.php     |  26 ++++
 app/Http/Resources/V1/User/UserCollection.php |  17 +++
 app/Http/Resources/V1/User/UserResource.php   |  40 +++++
 app/Listeners/RemovePlaceholder.php           |  30 ++++
 app/Models/Organization.php                   |  27 ++++
 app/Models/User.php                           |  32 ++++
 app/Providers/EventServiceProvider.php        |   6 +-
 app/Providers/JetstreamServiceProvider.php    |   3 +
 .../Import/Importers/ImporterProvider.php     |   3 +
 app/Service/UserService.php                   |  23 +++
 config/telescope.php                          |   2 +-
 database/factories/OrganizationFactory.php    |   4 +-
 database/factories/UserFactory.php            |  10 ++
 database/seeders/DatabaseSeeder.php           |  54 +++++--
 docker-compose.yml                            |  35 +++++
 lang/en/exceptions.php                        |  13 ++
 phpunit.xml                                   |   1 +
 routes/api.php                                |   7 +
 tests/Feature/InviteTeamMemberTest.php        | 138 ++++++++++++++++++
 tests/Feature/RegistrationTest.php            |  44 +++++-
 .../Endpoint/Api/V1/ImportEndpointTest.php    |  33 ++++-
 .../Unit/Endpoint/Api/V1/UserEndpointTest.php |  85 +++++++++++
 tests/Unit/Model/UserModelTest.php            |  45 ++++++
 .../Import/ImportDatabaseHelperTest.php       |  22 ++-
 tests/Unit/Service/UserServiceTest.php        |  37 +++++
 38 files changed, 880 insertions(+), 87 deletions(-)
 create mode 100644 app/Exceptions/Api/ApiException.php
 create mode 100644 app/Exceptions/Api/TimeEntryStillRunningApiException.php
 create mode 100644 app/Exceptions/Api/UserNotPlaceholderApiException.php
 delete mode 100644 app/Exceptions/ApiException.php
 delete mode 100644 app/Exceptions/TimeEntryStillRunning.php
 create mode 100644 app/Http/Controllers/Api/V1/UserController.php
 create mode 100644 app/Http/Requests/V1/User/UserIndexRequest.php
 create mode 100644 app/Http/Resources/V1/User/UserCollection.php
 create mode 100644 app/Http/Resources/V1/User/UserResource.php
 create mode 100644 app/Listeners/RemovePlaceholder.php
 create mode 100644 app/Service/UserService.php
 create mode 100644 lang/en/exceptions.php
 create mode 100644 tests/Unit/Endpoint/Api/V1/UserEndpointTest.php
 create mode 100644 tests/Unit/Service/UserServiceTest.php

diff --git a/.env.example b/.env.example
index d3e03c26..ed50bd57 100644
--- a/.env.example
+++ b/.env.example
@@ -37,7 +37,7 @@ MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS="hello@example.com"
+MAIL_FROM_ADDRESS="no-reply@solidtime.test"
 MAIL_FROM_NAME="${APP_NAME}"
 
 AWS_ACCESS_KEY_ID=
diff --git a/.gitignore b/.gitignore
index e6028879..ffdee140 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ yarn-error.log
 /blob-report/
 /playwright/.cache/
 /coverage
+/extensions/*
diff --git a/README.md b/README.md
index eb0c4796..4f7a64f7 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ Add the following entry to your `/etc/hosts`
 ```
 127.0.0.1 solidtime.test
 127.0.0.1 playwright.solidtime.test
+127.0.0.1 mail.solidtime.test
 ```
 
 ## Running E2E Tests
diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php
index 292463ef..3702cf5a 100644
--- a/app/Actions/Fortify/CreateNewUser.php
+++ b/app/Actions/Fortify/CreateNewUser.php
@@ -6,9 +6,12 @@
 
 use App\Models\Organization;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
+use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 use Laravel\Fortify\Contracts\CreatesNewUsers;
 use Laravel\Jetstream\Jetstream;
 
@@ -20,12 +23,27 @@ class CreateNewUser implements CreatesNewUsers
      * Create a newly registered user.
      *
      * @param  array<string, string>  $input
+     *
+     * @throws ValidationException
      */
     public function create(array $input): User
     {
         Validator::make($input, [
-            'name' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
+            'name' => [
+                'required',
+                'string',
+                'max:255',
+            ],
+            'email' => [
+                'required',
+                'string',
+                'email',
+                'max:255',
+                new UniqueEloquent(User::class, 'email', function (Builder $builder): Builder {
+                    /** @var Builder<User> $builder */
+                    return $builder->where('is_placeholder', '=', false);
+                }),
+            ],
             'password' => $this->passwordRules(),
             'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature() ? ['accepted', 'required'] : '',
         ])->validate();
diff --git a/app/Actions/Jetstream/AddOrganizationMember.php b/app/Actions/Jetstream/AddOrganizationMember.php
index 47f9ccfa..7a84d53f 100644
--- a/app/Actions/Jetstream/AddOrganizationMember.php
+++ b/app/Actions/Jetstream/AddOrganizationMember.php
@@ -8,8 +8,10 @@
 use App\Models\User;
 use Closure;
 use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
+use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 use Laravel\Jetstream\Contracts\AddsTeamMembers;
 use Laravel\Jetstream\Events\AddingTeamMember;
 use Laravel\Jetstream\Events\TeamMemberAdded;
@@ -21,21 +23,24 @@ class AddOrganizationMember implements AddsTeamMembers
     /**
      * Add a new team member to the given team.
      */
-    public function add(User $user, Organization $organization, string $email, ?string $role = null): void
+    public function add(User $owner, Organization $organization, string $email, ?string $role = null): void
     {
-        Gate::forUser($user)->authorize('addTeamMember', $organization);
+        Gate::forUser($owner)->authorize('addTeamMember', $organization);
 
         $this->validate($organization, $email, $role);
 
-        $newTeamMember = Jetstream::findUserByEmailOrFail($email);
+        $newOrganizationMember = User::query()
+            ->where('email', $email)
+            ->where('is_placeholder', '=', false)
+            ->firstOrFail();
 
-        AddingTeamMember::dispatch($organization, $newTeamMember);
+        AddingTeamMember::dispatch($organization, $newOrganizationMember);
 
         $organization->users()->attach(
-            $newTeamMember, ['role' => $role]
+            $newOrganizationMember, ['role' => $role]
         );
 
-        TeamMemberAdded::dispatch($organization, $newTeamMember);
+        TeamMemberAdded::dispatch($organization, $newOrganizationMember);
     }
 
     /**
@@ -46,9 +51,7 @@ protected function validate(Organization $organization, string $email, ?string $
         Validator::make([
             'email' => $email,
             'role' => $role,
-        ], $this->rules(), [
-            'email.exists' => __('We were unable to find a registered user with this email address.'),
-        ])->after(
+        ], $this->rules())->after(
             $this->ensureUserIsNotAlreadyOnTeam($organization, $email)
         )->validateWithBag('addTeamMember');
     }
@@ -61,7 +64,13 @@ protected function validate(Organization $organization, string $email, ?string $
     protected function rules(): array
     {
         return array_filter([
-            'email' => ['required', 'email', 'exists:users'],
+            'email' => [
+                'required',
+                'email',
+                (new ExistsEloquent(User::class, 'email', function (Builder $builder) {
+                    return $builder->where('is_placeholder', '=', false);
+                }))->withMessage(__('We were unable to find a registered user with this email address.')),
+            ],
             'role' => Jetstream::hasRoles()
                             ? ['required', 'string', new Role]
                             : null,
@@ -75,7 +84,7 @@ protected function ensureUserIsNotAlreadyOnTeam(Organization $team, string $emai
     {
         return function ($validator) use ($team, $email) {
             $validator->errors()->addIf(
-                $team->hasUserWithEmail($email),
+                $team->hasRealUserWithEmail($email),
                 'email',
                 __('This user already belongs to the team.')
             );
diff --git a/app/Actions/Jetstream/InviteOrganizationMember.php b/app/Actions/Jetstream/InviteOrganizationMember.php
index a688fffa..686a9978 100644
--- a/app/Actions/Jetstream/InviteOrganizationMember.php
+++ b/app/Actions/Jetstream/InviteOrganizationMember.php
@@ -34,6 +34,7 @@ public function invite(User $user, Organization $organization, string $email, ?s
 
         InvitingTeamMember::dispatch($organization, $email, $role);
 
+        /** @var TeamInvitation $invitation */
         $invitation = $organization->teamInvitations()->create([
             'email' => $email,
             'role' => $role,
@@ -50,9 +51,7 @@ protected function validate(Organization $organization, string $email, ?string $
         Validator::make([
             'email' => $email,
             'role' => $role,
-        ], $this->rules($organization), [
-            'email.unique' => __('This user has already been invited to the team.'),
-        ])->after(
+        ], $this->rules($organization))->after(
             $this->ensureUserIsNotAlreadyOnTeam($organization, $email)
         )->validateWithBag('addTeamMember');
     }
@@ -68,10 +67,10 @@ protected function rules(Organization $organization): array
             'email' => [
                 'required',
                 'email',
-                new UniqueEloquent(OrganizationInvitation::class, 'email', function (Builder $builder) use ($organization) {
+                (new UniqueEloquent(OrganizationInvitation::class, 'email', function (Builder $builder) use ($organization) {
                     /** @var Builder<OrganizationInvitation> $builder */
                     return $builder->whereBelongsTo($organization, 'organization');
-                }),
+                }))->withMessage(__('This user has already been invited to the team.')),
             ],
             'role' => Jetstream::hasRoles()
                             ? ['required', 'string', new Role]
@@ -86,7 +85,7 @@ protected function ensureUserIsNotAlreadyOnTeam(Organization $organization, stri
     {
         return function ($validator) use ($organization, $email) {
             $validator->errors()->addIf(
-                $organization->hasUserWithEmail($email),
+                $organization->hasRealUserWithEmail($email),
                 'email',
                 __('This user already belongs to the team.')
             );
diff --git a/app/Exceptions/Api/ApiException.php b/app/Exceptions/Api/ApiException.php
new file mode 100644
index 00000000..bcd5ae01
--- /dev/null
+++ b/app/Exceptions/Api/ApiException.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions\Api;
+
+use Exception;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use LogicException;
+
+abstract class ApiException extends Exception
+{
+    /**
+     * Render the exception into an HTTP response.
+     */
+    public function render(Request $request): JsonResponse
+    {
+        return response()
+            ->json([
+                'error' => true,
+                'key' => $this->getKey(),
+                'message' => $this->getTranslatedMessage(),
+            ], 400);
+    }
+
+    /**
+     * Get the key for the exception.
+     */
+    public function getKey(): string
+    {
+        if (defined(static::class.'::KEY')) {
+            return static::KEY;
+        }
+
+        throw new LogicException('API exceptions need the KEY constant defined.');
+    }
+
+    /**
+     * Get the translated message for the exception.
+     */
+    public function getTranslatedMessage(): string
+    {
+        return __('exceptions.api.'.$this->getKey());
+    }
+}
diff --git a/app/Exceptions/Api/TimeEntryStillRunningApiException.php b/app/Exceptions/Api/TimeEntryStillRunningApiException.php
new file mode 100644
index 00000000..e110a9ae
--- /dev/null
+++ b/app/Exceptions/Api/TimeEntryStillRunningApiException.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions\Api;
+
+class TimeEntryStillRunningApiException extends ApiException
+{
+    const string KEY = 'time_entry_still_running';
+}
diff --git a/app/Exceptions/Api/UserNotPlaceholderApiException.php b/app/Exceptions/Api/UserNotPlaceholderApiException.php
new file mode 100644
index 00000000..2aae88c9
--- /dev/null
+++ b/app/Exceptions/Api/UserNotPlaceholderApiException.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions\Api;
+
+class UserNotPlaceholderApiException extends ApiException
+{
+    const string KEY = 'user_not_placeholder';
+}
diff --git a/app/Exceptions/ApiException.php b/app/Exceptions/ApiException.php
deleted file mode 100644
index c4a61eab..00000000
--- a/app/Exceptions/ApiException.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Exceptions;
-
-use Exception;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ApiException extends Exception
-{
-    /**
-     * Render the exception into an HTTP response.
-     */
-    public function render(Request $request): JsonResponse
-    {
-        return response()
-            ->json([
-                'error' => true,
-                'message' => $this->getMessage(),
-            ], 400);
-    }
-}
diff --git a/app/Exceptions/TimeEntryStillRunning.php b/app/Exceptions/TimeEntryStillRunning.php
deleted file mode 100644
index a4ee00a2..00000000
--- a/app/Exceptions/TimeEntryStillRunning.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Exceptions;
-
-class TimeEntryStillRunning extends ApiException
-{
-}
diff --git a/app/Http/Controllers/Api/V1/TimeEntryController.php b/app/Http/Controllers/Api/V1/TimeEntryController.php
index 0b627b1d..514da8e4 100644
--- a/app/Http/Controllers/Api/V1/TimeEntryController.php
+++ b/app/Http/Controllers/Api/V1/TimeEntryController.php
@@ -4,7 +4,7 @@
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Exceptions\TimeEntryStillRunning;
+use App\Exceptions\Api\TimeEntryStillRunningApiException;
 use App\Http\Requests\V1\TimeEntry\TimeEntryIndexRequest;
 use App\Http\Requests\V1\TimeEntry\TimeEntryStoreRequest;
 use App\Http\Requests\V1\TimeEntry\TimeEntryUpdateRequest;
@@ -102,7 +102,7 @@ public function index(Organization $organization, TimeEntryIndexRequest $request
     /**
      * Create time entry
      *
-     * @throws AuthorizationException|TimeEntryStillRunning
+     * @throws AuthorizationException|TimeEntryStillRunningApiException
      */
     public function store(Organization $organization, TimeEntryStoreRequest $request): JsonResource
     {
@@ -114,8 +114,7 @@ public function store(Organization $organization, TimeEntryStoreRequest $request
 
         if ($request->get('end') === null && TimeEntry::query()->where('user_id', $request->get('user_id'))->where('end', null)->exists()) {
             // TODO: API documentation
-            // TODO: Create concept for api exceptions
-            throw new TimeEntryStillRunning('User already has an active time entry');
+            throw new TimeEntryStillRunningApiException();
         }
 
         $timeEntry = new TimeEntry();
diff --git a/app/Http/Controllers/Api/V1/UserController.php b/app/Http/Controllers/Api/V1/UserController.php
new file mode 100644
index 00000000..94ff6f2e
--- /dev/null
+++ b/app/Http/Controllers/Api/V1/UserController.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Exceptions\Api\UserNotPlaceholderApiException;
+use App\Http\Requests\V1\User\UserIndexRequest;
+use App\Http\Resources\V1\User\UserCollection;
+use App\Models\Organization;
+use App\Models\User;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Laravel\Jetstream\Contracts\InvitesTeamMembers;
+
+class UserController extends Controller
+{
+    /**
+     * List all users in an organization
+     *
+     * @throws AuthorizationException
+     */
+    public function index(Organization $organization, UserIndexRequest $request): UserCollection
+    {
+        $this->checkPermission($organization, 'users:view');
+
+        $users = $organization->users()
+            ->paginate();
+
+        return UserCollection::make($users);
+    }
+
+    /**
+     * Invite a placeholder user to become a real user in the organization
+     *
+     * @throws AuthorizationException|UserNotPlaceholderApiException
+     */
+    public function invitePlaceholder(Organization $organization, User $user, Request $request): JsonResponse
+    {
+        $this->checkPermission($organization, 'users:invite-placeholder');
+
+        if (! $user->is_placeholder) {
+            throw new UserNotPlaceholderApiException();
+        }
+
+        app(InvitesTeamMembers::class)->invite(
+            $request->user(),
+            $organization,
+            $user->email,
+            'employee'
+        );
+
+        return response()->json($user);
+    }
+}
diff --git a/app/Http/Requests/V1/User/UserIndexRequest.php b/app/Http/Requests/V1/User/UserIndexRequest.php
new file mode 100644
index 00000000..f600d01b
--- /dev/null
+++ b/app/Http/Requests/V1/User/UserIndexRequest.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\User;
+
+use App\Models\Organization;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * @property Organization $organization
+ */
+class UserIndexRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string|ValidationRule>>
+     */
+    public function rules(): array
+    {
+        return [
+        ];
+    }
+}
diff --git a/app/Http/Resources/V1/User/UserCollection.php b/app/Http/Resources/V1/User/UserCollection.php
new file mode 100644
index 00000000..e9461a8f
--- /dev/null
+++ b/app/Http/Resources/V1/User/UserCollection.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources\V1\User;
+
+use Illuminate\Http\Resources\Json\ResourceCollection;
+
+class UserCollection extends ResourceCollection
+{
+    /**
+     * The resource that this resource collects.
+     *
+     * @var string
+     */
+    public $collects = UserResource::class;
+}
diff --git a/app/Http/Resources/V1/User/UserResource.php b/app/Http/Resources/V1/User/UserResource.php
new file mode 100644
index 00000000..acb3b9d4
--- /dev/null
+++ b/app/Http/Resources/V1/User/UserResource.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources\V1\User;
+
+use App\Http\Resources\V1\BaseResource;
+use App\Models\Membership;
+use App\Models\User;
+use Illuminate\Http\Request;
+
+/**
+ * @property User $resource
+ */
+class UserResource extends BaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, string|bool|int|null|array<string>>
+     */
+    public function toArray(Request $request): array
+    {
+        /** @var Membership $membership */
+        $membership = $this->resource->getRelationValue('membership');
+
+        return [
+            /** @var string $id ID */
+            'id' => $this->resource->id,
+            /** @var string $name Name */
+            'name' => $this->resource->name,
+            /** @var string $email Email */
+            'email' => $this->resource->email,
+            /** @var string $role Role */
+            'role' => $membership->role,
+            /** @var bool $is_placeholder Placeholder user for imports, user might not really exist and does not know about this placeholder membership */
+            'is_placeholder' => $this->resource->is_placeholder,
+        ];
+    }
+}
diff --git a/app/Listeners/RemovePlaceholder.php b/app/Listeners/RemovePlaceholder.php
new file mode 100644
index 00000000..4ba70a9d
--- /dev/null
+++ b/app/Listeners/RemovePlaceholder.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Listeners;
+
+use App\Models\User;
+use App\Service\UserService;
+use Laravel\Jetstream\Events\TeamMemberAdded;
+
+class RemovePlaceholder
+{
+    /**
+     * Handle the event.
+     */
+    public function handle(TeamMemberAdded $event): void
+    {
+        /** @var UserService $userService */
+        $userService = app(UserService::class);
+        $placeholders = User::query()
+            ->where('is_placeholder', '=', true)
+            ->where('email', '=', $event->user->email)
+            ->belongsToOrganization($event->team)
+            ->get();
+
+        foreach ($placeholders as $placeholder) {
+            $userService->assignOrganizationEntitiesToDifferentUser($event->team, $placeholder, $event->user);
+        }
+    }
+}
diff --git a/app/Models/Organization.php b/app/Models/Organization.php
index 62bd33b7..284675d4 100644
--- a/app/Models/Organization.php
+++ b/app/Models/Organization.php
@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Laravel\Jetstream\Events\TeamCreated;
 use Laravel\Jetstream\Events\TeamDeleted;
@@ -59,4 +60,30 @@ class Organization extends JetstreamTeam
         'updated' => TeamUpdated::class,
         'deleted' => TeamDeleted::class,
     ];
+
+    /**
+     * Get all the non-placeholder users of the organization including its owner.
+     *
+     * @return Collection<User>
+     */
+    public function allRealUsers(): Collection
+    {
+        return $this->realUsers->merge([$this->owner]);
+    }
+
+    public function hasRealUserWithEmail(string $email): bool
+    {
+        return $this->allRealUsers()->contains(function (User $user) use ($email): bool {
+            return $user->email === $email;
+        });
+    }
+
+    /**
+     * @return BelongsToMany<User>
+     */
+    public function realUsers(): BelongsToMany
+    {
+        return $this->users()
+            ->where('is_placeholder', false);
+    }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 19e6bc8f..a58a737f 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -6,6 +6,8 @@
 
 use Database\Factories\UserFactory;
 use Filament\Panel;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -21,9 +23,16 @@
  * @property string $id
  * @property string $name
  * @property string $email
+ * @property string|null $email_verified_at
+ * @property string|null $password
+ * @property bool $is_placeholder
+ * @property Collection<Organization> $organizations
+ * @property Collection<TimeEntry> $timeEntries
  *
  * @method HasMany<Organization> ownedTeams()
  * @method static UserFactory factory()
+ * @method static Builder<User> query()
+ * @method Builder<User> belongsToOrganization(Organization $organization)
  */
 class User extends Authenticatable
 {
@@ -97,4 +106,27 @@ public function organizations(): BelongsToMany
             ->withTimestamps()
             ->as('membership');
     }
+
+    /**
+     * @return HasMany<TimeEntry>
+     */
+    public function timeEntries(): HasMany
+    {
+        return $this->hasMany(TimeEntry::class);
+    }
+
+    /**
+     * @param  Builder<User>  $builder
+     * @return Builder<User>
+     */
+    public function scopeBelongsToOrganization(Builder $builder, Organization $organization): Builder
+    {
+        return $builder->where(function (Builder $builder) use ($organization): Builder {
+            return $builder->whereHas('organizations', function (Builder $query) use ($organization): void {
+                $query->whereKey($organization->getKey());
+            })->orWhereHas('ownedTeams', function (Builder $query) use ($organization): void {
+                $query->whereKey($organization->getKey());
+            });
+        });
+    }
 }
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index ee09f108..4dc848b5 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -4,10 +4,11 @@
 
 namespace App\Providers;
 
+use App\Listeners\RemovePlaceholder;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Event;
+use Laravel\Jetstream\Events\TeamMemberAdded;
 
 class EventServiceProvider extends ServiceProvider
 {
@@ -20,6 +21,9 @@ class EventServiceProvider extends ServiceProvider
         Registered::class => [
             SendEmailVerificationNotification::class,
         ],
+        TeamMemberAdded::class => [
+            RemovePlaceholder::class,
+        ],
     ];
 
     /**
diff --git a/app/Providers/JetstreamServiceProvider.php b/app/Providers/JetstreamServiceProvider.php
index 1de94d23..e3757c7c 100644
--- a/app/Providers/JetstreamServiceProvider.php
+++ b/app/Providers/JetstreamServiceProvider.php
@@ -75,6 +75,8 @@ protected function configurePermissions(): void
             'organizations:view',
             'organizations:update',
             'import',
+            'users:invite-placeholder',
+            'users:view',
         ])->description('Administrator users can perform any action.');
 
         Jetstream::role('manager', 'Manager', [
@@ -95,6 +97,7 @@ protected function configurePermissions(): void
             'tags:update',
             'tags:delete',
             'organizations:view',
+            'users:view',
         ])->description('Editor users have the ability to read, create, and update.');
 
         Jetstream::role('employee', 'Employee', [
diff --git a/app/Service/Import/Importers/ImporterProvider.php b/app/Service/Import/Importers/ImporterProvider.php
index 4ed1033f..ed413566 100644
--- a/app/Service/Import/Importers/ImporterProvider.php
+++ b/app/Service/Import/Importers/ImporterProvider.php
@@ -6,6 +6,9 @@
 
 class ImporterProvider
 {
+    /**
+     * @var array<string, class-string<ImporterContract>>
+     */
     private array $importers = [
         'toggl_time_entries' => TogglTimeEntriesImporter::class,
     ];
diff --git a/app/Service/UserService.php b/app/Service/UserService.php
new file mode 100644
index 00000000..e554e078
--- /dev/null
+++ b/app/Service/UserService.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use App\Models\Organization;
+use App\Models\TimeEntry;
+use App\Models\User;
+
+class UserService
+{
+    public function assignOrganizationEntitiesToDifferentUser(Organization $organization, User $fromUser, User $toUser): void
+    {
+        // Time entries
+        dump(TimeEntry::query()
+            ->whereBelongsTo($organization, 'organization')
+            ->whereBelongsTo($fromUser, 'user')
+            ->update([
+                'user_id' => $toUser->getKey(),
+            ]));
+    }
+}
diff --git a/config/telescope.php b/config/telescope.php
index 21d8ddda..d4057545 100644
--- a/config/telescope.php
+++ b/config/telescope.php
@@ -155,7 +155,7 @@
 
         Watchers\LogWatcher::class => [
             'enabled' => env('TELESCOPE_LOG_WATCHER', true),
-            'level' => 'error',
+            'level' => 'debug',
         ],
 
         Watchers\MailWatcher::class => env('TELESCOPE_MAIL_WATCHER', true),
diff --git a/database/factories/OrganizationFactory.php b/database/factories/OrganizationFactory.php
index e0d629e4..e1efdea6 100644
--- a/database/factories/OrganizationFactory.php
+++ b/database/factories/OrganizationFactory.php
@@ -27,10 +27,10 @@ public function definition(): array
         ];
     }
 
-    public function withOwner(): self
+    public function withOwner(?User $owner = null): self
     {
         return $this->state(fn (array $attributes) => [
-            'user_id' => User::factory(),
+            'user_id' => $owner === null ? User::factory() : $owner,
         ]);
     }
 }
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 60f31ffb..893c7e65 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -31,9 +31,19 @@ public function definition(): array
             'remember_token' => Str::random(10),
             'profile_photo_path' => null,
             'current_team_id' => null,
+            'is_placeholder' => false,
         ];
     }
 
+    public function placeholder(bool $placeholder = true): static
+    {
+        return $this->state(function (array $attributes) use ($placeholder): array {
+            return [
+                'is_placeholder' => $placeholder,
+            ];
+        });
+    }
+
     /**
      * Indicate that the model's email address should be unverified.
      */
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 7dd88fa8..b59a486d 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -22,31 +22,57 @@ class DatabaseSeeder extends Seeder
     public function run(): void
     {
         $this->deleteAll();
-        $organization1 = Organization::factory()->create([
+        $userAcmeOwner = User::factory()->create([
+            'name' => 'ACME Admin',
+            'email' => 'owner@acme.test',
+        ]);
+        $organizationAcme = Organization::factory()->withOwner($userAcmeOwner)->create([
             'name' => 'ACME Corp',
         ]);
-        $user1 = User::factory()->withPersonalOrganization()->create([
+        $userAcmeManager = User::factory()->withPersonalOrganization()->create([
             'name' => 'Test User',
             'email' => 'test@example.com',
         ]);
-        $employee1 = User::factory()->withPersonalOrganization()->create([
-            'name' => 'Test User',
-            'email' => 'employee@example.com',
-        ]);
-        $userAcmeAdmin = User::factory()->create([
+        $userAcmeAdmin = User::factory()->withPersonalOrganization()->create([
             'name' => 'ACME Admin',
             'email' => 'admin@acme.test',
         ]);
-        $user1->organizations()->attach($organization1, [
+        $userAcmeEmployee = User::factory()->withPersonalOrganization()->create([
+            'name' => 'Max Mustermann',
+            'email' => 'max.mustermann@acme.test',
+        ]);
+        $userAcmePlaceholder = User::factory()->placeholder()->create([
+            'name' => 'Old Employee',
+            'email' => 'old.employee@acme.test',
+            'password' => null,
+        ]);
+        $userAcmeManager->organizations()->attach($organizationAcme, [
             'role' => 'manager',
         ]);
-        $userAcmeAdmin->organizations()->attach($organization1, [
+        $userAcmeAdmin->organizations()->attach($organizationAcme, [
             'role' => 'admin',
         ]);
-        $timeEntriesEmployees = TimeEntry::factory()
+        $userAcmeEmployee->organizations()->attach($organizationAcme, [
+            'role' => 'employee',
+        ]);
+        $userAcmePlaceholder->organizations()->attach($organizationAcme, [
+            'role' => 'employee',
+        ]);
+
+        $timeEntriesAcmeAdmin = TimeEntry::factory()
+            ->count(10)
+            ->forUser($userAcmeAdmin)
+            ->forOrganization($organizationAcme)
+            ->create();
+        $timeEntriesAcmePlaceholder = TimeEntry::factory()
+            ->count(10)
+            ->forUser($userAcmePlaceholder)
+            ->forOrganization($organizationAcme)
+            ->create();
+        $timeEntriesAcmePlaceholder = TimeEntry::factory()
             ->count(10)
-            ->forUser($employee1)
-            ->forOrganization($organization1)
+            ->forUser($userAcmeEmployee)
+            ->forOrganization($organizationAcme)
             ->create();
         $client = Client::factory()->create([
             'name' => 'Big Company',
@@ -63,11 +89,11 @@ public function run(): void
         $organization2 = Organization::factory()->create([
             'name' => 'Rival Corp',
         ]);
-        $user1 = User::factory()->withPersonalOrganization()->create([
+        $userAcmeManager = User::factory()->withPersonalOrganization()->create([
             'name' => 'Other User',
             'email' => 'test@rival-company.test',
         ]);
-        $user1->organizations()->attach($organization2, [
+        $userAcmeManager->organizations()->attach($organization2, [
             'role' => 'admin',
         ]);
         $otherCompanyProject = Project::factory()->forClient($client)->create([
diff --git a/docker-compose.yml b/docker-compose.yml
index 876bcfe0..d4faaf13 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,10 +57,43 @@ services:
                 - '${DB_USERNAME}'
             retries: 3
             timeout: 5s
+    pgsql_test:
+        image: 'postgres:15'
+        environment:
+            PGPASSWORD: '${DB_PASSWORD:-secret}'
+            POSTGRES_DB: '${DB_DATABASE}'
+            POSTGRES_USER: '${DB_USERNAME}'
+            POSTGRES_PASSWORD: '${DB_PASSWORD:-secret}'
+        volumes:
+            - 'sail-pgsql-test:/var/lib/postgresql/data'
+            - './vendor/laravel/sail/database/pgsql/create-testing-database.sql:/docker-entrypoint-initdb.d/10-create-testing-database.sql'
+        networks:
+            - sail
+        healthcheck:
+            test:
+                - CMD
+                - pg_isready
+                - '-q'
+                - '-d'
+                - '${DB_DATABASE}'
+                - '-U'
+                - '${DB_USERNAME}'
+            retries: 3
+            timeout: 5s
     mailpit:
         image: 'axllent/mailpit:latest'
+        labels:
+            - "traefik.enable=true"
+            - "traefik.docker.network=${NETWORK_NAME}"
+            - "traefik.http.routers.solidtime-mailpit.rule=Host(`mail.${NGINX_HOST_NAME}`)"
+            - "traefik.http.routers.solidtime-mailpit.entrypoints=web"
+            - "traefik.http.services.solidtime-mailpit.loadbalancer.server.port=8025"
+            - "traefik.http.routers.solidtime-mailpit-https.rule=Host(`mail.${NGINX_HOST_NAME}`)"
+            - "traefik.http.routers.solidtime-mailpit-https.entrypoints=websecure"
+            - "traefik.http.routers.solidtime-mailpit-https.tls=true"
         networks:
             - sail
+            - reverse-proxy
     playwright:
         image: mcr.microsoft.com/playwright:v1.41.1-jammy
         command: ['npx', 'playwright', 'test', '--ui-port=8080', '--ui-host=0.0.0.0']
@@ -88,3 +121,5 @@ networks:
 volumes:
     sail-pgsql:
         driver: local
+    sail-pgsql-test:
+        driver: local
diff --git a/lang/en/exceptions.php b/lang/en/exceptions.php
new file mode 100644
index 00000000..706574fb
--- /dev/null
+++ b/lang/en/exceptions.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Exceptions\Api\TimeEntryStillRunningApiException;
+use App\Exceptions\Api\UserNotPlaceholderApiException;
+
+return [
+    'api' => [
+        TimeEntryStillRunningApiException::KEY => 'Time entry is still running',
+        UserNotPlaceholderApiException::KEY => 'The given user is not a placeholder',
+    ],
+];
diff --git a/phpunit.xml b/phpunit.xml
index 82235621..f5ab132a 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -22,6 +22,7 @@
         <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="CACHE_DRIVER" value="array"/>
         <env name="DB_CONNECTION" value="pgsql"/>
+        <env name="DB_HOST" value="pgsql_test"/>
         <env name="MAIL_MAILER" value="array"/>
         <env name="PULSE_ENABLED" value="false"/>
         <env name="QUEUE_CONNECTION" value="sync"/>
diff --git a/routes/api.php b/routes/api.php
index a75683a9..ca46d271 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -8,6 +8,7 @@
 use App\Http\Controllers\Api\V1\ProjectController;
 use App\Http\Controllers\Api\V1\TagController;
 use App\Http\Controllers\Api\V1\TimeEntryController;
+use App\Http\Controllers\Api\V1\UserController;
 use Illuminate\Support\Facades\Route;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -29,6 +30,12 @@
         Route::put('/organizations/{organization}', [OrganizationController::class, 'update'])->name('update');
     });
 
+    // User routes
+    Route::name('users.')->group(static function () {
+        Route::get('/organizations/{organization}/users', [UserController::class, 'index'])->name('index');
+        Route::post('/organizations/{organization}/users/{user}/invite-placeholder', [UserController::class, 'invitePlaceholder'])->name('invite-placeholder');
+    });
+
     // Project routes
     Route::name('projects.')->group(static function () {
         Route::get('/organizations/{organization}/projects', [ProjectController::class, 'index'])->name('index');
diff --git a/tests/Feature/InviteTeamMemberTest.php b/tests/Feature/InviteTeamMemberTest.php
index a4f14b29..60bffb6b 100644
--- a/tests/Feature/InviteTeamMemberTest.php
+++ b/tests/Feature/InviteTeamMemberTest.php
@@ -4,9 +4,11 @@
 
 namespace Tests\Feature;
 
+use App\Models\TimeEntry;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\URL;
 use Laravel\Jetstream\Mail\TeamInvitation;
 use Tests\TestCase;
 
@@ -31,6 +33,49 @@ public function test_team_members_can_be_invited_to_team(): void
         $this->assertCount(1, $user->currentTeam->fresh()->teamInvitations);
     }
 
+    public function test_team_member_can_not_be_invited_to_team_if_already_on_team(): void
+    {
+        // Arrange
+        Mail::fake();
+        $user = User::factory()->withPersonalOrganization()->create();
+        $existingUser = User::factory()->create();
+        $user->currentTeam->users()->attach($existingUser, ['role' => 'admin']);
+        $this->actingAs($user);
+
+        // Act
+        $response = $this->post('/teams/'.$user->currentTeam->id.'/members', [
+            'email' => $existingUser->email,
+            'role' => 'admin',
+        ]);
+
+        // Assert
+        $response->assertInvalid(['email'], 'addTeamMember');
+        Mail::assertNotSent(TeamInvitation::class);
+        $this->assertCount(0, $user->currentTeam->fresh()->teamInvitations);
+    }
+
+    public function test_team_member_can_be_invited_to_team_if_already_on_team_as_placeholder(): void
+    {
+        // Arrange
+        Mail::fake();
+        $user = User::factory()->withPersonalOrganization()->create();
+        $existingUser = User::factory()->create([
+            'is_placeholder' => true,
+        ]);
+        $user->currentTeam->users()->attach($existingUser, ['role' => 'employee']);
+        $this->actingAs($user);
+
+        // Act
+        $response = $this->post('/teams/'.$user->currentTeam->id.'/members', [
+            'email' => $existingUser->email,
+            'role' => 'employee',
+        ]);
+
+        // Assert
+        Mail::assertSent(TeamInvitation::class);
+        $this->assertCount(1, $user->currentTeam->fresh()->teamInvitations);
+    }
+
     public function test_team_member_invitations_can_be_cancelled(): void
     {
         // Arrange
@@ -49,4 +94,97 @@ public function test_team_member_invitations_can_be_cancelled(): void
         // Assert
         $this->assertCount(0, $user->currentTeam->fresh()->teamInvitations);
     }
+
+    public function test_team_member_invitations_can_be_accepted(): void
+    {
+        // Arrange
+        Mail::fake();
+        $owner = User::factory()->withPersonalOrganization()->create();
+        $user = User::factory()->withPersonalOrganization()->create();
+        $invitation = $owner->currentTeam->teamInvitations()->create([
+            'email' => $user->email,
+            'role' => 'employee',
+        ]);
+        $this->actingAs($user);
+
+        // Act
+        $acceptUrl = URL::temporarySignedRoute(
+            'team-invitations.accept',
+            now()->addMinutes(60),
+            [$invitation->getKey()]
+        );
+        $response = $this->get($acceptUrl);
+
+        // Assert
+        $this->assertCount(0, $owner->currentTeam->fresh()->teamInvitations);
+        $user->refresh();
+        $this->assertCount(1, $user->organizations);
+        $this->assertContains($owner->currentTeam->getKey(), $user->organizations->pluck('id'));
+    }
+
+    public function test_team_member_invitations_of_placeholder_can_be_accepted_and_migrates_date_to_real_user(): void
+    {
+        // Arrange
+        Mail::fake();
+        $placeholder = User::factory()->withPersonalOrganization()->create([
+            'is_placeholder' => true,
+        ]);
+
+        $owner = User::factory()->withPersonalOrganization()->create();
+        $owner->currentTeam->users()->attach($placeholder, ['role' => 'employee']);
+        $timeEntries = TimeEntry::factory()->forOrganization($owner->currentTeam)->forUser($placeholder)->createMany(5);
+
+        $user = User::factory()->withPersonalOrganization()->create([
+            'email' => $placeholder->email,
+        ]);
+
+        $invitation = $owner->currentTeam->teamInvitations()->create([
+            'email' => $user->email,
+            'role' => 'employee',
+        ]);
+        $this->actingAs($user);
+
+        // Act
+        $acceptUrl = URL::temporarySignedRoute(
+            'team-invitations.accept',
+            now()->addMinutes(60),
+            [$invitation->getKey()]
+        );
+        $response = $this->get($acceptUrl);
+
+        // Assert
+        $user->refresh();
+        $placeholder->refresh();
+        $this->assertCount(0, $owner->currentTeam->fresh()->teamInvitations);
+        $this->assertCount(1, $user->organizations);
+        $this->assertContains($owner->currentTeam->getKey(), $user->organizations->pluck('id'));
+        $this->assertCount(5, $user->timeEntries);
+        $this->assertCount(0, $placeholder->timeEntries);
+    }
+
+    public function test_team_member_accept_fails_if_user_with_that_email_does_not_exist(): void
+    {
+        // Arrange
+        Mail::fake();
+        $owner = User::factory()->withPersonalOrganization()->create();
+        $user = User::factory()->withPersonalOrganization()->create();
+        $invitation = $owner->currentTeam->teamInvitations()->create([
+            'email' => 'firstname.lastname@mail.test',
+            'role' => 'employee',
+        ]);
+        $this->actingAs($user);
+
+        // Act
+        $acceptUrl = URL::temporarySignedRoute(
+            'team-invitations.accept',
+            now()->addMinutes(60),
+            [$invitation->getKey()]
+        );
+        $response = $this->get($acceptUrl);
+
+        // Assert
+        $this->assertCount(1, $owner->currentTeam->fresh()->teamInvitations);
+        $user->refresh();
+        $this->assertCount(0, $user->organizations);
+    }
 }
diff --git a/tests/Feature/RegistrationTest.php b/tests/Feature/RegistrationTest.php
index 23ab3426..4373809f 100644
--- a/tests/Feature/RegistrationTest.php
+++ b/tests/Feature/RegistrationTest.php
@@ -4,6 +4,7 @@
 
 namespace Tests\Feature;
 
+use App\Models\User;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Fortify\Features;
@@ -38,10 +39,47 @@ public function test_registration_screen_cannot_be_rendered_if_support_is_disabl
 
     public function test_new_users_can_register(): void
     {
-        if (! Features::enabled(Features::registration())) {
-            $this->markTestSkipped('Registration support is not enabled.');
-        }
+        $response = $this->post('/register', [
+            'name' => 'Test User',
+            'email' => 'test@example.com',
+            'password' => 'password',
+            'password_confirmation' => 'password',
+            'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature(),
+        ]);
+
+        $this->assertAuthenticated();
+        $response->assertRedirect(RouteServiceProvider::HOME);
+    }
+
+    public function test_new_users_can_not_register_if_user_with_email_already_exists(): void
+    {
+        // Arrange
+        $user = User::factory()->create([
+            'email' => 'test@example.com',
+        ]);
+
+        // Act
+        $response = $this->post('/register', [
+            'name' => 'Test User',
+            'email' => 'test@example.com',
+            'password' => 'password',
+            'password_confirmation' => 'password',
+            'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature(),
+        ]);
+
+        $this->assertFalse($this->isAuthenticated(), 'The user is authenticated');
+        $response->assertInvalid(['email']);
+    }
+
+    public function test_new_users_can_register_if_placeholder_user_with_email_already_exists(): void
+    {
+        // Arrange
+        $user = User::factory()->create([
+            'email' => 'test@example.com',
+            'is_placeholder' => true,
+        ]);
 
+        // Act
         $response = $this->post('/register', [
             'name' => 'Test User',
             'email' => 'test@example.com',
diff --git a/tests/Unit/Endpoint/Api/V1/ImportEndpointTest.php b/tests/Unit/Endpoint/Api/V1/ImportEndpointTest.php
index c53b2fde..5534cf14 100644
--- a/tests/Unit/Endpoint/Api/V1/ImportEndpointTest.php
+++ b/tests/Unit/Endpoint/Api/V1/ImportEndpointTest.php
@@ -5,6 +5,7 @@
 namespace Tests\Unit\Endpoint\Api\V1;
 
 use App\Models\Organization;
+use App\Service\Import\Importers\ReportDto;
 use App\Service\Import\ImportService;
 use Laravel\Passport\Passport;
 use Mockery\MockInterface;
@@ -20,7 +21,7 @@ public function test_import_fails_if_user_does_not_have_permission()
         Passport::actingAs($data->user);
 
         // Act
-        $response = $this->postJson(route('api.v1.import', ['organization' => $data->organization->id]), [
+        $response = $this->postJson(route('api.v1.import.import', ['organization' => $data->organization->id]), [
             'type' => 'toggl_time_entries',
             'data' => 'some data',
             'options' => [],
@@ -41,6 +42,14 @@ public function test_import_calls_import_service_if_user_has_permission(): void
                 ->withArgs(function (Organization $organization, string $importerType, string $data, array $options) use (&$user): bool {
                     return $organization->is($user->organization) && $importerType === 'toggl_time_entries' && $data === 'some data' && $options === [];
                 })
+                ->andReturn(new ReportDto(
+                    clientsCreated: 1,
+                    projectsCreated: 2,
+                    tasksCreated: 3,
+                    timeEntriesCreated: 4,
+                    tagsCreated: 5,
+                    usersCreated: 6,
+                ))
                 ->once();
         });
         Passport::actingAs($user->user);
@@ -54,5 +63,27 @@ public function test_import_calls_import_service_if_user_has_permission(): void
 
         // Assert
         $response->assertStatus(200);
+        $response->assertExactJson([
+            'report' => [
+                'clients' => [
+                    'created' => 1,
+                ],
+                'projects' => [
+                    'created' => 2,
+                ],
+                'tasks' => [
+                    'created' => 3,
+                ],
+                'time-entries' => [
+                    'created' => 4,
+                ],
+                'tags' => [
+                    'created' => 5,
+                ],
+                'users' => [
+                    'created' => 6,
+                ],
+            ],
+        ]);
     }
 }
diff --git a/tests/Unit/Endpoint/Api/V1/UserEndpointTest.php b/tests/Unit/Endpoint/Api/V1/UserEndpointTest.php
new file mode 100644
index 00000000..9cbe27a2
--- /dev/null
+++ b/tests/Unit/Endpoint/Api/V1/UserEndpointTest.php
@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Endpoint\Api\V1;
+
+use App\Models\Organization;
+use App\Models\User;
+use Laravel\Passport\Passport;
+
+class UserEndpointTest extends ApiEndpointTestAbstract
+{
+    public function test_index_returns_members_of_organization(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'users:view',
+        ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->getJson(route('api.v1.users.index', $data->organization->id));
+
+        // Assert
+        $response->assertStatus(200);
+    }
+
+    public function test_invite_placeholder_fails_if_user_does_not_have_permission(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+        ]);
+        $user = User::factory()->create([
+            'is_placeholder' => true,
+        ]);
+        $data->organization->users()->attach($user);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->postJson(route('api.v1.users.invite-placeholder', ['organization' => $data->organization->id, 'user' => $user->id]));
+
+        // Assert
+        $response->assertStatus(403);
+    }
+
+    public function test_invite_placeholder_fails_if_user_is_not_part_of_organization(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'users:invite-placeholder',
+        ]);
+        $otherOrganization = Organization::factory()->create();
+        $user = User::factory()->create([
+            'is_placeholder' => true,
+        ]);
+        $otherOrganization->users()->attach($user);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->postJson(route('api.v1.users.invite-placeholder', ['organization' => $data->organization->id, 'user' => $user->id]));
+
+        // Assert
+        $response->assertStatus(403);
+    }
+
+    public function test_invite_placeholder_returns_400_if_user_is_not_placeholder(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'users:invite-placeholder',
+        ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->postJson(route('api.v1.users.invite-placeholder', ['organization' => $data->organization->id, 'user' => $data->user->id]));
+
+        // Assert
+        $response->assertStatus(400);
+        $response->assertExactJson([
+            'error' => true,
+            'key' => 'user_not_placeholder',
+            'message' => 'The given user is not a placeholder',
+        ]);
+    }
+}
diff --git a/tests/Unit/Model/UserModelTest.php b/tests/Unit/Model/UserModelTest.php
index c0d72d37..228284cf 100644
--- a/tests/Unit/Model/UserModelTest.php
+++ b/tests/Unit/Model/UserModelTest.php
@@ -4,6 +4,8 @@
 
 namespace Tests\Unit\Model;
 
+use App\Models\Organization;
+use App\Models\TimeEntry;
 use App\Models\User;
 use App\Providers\Filament\AdminPanelProvider;
 use Filament\Panel;
@@ -42,4 +44,47 @@ public function test_user_in_super_admin_config_can_access_admin_panel(): void
         // Assert
         $this->assertTrue($canAccess);
     }
+
+    public function test_scope_belongs_to_organization_returns_only_users_of_organization_including_owners(): void
+    {
+        // Arrange
+        $owner = User::factory()->create();
+        $organization = Organization::factory()->withOwner($owner)->create();
+        $user = User::factory()->create();
+        $user->organizations()->attach($organization, [
+            'role' => 'employee',
+        ]);
+        $otherOrganization = Organization::factory()->create();
+        $otherUser = User::factory()->create();
+        $otherUser->organizations()->attach($otherOrganization, [
+            'role' => 'employee',
+        ]);
+
+        // Act
+        $users = User::query()
+            ->belongsToOrganization($organization)
+            ->get();
+
+        // Assert
+        $this->assertCount(2, $users);
+        $userIds = $users->pluck('id')->toArray();
+        $this->assertContains($user->getKey(), $userIds);
+        $this->assertContains($owner->getKey(), $userIds);
+    }
+
+    public function test_it_has_many_time_entries(): void
+    {
+        // Arrange
+        $user = User::factory()->create();
+        $timeEntries = TimeEntry::factory()->forUser($user)->createMany(3);
+
+        // Act
+        $user->refresh();
+        $timeEntriesRel = $user->timeEntries;
+
+        // Assert
+        $this->assertNotNull($timeEntriesRel);
+        $this->assertCount(3, $timeEntriesRel);
+        $this->assertTrue($timeEntriesRel->first()->is($timeEntries->first()));
+    }
 }
diff --git a/tests/Unit/Service/Import/ImportDatabaseHelperTest.php b/tests/Unit/Service/Import/ImportDatabaseHelperTest.php
index f0a03d9b..d1d156f2 100644
--- a/tests/Unit/Service/Import/ImportDatabaseHelperTest.php
+++ b/tests/Unit/Service/Import/ImportDatabaseHelperTest.php
@@ -51,21 +51,27 @@ public function test_get_key_attach_to_existing_creates_model_if_not_existing():
         ]);
     }
 
-    public function test_get_key_not_attach_to_existing_returns_key_for_identifier_without_creating_model(): void
+    public function test_get_key_not_attach_to_existing_is_not_implemented_yet(): void
     {
         // Arrange
         $project = Project::factory()->create();
         $helper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], false);
 
         // Act
-        $key = $helper->getKey([
-            'name' => $project->name,
-            'organization_id' => $project->organization_id,
-        ], [
-            'color' => '#000000',
-        ]);
+        try {
+            $key = $helper->getKey([
+                'name' => $project->name,
+                'organization_id' => $project->organization_id,
+            ], [
+                'color' => '#000000',
+            ]);
+        } catch (\Exception $e) {
+            $this->assertSame('Not implemented', $e->getMessage());
+
+            return;
+        }
 
         // Assert
-        $this->assertNotSame($project->getKey(), $key);
+        $this->fail();
     }
 }
diff --git a/tests/Unit/Service/UserServiceTest.php b/tests/Unit/Service/UserServiceTest.php
new file mode 100644
index 00000000..79494844
--- /dev/null
+++ b/tests/Unit/Service/UserServiceTest.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Service;
+
+use App\Models\Organization;
+use App\Models\TimeEntry;
+use App\Models\User;
+use App\Service\UserService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class UserServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_assign_organization_entities_to_different_user(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $otherUser = User::factory()->create();
+        $fromUser = User::factory()->create();
+        $toUser = User::factory()->create();
+        TimeEntry::factory()->forOrganization($organization)->forUser($otherUser)->createMany(3);
+        TimeEntry::factory()->forOrganization($organization)->forUser($fromUser)->createMany(3);
+
+        // Act
+        $userService = app(UserService::class);
+        $userService->assignOrganizationEntitiesToDifferentUser($organization, $fromUser, $toUser);
+
+        // Assert
+        $this->assertSame(3, TimeEntry::query()->whereBelongsTo($toUser, 'user')->count());
+        $this->assertSame(3, TimeEntry::query()->whereBelongsTo($otherUser, 'user')->count());
+        $this->assertSame(0, TimeEntry::query()->whereBelongsTo($fromUser, 'user')->count());
+    }
+}

From b1d4a47c0306735050bf78eced17a2eb276ebdf5 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregorvostrak@Gregors-MacBook-Pro.local>
Date: Mon, 11 Mar 2024 18:02:54 +0100
Subject: [PATCH 03/20] add dashboard frontend

---
 .eslintrc.cjs                                 |    6 +-
 README.md                                     |   15 +
 .../Controllers/Api/V1/ProjectController.php  |   10 +
 app/Http/Controllers/Api/V1/TagController.php |    8 +
 .../Api/V1/TimeEntryController.php            |   11 +-
 .../V1/TimeEntry/TimeEntryUpdateRequest.php   |    2 +-
 .../V1/TimeEntry/TimeEntryResource.php        |    6 +-
 app/Providers/JetstreamServiceProvider.php    |    4 +-
 config/scramble.php                           |    6 +-
 docker-compose.yml                            |    2 +
 e2e/auth.spec.ts                              |   17 +-
 e2e/organization.spec.ts                      |   24 +-
 e2e/timetracker.spec.ts                       |  507 ++++++++
 openapi.json                                  |    1 +
 openapi.json.client.ts                        |  833 +++++++++++++
 package-lock.json                             | 1082 ++++++++++++++++-
 package.json                                  |   14 +-
 playwright/config.ts                          |    2 +-
 playwright/fixtures.ts                        |    7 +-
 public/fonts/Outfit-VariableFont_wght.ttf     |  Bin 0 -> 110572 bytes
 resources/css/app.css                         |   12 +
 resources/js/Components/ActionMessage.vue     |    2 +-
 resources/js/Components/ActionSection.vue     |    2 +-
 resources/js/Components/ConfirmationModal.vue |    5 +-
 .../js/Components/CurrentSidebarTimer.vue     |   13 +
 .../Dashboard/ActivityGraphCard.vue           |   87 ++
 .../js/Components/Dashboard/DashboardCard.vue |   25 +
 .../Dashboard/DayOverviewCardEntry.vue        |  103 ++
 .../Dashboard/LastSevenDaysCard.vue           |   22 +
 .../Dashboard/ProjectsChartCard.vue           |  105 ++
 .../Dashboard/RecentlyTrackedTasksCard.vue    |   23 +
 .../RecentlyTrackedTasksCardEntry.vue         |   23 +
 .../Components/Dashboard/TeamActivityCard.vue |   27 +
 .../Dashboard/TeamActivityCardEntry.vue       |   31 +
 .../Components/Dashboard/ThisWeekOverview.vue |  171 +++
 resources/js/Components/DialogModal.vue       |    4 +-
 resources/js/Components/Dropdown.vue          |   61 +-
 resources/js/Components/DropdownLink.vue      |   16 +-
 resources/js/Components/FormSection.vue       |    4 +-
 resources/js/Components/InputLabel.vue        |    2 +-
 .../js/Components/NavigationSidebarItem.vue   |   34 +
 .../js/Components/OrganizationSwitcher.vue    |  134 ++
 resources/js/Components/ResponsiveNavLink.vue |    2 +-
 resources/js/Components/SecondaryButton.vue   |    3 +-
 resources/js/Components/SectionBorder.vue     |    2 +-
 resources/js/Components/SectionTitle.vue      |    4 +-
 resources/js/Components/TextInput.vue         |    4 +-
 resources/js/Components/TimeTracker.vue       |  178 +++
 resources/js/Components/UserSettingsIcon.vue  |   89 ++
 resources/js/Components/Welcome.vue           |  177 ---
 .../common/BillableToggleButton.vue           |   42 +
 resources/js/Components/common/CardTitle.vue  |   22 +
 .../js/Components/common/ProjectBadge.vue     |   51 +
 .../js/Components/common/ProjectDropdown.vue  |  162 +++
 .../Components/common/ProjectDropdownItem.vue |   19 +
 resources/js/Components/common/StatCard.vue   |   18 +
 .../js/Components/common/TagDropdown.vue      |  220 ++++
 .../js/Components/common/TagDropdownItem.vue  |   28 +
 .../common/TimeTrackerStartStop.vue           |   89 ++
 resources/js/Layouts/AppLayout.vue            |  567 ++-------
 .../js/Pages/API/Partials/ApiTokenManager.vue |   14 +-
 resources/js/Pages/Auth/ConfirmPassword.vue   |    2 +-
 resources/js/Pages/Auth/ForgotPassword.vue    |    2 +-
 resources/js/Pages/Auth/Login.vue             |    6 +-
 resources/js/Pages/Auth/Register.vue          |    6 +-
 .../js/Pages/Auth/TwoFactorChallenge.vue      |    4 +-
 resources/js/Pages/Auth/VerifyEmail.vue       |    6 +-
 resources/js/Pages/Dashboard.vue              |  106 +-
 .../Pages/Profile/Partials/DeleteUserForm.vue |    2 +-
 .../LogoutOtherBrowserSessionsForm.vue        |    8 +-
 .../Partials/TwoFactorAuthenticationForm.vue  |   14 +-
 .../Partials/UpdateProfileInformationForm.vue |    2 +-
 .../Pages/Teams/Partials/DeleteTeamForm.vue   |    2 +-
 .../Teams/Partials/TeamMemberManager.vue      |   14 +-
 resources/js/app.ts                           |    3 +
 resources/js/types/models.ts                  |   11 -
 resources/js/utils/api.ts                     |    4 +
 resources/js/utils/color.ts                   |   25 +
 resources/js/utils/money.ts                   |    6 +
 resources/js/utils/time.ts                    |    8 +
 resources/js/utils/useCurrentTimeEntry.ts     |  151 +++
 resources/js/utils/useProjects.ts             |   24 +
 resources/js/utils/useTags.ts                 |   53 +
 resources/js/utils/useUser.ts                 |   17 +
 routes/web.php                                |  305 ++++-
 tailwind.config.js                            |   36 +-
 86 files changed, 5123 insertions(+), 848 deletions(-)
 create mode 100644 e2e/timetracker.spec.ts
 create mode 100644 openapi.json
 create mode 100644 openapi.json.client.ts
 create mode 100644 public/fonts/Outfit-VariableFont_wght.ttf
 create mode 100644 resources/js/Components/CurrentSidebarTimer.vue
 create mode 100644 resources/js/Components/Dashboard/ActivityGraphCard.vue
 create mode 100644 resources/js/Components/Dashboard/DashboardCard.vue
 create mode 100644 resources/js/Components/Dashboard/DayOverviewCardEntry.vue
 create mode 100644 resources/js/Components/Dashboard/LastSevenDaysCard.vue
 create mode 100644 resources/js/Components/Dashboard/ProjectsChartCard.vue
 create mode 100644 resources/js/Components/Dashboard/RecentlyTrackedTasksCard.vue
 create mode 100644 resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
 create mode 100644 resources/js/Components/Dashboard/TeamActivityCard.vue
 create mode 100644 resources/js/Components/Dashboard/TeamActivityCardEntry.vue
 create mode 100644 resources/js/Components/Dashboard/ThisWeekOverview.vue
 create mode 100644 resources/js/Components/NavigationSidebarItem.vue
 create mode 100644 resources/js/Components/OrganizationSwitcher.vue
 create mode 100644 resources/js/Components/TimeTracker.vue
 create mode 100644 resources/js/Components/UserSettingsIcon.vue
 delete mode 100644 resources/js/Components/Welcome.vue
 create mode 100644 resources/js/Components/common/BillableToggleButton.vue
 create mode 100644 resources/js/Components/common/CardTitle.vue
 create mode 100644 resources/js/Components/common/ProjectBadge.vue
 create mode 100644 resources/js/Components/common/ProjectDropdown.vue
 create mode 100644 resources/js/Components/common/ProjectDropdownItem.vue
 create mode 100644 resources/js/Components/common/StatCard.vue
 create mode 100644 resources/js/Components/common/TagDropdown.vue
 create mode 100644 resources/js/Components/common/TagDropdownItem.vue
 create mode 100644 resources/js/Components/common/TimeTrackerStartStop.vue
 create mode 100644 resources/js/utils/api.ts
 create mode 100644 resources/js/utils/color.ts
 create mode 100644 resources/js/utils/money.ts
 create mode 100644 resources/js/utils/time.ts
 create mode 100644 resources/js/utils/useCurrentTimeEntry.ts
 create mode 100644 resources/js/utils/useProjects.ts
 create mode 100644 resources/js/utils/useTags.ts
 create mode 100644 resources/js/utils/useUser.ts

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 93cf0f8a..2bb9b68b 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -2,11 +2,7 @@
 require("@rushstack/eslint-patch/modern-module-resolution")
 
 module.exports = {
-    extends: [
-        'plugin:vue/vue3-essential',
-        '@vue/eslint-config-typescript/recommended',
-        '@vue/eslint-config-prettier'
-    ],
+    extends: ['plugin:vue/vue3-essential', '@vue/eslint-config-typescript/recommended', '@vue/eslint-config-prettier'],
     rules: {
         'vue/multi-word-component-names': 'off',
     }
diff --git a/README.md b/README.md
index eb0c4796..08b42048 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,8 @@ cp .env.example .env
 
 ./vendor/bin/sail artisan migrate:fresh --seed
 
+./vendor/bin/sail php artisan passport:install
+
 ./vendor/bin/sail npm install
 
 ./vendor/bin/sail npm run build
@@ -52,6 +54,19 @@ npx playwright install
 npx playwright codegen solidtime.test
 ``` 
 
+## E2E Troubleshooting
+
+If the E2E tests are not working consistently and fail with a timeout during the authentication, you might want to delete the `test-results/.auth` directory to force new test accounts to be created.
+
+## Generate ZOD Client
+
+The Zodius HTTP client is generated using the following command:
+
+```bash
+
+npm run generate:zod
+```
+
 ## Contributing
 
 This project is in a very early stage. The structure and APIs are still subject to change and not stable. 
diff --git a/app/Http/Controllers/Api/V1/ProjectController.php b/app/Http/Controllers/Api/V1/ProjectController.php
index 5ab9ceeb..bbb40d48 100644
--- a/app/Http/Controllers/Api/V1/ProjectController.php
+++ b/app/Http/Controllers/Api/V1/ProjectController.php
@@ -28,6 +28,8 @@ protected function checkPermission(Organization $organization, string $permissio
      * Get projects
      *
      * @throws AuthorizationException
+     *
+     * @operationId getProjects
      */
     public function index(Organization $organization): JsonResource
     {
@@ -43,6 +45,8 @@ public function index(Organization $organization): JsonResource
      * Get project
      *
      * @throws AuthorizationException
+     *
+     * @operationId getProject
      */
     public function show(Organization $organization, Project $project): JsonResource
     {
@@ -57,6 +61,8 @@ public function show(Organization $organization, Project $project): JsonResource
      * Create project
      *
      * @throws AuthorizationException
+     *
+     * @operationId createProject
      */
     public function store(Organization $organization, ProjectStoreRequest $request): JsonResource
     {
@@ -75,6 +81,8 @@ public function store(Organization $organization, ProjectStoreRequest $request):
      * Update project
      *
      * @throws AuthorizationException
+     *
+     * @operationId updateProject
      */
     public function update(Organization $organization, Project $project, ProjectUpdateRequest $request): JsonResource
     {
@@ -90,6 +98,8 @@ public function update(Organization $organization, Project $project, ProjectUpda
      * Delete project
      *
      * @throws AuthorizationException
+     *
+     * @operationId deleteProject
      */
     public function destroy(Organization $organization, Project $project): JsonResponse
     {
diff --git a/app/Http/Controllers/Api/V1/TagController.php b/app/Http/Controllers/Api/V1/TagController.php
index 58db6784..4e5bcfaa 100644
--- a/app/Http/Controllers/Api/V1/TagController.php
+++ b/app/Http/Controllers/Api/V1/TagController.php
@@ -27,6 +27,8 @@ protected function checkPermission(Organization $organization, string $permissio
      * Get tags
      *
      * @throws AuthorizationException
+     *
+     * @operationId getTags
      */
     public function index(Organization $organization): TagCollection
     {
@@ -44,6 +46,8 @@ public function index(Organization $organization): TagCollection
      * Create tag
      *
      * @throws AuthorizationException
+     *
+     * @operationId createTag
      */
     public function store(Organization $organization, TagStoreRequest $request): TagResource
     {
@@ -61,6 +65,8 @@ public function store(Organization $organization, TagStoreRequest $request): Tag
      * Update tag
      *
      * @throws AuthorizationException
+     *
+     * @operationId updateTag
      */
     public function update(Organization $organization, Tag $tag, TagUpdateRequest $request): TagResource
     {
@@ -76,6 +82,8 @@ public function update(Organization $organization, Tag $tag, TagUpdateRequest $r
      * Delete tag
      *
      * @throws AuthorizationException
+     *
+     * @operationId deleteTag
      */
     public function destroy(Organization $organization, Tag $tag): JsonResponse
     {
diff --git a/app/Http/Controllers/Api/V1/TimeEntryController.php b/app/Http/Controllers/Api/V1/TimeEntryController.php
index 0b627b1d..6919faad 100644
--- a/app/Http/Controllers/Api/V1/TimeEntryController.php
+++ b/app/Http/Controllers/Api/V1/TimeEntryController.php
@@ -32,6 +32,8 @@ protected function checkPermission(Organization $organization, string $permissio
      * Get time entries
      *
      * @throws AuthorizationException
+     *
+     * @operationId getTimeEntries
      */
     public function index(Organization $organization, TimeEntryIndexRequest $request): JsonResource
     {
@@ -103,6 +105,8 @@ public function index(Organization $organization, TimeEntryIndexRequest $request
      * Create time entry
      *
      * @throws AuthorizationException|TimeEntryStillRunning
+     *
+     * @operationId createTimeEntry
      */
     public function store(Organization $organization, TimeEntryStoreRequest $request): JsonResource
     {
@@ -120,7 +124,7 @@ public function store(Organization $organization, TimeEntryStoreRequest $request
 
         $timeEntry = new TimeEntry();
         $timeEntry->fill($request->validated());
-        $timeEntry->description = $request->get('description', '');
+        $timeEntry->description = $request->get('description') ?? '';
         $timeEntry->organization()->associate($organization);
         $timeEntry->save();
 
@@ -131,6 +135,8 @@ public function store(Organization $organization, TimeEntryStoreRequest $request
      * Update time entry
      *
      * @throws AuthorizationException
+     *
+     * @operationId updateTimeEntry
      */
     public function update(Organization $organization, TimeEntry $timeEntry, TimeEntryUpdateRequest $request): JsonResource
     {
@@ -141,6 +147,7 @@ public function update(Organization $organization, TimeEntry $timeEntry, TimeEnt
         }
 
         $timeEntry->fill($request->validated());
+        $timeEntry->description = $request->get('description', $timeEntry->description) ?? '';
         $timeEntry->save();
 
         return new TimeEntryResource($timeEntry);
@@ -150,6 +157,8 @@ public function update(Organization $organization, TimeEntry $timeEntry, TimeEnt
      * Delete time entry
      *
      * @throws AuthorizationException
+     *
+     * @operationId deleteTimeEntry
      */
     public function destroy(Organization $organization, TimeEntry $timeEntry): JsonResponse
     {
diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php
index f044ce72..f9c1bf4c 100644
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php
@@ -42,7 +42,7 @@ public function rules(): array
             ],
             // End of time entry (ISO 8601 format, UTC timezone)
             'end' => [
-                'required',
+                'present',
                 'nullable',
                 'date', // TODO
                 'after:start',
diff --git a/app/Http/Resources/V1/TimeEntry/TimeEntryResource.php b/app/Http/Resources/V1/TimeEntry/TimeEntryResource.php
index 9003dae1..146ba44f 100644
--- a/app/Http/Resources/V1/TimeEntry/TimeEntryResource.php
+++ b/app/Http/Resources/V1/TimeEntry/TimeEntryResource.php
@@ -30,8 +30,8 @@ public function toArray(Request $request): array
             /**
              * @var string|null $end End of time entry (ISO 8601 format, UTC timezone, example: 2024-02-26T17:17:17Z)
              */
-            'end' => $this->formatDateTime($this->resource->start),
-            /** @var int $duration Duration of time entry in seconds */
+            'end' => $this->formatDateTime($this->resource->end),
+            /** @var int|null $duration Duration of time entry in seconds */
             'duration' => $this->resource->getDuration()?->seconds,
             /** @var string|null $description Description of time entry */
             'description' => $this->resource->description,
@@ -42,7 +42,7 @@ public function toArray(Request $request): array
             /** @var string $user_id ID of user */
             'user_id' => $this->resource->user_id,
             /** @var array<string> $tags List of tag IDs */
-            'tags' => $this->resource->tags,
+            'tags' => $this->resource->tags ?? [],
         ];
     }
 }
diff --git a/app/Providers/JetstreamServiceProvider.php b/app/Providers/JetstreamServiceProvider.php
index e8e5bfb0..f1762c10 100644
--- a/app/Providers/JetstreamServiceProvider.php
+++ b/app/Providers/JetstreamServiceProvider.php
@@ -94,7 +94,7 @@ protected function configurePermissions(): void
             'tags:update',
             'tags:delete',
             'organizations:view',
-        ])->description('Editor users have the ability to read, create, and update.');
+        ])->description('Managers have the ability to read, create, and update their own time entries as well as those of their team.');
 
         Jetstream::role('employee', 'Employee', [
             'projects:view',
@@ -104,6 +104,6 @@ protected function configurePermissions(): void
             'time-entries:update:own',
             'time-entries:delete:own',
             'organizations:view',
-        ])->description('Editor users have the ability to read, create, and update.');
+        ])->description('Employees have the ability to read, create, and update their own time entries.');
     }
 }
diff --git a/config/scramble.php b/config/scramble.php
index 6bc087ff..eb01031c 100644
--- a/config/scramble.php
+++ b/config/scramble.php
@@ -64,9 +64,9 @@
      * ```
      */
     'servers' => [
-        'Production' => 'https://app.solidtime.io',
-        'Staging' => 'https://app.staging.solidtime.io',
-        'Local' => 'https://soldtime.test',
+        'Production' => 'https://app.solidtime.io/api',
+        'Staging' => 'https://app.staging.solidtime.io/api',
+        'Local' => 'https://soldtime.test/api',
     ],
 
     'middleware' => [
diff --git a/docker-compose.yml b/docker-compose.yml
index 876bcfe0..3874cd43 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -65,6 +65,8 @@ services:
         image: mcr.microsoft.com/playwright:v1.41.1-jammy
         command: ['npx', 'playwright', 'test', '--ui-port=8080', '--ui-host=0.0.0.0']
         working_dir: /src
+        extra_hosts:
+            - "solidtime.test:${REVERSE_PROXY_IP:-10.100.100.10}"
         labels:
             - "traefik.enable=true"
             - "traefik.docker.network=${NETWORK_NAME}"
diff --git a/e2e/auth.spec.ts b/e2e/auth.spec.ts
index d3837545..2051647e 100644
--- a/e2e/auth.spec.ts
+++ b/e2e/auth.spec.ts
@@ -8,9 +8,7 @@ async function registerNewUser(page, email, password) {
     await page.getByLabel('Password', { exact: true }).fill(password);
     await page.getByLabel('Confirm Password').fill(password);
     await page.getByRole('button', { name: 'Register' }).click();
-    await expect(
-        page.getByRole('heading', { name: 'Dashboard' })
-    ).toBeVisible();
+    await expect(page.getByTestId('dashboard_view')).toBeVisible();
 }
 
 test('can register, logout and log back in', async ({ page }) => {
@@ -18,20 +16,15 @@ test('can register, logout and log back in', async ({ page }) => {
     const email = `john+${Math.round(Math.random() * 10000)}@doe.com`;
     const password = 'suchagreatpassword123';
     await registerNewUser(page, email, password);
-    await expect(
-        page.getByRole('button', { name: "John's Organization" })
-    ).toBeVisible();
-    await page.locator('#currentUserButton').click();
-
-    await page.getByRole('button', { name: 'Log Out' }).click();
+    await expect(page.getByTestId('dashboard_view')).toBeVisible();
+    await page.getByTestId('current_user_button').click();
+    await page.getByText('Log Out').click();
     await page.waitForURL(PLAYWRIGHT_BASE_URL + '/');
     await page.goto(PLAYWRIGHT_BASE_URL + '/login');
     await page.getByLabel('Email').fill(email);
     await page.getByLabel('Password').fill(password);
     await page.getByRole('button', { name: 'Log in' }).click();
-    await expect(
-        page.getByRole('heading', { name: 'Dashboard' })
-    ).toBeVisible();
+    await expect(page.getByTestId('dashboard_view')).toBeVisible();
 });
 
 test('can register and delete account', async ({ page }) => {
diff --git a/e2e/organization.spec.ts b/e2e/organization.spec.ts
index a61fb985..d079f8e6 100644
--- a/e2e/organization.spec.ts
+++ b/e2e/organization.spec.ts
@@ -3,8 +3,8 @@ import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 
 async function goToOrganizationSettings(page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
-    await page.locator('#currentTeamButton').click();
-    await page.getByRole('link', { name: 'Team Settings' }).click();
+    await page.getByTestId('organization_switcher').click();
+    await page.getByText('Team Settings').click();
 }
 
 test('test that organization name can be updated', async ({ page }) => {
@@ -12,14 +12,28 @@ test('test that organization name can be updated', async ({ page }) => {
     await page.getByLabel('Team Name').fill('NEW ORG NAME');
     await page.getByLabel('Team Name').press('Enter');
     await page.getByLabel('Team Name').press('Meta+r');
-    await expect(page.getByRole('navigation')).toContainText('NEW ORG NAME');
+    await expect(page.getByTestId('organization_switcher')).toContainText(
+        'NEW ORG NAME'
+    );
+});
+
+test('test that new manager can be invited', async ({ page }) => {
+    await goToOrganizationSettings(page);
+    const editorId = Math.round(Math.random() * 10000);
+    await page.getByLabel('Email').fill(`new+${editorId}@editor.test`);
+    await page.getByRole('button', { name: 'Manager' }).click();
+    await page.getByRole('button', { name: 'Add' }).click();
+    await page.reload();
+    await expect(page.getByRole('main')).toContainText(
+        `new+${editorId}@editor.test`
+    );
 });
 
-test('test that new editor can be invited', async ({ page }) => {
+test('test that new employee can be invited', async ({ page }) => {
     await goToOrganizationSettings(page);
     const editorId = Math.round(Math.random() * 10000);
     await page.getByLabel('Email').fill(`new+${editorId}@editor.test`);
-    await page.getByRole('button', { name: 'Editor' }).click();
+    await page.getByRole('button', { name: 'Employee' }).click();
     await page.getByRole('button', { name: 'Add' }).click();
     await page.reload();
     await expect(page.getByRole('main')).toContainText(
diff --git a/e2e/timetracker.spec.ts b/e2e/timetracker.spec.ts
new file mode 100644
index 00000000..ec0789b0
--- /dev/null
+++ b/e2e/timetracker.spec.ts
@@ -0,0 +1,507 @@
+import { expect, test } from '../playwright/fixtures';
+import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
+
+async function goToDashboard(page) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
+}
+
+async function startOrStopTimerWithButton(page) {
+    await page
+        .locator('[data-testid="dashboard_timer"] [data-testid="timer_button"]')
+        .click();
+}
+
+async function assertThatTimerHasStarted(page) {
+    await page.locator(
+        '[data-testid="dashboard_timer"] [data-testid="timer_button"].bg-red-400/80'
+    );
+}
+
+async function assertNewTimeEntryResponse(page) {
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 201 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end === null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description === '' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration === null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+}
+
+async function assertThatTimerIsStoped(page) {
+    await page.locator(
+        '[data-testid="dashboard_timer"] [data-testid="timer_button"].bg-accent-300/70'
+    );
+}
+
+test('test that starting and stopping a timer without description and project works', async ({
+    page,
+}) => {
+    await goToDashboard(page);
+    await startOrStopTimerWithButton(page);
+    await assertNewTimeEntryResponse(page);
+    await assertThatTimerHasStarted(page);
+    await page.waitForTimeout(1500);
+    await startOrStopTimerWithButton(page);
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 200 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end !== null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description === '' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration !== null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await assertThatTimerIsStoped(page);
+});
+
+test('test that starting and stopping a timer with a description works', async ({
+    page,
+}) => {
+    await goToDashboard(page);
+    await page
+        .getByTestId('time_entry_description')
+        .fill('New Time Entry Description');
+    await startOrStopTimerWithButton(page);
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 201 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end === null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description ===
+                'New Time Entry Description' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration === null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await assertThatTimerHasStarted(page);
+    await page.waitForTimeout(500);
+    await startOrStopTimerWithButton(page);
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 200 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end !== null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description ===
+                'New Time Entry Description' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration !== null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await assertThatTimerIsStoped(page);
+});
+
+test('test that starting and updating the description while running works', async ({
+    page,
+}) => {
+    await goToDashboard(page);
+    await startOrStopTimerWithButton(page);
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 201 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end === null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description === '' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration === null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await assertThatTimerHasStarted(page);
+    await page.waitForTimeout(500);
+    await page
+        .getByTestId('time_entry_description')
+        .fill('New Time Entry Description');
+    await page.getByTestId('time_entry_description').press('Tab');
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 200 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end === null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description ===
+                'New Time Entry Description' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration === null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await page.waitForTimeout(500);
+    await startOrStopTimerWithButton(page);
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 200 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end !== null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description ===
+                'New Time Entry Description' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration !== null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await assertThatTimerIsStoped(page);
+});
+
+test('test that starting and updating the description while running works', async ({
+    page,
+}) => {
+    await goToDashboard(page);
+    await startOrStopTimerWithButton(page);
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 201 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end === null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description === '' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration === null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await assertThatTimerHasStarted(page);
+    await page.waitForTimeout(500);
+    await page
+        .getByTestId('time_entry_description')
+        .fill('New Time Entry Description');
+    await page.getByTestId('time_entry_description').press('Tab');
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 200 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end === null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description ===
+                'New Time Entry Description' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration === null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await page.waitForTimeout(500);
+    await startOrStopTimerWithButton(page);
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 200 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end !== null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description ===
+                'New Time Entry Description' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration !== null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await assertThatTimerIsStoped(page);
+});
+
+test('test that starting and updating the time while running works', async ({
+    page,
+}) => {
+    await goToDashboard(page);
+    await startOrStopTimerWithButton(page);
+    const createResponse = await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 201 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end === null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description === '' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration === null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await assertThatTimerHasStarted(page);
+    await page.waitForTimeout(500);
+    await page.getByTestId('time_entry_time').fill('20min');
+    await page.getByTestId('time_entry_time').press('Tab');
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 200 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.start !==
+                (await createResponse.json()).data.start &&
+            (await response.json()).data.end === null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description === '' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration === null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await expect(page.getByTestId('time_entry_time')).toHaveValue(/00:20/);
+    await page.waitForTimeout(500);
+    await startOrStopTimerWithButton(page);
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 200 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end !== null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description === '' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration !== null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await assertThatTimerIsStoped(page);
+});
+
+test('test that entering a time starts the timer on blur', async ({ page }) => {
+    await goToDashboard(page);
+    await page.getByTestId('time_entry_time').fill('20min');
+    await page.getByTestId('time_entry_time').press('Tab');
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 201 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end === null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description === '' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration === null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await assertThatTimerHasStarted(page);
+    await startOrStopTimerWithButton(page);
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 200 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end !== null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description === '' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration !== null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await page.locator(
+        '[data-testid="dashboard_timer"] [data-testid="timer_button"].bg-accent-300/70'
+    );
+});
+
+test('test that entering a time starts the timer on enter', async ({
+    page,
+}) => {
+    await goToDashboard(page);
+    await page.getByTestId('time_entry_time').fill('20min');
+    await page.getByTestId('time_entry_time').press('Enter');
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 201 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end === null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description === '' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration === null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await assertThatTimerHasStarted(page);
+    await startOrStopTimerWithButton(page);
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 200 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end !== null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description === '' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration !== null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([])
+        );
+    });
+    await assertThatTimerIsStoped(page);
+});
+
+test('test that adding a new tag works', async ({ page }) => {
+    const newTagName = 'New Tag' + Math.floor(Math.random() * 10000);
+    await goToDashboard(page);
+    await page.getByTestId('tag_dropdown').click();
+    await page.getByTestId('tag_dropdown_search').fill(newTagName);
+    await page.getByTestId('tag_dropdown_search').press('Enter');
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 201 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.name === newTagName
+        );
+    });
+    await expect(page.getByTestId('tag_dropdown_search')).toHaveValue('');
+    await expect(page.getByTestId('tag_dropdown_entries')).toHaveText(
+        newTagName
+    );
+});
+
+test('test that adding a new tag when the timer is running', async ({
+    page,
+}) => {
+    const newTagName = 'New Tag' + Math.floor(Math.random() * 10000);
+    await goToDashboard(page);
+    await startOrStopTimerWithButton(page);
+    await assertNewTimeEntryResponse(page);
+    await assertThatTimerHasStarted(page);
+    await page.getByTestId('tag_dropdown').click();
+    await page.getByTestId('tag_dropdown_search').fill(newTagName);
+    await page.getByTestId('tag_dropdown_search').press('Enter');
+    const tagCreateResponse = await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 201 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.name === newTagName
+        );
+    });
+    await expect(page.getByTestId('tag_dropdown_search')).toHaveValue('');
+    await expect(page.getByTestId('tag_dropdown_entries')).toHaveText(
+        newTagName
+    );
+
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 200 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end === null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description === '' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration === null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([(await tagCreateResponse.json()).data.id])
+        );
+    });
+    await page.getByTestId('tag_dropdown_search').press('Escape');
+    await page.waitForTimeout(1000);
+    await startOrStopTimerWithButton(page);
+    await page.waitForResponse(async (response) => {
+        return (
+            response.status() === 200 &&
+            (await response.headerValue('Content-Type')) ===
+                'application/json' &&
+            (await response.json()).data.id !== null &&
+            (await response.json()).data.start !== null &&
+            (await response.json()).data.end !== null &&
+            (await response.json()).data.project_id === null &&
+            (await response.json()).data.description === '' &&
+            (await response.json()).data.task_id === null &&
+            (await response.json()).data.duration !== null &&
+            (await response.json()).data.user_id !== null &&
+            JSON.stringify((await response.json()).data.tags) ===
+                JSON.stringify([(await tagCreateResponse.json()).data.id])
+        );
+    });
+    await assertThatTimerIsStoped(page);
+});
+
+// test that adding a new tag when the timer is running
+
+// test that search is working
diff --git a/openapi.json b/openapi.json
new file mode 100644
index 00000000..0d424c08
--- /dev/null
+++ b/openapi.json
@@ -0,0 +1 @@
+{"openapi":"3.1.0","info":{"title":"Laravel","version":"0.0.1"},"servers":[{"url":"https:\/\/app.solidtime.io\/api","description":"Production"},{"url":"https:\/\/app.staging.solidtime.io\/api","description":"Staging"},{"url":"https:\/\/soldtime.test\/api","description":"Local"}],"security":[{"oauth2":[]}],"paths":{"\/v1\/organization\/{organization}\/projects":{"get":{"operationId":"getProjects","summary":"Get projects","tags":["Project"],"parameters":[{"name":"organization","in":"path","required":true,"description":"The organization ID","schema":{"type":"string","format":"uuid"}}],"responses":{"200":{"description":"`ProjectCollection`","content":{"application\/json":{"schema":{"type":"object","properties":{"data":{"$ref":"#\/components\/schemas\/ProjectCollection"}},"required":["data"]}}}},"403":{"$ref":"#\/components\/responses\/AuthorizationException"},"404":{"$ref":"#\/components\/responses\/ModelNotFoundException"}}},"post":{"operationId":"createProject","summary":"Create project","tags":["Project"],"parameters":[{"name":"organization","in":"path","required":true,"description":"The organization ID","schema":{"type":"string","format":"uuid"}}],"requestBody":{"content":{"application\/json":{"schema":{"type":"object","properties":{"name":{"type":"string"},"color":{"type":"string"}},"required":["name","color"]}}}},"responses":{"200":{"description":"`ProjectResource`","content":{"application\/json":{"schema":{"type":"object","properties":{"data":{"$ref":"#\/components\/schemas\/ProjectResource"}},"required":["data"]}}}},"403":{"$ref":"#\/components\/responses\/AuthorizationException"},"404":{"$ref":"#\/components\/responses\/ModelNotFoundException"},"422":{"$ref":"#\/components\/responses\/ValidationException"}}}},"\/v1\/organization\/{organization}\/projects\/{project}":{"get":{"operationId":"getProject","summary":"Get project","tags":["Project"],"parameters":[{"name":"organization","in":"path","required":true,"description":"The organization ID","schema":{"type":"string","format":"uuid"}},{"name":"project","in":"path","required":true,"description":"The project ID","schema":{"type":"string","format":"uuid"}}],"responses":{"200":{"description":"`ProjectResource`","content":{"application\/json":{"schema":{"type":"object","properties":{"data":{"$ref":"#\/components\/schemas\/ProjectResource"}},"required":["data"]}}}},"403":{"$ref":"#\/components\/responses\/AuthorizationException"},"404":{"$ref":"#\/components\/responses\/ModelNotFoundException"}}},"put":{"operationId":"updateProject","summary":"Update project","tags":["Project"],"parameters":[{"name":"organization","in":"path","required":true,"description":"The organization ID","schema":{"type":"string","format":"uuid"}},{"name":"project","in":"path","required":true,"description":"The project ID","schema":{"type":"string","format":"uuid"}}],"requestBody":{"content":{"application\/json":{"schema":{"type":"object","properties":{"name":{"type":"string"},"color":{"type":"string"}},"required":["name","color"]}}}},"responses":{"200":{"description":"`ProjectResource`","content":{"application\/json":{"schema":{"type":"object","properties":{"data":{"$ref":"#\/components\/schemas\/ProjectResource"}},"required":["data"]}}}},"403":{"$ref":"#\/components\/responses\/AuthorizationException"},"404":{"$ref":"#\/components\/responses\/ModelNotFoundException"},"422":{"$ref":"#\/components\/responses\/ValidationException"}}},"delete":{"operationId":"v1.projects.destroy","summary":"Delete project","tags":["Project"],"parameters":[{"name":"organization","in":"path","required":true,"description":"The organization ID","schema":{"type":"string","format":"uuid"}},{"name":"project","in":"path","required":true,"description":"The project ID","schema":{"type":"string","format":"uuid"}}],"requestBody":{"content":{"application\/json":{"schema":{"type":"object"}}}},"responses":{"204":{"description":"No content","content":{"application\/json":{"schema":{"type":"null"}}}},"403":{"$ref":"#\/components\/responses\/AuthorizationException"},"404":{"$ref":"#\/components\/responses\/ModelNotFoundException"}}}},"\/v1\/organization\/{organization}\/time-entries":{"get":{"operationId":"v1.time-entries.index","summary":"Get time entries","tags":["TimeEntry"],"parameters":[{"name":"organization","in":"path","required":true,"description":"The organization ID","schema":{"type":"string","format":"uuid"}},{"name":"user_id","in":"query","description":"Filter by user ID","schema":{"type":"string","format":"uuid"}},{"name":"before","in":"query","description":"Filter only time entries that have a start date before (not including) the given date (example: 2021-12-31)","schema":{"type":["string","null"]}},{"name":"after","in":"query","description":"Filter only time entries that have a start date after (not including) the given date (example: 2021-12-31)","schema":{"type":["string","null"]}},{"name":"active","in":"query","description":"Filter only time entries that are active (have no end date, are still running)","schema":{"type":"boolean"}},{"name":"limit","in":"query","description":"Limit the number of returned time entries","schema":{"type":"integer","minimum":1,"maximum":500}},{"name":"only_full_dates","in":"query","description":"Filter makes sure that only time entries of a whole date are returned","schema":{"type":"boolean"}}],"responses":{"200":{"description":"`TimeEntryCollection`","content":{"application\/json":{"schema":{"type":"object","properties":{"data":{"$ref":"#\/components\/schemas\/TimeEntryCollection"}},"required":["data"]}}}},"403":{"$ref":"#\/components\/responses\/AuthorizationException"},"404":{"$ref":"#\/components\/responses\/ModelNotFoundException"},"422":{"$ref":"#\/components\/responses\/ValidationException"}}},"post":{"operationId":"v1.time-entries.store","summary":"Create time entry","tags":["TimeEntry"],"parameters":[{"name":"organization","in":"path","required":true,"description":"The organization ID","schema":{"type":"string","format":"uuid"}}],"requestBody":{"content":{"application\/json":{"schema":{"type":"object","properties":{"user_id":{"type":"string","format":"uuid","description":"ID of the user that the time entry should belong to"},"task_id":{"type":["string","null"],"format":"uuid","description":"ID of the task that the time entry should belong to"},"start":{"type":"string","description":"Start of time entry (ISO 8601 format, UTC timezone)"},"end":{"type":["string","null"],"description":"End of time entry (ISO 8601 format, UTC timezone)"},"description":{"type":["string","null"],"description":"Description of time entry"},"tags":{"type":["array","null"],"description":"List of tag IDs","items":{"type":"string","format":"uuid"}}},"required":["user_id","start","end"]}}}},"responses":{"200":{"description":"`TimeEntryResource`","content":{"application\/json":{"schema":{"type":"object","properties":{"data":{"$ref":"#\/components\/schemas\/TimeEntryResource"}},"required":["data"]}}}},"403":{"$ref":"#\/components\/responses\/AuthorizationException"},"404":{"$ref":"#\/components\/responses\/ModelNotFoundException"},"422":{"$ref":"#\/components\/responses\/ValidationException"}}}},"\/v1\/organization\/{organization}\/time-entries\/{timeEntry}":{"put":{"operationId":"v1.time-entries.update","summary":"Update time entry","tags":["TimeEntry"],"parameters":[{"name":"organization","in":"path","required":true,"description":"The organization ID","schema":{"type":"string","format":"uuid"}},{"name":"timeEntry","in":"path","required":true,"description":"The time entry ID","schema":{"type":"string","format":"uuid"}}],"requestBody":{"content":{"application\/json":{"schema":{"type":"object","properties":{"task_id":{"type":["string","null"],"format":"uuid","description":"ID of the task that the time entry should belong to"},"start":{"type":"string","description":"Start of time entry (ISO 8601 format, UTC timezone)"},"end":{"type":["string","null"],"description":"End of time entry (ISO 8601 format, UTC timezone)"},"description":{"type":["string","null"],"description":"Description of time entry"},"tags":{"type":["array","null"],"description":"List of tag IDs","items":{"type":"string","format":"uuid"}}},"required":["start","end"]}}}},"responses":{"200":{"description":"`TimeEntryResource`","content":{"application\/json":{"schema":{"type":"object","properties":{"data":{"$ref":"#\/components\/schemas\/TimeEntryResource"}},"required":["data"]}}}},"403":{"$ref":"#\/components\/responses\/AuthorizationException"},"404":{"$ref":"#\/components\/responses\/ModelNotFoundException"},"422":{"$ref":"#\/components\/responses\/ValidationException"}}},"delete":{"operationId":"v1.time-entries.destroy","summary":"Delete time entry","tags":["TimeEntry"],"parameters":[{"name":"organization","in":"path","required":true,"description":"The organization ID","schema":{"type":"string","format":"uuid"}},{"name":"timeEntry","in":"path","required":true,"description":"The time entry ID","schema":{"type":"string","format":"uuid"}}],"requestBody":{"content":{"application\/json":{"schema":{"type":"object"}}}},"responses":{"204":{"description":"No content","content":{"application\/json":{"schema":{"type":"null"}}}},"403":{"$ref":"#\/components\/responses\/AuthorizationException"},"404":{"$ref":"#\/components\/responses\/ModelNotFoundException"}}}}},"components":{"securitySchemes":{"oauth2":{"type":"oauth2","flows":{"authorizationCode":{"authorizationUrl":"https:\/\/solidtime.test\/oauth\/authorize"}}}},"schemas":{"ProjectCollection":{"type":"array","items":{"$ref":"#\/components\/schemas\/ProjectResource"},"title":"ProjectCollection"},"ProjectResource":{"type":"object","properties":{"id":{"type":"string","description":"ID of project"},"name":{"type":"string","description":"Name of project"},"color":{"type":"string","description":"Color of project"},"client_id":{"type":["string","null"],"description":"ID of client"}},"required":["id","name","color","client_id"],"title":"ProjectResource"},"TimeEntryCollection":{"type":"array","items":{"$ref":"#\/components\/schemas\/TimeEntryResource"},"title":"TimeEntryCollection"},"TimeEntryResource":{"type":"object","properties":{"id":{"type":"string","description":"ID of time entry"},"start":{"type":"string","description":"Start of time entry (ISO 8601 format, UTC timezone, example: 2024-02-26T17:17:17Z)"},"end":{"type":["string","null"],"description":"End of time entry (ISO 8601 format, UTC timezone, example: 2024-02-26T17:17:17Z)"},"duration":{"type":"integer","description":"Duration of time entry in seconds"},"description":{"type":["string","null"],"description":"Description of time entry"},"task_id":{"type":["string","null"],"description":"ID of task"},"project_id":{"type":["string","null"],"description":"ID of project"},"user_id":{"type":"string","description":"ID of user"},"tags":{"type":"array","description":"List of tag IDs","items":{"type":"string"}}},"required":["id","start","end","duration","description","task_id","project_id","user_id","tags"],"title":"TimeEntryResource"}},"responses":{"AuthorizationException":{"description":"Authorization error","content":{"application\/json":{"schema":{"type":"object","properties":{"message":{"type":"string","description":"Error overview."}},"required":["message"]}}}},"ModelNotFoundException":{"description":"Not found","content":{"application\/json":{"schema":{"type":"object","properties":{"message":{"type":"string","description":"Error overview."}},"required":["message"]}}}},"ValidationException":{"description":"Validation error","content":{"application\/json":{"schema":{"type":"object","properties":{"message":{"type":"string","description":"Errors overview."},"errors":{"type":"object","description":"A detailed description of each field that failed validation.","additionalProperties":{"type":"array","items":{"type":"string"}}}},"required":["message","errors"]}}}}}}}
diff --git a/openapi.json.client.ts b/openapi.json.client.ts
new file mode 100644
index 00000000..5366233e
--- /dev/null
+++ b/openapi.json.client.ts
@@ -0,0 +1,833 @@
+import { makeApi, Zodios, type ZodiosOptions } from '@zodios/core';
+import { z } from 'zod';
+
+const ClientResource = z
+    .object({
+        id: z.string(),
+        name: z.string(),
+        created_at: z.string(),
+        updated_at: z.string(),
+    })
+    .passthrough();
+const ClientCollection = z.array(ClientResource);
+const OrganizationResource = z
+    .object({ id: z.string(), name: z.string(), is_personal: z.string() })
+    .passthrough();
+const ProjectResource = z
+    .object({
+        id: z.string(),
+        name: z.string(),
+        color: z.string(),
+        client_id: z.union([z.string(), z.null()]),
+    })
+    .passthrough();
+const ProjectCollection = z.array(ProjectResource);
+const createProject_Body = z
+    .object({
+        name: z.string(),
+        color: z.string(),
+        client_id: z.union([z.string(), z.null()]).optional(),
+    })
+    .passthrough();
+const TagResource = z
+    .object({
+        id: z.string(),
+        name: z.string(),
+        created_at: z.string(),
+        updated_at: z.string(),
+    })
+    .passthrough();
+const TagCollection = z.array(TagResource);
+const before = z.union([z.string(), z.null()]).optional();
+const TimeEntryResource = z
+    .object({
+        id: z.string(),
+        start: z.string(),
+        end: z.union([z.string(), z.null()]),
+        duration: z.union([z.number(), z.null()]),
+        description: z.union([z.string(), z.null()]),
+        task_id: z.union([z.string(), z.null()]),
+        project_id: z.union([z.string(), z.null()]),
+        user_id: z.string(),
+        tags: z.array(z.string()),
+    })
+    .passthrough();
+const TimeEntryCollection = z.array(TimeEntryResource);
+const createTimeEntry_Body = z
+    .object({
+        user_id: z.string().uuid(),
+        task_id: z.union([z.string(), z.null()]).optional(),
+        start: z.string(),
+        end: z.union([z.string(), z.null()]).optional(),
+        description: z.union([z.string(), z.null()]).optional(),
+        tags: z.union([z.array(z.string()), z.null()]).optional(),
+    })
+    .passthrough();
+const updateTimeEntry_Body = z
+    .object({
+        task_id: z.union([z.string(), z.null()]).optional(),
+        start: z.string(),
+        end: z.union([z.string(), z.null()]).optional(),
+        description: z.union([z.string(), z.null()]).optional(),
+        tags: z.union([z.array(z.string()), z.null()]).optional(),
+    })
+    .passthrough();
+
+export const schemas = {
+    ClientResource,
+    ClientCollection,
+    OrganizationResource,
+    ProjectResource,
+    ProjectCollection,
+    createProject_Body,
+    TagResource,
+    TagCollection,
+    before,
+    TimeEntryResource,
+    TimeEntryCollection,
+    createTimeEntry_Body,
+    updateTimeEntry_Body,
+};
+
+const endpoints = makeApi([
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization',
+        alias: 'v1.organizations.show',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: OrganizationResource }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'put',
+        path: '/v1/organizations/:organization',
+        alias: 'v1.organizations.update',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: z.object({ name: z.string() }).passthrough(),
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: OrganizationResource }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
+                    .passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/clients',
+        alias: 'v1.clients.index',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: ClientCollection }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'post',
+        path: '/v1/organizations/:organization/clients',
+        alias: 'v1.clients.store',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: z.object({ name: z.string() }).passthrough(),
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: ClientResource }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
+                    .passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'put',
+        path: '/v1/organizations/:organization/clients/:client',
+        alias: 'v1.clients.update',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: z.object({ name: z.string() }).passthrough(),
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+            {
+                name: 'client',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: ClientResource }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
+                    .passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'delete',
+        path: '/v1/organizations/:organization/clients/:client',
+        alias: 'v1.clients.destroy',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: z.object({}).partial().passthrough(),
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+            {
+                name: 'client',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.null(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/projects',
+        alias: 'getProjects',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: ProjectCollection }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'post',
+        path: '/v1/organizations/:organization/projects',
+        alias: 'createProject',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: createProject_Body,
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: ProjectResource }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
+                    .passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/projects/:project',
+        alias: 'getProject',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+            {
+                name: 'project',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: ProjectResource }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'put',
+        path: '/v1/organizations/:organization/projects/:project',
+        alias: 'updateProject',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: createProject_Body,
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+            {
+                name: 'project',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: ProjectResource }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
+                    .passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'delete',
+        path: '/v1/organizations/:organization/projects/:project',
+        alias: 'deleteProject',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: z.object({}).partial().passthrough(),
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+            {
+                name: 'project',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.null(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/tags',
+        alias: 'getTags',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: TagCollection }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'post',
+        path: '/v1/organizations/:organization/tags',
+        alias: 'createTag',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: z.object({ name: z.string() }).passthrough(),
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: TagResource }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
+                    .passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'put',
+        path: '/v1/organizations/:organization/tags/:tag',
+        alias: 'updateTag',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: z.object({ name: z.string() }).passthrough(),
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+            {
+                name: 'tag',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: TagResource }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
+                    .passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'delete',
+        path: '/v1/organizations/:organization/tags/:tag',
+        alias: 'deleteTag',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: z.object({}).partial().passthrough(),
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+            {
+                name: 'tag',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.null(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/time-entries',
+        alias: 'getTimeEntries',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+            {
+                name: 'user_id',
+                type: 'Query',
+                schema: z.string().uuid().optional(),
+            },
+            {
+                name: 'before',
+                type: 'Query',
+                schema: before,
+            },
+            {
+                name: 'after',
+                type: 'Query',
+                schema: before,
+            },
+            {
+                name: 'active',
+                type: 'Query',
+                schema: z.string().optional(),
+            },
+            {
+                name: 'limit',
+                type: 'Query',
+                schema: z.number().int().gte(1).lte(500).optional(),
+            },
+            {
+                name: 'only_full_dates',
+                type: 'Query',
+                schema: z.boolean().optional(),
+            },
+        ],
+        response: z.object({ data: TimeEntryCollection }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
+                    .passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'post',
+        path: '/v1/organizations/:organization/time-entries',
+        alias: 'createTimeEntry',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: createTimeEntry_Body,
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: TimeEntryResource }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
+                    .passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'put',
+        path: '/v1/organizations/:organization/time-entries/:timeEntry',
+        alias: 'updateTimeEntry',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: updateTimeEntry_Body,
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+            {
+                name: 'timeEntry',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: TimeEntryResource }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
+                    .passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'delete',
+        path: '/v1/organizations/:organization/time-entries/:timeEntry',
+        alias: 'deleteTimeEntry',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: z.object({}).partial().passthrough(),
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+            {
+                name: 'timeEntry',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.null(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
+]);
+
+export const api = new Zodios('http://solidtime.test/api', endpoints);
+
+export function createApiClient(baseUrl: string, options?: ZodiosOptions) {
+    return new Zodios(baseUrl, endpoints, options);
+}
diff --git a/package-lock.json b/package-lock.json
index a5469820..f1d717a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,9 +5,17 @@
     "packages": {
         "": {
             "dependencies": {
+                "@heroicons/vue": "^2.1.1",
                 "@rushstack/eslint-patch": "^1.7.0",
                 "@vue/eslint-config-prettier": "^9.0.0",
-                "@vue/eslint-config-typescript": "^12.0.0"
+                "@vue/eslint-config-typescript": "^12.0.0",
+                "dayjs": "^1.11.10",
+                "echarts": "^5.5.0",
+                "parse-duration": "^1.1.0",
+                "pinia": "^2.1.7",
+                "radix-vue": "^1.4.9",
+                "tailwind-merge": "^2.2.1",
+                "vue-echarts": "^6.6.9"
             },
             "devDependencies": {
                 "@inertiajs/vue3": "^1.0.0",
@@ -20,6 +28,7 @@
                 "autoprefixer": "^10.4.7",
                 "axios": "^1.6.4",
                 "laravel-vite-plugin": "^1.0.0",
+                "openapi-zod-client": "^1.16.2",
                 "postcss": "^8.4.14",
                 "tailwindcss": "^3.1.0",
                 "typescript": "^5.3.3",
@@ -51,6 +60,121 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/@ampproject/remapping": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+            "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@apidevtools/json-schema-ref-parser": {
+            "version": "9.0.6",
+            "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz",
+            "integrity": "sha512-M3YgsLjI0lZxvrpeGVk9Ap032W6TPQkH6pRAZz81Ac3WUNF79VQooAFnp8umjvVzUmD93NkogxEwbSce7qMsUg==",
+            "dev": true,
+            "dependencies": {
+                "@jsdevtools/ono": "^7.1.3",
+                "call-me-maybe": "^1.0.1",
+                "js-yaml": "^3.13.1"
+            }
+        },
+        "node_modules/@apidevtools/json-schema-ref-parser/node_modules/argparse": {
+            "version": "1.0.10",
+            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+            "dev": true,
+            "dependencies": {
+                "sprintf-js": "~1.0.2"
+            }
+        },
+        "node_modules/@apidevtools/json-schema-ref-parser/node_modules/js-yaml": {
+            "version": "3.14.1",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+            "dev": true,
+            "dependencies": {
+                "argparse": "^1.0.7",
+                "esprima": "^4.0.0"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
+        },
+        "node_modules/@apidevtools/openapi-schemas": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/@apidevtools/openapi-schemas/-/openapi-schemas-2.1.0.tgz",
+            "integrity": "sha512-Zc1AlqrJlX3SlpupFGpiLi2EbteyP7fXmUOGup6/DnkRgjP9bgMM/ag+n91rsv0U1Gpz0H3VILA/o3bW7Ua6BQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@apidevtools/swagger-methods": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@apidevtools/swagger-methods/-/swagger-methods-3.0.2.tgz",
+            "integrity": "sha512-QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg==",
+            "dev": true
+        },
+        "node_modules/@apidevtools/swagger-parser": {
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/@apidevtools/swagger-parser/-/swagger-parser-10.1.0.tgz",
+            "integrity": "sha512-9Kt7EuS/7WbMAUv2gSziqjvxwDbFSg3Xeyfuj5laUODX8o/k/CpsAKiQ8W7/R88eXFTMbJYg6+7uAmOWNKmwnw==",
+            "dev": true,
+            "dependencies": {
+                "@apidevtools/json-schema-ref-parser": "9.0.6",
+                "@apidevtools/openapi-schemas": "^2.1.0",
+                "@apidevtools/swagger-methods": "^3.0.2",
+                "@jsdevtools/ono": "^7.1.3",
+                "ajv": "^8.6.3",
+                "ajv-draft-04": "^1.0.0",
+                "call-me-maybe": "^1.0.1"
+            },
+            "peerDependencies": {
+                "openapi-types": ">=7"
+            }
+        },
+        "node_modules/@apidevtools/swagger-parser/node_modules/ajv": {
+            "version": "8.12.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+            "dev": true,
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/@apidevtools/swagger-parser/node_modules/ajv-draft-04": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz",
+            "integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==",
+            "dev": true,
+            "peerDependencies": {
+                "ajv": "^8.5.0"
+            },
+            "peerDependenciesMeta": {
+                "ajv": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@apidevtools/swagger-parser/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true
+        },
         "node_modules/@babel/code-frame": {
             "version": "7.23.5",
             "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
@@ -135,6 +259,207 @@
                 "node": ">=4"
             }
         },
+        "node_modules/@babel/compat-data": {
+            "version": "7.23.5",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
+            "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/core": {
+            "version": "7.24.0",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.0.tgz",
+            "integrity": "sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==",
+            "dev": true,
+            "dependencies": {
+                "@ampproject/remapping": "^2.2.0",
+                "@babel/code-frame": "^7.23.5",
+                "@babel/generator": "^7.23.6",
+                "@babel/helper-compilation-targets": "^7.23.6",
+                "@babel/helper-module-transforms": "^7.23.3",
+                "@babel/helpers": "^7.24.0",
+                "@babel/parser": "^7.24.0",
+                "@babel/template": "^7.24.0",
+                "@babel/traverse": "^7.24.0",
+                "@babel/types": "^7.24.0",
+                "convert-source-map": "^2.0.0",
+                "debug": "^4.1.0",
+                "gensync": "^1.0.0-beta.2",
+                "json5": "^2.2.3",
+                "semver": "^6.3.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/babel"
+            }
+        },
+        "node_modules/@babel/core/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/@babel/generator": {
+            "version": "7.23.6",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+            "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.23.6",
+                "@jridgewell/gen-mapping": "^0.3.2",
+                "@jridgewell/trace-mapping": "^0.3.17",
+                "jsesc": "^2.5.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-compilation-targets": {
+            "version": "7.23.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
+            "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/compat-data": "^7.23.5",
+                "@babel/helper-validator-option": "^7.23.5",
+                "browserslist": "^4.22.2",
+                "lru-cache": "^5.1.1",
+                "semver": "^6.3.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+            "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+            "dev": true,
+            "dependencies": {
+                "yallist": "^3.0.2"
+            }
+        },
+        "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+            "dev": true
+        },
+        "node_modules/@babel/helper-environment-visitor": {
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+            "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-function-name": {
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+            "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/template": "^7.22.15",
+                "@babel/types": "^7.23.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-hoist-variables": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+            "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.22.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-module-imports": {
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+            "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.22.15"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-module-transforms": {
+            "version": "7.23.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
+            "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-module-imports": "^7.22.15",
+                "@babel/helper-simple-access": "^7.22.5",
+                "@babel/helper-split-export-declaration": "^7.22.6",
+                "@babel/helper-validator-identifier": "^7.22.20"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/helper-simple-access": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+            "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.22.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-split-export-declaration": {
+            "version": "7.22.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+            "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.22.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-string-parser": {
+            "version": "7.23.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+            "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
         "node_modules/@babel/helper-validator-identifier": {
             "version": "7.22.20",
             "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
@@ -144,6 +469,29 @@
                 "node": ">=6.9.0"
             }
         },
+        "node_modules/@babel/helper-validator-option": {
+            "version": "7.23.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
+            "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helpers": {
+            "version": "7.24.0",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.0.tgz",
+            "integrity": "sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/template": "^7.24.0",
+                "@babel/traverse": "^7.24.0",
+                "@babel/types": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
         "node_modules/@babel/highlight": {
             "version": "7.23.4",
             "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
@@ -230,10 +578,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.23.6",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
-            "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
-            "dev": true,
+            "version": "7.24.0",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz",
+            "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==",
             "bin": {
                 "parser": "bin/babel-parser.js"
             },
@@ -241,6 +588,75 @@
                 "node": ">=6.0.0"
             }
         },
+        "node_modules/@babel/runtime": {
+            "version": "7.23.9",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.9.tgz",
+            "integrity": "sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==",
+            "dependencies": {
+                "regenerator-runtime": "^0.14.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/template": {
+            "version": "7.24.0",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
+            "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/code-frame": "^7.23.5",
+                "@babel/parser": "^7.24.0",
+                "@babel/types": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/traverse": {
+            "version": "7.24.0",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.0.tgz",
+            "integrity": "sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/code-frame": "^7.23.5",
+                "@babel/generator": "^7.23.6",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/helper-hoist-variables": "^7.22.5",
+                "@babel/helper-split-export-declaration": "^7.22.6",
+                "@babel/parser": "^7.24.0",
+                "@babel/types": "^7.24.0",
+                "debug": "^4.3.1",
+                "globals": "^11.1.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/traverse/node_modules/globals": {
+            "version": "11.12.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/types": {
+            "version": "7.24.0",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
+            "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-string-parser": "^7.23.4",
+                "@babel/helper-validator-identifier": "^7.22.20",
+                "to-fast-properties": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
         "node_modules/@esbuild/aix-ppc64": {
             "version": "0.19.11",
             "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.11.tgz",
@@ -685,6 +1101,71 @@
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
             }
         },
+        "node_modules/@floating-ui/core": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.0.tgz",
+            "integrity": "sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==",
+            "dependencies": {
+                "@floating-ui/utils": "^0.2.1"
+            }
+        },
+        "node_modules/@floating-ui/dom": {
+            "version": "1.6.3",
+            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz",
+            "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==",
+            "dependencies": {
+                "@floating-ui/core": "^1.0.0",
+                "@floating-ui/utils": "^0.2.0"
+            }
+        },
+        "node_modules/@floating-ui/utils": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz",
+            "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q=="
+        },
+        "node_modules/@floating-ui/vue": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/@floating-ui/vue/-/vue-1.0.6.tgz",
+            "integrity": "sha512-EdrOljjkpkkqZnrpqUcPoz9NvHxuTjUtSInh6GMv3+Mcy+giY2cE2pHh9rpacRcZ2eMSCxel9jWkWXTjLmY55w==",
+            "dependencies": {
+                "@floating-ui/dom": "^1.6.1",
+                "@floating-ui/utils": "^0.2.1",
+                "vue-demi": ">=0.13.0"
+            }
+        },
+        "node_modules/@floating-ui/vue/node_modules/vue-demi": {
+            "version": "0.14.7",
+            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
+            "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+            "hasInstallScript": true,
+            "bin": {
+                "vue-demi-fix": "bin/vue-demi-fix.js",
+                "vue-demi-switch": "bin/vue-demi-switch.js"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.0.0-rc.1",
+                "vue": "^3.0.0-0 || ^2.6.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@heroicons/vue": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/@heroicons/vue/-/vue-2.1.1.tgz",
+            "integrity": "sha512-Yi5nh/89L193ALgHyJUQUdNLsKXPrrE3yj5yiR8WAlo7nZyXGxGauQcEAmBsa2XJGMhBMuEdoOiuZ8wEwTBxVQ==",
+            "peerDependencies": {
+                "vue": ">= 3"
+            }
+        },
         "node_modules/@humanwhocodes/config-array": {
             "version": "0.11.14",
             "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
@@ -784,14 +1265,14 @@
             }
         },
         "node_modules/@jridgewell/gen-mapping": {
-            "version": "0.3.3",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-            "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+            "version": "0.3.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+            "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
             "dev": true,
             "dependencies": {
-                "@jridgewell/set-array": "^1.0.1",
+                "@jridgewell/set-array": "^1.2.1",
                 "@jridgewell/sourcemap-codec": "^1.4.10",
-                "@jridgewell/trace-mapping": "^0.3.9"
+                "@jridgewell/trace-mapping": "^0.3.24"
             },
             "engines": {
                 "node": ">=6.0.0"
@@ -807,9 +1288,9 @@
             }
         },
         "node_modules/@jridgewell/set-array": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-            "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+            "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
             "dev": true,
             "engines": {
                 "node": ">=6.0.0"
@@ -818,19 +1299,48 @@
         "node_modules/@jridgewell/sourcemap-codec": {
             "version": "1.4.15",
             "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-            "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-            "dev": true
+            "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
         },
         "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.21",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.21.tgz",
-            "integrity": "sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g==",
+            "version": "0.3.24",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.24.tgz",
+            "integrity": "sha512-+VaWXDa6+l6MhflBvVXjIEAzb59nQ2JUK3bwRp2zRpPtU+8TFRy9Gg/5oIcNlkEL5PGlBFGfemUVvIgLnTzq7Q==",
             "dev": true,
             "dependencies": {
                 "@jridgewell/resolve-uri": "^3.1.0",
                 "@jridgewell/sourcemap-codec": "^1.4.14"
             }
         },
+        "node_modules/@jsdevtools/ono": {
+            "version": "7.1.3",
+            "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz",
+            "integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==",
+            "dev": true
+        },
+        "node_modules/@liuli-util/fs-extra": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/@liuli-util/fs-extra/-/fs-extra-0.1.0.tgz",
+            "integrity": "sha512-eaAyDyMGT23QuRGbITVY3SOJff3G9ekAAyGqB9joAnTBmqvFN+9a1FazOdO70G6IUqgpKV451eBHYSRcOJ/FNQ==",
+            "dev": true,
+            "dependencies": {
+                "@types/fs-extra": "^9.0.13",
+                "fs-extra": "^10.1.0"
+            }
+        },
+        "node_modules/@liuli-util/fs-extra/node_modules/fs-extra": {
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+            "dev": true,
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -1106,6 +1616,15 @@
             "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
             "dev": true
         },
+        "node_modules/@types/fs-extra": {
+            "version": "9.0.13",
+            "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
+            "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
+            "dev": true,
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
         "node_modules/@types/json-schema": {
             "version": "7.0.15",
             "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -1358,7 +1877,6 @@
             "version": "3.4.14",
             "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.14.tgz",
             "integrity": "sha512-ro4Zzl/MPdWs7XwxT7omHRxAjMbDFRZEEjD+2m3NBf8YzAe3HuoSEZosXQo+m1GQ1G3LQ1LdmNh1RKTYe+ssEg==",
-            "dev": true,
             "dependencies": {
                 "@babel/parser": "^7.23.6",
                 "@vue/shared": "3.4.14",
@@ -1371,7 +1889,6 @@
             "version": "3.4.14",
             "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.14.tgz",
             "integrity": "sha512-nOZTY+veWNa0DKAceNWxorAbWm0INHdQq7cejFaWM1WYnoNSJbSEKYtE7Ir6lR/+mo9fttZpPVI9ZFGJ1juUEQ==",
-            "dev": true,
             "dependencies": {
                 "@vue/compiler-core": "3.4.14",
                 "@vue/shared": "3.4.14"
@@ -1381,7 +1898,6 @@
             "version": "3.4.14",
             "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.14.tgz",
             "integrity": "sha512-1vHc9Kv1jV+YBZC/RJxQJ9JCxildTI+qrhtDh6tPkR1O8S+olBUekimY0km0ZNn8nG1wjtFAe9XHij+YLR8cRQ==",
-            "dev": true,
             "dependencies": {
                 "@babel/parser": "^7.23.6",
                 "@vue/compiler-core": "3.4.14",
@@ -1398,12 +1914,16 @@
             "version": "3.4.14",
             "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.14.tgz",
             "integrity": "sha512-bXT6+oAGlFjTYVOTtFJ4l4Jab1wjsC0cfSfOe2B4Z0N2vD2zOBSQ9w694RsCfhjk+bC2DY5Gubb1rHZVii107Q==",
-            "dev": true,
             "dependencies": {
                 "@vue/compiler-dom": "3.4.14",
                 "@vue/shared": "3.4.14"
             }
         },
+        "node_modules/@vue/devtools-api": {
+            "version": "6.6.1",
+            "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.1.tgz",
+            "integrity": "sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA=="
+        },
         "node_modules/@vue/eslint-config-prettier": {
             "version": "9.0.0",
             "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz",
@@ -1469,7 +1989,6 @@
             "version": "3.4.14",
             "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.14.tgz",
             "integrity": "sha512-xRYwze5Q4tK7tT2J4uy4XLhK/AIXdU5EBUu9PLnIHcOKXO0uyXpNNMzlQKuq7B+zwtq6K2wuUL39pHA6ZQzObw==",
-            "dev": true,
             "dependencies": {
                 "@vue/shared": "3.4.14"
             }
@@ -1478,7 +1997,6 @@
             "version": "3.4.14",
             "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.14.tgz",
             "integrity": "sha512-qu+NMkfujCoZL6cfqK5NOfxgXJROSlP2ZPs4CTcVR+mLrwl4TtycF5Tgo0QupkdBL+2kigc6EsJlTcuuZC1NaQ==",
-            "dev": true,
             "dependencies": {
                 "@vue/reactivity": "3.4.14",
                 "@vue/shared": "3.4.14"
@@ -1488,7 +2006,6 @@
             "version": "3.4.14",
             "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.14.tgz",
             "integrity": "sha512-B85XmcR4E7XsirEHVqhmy4HPbRT9WLFWV9Uhie3OapV9m1MEN9+Er6hmUIE6d8/l2sUygpK9RstFM2bmHEUigA==",
-            "dev": true,
             "dependencies": {
                 "@vue/runtime-core": "3.4.14",
                 "@vue/shared": "3.4.14",
@@ -1499,7 +2016,6 @@
             "version": "3.4.14",
             "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.14.tgz",
             "integrity": "sha512-pwSKXQfYdJBTpvWHGEYI+akDE18TXAiLcGn+Q/2Fj8wQSHWztoo7PSvfMNqu6NDhp309QXXbPFEGCU5p85HqkA==",
-            "dev": true,
             "dependencies": {
                 "@vue/compiler-ssr": "3.4.14",
                 "@vue/shared": "3.4.14"
@@ -1511,8 +2027,7 @@
         "node_modules/@vue/shared": {
             "version": "3.4.14",
             "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.14.tgz",
-            "integrity": "sha512-nmi3BtLpvqXAWoRZ6HQ+pFJOHBU4UnH3vD3opgmwXac7vhaHKA9nj1VeGjMggdB9eLtW83eHyPCmOU1qzdsC7Q==",
-            "dev": true
+            "integrity": "sha512-nmi3BtLpvqXAWoRZ6HQ+pFJOHBU4UnH3vD3opgmwXac7vhaHKA9nj1VeGjMggdB9eLtW83eHyPCmOU1qzdsC7Q=="
         },
         "node_modules/@vue/tsconfig": {
             "version": "0.5.1",
@@ -1520,6 +2035,16 @@
             "integrity": "sha512-VcZK7MvpjuTPx2w6blwnwZAu5/LgBUtejFOi3pPGQFXQN5Ela03FUtd2Qtg4yWGGissVL0dr6Ro1LfOFh+PCuQ==",
             "dev": true
         },
+        "node_modules/@zodios/core": {
+            "version": "10.9.6",
+            "resolved": "https://registry.npmjs.org/@zodios/core/-/core-10.9.6.tgz",
+            "integrity": "sha512-aH4rOdb3AcezN7ws8vDgBfGboZMk2JGGzEq/DtW65MhnRxyTGRuLJRWVQ/2KxDgWvV2F5oTkAS+5pnjKbl0n+A==",
+            "dev": true,
+            "peerDependencies": {
+                "axios": "^0.x || ^1.0.0",
+                "zod": "^3.x"
+            }
+        },
         "node_modules/acorn": {
             "version": "8.11.3",
             "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
@@ -1767,7 +2292,16 @@
                 "browserslist": "cli.js"
             },
             "engines": {
-                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+            }
+        },
+        "node_modules/cac": {
+            "version": "6.7.14",
+            "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
+            "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
             }
         },
         "node_modules/call-bind": {
@@ -1784,6 +2318,12 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/call-me-maybe": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz",
+            "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==",
+            "dev": true
+        },
         "node_modules/callsites": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -1938,6 +2478,12 @@
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
             "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
         },
+        "node_modules/convert-source-map": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+            "dev": true
+        },
         "node_modules/cross-spawn": {
             "version": "7.0.3",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -1965,8 +2511,12 @@
         "node_modules/csstype": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-            "dev": true
+            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+        },
+        "node_modules/dayjs": {
+            "version": "1.11.10",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
+            "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
         },
         "node_modules/de-indent": {
             "version": "1.0.2",
@@ -2069,6 +2619,20 @@
             "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
             "dev": true
         },
+        "node_modules/echarts": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.5.0.tgz",
+            "integrity": "sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==",
+            "dependencies": {
+                "tslib": "2.3.0",
+                "zrender": "5.5.0"
+            }
+        },
+        "node_modules/echarts/node_modules/tslib": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+            "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+        },
         "node_modules/electron-to-chromium": {
             "version": "1.4.632",
             "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.632.tgz",
@@ -2085,7 +2649,6 @@
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
             "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-            "dev": true,
             "engines": {
                 "node": ">=0.12"
             },
@@ -2366,6 +2929,19 @@
                 "url": "https://opencollective.com/eslint"
             }
         },
+        "node_modules/esprima": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+            "dev": true,
+            "bin": {
+                "esparse": "bin/esparse.js",
+                "esvalidate": "bin/esvalidate.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
         "node_modules/esquery": {
             "version": "1.5.0",
             "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
@@ -2399,8 +2975,7 @@
         "node_modules/estree-walker": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-            "dev": true
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
         },
         "node_modules/esutils": {
             "version": "2.0.3",
@@ -2411,11 +2986,16 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/eval-estree-expression": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/eval-estree-expression/-/eval-estree-expression-1.1.0.tgz",
+            "integrity": "sha512-6ZAHSb0wsqxutjk2lXZcW7btSc51I8BhlIetit0wIf5sOb5xDNBrIqe0g8RFyQ/EW6Xwn1szrtButztU7Vdj1Q==",
+            "dev": true
+        },
         "node_modules/fast-deep-equal": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-            "peer": true
+            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
         },
         "node_modules/fast-diff": {
             "version": "1.3.0",
@@ -2633,6 +3213,15 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/gensync": {
+            "version": "1.0.0-beta.2",
+            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
         "node_modules/get-intrinsic": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
@@ -2738,6 +3327,27 @@
             "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
             "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
         },
+        "node_modules/handlebars": {
+            "version": "4.7.8",
+            "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
+            "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
+            "dev": true,
+            "dependencies": {
+                "minimist": "^1.2.5",
+                "neo-async": "^2.6.2",
+                "source-map": "^0.6.1",
+                "wordwrap": "^1.0.0"
+            },
+            "bin": {
+                "handlebars": "bin/handlebars"
+            },
+            "engines": {
+                "node": ">=0.4.7"
+            },
+            "optionalDependencies": {
+                "uglify-js": "^3.1.4"
+            }
+        },
         "node_modules/has-flag": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -2971,6 +3581,18 @@
                 "js-yaml": "bin/js-yaml.js"
             }
         },
+        "node_modules/jsesc": {
+            "version": "2.5.2",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+            "dev": true,
+            "bin": {
+                "jsesc": "bin/jsesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
         "node_modules/json-buffer": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -2989,6 +3611,18 @@
             "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
             "peer": true
         },
+        "node_modules/json5": {
+            "version": "2.2.3",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+            "dev": true,
+            "bin": {
+                "json5": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
         "node_modules/jsonfile": {
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -3131,7 +3765,6 @@
             "version": "0.30.5",
             "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
             "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
-            "dev": true,
             "dependencies": {
                 "@jridgewell/sourcemap-codec": "^1.4.15"
             },
@@ -3203,6 +3836,15 @@
                 "url": "https://github.com/sponsors/isaacs"
             }
         },
+        "node_modules/minimist": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+            "dev": true,
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/minipass": {
             "version": "7.0.4",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
@@ -3238,7 +3880,6 @@
             "version": "3.3.7",
             "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
             "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-            "dev": true,
             "funding": [
                 {
                     "type": "github",
@@ -3257,6 +3898,12 @@
             "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
             "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
         },
+        "node_modules/neo-async": {
+            "version": "2.6.2",
+            "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+            "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+            "dev": true
+        },
         "node_modules/node-releases": {
             "version": "2.0.14",
             "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
@@ -3347,6 +3994,61 @@
                 "wrappy": "1"
             }
         },
+        "node_modules/openapi-types": {
+            "version": "12.1.3",
+            "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-12.1.3.tgz",
+            "integrity": "sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==",
+            "dev": true
+        },
+        "node_modules/openapi-zod-client": {
+            "version": "1.16.2",
+            "resolved": "https://registry.npmjs.org/openapi-zod-client/-/openapi-zod-client-1.16.2.tgz",
+            "integrity": "sha512-cN8rb7bzWqvsJzzDGoi9sUJJNid8triuH5ry2dYhJ++Xw/TStkCaOwe2NaNnIrLp7uVgIu+cEIE608Y9YS3/aw==",
+            "dev": true,
+            "dependencies": {
+                "@apidevtools/swagger-parser": "^10.1.0",
+                "@liuli-util/fs-extra": "^0.1.0",
+                "@zodios/core": "^10.3.1",
+                "axios": "^1.6.0",
+                "cac": "^6.7.14",
+                "handlebars": "^4.7.7",
+                "openapi-types": "^12.0.2",
+                "openapi3-ts": "3.1.0",
+                "pastable": "^2.2.1",
+                "prettier": "^2.7.1",
+                "tanu": "^0.1.13",
+                "ts-pattern": "^5.0.1",
+                "whence": "^2.0.0",
+                "zod": "^3.19.1"
+            },
+            "bin": {
+                "openapi-zod-client": "bin.js"
+            }
+        },
+        "node_modules/openapi-zod-client/node_modules/prettier": {
+            "version": "2.8.8",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+            "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+            "dev": true,
+            "bin": {
+                "prettier": "bin-prettier.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            },
+            "funding": {
+                "url": "https://github.com/prettier/prettier?sponsor=1"
+            }
+        },
+        "node_modules/openapi3-ts": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-3.1.0.tgz",
+            "integrity": "sha512-1qKTvCCVoV0rkwUh1zq5o8QyghmwYPuhdvtjv1rFjuOnJToXhQyF8eGjNETQ8QmGjr9Jz/tkAKLITIl2s7dw3A==",
+            "dev": true,
+            "dependencies": {
+                "yaml": "^2.1.3"
+            }
+        },
         "node_modules/optionator": {
             "version": "0.9.3",
             "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
@@ -3406,6 +4108,49 @@
                 "node": ">=6"
             }
         },
+        "node_modules/parse-duration": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-1.1.0.tgz",
+            "integrity": "sha512-z6t9dvSJYaPoQq7quMzdEagSFtpGu+utzHqqxmpVWNNZRIXnvqyCvn9XsTdh7c/w0Bqmdz3RB3YnRaKtpRtEXQ=="
+        },
+        "node_modules/pastable": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/pastable/-/pastable-2.2.1.tgz",
+            "integrity": "sha512-K4ClMxRKpgN4sXj6VIPPrvor/TMp2yPNCGtfhvV106C73SwefQ3FuegURsH7AQHpqu0WwbvKXRl1HQxF6qax9w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/core": "^7.20.12",
+                "ts-toolbelt": "^9.6.0",
+                "type-fest": "^3.5.3"
+            },
+            "engines": {
+                "node": ">=14.x"
+            },
+            "peerDependencies": {
+                "react": ">=17",
+                "xstate": ">=4.32.1"
+            },
+            "peerDependenciesMeta": {
+                "react": {
+                    "optional": true
+                },
+                "xstate": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/pastable/node_modules/type-fest": {
+            "version": "3.13.1",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
+            "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
+            "dev": true,
+            "engines": {
+                "node": ">=14.16"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/path-browserify": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
@@ -3471,8 +4216,7 @@
         "node_modules/picocolors": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-            "dev": true
+            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
         },
         "node_modules/picomatch": {
             "version": "2.3.1",
@@ -3494,6 +4238,56 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/pinia": {
+            "version": "2.1.7",
+            "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.1.7.tgz",
+            "integrity": "sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==",
+            "dependencies": {
+                "@vue/devtools-api": "^6.5.0",
+                "vue-demi": ">=0.14.5"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/posva"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.4.0",
+                "typescript": ">=4.4.4",
+                "vue": "^2.6.14 || ^3.3.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                },
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/pinia/node_modules/vue-demi": {
+            "version": "0.14.7",
+            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
+            "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+            "hasInstallScript": true,
+            "bin": {
+                "vue-demi-fix": "bin/vue-demi-fix.js",
+                "vue-demi-switch": "bin/vue-demi-switch.js"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.0.0-rc.1",
+                "vue": "^3.0.0-0 || ^2.6.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/pirates": {
             "version": "4.0.6",
             "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
@@ -3551,7 +4345,6 @@
             "version": "8.4.33",
             "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
             "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
-            "dev": true,
             "funding": [
                 {
                     "type": "opencollective",
@@ -3751,7 +4544,6 @@
             "version": "2.3.1",
             "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
             "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-            "peer": true,
             "engines": {
                 "node": ">=6"
             }
@@ -3790,6 +4582,16 @@
                 }
             ]
         },
+        "node_modules/radix-vue": {
+            "version": "1.4.9",
+            "resolved": "https://registry.npmjs.org/radix-vue/-/radix-vue-1.4.9.tgz",
+            "integrity": "sha512-xGY29nUqaAJTncubdhevwGuv5ZSHGvZjUinWBXVrwHvo6oeJ/SLudxYuc3qRcAU+DK+OcthEQFq255wLJJe4Rw==",
+            "dependencies": {
+                "@floating-ui/dom": "^1.5.4",
+                "@floating-ui/vue": "^1.0.4",
+                "fast-deep-equal": "^3.1.3"
+            }
+        },
         "node_modules/read-cache": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -3811,6 +4613,25 @@
                 "node": ">=8.10.0"
             }
         },
+        "node_modules/regenerator-runtime": {
+            "version": "0.14.1",
+            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+            "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+        },
+        "node_modules/require-from-string": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/resize-detector": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/resize-detector/-/resize-detector-0.3.0.tgz",
+            "integrity": "sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ=="
+        },
         "node_modules/resolve": {
             "version": "1.22.8",
             "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
@@ -4051,15 +4872,29 @@
                 "node": ">=8"
             }
         },
+        "node_modules/source-map": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
         "node_modules/source-map-js": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
             "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-            "dev": true,
             "engines": {
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/sprintf-js": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+            "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+            "dev": true
+        },
         "node_modules/string-width": {
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
@@ -4228,6 +5063,18 @@
                 "url": "https://opencollective.com/unts"
             }
         },
+        "node_modules/tailwind-merge": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.2.1.tgz",
+            "integrity": "sha512-o+2GTLkthfa5YUt4JxPfzMIpQzZ3adD1vLVkvKE1Twl9UAhGsEbIZhHHZVRttyW177S8PDJI3bTQNaebyofK3Q==",
+            "dependencies": {
+                "@babel/runtime": "^7.23.7"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/dcastil"
+            }
+        },
         "node_modules/tailwindcss": {
             "version": "3.4.1",
             "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz",
@@ -4278,6 +5125,29 @@
                 "node": ">=4"
             }
         },
+        "node_modules/tanu": {
+            "version": "0.1.13",
+            "resolved": "https://registry.npmjs.org/tanu/-/tanu-0.1.13.tgz",
+            "integrity": "sha512-UbRmX7ccZ4wMVOY/Uw+7ji4VOkEYSYJG1+I4qzbnn4qh/jtvVbrm6BFnF12NQQ4+jGv21wKmjb1iFyUSVnBWcQ==",
+            "dev": true,
+            "dependencies": {
+                "tslib": "^2.4.0",
+                "typescript": "^4.7.4"
+            }
+        },
+        "node_modules/tanu/node_modules/typescript": {
+            "version": "4.9.5",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+            "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+            "dev": true,
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=4.2.0"
+            }
+        },
         "node_modules/text-table": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -4311,6 +5181,15 @@
             "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==",
             "dev": true
         },
+        "node_modules/to-fast-properties": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+            "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
         "node_modules/to-regex-range": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -4339,6 +5218,18 @@
             "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
             "dev": true
         },
+        "node_modules/ts-pattern": {
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-5.0.8.tgz",
+            "integrity": "sha512-aafbuAQOTEeWmA7wtcL94w6I89EgLD7F+IlWkr596wYxeb0oveWDO5dQpv85YP0CGbxXT/qXBIeV6IYLcoZ2uA==",
+            "dev": true
+        },
+        "node_modules/ts-toolbelt": {
+            "version": "9.6.0",
+            "resolved": "https://registry.npmjs.org/ts-toolbelt/-/ts-toolbelt-9.6.0.tgz",
+            "integrity": "sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w==",
+            "dev": true
+        },
         "node_modules/tslib": {
             "version": "2.6.2",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
@@ -4380,6 +5271,19 @@
                 "node": ">=14.17"
             }
         },
+        "node_modules/uglify-js": {
+            "version": "3.17.4",
+            "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
+            "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
+            "dev": true,
+            "optional": true,
+            "bin": {
+                "uglifyjs": "bin/uglifyjs"
+            },
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
         "node_modules/undici-types": {
             "version": "5.26.5",
             "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
@@ -4429,7 +5333,6 @@
             "version": "4.4.1",
             "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
             "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-            "peer": true,
             "dependencies": {
                 "punycode": "^2.1.0"
             }
@@ -4688,7 +5591,6 @@
             "version": "3.4.14",
             "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.14.tgz",
             "integrity": "sha512-Rop5Al/ZcBbBz+KjPZaZDgHDX0kUP4duEzDbm+1o91uxYUNmJrZSBuegsNIJvUGy+epLevNRNhLjm08VKTgGyw==",
-            "dev": true,
             "dependencies": {
                 "@vue/compiler-dom": "3.4.14",
                 "@vue/compiler-sfc": "3.4.14",
@@ -4705,6 +5607,55 @@
                 }
             }
         },
+        "node_modules/vue-echarts": {
+            "version": "6.6.9",
+            "resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-6.6.9.tgz",
+            "integrity": "sha512-mojIq3ZvsjabeVmDthhAUDV8Kgf2Rr/X4lV4da7gEFd1fP05gcSJ0j7wa7HQkW5LlFmF2gdCJ8p4Chas6NNIQQ==",
+            "hasInstallScript": true,
+            "dependencies": {
+                "resize-detector": "^0.3.0",
+                "vue-demi": "^0.13.11"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.0.5",
+                "@vue/runtime-core": "^3.0.0",
+                "echarts": "^5.4.1",
+                "vue": "^2.6.12 || ^3.1.1"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                },
+                "@vue/runtime-core": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vue-echarts/node_modules/vue-demi": {
+            "version": "0.13.11",
+            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
+            "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==",
+            "hasInstallScript": true,
+            "bin": {
+                "vue-demi-fix": "bin/vue-demi-fix.js",
+                "vue-demi-switch": "bin/vue-demi-switch.js"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.0.0-rc.1",
+                "vue": "^3.0.0-0 || ^2.6.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/vue-eslint-parser": {
             "version": "9.4.0",
             "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.0.tgz",
@@ -4755,6 +5706,19 @@
                 "typescript": "*"
             }
         },
+        "node_modules/whence": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/whence/-/whence-2.0.0.tgz",
+            "integrity": "sha512-exmM13v2lg8juBbfS2tao/alV68jyryPXS+jf29NBNGLzE2hRgmzvQFQGX5CxNfH4Ag9qRqd6gGpXTH2JxqKHg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/parser": "^7.15.7",
+                "eval-estree-expression": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=14"
+            }
+        },
         "node_modules/which": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -4769,6 +5733,12 @@
                 "node": ">= 8"
             }
         },
+        "node_modules/wordwrap": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+            "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
+            "dev": true
+        },
         "node_modules/wrap-ansi": {
             "version": "8.1.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
@@ -4921,6 +5891,28 @@
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
+        },
+        "node_modules/zod": {
+            "version": "3.22.4",
+            "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
+            "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==",
+            "dev": true,
+            "funding": {
+                "url": "https://github.com/sponsors/colinhacks"
+            }
+        },
+        "node_modules/zrender": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.5.0.tgz",
+            "integrity": "sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==",
+            "dependencies": {
+                "tslib": "2.3.0"
+            }
+        },
+        "node_modules/zrender/node_modules/tslib": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+            "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
         }
     }
 }
diff --git a/package.json b/package.json
index 1e06d963..9ecfa5fa 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
         "lint": "eslint --ext .js,.vue,.ts --ignore-path .gitignore .",
         "lint:fix": "eslint --fix --ext .js,.vue,.ts --ignore-path .gitignore .",
         "type-check": "vue-tsc --noEmit",
-        "test:e2e": "npx playwright test"
+        "test:e2e": "npx playwright test",
+        "generate:zod": "npx openapi-zod-client http://localhost:80/docs/api.json --output openapi.json.client.ts --base-url http://solidtime.test/api"
     },
     "devDependencies": {
         "@inertiajs/vue3": "^1.0.0",
@@ -20,6 +21,7 @@
         "autoprefixer": "^10.4.7",
         "axios": "^1.6.4",
         "laravel-vite-plugin": "^1.0.0",
+        "openapi-zod-client": "^1.16.2",
         "postcss": "^8.4.14",
         "tailwindcss": "^3.1.0",
         "typescript": "^5.3.3",
@@ -30,8 +32,16 @@
         "ziggy-js": "^1.8.1"
     },
     "dependencies": {
+        "@heroicons/vue": "^2.1.1",
         "@rushstack/eslint-patch": "^1.7.0",
         "@vue/eslint-config-prettier": "^9.0.0",
-        "@vue/eslint-config-typescript": "^12.0.0"
+        "@vue/eslint-config-typescript": "^12.0.0",
+        "dayjs": "^1.11.10",
+        "echarts": "^5.5.0",
+        "parse-duration": "^1.1.0",
+        "pinia": "^2.1.7",
+        "radix-vue": "^1.4.9",
+        "tailwind-merge": "^2.2.1",
+        "vue-echarts": "^6.6.9"
     }
 }
diff --git a/playwright/config.ts b/playwright/config.ts
index 9942dfd7..06ada1f8 100644
--- a/playwright/config.ts
+++ b/playwright/config.ts
@@ -1,2 +1,2 @@
 export const PLAYWRIGHT_BASE_URL =
-    process.env.PLAYWRIGHT_BASE_URL ?? 'http://laravel.test';
+    process.env.PLAYWRIGHT_BASE_URL ?? 'http://solidtime.test';
diff --git a/playwright/fixtures.ts b/playwright/fixtures.ts
index 7d34ba60..92bcf4ce 100644
--- a/playwright/fixtures.ts
+++ b/playwright/fixtures.ts
@@ -1,4 +1,4 @@
-import { expect, test as baseTest } from '@playwright/test';
+import { test as baseTest } from '@playwright/test';
 import fs from 'fs';
 import path from 'path';
 import { PLAYWRIGHT_BASE_URL } from './config';
@@ -55,11 +55,6 @@ export const test = baseTest.extend<object, { workerStorageState: string }>({
             // Wait for the final URL to ensure that the cookies are actually set.
             await page.waitForURL(PLAYWRIGHT_BASE_URL + '/dashboard');
 
-            // Alternatively, you can wait until the page reaches a state where all cookies are set.
-            await expect(
-                page.getByRole('heading', { name: 'Dashboard' })
-            ).toBeVisible();
-
             // End of authentication steps.
 
             await page.context().storageState({ path: fileName });
diff --git a/public/fonts/Outfit-VariableFont_wght.ttf b/public/fonts/Outfit-VariableFont_wght.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..96106f09d6bc9fb0a188518655acdcf7e73df399
GIT binary patch
literal 110572
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

literal 0
HcmV?d00001

diff --git a/resources/css/app.css b/resources/css/app.css
index 0de21207..6697dea9 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -2,6 +2,18 @@
 @tailwind components;
 @tailwind utilities;
 
+
+:root{
+    --theme-color-icon-default: #42466C;
+    --theme-color-card-background: #13152B;
+}
+
+
 [x-cloak] {
     display: none;
 }
+
+@font-face {
+    font-family: 'Outfit';
+    src: url('/fonts/Outfit-VariableFont_wght.ttf');
+}
diff --git a/resources/js/Components/ActionMessage.vue b/resources/js/Components/ActionMessage.vue
index ef7a286e..a0becbe8 100644
--- a/resources/js/Components/ActionMessage.vue
+++ b/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-gray-600 dark:text-gray-400">
+            <div v-show="on" class="text-sm text-muted">
                 <slot />
             </div>
         </transition>
diff --git a/resources/js/Components/ActionSection.vue b/resources/js/Components/ActionSection.vue
index f54f18be..6d07781e 100644
--- a/resources/js/Components/ActionSection.vue
+++ b/resources/js/Components/ActionSection.vue
@@ -15,7 +15,7 @@ import SectionTitle from './SectionTitle.vue';
 
         <div class="mt-5 md:mt-0 md:col-span-2">
             <div
-                class="px-4 py-5 sm:p-6 bg-white dark:bg-gray-800 shadow sm:rounded-lg">
+                class="px-4 py-5 sm:p-6 bg-card-background shadow sm:rounded-lg">
                 <slot name="content" />
             </div>
         </div>
diff --git a/resources/js/Components/ConfirmationModal.vue b/resources/js/Components/ConfirmationModal.vue
index a771b506..abea8f8f 100644
--- a/resources/js/Components/ConfirmationModal.vue
+++ b/resources/js/Components/ConfirmationModal.vue
@@ -48,12 +48,11 @@ const close = () => {
                 </div>
 
                 <div class="mt-3 text-center sm:mt-0 sm:ms-4 sm:text-start">
-                    <h3
-                        class="text-lg font-medium text-gray-900 dark:text-gray-100">
+                    <h3 class="text-lg font-medium text-white">
                         <slot name="title" />
                     </h3>
 
-                    <div class="mt-4 text-sm text-gray-600 dark:text-gray-400">
+                    <div class="mt-4 text-sm text-muted">
                         <slot name="content" />
                     </div>
                 </div>
diff --git a/resources/js/Components/CurrentSidebarTimer.vue b/resources/js/Components/CurrentSidebarTimer.vue
new file mode 100644
index 00000000..da07403d
--- /dev/null
+++ b/resources/js/Components/CurrentSidebarTimer.vue
@@ -0,0 +1,13 @@
+<script setup lang="ts">
+import TimeTrackerStartStop from '@/Components/common/TimeTrackerStartStop.vue';
+</script>
+
+<template>
+    <div class="py-4 px-2 flex justify-between items-center">
+        <div>
+            <div class="text-muted font-extrabold text-xs">Current Timer</div>
+            <div class="text-white font-medium text-lg py-1">1h 23min</div>
+        </div>
+        <TimeTrackerStartStop size="base"></TimeTrackerStartStop>
+    </div>
+</template>
diff --git a/resources/js/Components/Dashboard/ActivityGraphCard.vue b/resources/js/Components/Dashboard/ActivityGraphCard.vue
new file mode 100644
index 00000000..e0f9fb95
--- /dev/null
+++ b/resources/js/Components/Dashboard/ActivityGraphCard.vue
@@ -0,0 +1,87 @@
+<script lang="ts" setup>
+import VChart, { THEME_KEY } from 'vue-echarts';
+import { provide, ref } from 'vue';
+import { use } from 'echarts/core';
+import DashboardCard from '@/Components/Dashboard/DashboardCard.vue';
+import { BoltIcon } from '@heroicons/vue/20/solid';
+import { HeatmapChart } from 'echarts/charts';
+import {
+    CalendarComponent,
+    TitleComponent,
+    TooltipComponent,
+    VisualMapComponent,
+} from 'echarts/components';
+import { CanvasRenderer } from 'echarts/renderers';
+import dayjs from 'dayjs';
+
+const props = defineProps<{
+    dailyHoursTracked: [string, number][];
+}>();
+
+use([
+    TitleComponent,
+    TooltipComponent,
+    VisualMapComponent,
+    CalendarComponent,
+    HeatmapChart,
+    CanvasRenderer,
+]);
+
+provide(THEME_KEY, 'dark');
+
+const max = Math.max(...props.dailyHoursTracked.map((el) => el[1]));
+
+const option = ref({
+    tooltip: {},
+    visualMap: {
+        min: 0,
+        max: max,
+        type: 'piecewise',
+        orient: 'horizontal',
+        left: 'center',
+        top: 'center',
+        inRange: {
+            color: ['#242940', '#2DBE45'],
+        },
+        show: false,
+    },
+    calendar: {
+        top: 40,
+        bottom: 20,
+        left: 40,
+        right: 10,
+        cellSize: [40, 40],
+        splitLine: {
+            show: false,
+        },
+        range: [
+            dayjs().format('YYYY-MM-DD'),
+            dayjs().subtract(50, 'day').startOf('week').format('YYYY-MM-DD'),
+        ],
+        itemStyle: {
+            borderWidth: 8,
+            borderColor: '#13152B',
+        },
+        yearLabel: { show: false },
+    },
+    series: {
+        type: 'heatmap',
+        coordinateSystem: 'calendar',
+        data: props.dailyHoursTracked,
+        itemStyle: {
+            borderRadius: 5,
+        },
+    },
+    backgroundColor: 'transparent',
+});
+</script>
+
+<template>
+    <DashboardCard title="Activity Graph" :icon="BoltIcon">
+        <div class="px-2">
+            <v-chart class="chart" :option="option" style="height: 310px" />
+        </div>
+    </DashboardCard>
+</template>
+
+<style></style>
diff --git a/resources/js/Components/Dashboard/DashboardCard.vue b/resources/js/Components/Dashboard/DashboardCard.vue
new file mode 100644
index 00000000..b07d2724
--- /dev/null
+++ b/resources/js/Components/Dashboard/DashboardCard.vue
@@ -0,0 +1,25 @@
+<template>
+    <section class="">
+        <h3
+            class="text-white font-bold pb-4 text-lg flex items-center space-x-2.5">
+            <component
+                v-if="icon"
+                :is="icon"
+                class="w-6 text-icon-default"></component>
+            <span>{{ title }}</span>
+        </h3>
+        <div
+            class="rounded-lg bg-card-background border border-card-border divide-y divide-card-background-seperator">
+            <slot></slot>
+        </div>
+    </section>
+</template>
+
+<script setup lang="ts">
+import type { Component } from 'vue';
+
+defineProps<{
+    title: string;
+    icon?: Component;
+}>();
+</script>
diff --git a/resources/js/Components/Dashboard/DayOverviewCardEntry.vue b/resources/js/Components/Dashboard/DayOverviewCardEntry.vue
new file mode 100644
index 00000000..df8be660
--- /dev/null
+++ b/resources/js/Components/Dashboard/DayOverviewCardEntry.vue
@@ -0,0 +1,103 @@
+<script setup lang="ts">
+import dayjs from 'dayjs';
+
+defineProps<{
+    date: string;
+    duration: number;
+}>();
+import relativeTime from 'dayjs/plugin/relativeTime';
+import isToday from 'dayjs/plugin/isToday';
+import isYesterday from 'dayjs/plugin/isYesterday';
+import { formatHumanReadableDuration } from '@/utils/time';
+
+dayjs.extend(relativeTime);
+dayjs.extend(isToday);
+dayjs.extend(isYesterday);
+function dayFormat(date: string) {
+    if (dayjs(date).isToday()) {
+        return 'Today';
+    } else if (dayjs(date).isYesterday()) {
+        return 'Yesterday';
+    }
+    return dayjs(date).fromNow();
+}
+</script>
+
+<template>
+    <div class="px-4 py-2 grid grid-cols-3">
+        <div class="flex items-center">
+            <p class="font-semibold text-white pb-1">
+                {{ dayFormat(date) }}
+            </p>
+        </div>
+        <div class="flex items-center">
+            <svg
+                class="w-20"
+                viewBox="0 0 42 10"
+                fill="none"
+                xmlns="http://www.w3.org/2000/svg">
+                <rect
+                    y="9.28572"
+                    width="4.18367"
+                    height="0.714286"
+                    rx="0.357143"
+                    fill="#B0D7FF"
+                    fill-opacity="0.9" />
+                <rect
+                    x="5.37939"
+                    y="7.85715"
+                    width="4.18367"
+                    height="2.14286"
+                    rx="0.714286"
+                    fill="#B0D7FF"
+                    fill-opacity="0.9" />
+                <rect
+                    x="10.7578"
+                    y="4.28572"
+                    width="4.18367"
+                    height="5.71429"
+                    rx="0.714286"
+                    fill="#B0D7FF"
+                    fill-opacity="0.9" />
+                <rect
+                    x="16.1372"
+                    width="4.18367"
+                    height="10"
+                    rx="0.714286"
+                    fill="#B0D7FF"
+                    fill-opacity="0.9" />
+                <rect
+                    width="4.18367"
+                    height="6.42857"
+                    rx="0.714286"
+                    transform="matrix(1 0 0 -1 21.5161 10)"
+                    fill="#B0D7FF"
+                    fill-opacity="0.9" />
+                <rect
+                    width="4.18367"
+                    height="5"
+                    rx="0.714286"
+                    transform="matrix(1 0 0 -1 26.8955 10)"
+                    fill="#B0D7FF"
+                    fill-opacity="0.9" />
+                <rect
+                    width="4.18367"
+                    height="0.714286"
+                    rx="0.357143"
+                    transform="matrix(1 0 0 -1 32.2739 10)"
+                    fill="#B0D7FF"
+                    fill-opacity="0.9" />
+                <rect
+                    width="4.18367"
+                    height="0.714286"
+                    rx="0.357143"
+                    transform="matrix(1 0 0 -1 37.6533 10)"
+                    fill="#B0D7FF"
+                    fill-opacity="0.9" />
+            </svg>
+        </div>
+        <div class="flex items-center justify-center text-muted font-semibold">
+            {{ formatHumanReadableDuration(duration) }}
+        </div>
+    </div>
+</template>
diff --git a/resources/js/Components/Dashboard/LastSevenDaysCard.vue b/resources/js/Components/Dashboard/LastSevenDaysCard.vue
new file mode 100644
index 00000000..123f00a8
--- /dev/null
+++ b/resources/js/Components/Dashboard/LastSevenDaysCard.vue
@@ -0,0 +1,22 @@
+<script setup lang="ts">
+import DashboardCard from '@/Components/Dashboard/DashboardCard.vue';
+import DayOverviewCardEntry from '@/Components/Dashboard/DayOverviewCardEntry.vue';
+import { CalendarIcon } from '@heroicons/vue/20/solid';
+defineProps<{
+    last7Days: {
+        date: string;
+        duration: number; // Total duration in seconds
+        history: number[]; // Array representing the duration in seconds of the 3h windows for the day
+    }[];
+}>();
+</script>
+
+<template>
+    <DashboardCard title="Last 7 Days" :icon="CalendarIcon">
+        <DayOverviewCardEntry
+            v-for="day in last7Days"
+            :key="day.date"
+            :date="day.date"
+            :duration="day.duration"></DayOverviewCardEntry>
+    </DashboardCard>
+</template>
diff --git a/resources/js/Components/Dashboard/ProjectsChartCard.vue b/resources/js/Components/Dashboard/ProjectsChartCard.vue
new file mode 100644
index 00000000..6d3221c5
--- /dev/null
+++ b/resources/js/Components/Dashboard/ProjectsChartCard.vue
@@ -0,0 +1,105 @@
+<script setup lang="ts">
+import VChart, { THEME_KEY } from 'vue-echarts';
+import { provide, ref } from 'vue';
+import LinearGradient from 'zrender/lib/graphic/LinearGradient';
+import { use } from 'echarts/core';
+import { CanvasRenderer } from 'echarts/renderers';
+import { PieChart } from 'echarts/charts';
+import {
+    GridComponent,
+    LegendComponent,
+    TitleComponent,
+    TooltipComponent,
+} from 'echarts/components';
+
+use([
+    CanvasRenderer,
+    PieChart,
+    TitleComponent,
+    GridComponent,
+    TooltipComponent,
+    LegendComponent,
+]);
+
+provide(THEME_KEY, 'dark');
+
+function hexToRGBA(hex: string, opacity = 1) {
+    // Remove the hash at the start if it's there
+    hex = hex.replace(/^#/, '');
+
+    // Parse the hex color
+    let r, g, b;
+    if (hex.length === 3) {
+        r = parseInt(hex.charAt(0) + hex.charAt(0), 16);
+        g = parseInt(hex.charAt(1) + hex.charAt(1), 16);
+        b = parseInt(hex.charAt(2) + hex.charAt(2), 16);
+    } else if (hex.length === 6) {
+        r = parseInt(hex.substring(0, 2), 16);
+        g = parseInt(hex.substring(2, 4), 16);
+        b = parseInt(hex.substring(4, 6), 16);
+    } else {
+        throw new Error('Invalid HEX color.');
+    }
+
+    // Return the RGBA color string
+    return `rgba(${r}, ${g}, ${b}, ${opacity})`;
+}
+
+const props = defineProps<{
+    weeklyProjectOverview: {
+        value: number;
+        name: string;
+        color: string;
+    }[];
+}>();
+
+const seriesData = props.weeklyProjectOverview.map((el) => {
+    return {
+        ...el,
+        ...{
+            itemStyle: {
+                borderRadius: 15,
+                // TODO: Fix dynamic color
+                borderColor: '#040618',
+                borderWidth: 18,
+                color: new LinearGradient(0, 0, 0, 1, [
+                    {
+                        offset: 0,
+                        color: hexToRGBA(el.color, 0.8),
+                    },
+                    {
+                        offset: 1,
+                        color: hexToRGBA(el.color, 0.4),
+                    },
+                ]),
+            },
+        },
+    };
+});
+const option = ref({
+    backgroundColor: 'transparent',
+    series: [
+        {
+            label: {
+                // TODO: Muted color make dynamic
+                color: '#D9DCFB',
+                fontWeight: 'bold',
+            },
+            data: seriesData,
+            radius: ['30%', '65%'],
+            type: 'pie',
+        },
+    ],
+});
+</script>
+
+<template>
+    <v-chart class="chart" :option="option" />
+</template>
+
+<style scoped>
+.chart {
+    height: 300px;
+    background: transparent;
+}
+</style>
diff --git a/resources/js/Components/Dashboard/RecentlyTrackedTasksCard.vue b/resources/js/Components/Dashboard/RecentlyTrackedTasksCard.vue
new file mode 100644
index 00000000..35195a24
--- /dev/null
+++ b/resources/js/Components/Dashboard/RecentlyTrackedTasksCard.vue
@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import RecentlyTrackedTasksCardEntry from '@/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue';
+import DashboardCard from '@/Components/Dashboard/DashboardCard.vue';
+import { CheckCircleIcon } from '@heroicons/vue/20/solid';
+const props = defineProps<{
+    latestTasks: {
+        id: string;
+        name: string;
+        project_name: string;
+        project_id: string;
+    }[];
+}>();
+</script>
+
+<template>
+    <DashboardCard title="Recently Tracked Tasks" :icon="CheckCircleIcon">
+        <RecentlyTrackedTasksCardEntry
+            v-for="lastTask in props.latestTasks"
+            :key="lastTask.id"
+            :project="lastTask.project_name"
+            :title="lastTask.name"></RecentlyTrackedTasksCardEntry>
+    </DashboardCard>
+</template>
diff --git a/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue b/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
new file mode 100644
index 00000000..2356acfd
--- /dev/null
+++ b/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import ProjectBadge from '@/Components/common/ProjectBadge.vue';
+import TimeTrackerStartStop from '@/Components/common/TimeTrackerStartStop.vue';
+
+defineProps<{
+    title: string;
+    project: string;
+}>();
+</script>
+
+<template>
+    <div class="px-4 py-2.5 grid grid-cols-5">
+        <div class="col-span-4">
+            <p class="font-semibold text-white pb-1">
+                {{ title }}
+            </p>
+            <ProjectBadge :name="project"></ProjectBadge>
+        </div>
+        <div class="flex items-center justify-center">
+            <TimeTrackerStartStop></TimeTrackerStartStop>
+        </div>
+    </div>
+</template>
diff --git a/resources/js/Components/Dashboard/TeamActivityCard.vue b/resources/js/Components/Dashboard/TeamActivityCard.vue
new file mode 100644
index 00000000..9f262cd7
--- /dev/null
+++ b/resources/js/Components/Dashboard/TeamActivityCard.vue
@@ -0,0 +1,27 @@
+<script lang="ts" setup>
+import DashboardCard from '@/Components/Dashboard/DashboardCard.vue';
+import TeamActivityCardEntry from '@/Components/Dashboard/TeamActivityCardEntry.vue';
+import { UserGroupIcon } from '@heroicons/vue/20/solid';
+
+defineProps<{
+    latestTeamActivity: {
+        user_id: string;
+        name: string;
+        description: string;
+        time_entry_id: string;
+        task_id: string;
+        status: boolean;
+    }[];
+}>();
+</script>
+
+<template>
+    <DashboardCard title="Team Activity" :icon="UserGroupIcon">
+        <TeamActivityCardEntry
+            v-for="activity in latestTeamActivity"
+            :key="activity.user_id"
+            :name="activity.name"
+            :description="activity.description"
+            :working="activity.status"></TeamActivityCardEntry>
+    </DashboardCard>
+</template>
diff --git a/resources/js/Components/Dashboard/TeamActivityCardEntry.vue b/resources/js/Components/Dashboard/TeamActivityCardEntry.vue
new file mode 100644
index 00000000..eeb5fb36
--- /dev/null
+++ b/resources/js/Components/Dashboard/TeamActivityCardEntry.vue
@@ -0,0 +1,31 @@
+<script lang="ts" setup>
+defineProps<{
+    name: string;
+    description: string;
+    working?: boolean;
+}>();
+</script>
+
+<template>
+    <div class="px-4 py-3 grid grid-cols-3">
+        <div class="col-span-2">
+            <p class="font-semibold text-white pb-1">
+                {{ name }}
+            </p>
+            <div class="text-muted font-medium">
+                {{ description }}
+            </div>
+        </div>
+        <div v-if="working" class="flex space-x-1.5 items-center justify-end">
+            <span class="relative flex h-3 w-3 justify-center items-center">
+                <span
+                    class="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-500 opacity-75"></span>
+                <span
+                    class="relative inline-flex rounded-full h-2 w-2 bg-green-500"></span>
+            </span>
+            <span class="text-green-500 font-medium block pb-0.5">
+                working
+            </span>
+        </div>
+    </div>
+</template>
diff --git a/resources/js/Components/Dashboard/ThisWeekOverview.vue b/resources/js/Components/Dashboard/ThisWeekOverview.vue
new file mode 100644
index 00000000..ad4fefaa
--- /dev/null
+++ b/resources/js/Components/Dashboard/ThisWeekOverview.vue
@@ -0,0 +1,171 @@
+<script setup lang="ts">
+import { use } from 'echarts/core';
+import { CanvasRenderer } from 'echarts/renderers';
+import { BarChart } from 'echarts/charts';
+import {
+    GridComponent,
+    LegendComponent,
+    TitleComponent,
+    TooltipComponent,
+} from 'echarts/components';
+import VChart, { THEME_KEY } from 'vue-echarts';
+import { provide, ref } from 'vue';
+import StatCard from '@/Components/common/StatCard.vue';
+import { ClockIcon } from '@heroicons/vue/20/solid';
+import CardTitle from '@/Components/common/CardTitle.vue';
+import LinearGradient from 'zrender/lib/graphic/LinearGradient';
+import ProjectsChartCard from '@/Components/Dashboard/ProjectsChartCard.vue';
+import { formatHumanReadableDuration } from '@/utils/time';
+import { formatMoney } from '@/utils/money';
+
+use([
+    CanvasRenderer,
+    BarChart,
+    TitleComponent,
+    GridComponent,
+    TooltipComponent,
+    LegendComponent,
+]);
+
+provide(THEME_KEY, 'dark');
+
+const props = defineProps<{
+    weeklyProjectOverview: {
+        value: number;
+        name: string;
+        color: string;
+    }[];
+    totalWeeklyTime: number;
+    totalWeeklyBillableTime: number;
+    totalWeeklyBillableAmount: {
+        value: number;
+        currency: string;
+    };
+    weeklyHistory: {
+        date: string;
+        duration: number;
+    }[];
+}>();
+
+const seriesData = props.weeklyHistory.map((el) => {
+    return {
+        value: el.duration,
+        ...{
+            itemStyle: {
+                borderColor: new LinearGradient(0, 0, 0, 1, [
+                    {
+                        offset: 0,
+                        color: 'rgba(125,156,188,1)',
+                    },
+                    {
+                        offset: 1,
+                        color: 'rgba(125,156,188,0.7)',
+                    },
+                ]),
+                borderWidth: 3,
+                borderRadius: [12, 12, 0, 0],
+                color: new LinearGradient(0, 0, 0, 1, [
+                    {
+                        offset: 0,
+                        color: 'rgba(125,156,188,0.9)',
+                    },
+                    {
+                        offset: 1,
+                        color: 'rgba(125,156,188,0.4)',
+                    },
+                ]),
+            },
+        },
+    };
+});
+const option = ref({
+    grid: {
+        top: 0,
+        right: 0,
+        bottom: 50,
+        left: 0,
+    },
+    backgroundColor: 'transparent',
+    xAxis: {
+        type: 'category',
+        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+        markLine: {
+            lineStyle: {
+                color: 'rgba(125,156,188,0.1)',
+                type: 'dashed',
+            },
+        },
+        axisLine: {
+            lineStyle: {
+                color: 'transparent', // Set desired color here
+            },
+        },
+        axisLabel: {
+            fontSize: 16,
+            fontWeight: 600,
+            margin: 24,
+            fontFamily: 'Outfit, sans-serif',
+        },
+        axisTick: {
+            lineStyle: {
+                color: 'transparent', // Set desired color here
+            },
+        },
+    },
+    yAxis: {
+        type: 'value',
+        splitLine: {
+            lineStyle: {
+                color: 'rgba(125,156,188,0.2)', // Set desired color here
+            },
+        },
+    },
+    series: [
+        {
+            data: seriesData,
+            type: 'bar',
+        },
+    ],
+});
+</script>
+
+<template>
+    <div class="grid gap-x-6 grid-cols-4">
+        <div class="col-span-3">
+            <CardTitle
+                title="This Week"
+                class="pb-8"
+                :icon="ClockIcon"></CardTitle>
+            <v-chart class="chart" :option="option" />
+        </div>
+        <div class="space-y-6">
+            <StatCard
+                title="Total Time"
+                :value="formatHumanReadableDuration(props.totalWeeklyTime)" />
+            <StatCard
+                title="Billable Time"
+                :value="
+                    formatHumanReadableDuration(props.totalWeeklyBillableTime)
+                " />
+            <StatCard
+                title="Billable Amount"
+                :value="
+                    formatMoney(
+                        props.totalWeeklyBillableAmount.value,
+                        props.totalWeeklyBillableAmount.currency
+                    )
+                " />
+            <ProjectsChartCard
+                :weekly-project-overview="
+                    props.weeklyProjectOverview
+                "></ProjectsChartCard>
+        </div>
+    </div>
+</template>
+
+<style scoped>
+.chart {
+    height: 300px;
+    background: transparent;
+}
+</style>
diff --git a/resources/js/Components/DialogModal.vue b/resources/js/Components/DialogModal.vue
index 06534946..0d2468fe 100644
--- a/resources/js/Components/DialogModal.vue
+++ b/resources/js/Components/DialogModal.vue
@@ -30,11 +30,11 @@ const close = () => {
         :closeable="closeable"
         @close="close">
         <div class="px-6 py-4">
-            <div class="text-lg font-medium text-gray-900 dark:text-gray-100">
+            <div class="text-lg font-medium text-white">
                 <slot name="title" />
             </div>
 
-            <div class="mt-4 text-sm text-gray-600 dark:text-gray-400">
+            <div class="mt-4 text-sm text-muted">
                 <slot name="content" />
             </div>
         </div>
diff --git a/resources/js/Components/Dropdown.vue b/resources/js/Components/Dropdown.vue
index f2470927..fb5709c9 100644
--- a/resources/js/Components/Dropdown.vue
+++ b/resources/js/Components/Dropdown.vue
@@ -1,22 +1,28 @@
 <script setup lang="ts">
-import { computed, onMounted, onUnmounted, ref } from 'vue';
+import { computed, onMounted, onUnmounted } from 'vue';
 
-const props = defineProps({
-    align: {
-        type: String,
-        default: 'right',
-    },
-    width: {
-        type: String,
-        default: '48',
-    },
-    contentClasses: {
-        type: Array,
-        default: () => ['py-1', 'bg-white dark:bg-gray-700'],
-    },
-});
+const props = withDefaults(
+    defineProps<{
+        align: string;
+        width: string;
+        contentClasses?: string[];
+        closeOnContentClick: boolean;
+    }>(),
+    {
+        align: 'right',
+        width: '48',
+        contentClasses: () => [
+            'overflow-none',
+            'bg-card-background',
+            'border',
+            'border-card-border',
+        ],
+        closeOnContentClick: true,
+    }
+);
 
-const open = ref(false);
+const emit = defineEmits(['open']);
+const open = defineModel({ default: false });
 
 const closeOnEscape = (e: KeyboardEvent) => {
     if (open.value && e.key === 'Escape') {
@@ -27,6 +33,12 @@ const closeOnEscape = (e: KeyboardEvent) => {
 onMounted(() => document.addEventListener('keydown', closeOnEscape));
 onUnmounted(() => document.removeEventListener('keydown', closeOnEscape));
 
+function onContentClick() {
+    if (props.closeOnContentClick === true) {
+        open.value = false;
+    }
+}
+
 const widthClass = computed(() => {
     return {
         48: 'w-48',
@@ -42,13 +54,24 @@ const alignmentClasses = computed(() => {
         return 'ltr:origin-top-right rtl:origin-top-left end-0';
     }
 
+    if (props.align === 'bottom-right') {
+        return 'bottom-[calc(100%+15px)] ltr:origin-top-right rtl:origin-top-left end-0';
+    }
+
     return 'origin-top';
 });
+
+function toggleOpen() {
+    open.value = !open.value;
+    if (open.value === true) {
+        emit('open');
+    }
+}
 </script>
 
 <template>
     <div class="relative">
-        <div @click="open = !open">
+        <div @click="toggleOpen">
             <slot name="trigger" />
         </div>
 
@@ -67,9 +90,9 @@ const alignmentClasses = computed(() => {
                 class="absolute z-50 mt-2 rounded-md shadow-lg"
                 :class="[widthClass, alignmentClasses]"
                 style="display: none"
-                @click="open = false">
+                @click="onContentClick">
                 <div
-                    class="rounded-md ring-1 ring-black ring-opacity-5"
+                    class="rounded-lg ring-1 relative ring-black ring-opacity-5"
                     :class="contentClasses">
                     <slot name="content" />
                 </div>
diff --git a/resources/js/Components/DropdownLink.vue b/resources/js/Components/DropdownLink.vue
index 7ed86e42..28b09c83 100644
--- a/resources/js/Components/DropdownLink.vue
+++ b/resources/js/Components/DropdownLink.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { Link } from '@inertiajs/vue3';
 
-defineProps({
-    href: String,
-    as: String,
-});
+defineProps<{
+    href?: string;
+    as?: string;
+}>();
 </script>
 
 <template>
@@ -12,21 +12,21 @@ defineProps({
         <button
             v-if="as == 'button'"
             type="submit"
-            class="block w-full px-4 py-2 text-start text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-800 transition duration-150 ease-in-out">
+            v-bind="$attrs"
+            class="block w-full px-4 py-2 text-start text-sm leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out">
             <slot />
         </button>
-
         <a
             v-else-if="as == 'a'"
             :href="href"
-            class="block px-4 py-2 text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-800 transition duration-150 ease-in-out">
+            class="block px-4 py-2 text-sm leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out">
             <slot />
         </a>
 
         <Link
             v-else
             :href="href ?? ''"
-            class="block px-4 py-2 text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-800 transition duration-150 ease-in-out">
+            class="block px-4 py-2 text-sm leading-5 text-white hover:bg-card-background-active focus:outline-none focus:bg-card-background-active transition duration-150 ease-in-out">
             <slot />
         </Link>
     </div>
diff --git a/resources/js/Components/FormSection.vue b/resources/js/Components/FormSection.vue
index ef77f003..55c08b22 100644
--- a/resources/js/Components/FormSection.vue
+++ b/resources/js/Components/FormSection.vue
@@ -21,7 +21,7 @@ const hasActions = computed(() => !!useSlots().actions);
         <div class="mt-5 md:mt-0 md:col-span-2">
             <form @submit.prevent="$emit('submitted')">
                 <div
-                    class="px-4 py-5 bg-white dark:bg-gray-800 sm:p-6 shadow"
+                    class="px-4 py-5 bg-card-background sm:p-6 shadow"
                     :class="
                         hasActions
                             ? 'sm:rounded-tl-md sm:rounded-tr-md'
@@ -34,7 +34,7 @@ const hasActions = computed(() => !!useSlots().actions);
 
                 <div
                     v-if="hasActions"
-                    class="flex items-center justify-end px-4 py-3 bg-gray-50 dark:bg-gray-800 text-end sm:px-6 shadow sm:rounded-bl-md sm:rounded-br-md">
+                    class="flex items-center justify-end px-4 py-3 bg-card-background border-t border-card-background-seperator text-end sm:px-6 shadow sm:rounded-bl-md sm:rounded-br-md">
                     <slot name="actions" />
                 </div>
             </form>
diff --git a/resources/js/Components/InputLabel.vue b/resources/js/Components/InputLabel.vue
index 2bcb9e4f..3b26709d 100644
--- a/resources/js/Components/InputLabel.vue
+++ b/resources/js/Components/InputLabel.vue
@@ -5,7 +5,7 @@ defineProps({
 </script>
 
 <template>
-    <label class="block font-medium text-sm text-gray-700 dark:text-gray-300">
+    <label class="block font-medium text-sm text-white">
         <span v-if="value">{{ value }}</span>
         <span v-else><slot /></span>
     </label>
diff --git a/resources/js/Components/NavigationSidebarItem.vue b/resources/js/Components/NavigationSidebarItem.vue
new file mode 100644
index 00000000..1f7a7fee
--- /dev/null
+++ b/resources/js/Components/NavigationSidebarItem.vue
@@ -0,0 +1,34 @@
+<script setup lang="ts">
+import type { Component } from 'vue';
+
+defineProps<{
+    title: string;
+    icon: Component;
+    current?: boolean;
+    href: string;
+}>();
+</script>
+
+<template>
+    <li>
+        <a
+            :href="href"
+            :class="[
+                current
+                    ? 'bg-menu-active text-white'
+                    : 'text-indigo-200 hover:text-white hover:bg-menu-active',
+                'group flex gap-x-3 rounded-md px-3 py-2 transition leading-6 font-medium',
+            ]">
+            <component
+                :is="icon"
+                :class="[
+                    current
+                        ? 'text-icon-active'
+                        : 'text-icon-default group-hover:text-icon-active',
+                    'transition h-6 w-6 shrink-0',
+                ]"
+                aria-hidden="true" />
+            {{ title }}
+        </a>
+    </li>
+</template>
diff --git a/resources/js/Components/OrganizationSwitcher.vue b/resources/js/Components/OrganizationSwitcher.vue
new file mode 100644
index 00000000..35f14ef2
--- /dev/null
+++ b/resources/js/Components/OrganizationSwitcher.vue
@@ -0,0 +1,134 @@
+<script setup lang="ts">
+import { ChevronDownIcon } from '@heroicons/vue/20/solid';
+import route from 'ziggy-js';
+import Dropdown from '@/Components/Dropdown.vue';
+import DropdownLink from '@/Components/DropdownLink.vue';
+import { router, usePage } from '@inertiajs/vue3';
+import type { Organization, User } from '@/types/models';
+
+const page = usePage<{
+    jetstream: {
+        canCreateTeams: boolean;
+        hasTeamFeatures: boolean;
+        managesProfilePhotos: boolean;
+        hasApiFeatures: boolean;
+    };
+    auth: {
+        user: User & {
+            all_teams: Organization[];
+        };
+    };
+}>();
+
+const switchToTeam = (team: Organization) => {
+    router.put(
+        route('current-team.update'),
+        {
+            team_id: team.id,
+        },
+        {
+            preserveState: false,
+        }
+    );
+};
+</script>
+
+<template>
+    <Dropdown
+        v-if="page.props.jetstream.hasTeamFeatures"
+        align="right"
+        width="60">
+        <template #trigger>
+            <div
+                data-testid="organization_switcher"
+                class="flex hover:bg-white/10 cursor-pointer transition px-2 py-1 rounded-lg w-full items-center justify-between font-medium">
+                <div class="flex flex-1 space-x-3 items-center w-4/5">
+                    <div
+                        class="rounded-lg bg-blue-900 font-semibold flex-shrink-0 text-white w-7 h-7 flex items-center justify-center">
+                        {{
+                            page.props.auth.user.current_team.name
+                                .slice(0, 1)
+                                .toUpperCase()
+                        }}
+                    </div>
+                    <span class="text-lg flex-1 truncate font-semibold">
+                        {{ page.props.auth.user.current_team.name }}
+                    </span>
+                </div>
+                <div class="w-1/5">
+                    <button
+                        class="p-1 transition hover:bg-white/10 rounded-full flex items-center w-9 h-9">
+                        <ChevronDownIcon
+                            class="w-full mt-[1px]"></ChevronDownIcon>
+                    </button>
+                </div>
+            </div>
+        </template>
+
+        <template #content>
+            <div class="w-60">
+                <!-- Organization Management -->
+                <div class="block px-4 py-2 text-xs text-muted">
+                    Manage Team
+                </div>
+
+                <!-- Organization Settings -->
+                <DropdownLink
+                    :href="
+                        route(
+                            'teams.show',
+                            page.props.auth.user.current_team.id
+                        )
+                    ">
+                    Team Settings
+                </DropdownLink>
+
+                <DropdownLink
+                    v-if="page.props.jetstream.canCreateTeams"
+                    :href="route('teams.create')">
+                    Create New Team
+                </DropdownLink>
+
+                <!-- Organization Switcher -->
+                <template v-if="page.props.auth.user.all_teams.length > 1">
+                    <div class="border-t border-card-background-seperator" />
+
+                    <div class="block px-4 py-2 text-xs text-muted">
+                        Switch Teams
+                    </div>
+
+                    <template
+                        v-for="team in page.props.auth.user.all_teams"
+                        :key="team.id">
+                        <form @submit.prevent="switchToTeam(team)">
+                            <DropdownLink as="button">
+                                <div class="flex items-center">
+                                    <svg
+                                        v-if="
+                                            team.id ==
+                                            page.props.auth.user.current_team_id
+                                        "
+                                        class="me-2 h-5 w-5 text-green-400"
+                                        xmlns="http://www.w3.org/2000/svg"
+                                        fill="none"
+                                        viewBox="0 0 24 24"
+                                        stroke-width="1.5"
+                                        stroke="currentColor">
+                                        <path
+                                            stroke-linecap="round"
+                                            stroke-linejoin="round"
+                                            d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+                                    </svg>
+
+                                    <div>
+                                        {{ team.name }}
+                                    </div>
+                                </div>
+                            </DropdownLink>
+                        </form>
+                    </template>
+                </template>
+            </div>
+        </template>
+    </Dropdown>
+</template>
diff --git a/resources/js/Components/ResponsiveNavLink.vue b/resources/js/Components/ResponsiveNavLink.vue
index 34e8b99a..2db6027f 100644
--- a/resources/js/Components/ResponsiveNavLink.vue
+++ b/resources/js/Components/ResponsiveNavLink.vue
@@ -11,7 +11,7 @@ const props = defineProps<{
 const classes = computed(() => {
     return props.active
         ? 'block w-full ps-3 pe-4 py-2 border-l-4 border-indigo-400 dark:border-indigo-600 text-start text-base font-medium text-indigo-700 dark:text-indigo-300 bg-indigo-50 dark:bg-indigo-900/50 focus:outline-none focus:text-indigo-800 dark:focus:text-indigo-200 focus:bg-indigo-100 dark:focus:bg-indigo-900 focus:border-indigo-700 dark:focus:border-indigo-300 transition duration-150 ease-in-out'
-        : 'block w-full ps-3 pe-4 py-2 border-l-4 border-transparent text-start text-base font-medium text-gray-600 dark:text-gray-400 hover:text-gray-800 dark:hover:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700 hover:border-gray-300 dark:hover:border-gray-600 focus:outline-none focus:text-gray-800 dark:focus:text-gray-200 focus:bg-gray-50 dark:focus:bg-gray-700 focus:border-gray-300 dark:focus:border-gray-600 transition duration-150 ease-in-out';
+        : 'block w-full ps-3 pe-4 py-2 border-l-4 border-transparent text-start text-base font-medium text-muted hover:text-gray-800 dark:hover:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700 hover:border-gray-300 dark:hover:border-gray-600 focus:outline-none focus:text-gray-800 dark:focus:text-gray-200 focus:bg-gray-50 dark:focus:bg-gray-700 focus:border-gray-300 dark:focus:border-gray-600 transition duration-150 ease-in-out';
 });
 </script>
 
diff --git a/resources/js/Components/SecondaryButton.vue b/resources/js/Components/SecondaryButton.vue
index ec52de8d..8f61fb22 100644
--- a/resources/js/Components/SecondaryButton.vue
+++ b/resources/js/Components/SecondaryButton.vue
@@ -14,8 +14,7 @@ withDefaults(
 <template>
     <button
         :type="type"
-        ResponsiveNavLink.vue
-        class="inline-flex items-center px-4 py-2 bg-white dark:bg-gray-800 border border-gray-300 dark:border-gray-500 rounded-md font-semibold text-xs text-gray-700 dark:text-gray-300 uppercase tracking-widest shadow-sm hover:bg-gray-50 dark:hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 disabled:opacity-25 transition ease-in-out duration-150">
+        class="inline-flex items-center px-4 py-2 bg-button-secondary-background border border-button-secondary-border hover:bg-button-secondary-background-hover rounded-md font-semibold text-xs text-white uppercase tracking-widest shadow-sm focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 disabled:opacity-25 transition ease-in-out duration-150">
         <slot />
     </button>
 </template>
diff --git a/resources/js/Components/SectionBorder.vue b/resources/js/Components/SectionBorder.vue
index cf81fa76..8c8bf67f 100644
--- a/resources/js/Components/SectionBorder.vue
+++ b/resources/js/Components/SectionBorder.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="hidden sm:block">
         <div class="py-8">
-            <div class="border-t border-gray-200 dark:border-gray-700" />
+            <div class="border-t border-default-background-seperator" />
         </div>
     </div>
 </template>
diff --git a/resources/js/Components/SectionTitle.vue b/resources/js/Components/SectionTitle.vue
index cd411b7d..166f18f9 100644
--- a/resources/js/Components/SectionTitle.vue
+++ b/resources/js/Components/SectionTitle.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="md:col-span-1 flex justify-between">
         <div class="px-4 sm:px-0">
-            <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100">
+            <h3 class="text-lg font-medium text-white">
                 <slot name="title" />
             </h3>
 
-            <p class="mt-1 text-sm text-gray-600 dark:text-gray-400">
+            <p class="mt-1 text-sm text-muted">
                 <slot name="description" />
             </p>
         </div>
diff --git a/resources/js/Components/TextInput.vue b/resources/js/Components/TextInput.vue
index baf518b8..64563a48 100644
--- a/resources/js/Components/TextInput.vue
+++ b/resources/js/Components/TextInput.vue
@@ -3,6 +3,7 @@ import { onMounted, ref } from 'vue';
 
 defineProps({
     modelValue: String,
+    name: String,
 });
 
 const input = ref<HTMLInputElement | null>(null);
@@ -27,7 +28,8 @@ function updateValue(event: Event) {
 <template>
     <input
         ref="input"
-        class="border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm"
+        class="border-input-border bg-input-background text-white focus:border-input-border-active rounded-md shadow-sm"
         :value="modelValue"
+        :name="name"
         @input="updateValue" />
 </template>
diff --git a/resources/js/Components/TimeTracker.vue b/resources/js/Components/TimeTracker.vue
new file mode 100644
index 00000000..b5a0dffb
--- /dev/null
+++ b/resources/js/Components/TimeTracker.vue
@@ -0,0 +1,178 @@
+<script setup lang="ts">
+import { ClockIcon } from '@heroicons/vue/20/solid';
+import CardTitle from '@/Components/common/CardTitle.vue';
+import BillableToggleButton from '@/Components/common/BillableToggleButton.vue';
+import TimeTrackerStartStop from '@/Components/common/TimeTrackerStartStop.vue';
+import TagDropdown from '@/Components/common/TagDropdown.vue';
+import ProjectDropdown from '@/Components/common/ProjectDropdown.vue';
+import { usePage } from '@inertiajs/vue3';
+import { type User } from '@/types/models';
+import { computed, onMounted, ref, watch } from 'vue';
+import dayjs, { Dayjs } from 'dayjs';
+import utc from 'dayjs/plugin/utc';
+import duration from 'dayjs/plugin/duration';
+
+import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
+import { storeToRefs } from 'pinia';
+import type { Project } from '@/utils/useProjects';
+import parse from 'parse-duration';
+
+const page = usePage<{
+    auth: {
+        user: User;
+    };
+}>();
+dayjs.extend(duration);
+
+dayjs.extend(utc);
+
+const currentTimeEntryStore = useCurrentTimeEntryStore();
+const { currentTimeEntry, isActive } = storeToRefs(currentTimeEntryStore);
+
+const now = ref<null | Dayjs>(null);
+const interval = ref<ReturnType<typeof setInterval> | null>(null);
+
+function startLiveTimer() {
+    stopLiveTimer();
+    now.value = dayjs().utc();
+    interval.value = setInterval(() => {
+        now.value = dayjs().utc();
+    }, 1000);
+}
+
+function stopLiveTimer() {
+    if (interval.value !== null) {
+        clearInterval(interval.value);
+    }
+}
+
+watch(isActive, () => {
+    if (isActive.value) {
+        startLiveTimer();
+    } else {
+        stopLiveTimer();
+    }
+});
+
+const temporaryCustomTimerEntry = ref<string>('');
+
+const currentTime = computed({
+    get() {
+        if (temporaryCustomTimerEntry.value !== '') {
+            return temporaryCustomTimerEntry.value;
+        }
+        if (now.value && currentTimeEntry.value.start) {
+            const startTime = dayjs(currentTimeEntry.value.start);
+            const diff = now.value.diff(startTime);
+            return dayjs(diff).utc().format('HH:mm:ss');
+        }
+        return null;
+    },
+    // setter
+    set(newValue) {
+        if (newValue) {
+            temporaryCustomTimerEntry.value = newValue;
+        } else {
+            temporaryCustomTimerEntry.value = '';
+        }
+    },
+});
+
+onMounted(async () => {
+    if (page.props.auth.user.current_team_id) {
+        await currentTimeEntryStore.fetchCurrentTimeEntry();
+        now.value = dayjs().utc();
+    }
+});
+
+async function onToggleButtonPress(newState: boolean) {
+    if (page.props.auth.user.current_team_id) {
+        if (newState) {
+            startLiveTimer();
+            await useCurrentTimeEntryStore().startTimer();
+        } else {
+            stopLiveTimer();
+            await useCurrentTimeEntryStore().stopTimer();
+        }
+    }
+}
+
+const currentProject = ref<Project | null>(null);
+watch(currentProject, () => {
+    if (currentProject.value) {
+        currentTimeEntry.value.project_id = currentProject.value.id;
+        if (isActive.value) {
+            useCurrentTimeEntryStore().updateTimer();
+        }
+    }
+});
+
+function updateTimeEntry() {
+    if (currentTimeEntry.value.id) {
+        useCurrentTimeEntryStore().updateTimer();
+    }
+}
+function pauseLiveTimerUpdate() {
+    stopLiveTimer();
+}
+
+function updateTimerAndStartLiveTimerUpdate() {
+    const time = parse(temporaryCustomTimerEntry.value, 's');
+    if (time && time > 0) {
+        const newStartDate = dayjs().subtract(time, 's');
+        currentTimeEntry.value.start = newStartDate.utc().format();
+        if (currentTimeEntry.value.id !== '') {
+            currentTimeEntryStore.updateTimer();
+        } else {
+            currentTimeEntryStore.startTimer();
+        }
+    }
+    now.value = dayjs().utc();
+    temporaryCustomTimerEntry.value = '';
+    startLiveTimer();
+}
+</script>
+
+<template>
+    <CardTitle title="Time Tracker" :icon="ClockIcon"></CardTitle>
+    <div class="flex items-center" data-testid="dashboard_timer">
+        <div
+            class="flex w-full rounded-lg bg-card-background border-card-border border transition">
+            <div class="flex-1 flex items-center pr-6">
+                <input
+                    placeholder="What are you working on?"
+                    data-testid="time_entry_description"
+                    v-model="currentTimeEntry.description"
+                    @blur="updateTimeEntry"
+                    class="w-full rounded-l-lg py-4 px-6 text-xl text-white focus:bg-card-background-active font-medium bg-transparent border-none placeholder-muted focus:ring-0 transition"
+                    type="text" />
+            </div>
+            <div class="flex items-center">
+                <ProjectDropdown v-model="currentProject"></ProjectDropdown>
+            </div>
+            <div class="flex items-center space-x-2 px-4">
+                <TagDropdown
+                    @changed="updateTimeEntry"
+                    v-model="currentTimeEntry.tags"></TagDropdown>
+                <BillableToggleButton></BillableToggleButton>
+            </div>
+            <div class="border-l border-card-border">
+                <input
+                    placeholder="00:00:00"
+                    @focus="pauseLiveTimerUpdate"
+                    data-testid="time_entry_time"
+                    @blur="updateTimerAndStartLiveTimerUpdate"
+                    @keydown.enter="updateTimerAndStartLiveTimerUpdate"
+                    v-model="currentTime"
+                    class="w-40 h-full text-white py-4 rounded-r-lg text-center px-4 text-xl font-bold bg-card-background border-none placeholder-muted focus:ring-0 transition focus:bg-card-background-active"
+                    type="text" />
+            </div>
+        </div>
+        <div class="pl-6 pr-3">
+            <TimeTrackerStartStop
+                :active="isActive"
+                @changed="onToggleButtonPress"
+                size="large"></TimeTrackerStartStop>
+        </div>
+    </div>
+</template>
diff --git a/resources/js/Components/UserSettingsIcon.vue b/resources/js/Components/UserSettingsIcon.vue
new file mode 100644
index 00000000..5f64d59c
--- /dev/null
+++ b/resources/js/Components/UserSettingsIcon.vue
@@ -0,0 +1,89 @@
+<script setup lang="ts">
+import route from 'ziggy-js';
+import { router, usePage } from '@inertiajs/vue3';
+import type { Organization, User } from '@/types/models';
+import DropdownLink from '@/Components/DropdownLink.vue';
+import Dropdown from '@/Components/Dropdown.vue';
+
+const page = usePage<{
+    jetstream: {
+        canCreateTeams: boolean;
+        hasTeamFeatures: boolean;
+        managesProfilePhotos: boolean;
+        hasApiFeatures: boolean;
+    };
+    auth: {
+        user: User & {
+            all_teams: Organization[];
+        };
+    };
+}>();
+
+const logout = () => {
+    router.post(route('logout'));
+};
+</script>
+<template>
+    <div class="ms-3 relative">
+        <Dropdown align="bottom-right" width="48">
+            <template #trigger>
+                <button
+                    v-if="page.props.jetstream.managesProfilePhotos"
+                    data-testid="current_user_button"
+                    class="flex text-sm border-2 border-transparent rounded-full focus:outline-none focus:border-gray-300 transition">
+                    <img
+                        class="h-8 w-8 rounded-full object-cover"
+                        :src="page.props.auth.user.profile_photo_url"
+                        :alt="page.props.auth.user.name" />
+                </button>
+
+                <span v-else class="inline-flex rounded-md">
+                    <button
+                        type="button"
+                        class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 dark:text-gray-400 bg-white dark:bg-gray-800 hover:text-gray-700 dark:hover:text-gray-300 focus:outline-none focus:bg-gray-50 dark:focus:bg-gray-700 active:bg-gray-50 dark:active:bg-gray-700 transition ease-in-out duration-150">
+                        {{ page.props.auth.user.name }}
+
+                        <svg
+                            class="ms-2 -me-0.5 h-4 w-4"
+                            xmlns="http://www.w3.org/2000/svg"
+                            fill="none"
+                            viewBox="0 0 24 24"
+                            stroke-width="1.5"
+                            stroke="currentColor">
+                            <path
+                                stroke-linecap="round"
+                                stroke-linejoin="round"
+                                d="M19.5 8.25l-7.5 7.5-7.5-7.5" />
+                        </svg>
+                    </button>
+                </span>
+            </template>
+
+            <template #content>
+                <!-- Account Management -->
+                <div class="block px-4 py-2 text-xs text-gray-400">
+                    Manage Account
+                </div>
+
+                <DropdownLink :href="route('profile.show')">
+                    Profile
+                </DropdownLink>
+
+                <DropdownLink
+                    v-if="page.props.jetstream.hasApiFeatures"
+                    :href="route('api-tokens.index')">
+                    API Tokens
+                </DropdownLink>
+
+                <div class="border-t border-gray-200 dark:border-gray-600" />
+
+                <!-- Authentication -->
+                <form @submit.prevent="logout">
+                    <DropdownLink as="button" data-testid="logout_button">
+                        Log Out
+                    </DropdownLink>
+                </form>
+            </template>
+        </Dropdown>
+    </div>
+</template>
diff --git a/resources/js/Components/Welcome.vue b/resources/js/Components/Welcome.vue
deleted file mode 100644
index 63143344..00000000
--- a/resources/js/Components/Welcome.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<script setup lang="ts">
-import ApplicationLogo from '@/Components/ApplicationLogo.vue';
-</script>
-
-<template>
-    <div>
-        <div
-            class="p-6 lg:p-8 bg-white dark:bg-gray-800 dark:bg-gradient-to-bl dark:from-gray-700/50 dark:via-transparent border-b border-gray-200 dark:border-gray-700">
-            <ApplicationLogo class="block h-12 w-auto" />
-
-            <h1 class="mt-8 text-2xl font-medium text-gray-900 dark:text-white">
-                Welcome to your Jetstream application!
-            </h1>
-
-            <p class="mt-6 text-gray-500 dark:text-gray-400 leading-relaxed">
-                Laravel Jetstream provides a beautiful, robust starting point
-                for your next Laravel application. Laravel is designed to help
-                you build your application using a development environment that
-                is simple, powerful, and enjoyable. We believe you should love
-                expressing your creativity through programming, so we have spent
-                time carefully crafting the Laravel ecosystem to be a breath of
-                fresh air. We hope you love it.
-            </p>
-        </div>
-
-        <div
-            class="bg-gray-200 dark:bg-gray-800 bg-opacity-25 grid grid-cols-1 md:grid-cols-2 gap-6 lg:gap-8 p-6 lg:p-8">
-            <div>
-                <div class="flex items-center">
-                    <svg
-                        xmlns="http://www.w3.org/2000/svg"
-                        fill="none"
-                        viewBox="0 0 24 24"
-                        stroke-width="1.5"
-                        class="w-6 h-6 stroke-gray-400">
-                        <path
-                            stroke-linecap="round"
-                            stroke-linejoin="round"
-                            d="M12 6.042A8.967 8.967 0 006 3.75c-1.052 0-2.062.18-3 .512v14.25A8.987 8.987 0 016 18c2.305 0 4.408.867 6 2.292m0-14.25a8.966 8.966 0 016-2.292c1.052 0 2.062.18 3 .512v14.25A8.987 8.987 0 0018 18a8.967 8.967 0 00-6 2.292m0-14.25v14.25" />
-                    </svg>
-                    <h2
-                        class="ms-3 text-xl font-semibold text-gray-900 dark:text-white">
-                        <a href="https://laravel.com/docs">Documentation</a>
-                    </h2>
-                </div>
-
-                <p
-                    class="mt-4 text-gray-500 dark:text-gray-400 text-sm leading-relaxed">
-                    Laravel has wonderful documentation covering every aspect of
-                    the framework. Whether you're new to the framework or have
-                    previous experience, we recommend reading all of the
-                    documentation from beginning to end.
-                </p>
-
-                <p class="mt-4 text-sm">
-                    <a
-                        href="https://laravel.com/docs"
-                        class="inline-flex items-center font-semibold text-indigo-700 dark:text-indigo-300">
-                        Explore the documentation
-
-                        <svg
-                            xmlns="http://www.w3.org/2000/svg"
-                            viewBox="0 0 20 20"
-                            class="ms-1 w-5 h-5 fill-indigo-500 dark:fill-indigo-200">
-                            <path
-                                fill-rule="evenodd"
-                                d="M5 10a.75.75 0 01.75-.75h6.638L10.23 7.29a.75.75 0 111.04-1.08l3.5 3.25a.75.75 0 010 1.08l-3.5 3.25a.75.75 0 11-1.04-1.08l2.158-1.96H5.75A.75.75 0 015 10z"
-                                clip-rule="evenodd" />
-                        </svg>
-                    </a>
-                </p>
-            </div>
-
-            <div>
-                <div class="flex items-center">
-                    <svg
-                        xmlns="http://www.w3.org/2000/svg"
-                        fill="none"
-                        viewBox="0 0 24 24"
-                        stroke-width="1.5"
-                        class="w-6 h-6 stroke-gray-400">
-                        <path
-                            stroke-linecap="round"
-                            d="M15.75 10.5l4.72-4.72a.75.75 0 011.28.53v11.38a.75.75 0 01-1.28.53l-4.72-4.72M4.5 18.75h9a2.25 2.25 0 002.25-2.25v-9a2.25 2.25 0 00-2.25-2.25h-9A2.25 2.25 0 002.25 7.5v9a2.25 2.25 0 002.25 2.25z" />
-                    </svg>
-                    <h2
-                        class="ms-3 text-xl font-semibold text-gray-900 dark:text-white">
-                        <a href="https://laracasts.com">Laracasts</a>
-                    </h2>
-                </div>
-
-                <p
-                    class="mt-4 text-gray-500 dark:text-gray-400 text-sm leading-relaxed">
-                    Laracasts offers thousands of video tutorials on Laravel,
-                    PHP, and JavaScript development. Check them out, see for
-                    yourself, and massively level up your development skills in
-                    the process.
-                </p>
-
-                <p class="mt-4 text-sm">
-                    <a
-                        href="https://laracasts.com"
-                        class="inline-flex items-center font-semibold text-indigo-700 dark:text-indigo-300">
-                        Start watching Laracasts
-
-                        <svg
-                            xmlns="http://www.w3.org/2000/svg"
-                            viewBox="0 0 20 20"
-                            class="ms-1 w-5 h-5 fill-indigo-500 dark:fill-indigo-200">
-                            <path
-                                fill-rule="evenodd"
-                                d="M5 10a.75.75 0 01.75-.75h6.638L10.23 7.29a.75.75 0 111.04-1.08l3.5 3.25a.75.75 0 010 1.08l-3.5 3.25a.75.75 0 11-1.04-1.08l2.158-1.96H5.75A.75.75 0 015 10z"
-                                clip-rule="evenodd" />
-                        </svg>
-                    </a>
-                </p>
-            </div>
-
-            <div>
-                <div class="flex items-center">
-                    <svg
-                        xmlns="http://www.w3.org/2000/svg"
-                        fill="none"
-                        viewBox="0 0 24 24"
-                        stroke-width="1.5"
-                        class="w-6 h-6 stroke-gray-400">
-                        <path
-                            stroke-linecap="round"
-                            stroke-linejoin="round"
-                            d="M2.25 15.75l5.159-5.159a2.25 2.25 0 013.182 0l5.159 5.159m-1.5-1.5l1.409-1.409a2.25 2.25 0 013.182 0l2.909 2.909m-18 3.75h16.5a1.5 1.5 0 001.5-1.5V6a1.5 1.5 0 00-1.5-1.5H3.75A1.5 1.5 0 002.25 6v12a1.5 1.5 0 001.5 1.5zm10.5-11.25h.008v.008h-.008V8.25zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0z" />
-                    </svg>
-                    <h2
-                        class="ms-3 text-xl font-semibold text-gray-900 dark:text-white">
-                        <a href="https://tailwindcss.com/">Tailwind</a>
-                    </h2>
-                </div>
-
-                <p
-                    class="mt-4 text-gray-500 dark:text-gray-400 text-sm leading-relaxed">
-                    Laravel Jetstream is built with Tailwind, an amazing utility
-                    first CSS framework that doesn't get in your way. You'll be
-                    amazed how easily you can build and maintain fresh, modern
-                    designs with this wonderful framework at your fingertips.
-                </p>
-            </div>
-
-            <div>
-                <div class="flex items-center">
-                    <svg
-                        xmlns="http://www.w3.org/2000/svg"
-                        fill="none"
-                        viewBox="0 0 24 24"
-                        stroke-width="1.5"
-                        class="w-6 h-6 stroke-gray-400">
-                        <path
-                            stroke-linecap="round"
-                            stroke-linejoin="round"
-                            d="M16.5 10.5V6.75a4.5 4.5 0 10-9 0v3.75m-.75 11.25h10.5a2.25 2.25 0 002.25-2.25v-6.75a2.25 2.25 0 00-2.25-2.25H6.75a2.25 2.25 0 00-2.25 2.25v6.75a2.25 2.25 0 002.25 2.25z" />
-                    </svg>
-                    <h2
-                        class="ms-3 text-xl font-semibold text-gray-900 dark:text-white">
-                        Authentication
-                    </h2>
-                </div>
-
-                <p
-                    class="mt-4 text-gray-500 dark:text-gray-400 text-sm leading-relaxed">
-                    Authentication and registration views are included with
-                    Laravel Jetstream, as well as support for user email
-                    verification and resetting forgotten passwords. So, you're
-                    free to get started with what matters most: building your
-                    application.
-                </p>
-            </div>
-        </div>
-    </div>
-</template>
diff --git a/resources/js/Components/common/BillableToggleButton.vue b/resources/js/Components/common/BillableToggleButton.vue
new file mode 100644
index 00000000..85792698
--- /dev/null
+++ b/resources/js/Components/common/BillableToggleButton.vue
@@ -0,0 +1,42 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import { twMerge } from 'tailwind-merge';
+const active = defineModel({ default: false });
+function toggleBillable() {
+    active.value = !active.value;
+}
+
+const iconColorClasses = computed(() => {
+    if (active.value) {
+        return 'text-accent-200/80 focus:text-accent-200 hover:text-accent-200';
+    } else {
+        return 'text-icon-default focus:text-icon-active hover:text-icon-active';
+    }
+});
+</script>
+
+<template>
+    <button
+        @click="toggleBillable"
+        :class="
+            twMerge(
+                iconColorClasses,
+                'flex-shrink-0 ring-0 focus:outline-none focus:ring-0 transition focus:bg-card-background-seperator hover:bg-card-background-seperator rounded-full w-11 h-11 flex items-center justify-center'
+            )
+        ">
+        <svg
+            class="h-7"
+            viewBox="0 0 8 14"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg">
+            <path
+                d="M4 1V13M1 10.182L1.879 10.841C3.05 11.72 4.949 11.72 6.121 10.841C7.293 9.962 7.293 8.538 6.121 7.659C5.536 7.219 4.768 7 4 7C3.275 7 2.55 6.78 1.997 6.341C0.891 5.462 0.891 4.038 1.997 3.159C3.103 2.28 4.897 2.28 6.003 3.159L6.418 3.489"
+                stroke="currentColor"
+                stroke-width="1.5"
+                stroke-linecap="round"
+                stroke-linejoin="round" />
+        </svg>
+    </button>
+</template>
+
+<style scoped></style>
diff --git a/resources/js/Components/common/CardTitle.vue b/resources/js/Components/common/CardTitle.vue
new file mode 100644
index 00000000..ea8a0915
--- /dev/null
+++ b/resources/js/Components/common/CardTitle.vue
@@ -0,0 +1,22 @@
+<script setup lang="ts">
+import type { Component } from 'vue';
+
+defineProps<{
+    title: string;
+    icon?: Component;
+}>();
+</script>
+
+<template>
+    <h3 class="text-white font-bold pb-4 text-lg flex items-center space-x-2.5">
+        <component
+            v-if="icon"
+            :is="icon"
+            class="w-6 text-icon-default"></component>
+        <span>
+            {{ title }}
+        </span>
+    </h3>
+</template>
+
+<style scoped></style>
diff --git a/resources/js/Components/common/ProjectBadge.vue b/resources/js/Components/common/ProjectBadge.vue
new file mode 100644
index 00000000..9d5d667c
--- /dev/null
+++ b/resources/js/Components/common/ProjectBadge.vue
@@ -0,0 +1,51 @@
+<script setup lang="ts">
+import { twMerge } from 'tailwind-merge';
+
+const props = withDefaults(
+    defineProps<{
+        name: string;
+        size: 'base' | 'large';
+        tag: string;
+        class?: string;
+        color: string;
+    }>(),
+    {
+        size: 'base',
+        tag: 'div',
+        color: 'var(--theme-color-icon-default)',
+    }
+);
+
+const indicatorClasses = {
+    base: 'w-2.5 h-2.5',
+    large: 'w-3 h-3',
+};
+
+const badgeClasses = {
+    base: 'py-1 px-2 space-x-1.5 text-sm',
+    large: 'py-1.5 px-3 space-x-2 text-base text-muted',
+};
+</script>
+
+<template>
+    <component
+        :is="tag"
+        :class="
+            twMerge(
+                props.class,
+                badgeClasses[size],
+                'border-input-border border rounded inline-flex items-center font-semibold text-white'
+            )
+        ">
+        <div
+            :style="{ backgroundColor: color }"
+            :class="
+                twMerge(indicatorClasses[size], 'inline-block rounded-full')
+            "></div>
+        <span>
+            {{ name }}
+        </span>
+    </component>
+</template>
+
+<style scoped></style>
diff --git a/resources/js/Components/common/ProjectDropdown.vue b/resources/js/Components/common/ProjectDropdown.vue
new file mode 100644
index 00000000..1fd896ee
--- /dev/null
+++ b/resources/js/Components/common/ProjectDropdown.vue
@@ -0,0 +1,162 @@
+<script setup lang="ts">
+import ProjectBadge from '@/Components/common/ProjectBadge.vue';
+import { computed, nextTick, ref, watch } from 'vue';
+import { type Project, useProjectsStore } from '@/utils/useProjects';
+import Dropdown from '@/Components/Dropdown.vue';
+import {
+    ComboboxAnchor,
+    ComboboxContent,
+    ComboboxInput,
+    ComboboxItem,
+    ComboboxRoot,
+    ComboboxViewport,
+} from 'radix-vue';
+import { PlusCircleIcon } from '@heroicons/vue/20/solid';
+import ProjectDropdownItem from '@/Components/common/ProjectDropdownItem.vue';
+import { storeToRefs } from 'pinia';
+import { api } from '../../../../openapi.json.client';
+import { usePage } from '@inertiajs/vue3';
+import { getRandomColor } from '@/utils/color';
+
+const searchValue = ref('');
+const searchInput = ref<HTMLElement | null>(null);
+const model = defineModel<Project | null>({
+    default: null,
+});
+const open = ref(false);
+const projectsStore = useProjectsStore();
+
+const { projects } = storeToRefs(projectsStore);
+const projectDropdownTrigger = ref<HTMLElement | null>(null);
+const shownProjects = computed(() => {
+    return projects.value.filter((project) => {
+        return project.name
+            .toLowerCase()
+            .includes(searchValue.value?.toLowerCase()?.trim() || '');
+    });
+});
+
+const page = usePage<{
+    auth: {
+        user: {
+            current_team_id: string;
+        };
+    };
+}>();
+
+async function addProjectIfNoneExists() {
+    if (searchValue.value.length > 0 && shownProjects.value.length === 0) {
+        const response = await api.createProject(
+            {
+                name: searchValue.value,
+                color: getRandomColor(),
+            },
+            { params: { organization: page.props.auth.user.current_team_id } }
+        );
+        projects.value.unshift(response.data);
+        model.value = response.data;
+        searchValue.value = '';
+        open.value = false;
+    }
+}
+
+watch(open, (isOpen) => {
+    if (isOpen) {
+        nextTick(() => {
+            searchInput.value?.$el?.focus();
+        });
+
+        projects.value.sort((a) => {
+            return model.value === a ? -1 : 1;
+        });
+    }
+});
+
+function isProjectSelected(project: Project) {
+    return model.value?.id === project.id;
+}
+
+const selectedProjectName = computed(() => {
+    return model.value?.name || 'No Project';
+});
+
+const selectedProjectColor = computed(() => {
+    return model.value?.color || 'var(--theme-color-icon-default)';
+});
+</script>
+
+<template>
+    <Dropdown v-model="open" align="right" width="60">
+        <template #trigger>
+            <ProjectBadge
+                ref="projectDropdownTrigger"
+                :color="selectedProjectColor"
+                size="large"
+                tag="button"
+                :name="selectedProjectName"
+                class="focus:border-input-border-active focus:outline-0 focus:bg-card-background-seperator hover:bg-card-background-seperator"></ProjectBadge>
+        </template>
+
+        <template #content>
+            <ComboboxRoot
+                :open="open"
+                v-model="model"
+                v-model:searchTerm="searchValue"
+                class="relative">
+                <ComboboxAnchor>
+                    <ComboboxInput
+                        @keydown.enter="addProjectIfNoneExists"
+                        ref="searchInput"
+                        class="bg-card-background border-0 placeholder-muted text-white py-2.5 focus:ring-0 border-b border-card-background-seperator focus:border-card-background-seperator w-full"
+                        placeholder="Search for a project..." />
+                </ComboboxAnchor>
+                <ComboboxContent>
+                    <ComboboxViewport ref="dropdownViewport" class="w-60">
+                        <ComboboxItem
+                            v-if="searchValue === ''"
+                            class="data-[highlighted]:bg-card-background-active"
+                            :data-project-id="null"
+                            :value="{
+                                id: null,
+                                name: '',
+                            }">
+                            <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="
+                                searchValue.length > 0 &&
+                                shownProjects.length === 0
+                            "
+                            class="bg-card-background-active">
+                            <div
+                                class="flex space-x-3 items-center px-4 py-3 text-sm font-medium border-t rounded-b-lg border-card-background-seperator">
+                                <PlusCircleIcon
+                                    class="w-5 flex-shrink-0"></PlusCircleIcon>
+                                <span
+                                    >Add "{{ searchValue }}" as a new
+                                    Project</span
+                                >
+                            </div>
+                        </div>
+                    </ComboboxViewport>
+                </ComboboxContent>
+            </ComboboxRoot>
+        </template>
+    </Dropdown>
+</template>
+
+<style scoped></style>
diff --git a/resources/js/Components/common/ProjectDropdownItem.vue b/resources/js/Components/common/ProjectDropdownItem.vue
new file mode 100644
index 00000000..2b59a9b7
--- /dev/null
+++ b/resources/js/Components/common/ProjectDropdownItem.vue
@@ -0,0 +1,19 @@
+<script setup lang="ts">
+defineProps<{
+    name: string;
+    selected: boolean;
+    color: string;
+}>();
+</script>
+
+<template>
+    <div
+        class="flex items-center space-x-3 w-full px-4 py-2.5 text-start text-base 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">
+        <div
+            :style="{ backgroundColor: color }"
+            class="w-4 h-4 rounded-full"></div>
+        <span>{{ name }}</span>
+    </div>
+</template>
+
+<style scoped></style>
diff --git a/resources/js/Components/common/StatCard.vue b/resources/js/Components/common/StatCard.vue
new file mode 100644
index 00000000..bf6c7ea3
--- /dev/null
+++ b/resources/js/Components/common/StatCard.vue
@@ -0,0 +1,18 @@
+<script setup lang="ts">
+defineProps<{
+    title: string;
+    value: string;
+}>();
+</script>
+
+<template>
+    <div
+        class="rounded-lg bg-card-background border-card-border border px-4 py-3">
+        <dt class="font-bold text-muted">{{ title }}</dt>
+        <dd class="text-3xl text-white pt-1 font-bold">
+            {{ value }}
+        </dd>
+    </div>
+</template>
+
+<style scoped></style>
diff --git a/resources/js/Components/common/TagDropdown.vue b/resources/js/Components/common/TagDropdown.vue
new file mode 100644
index 00000000..91160b40
--- /dev/null
+++ b/resources/js/Components/common/TagDropdown.vue
@@ -0,0 +1,220 @@
+<script setup lang="ts">
+import { PlusCircleIcon, TagIcon } from '@heroicons/vue/20/solid';
+import Dropdown from '@/Components/Dropdown.vue';
+import {
+    type Component,
+    computed,
+    nextTick,
+    onMounted,
+    ref,
+    watch,
+    watchEffect,
+} from 'vue';
+import TagDropdownItem from '@/Components/common/TagDropdownItem.vue';
+import { twMerge } from 'tailwind-merge';
+import {
+    ComboboxAnchor,
+    ComboboxContent,
+    ComboboxEmpty,
+    ComboboxInput,
+    ComboboxItem,
+    ComboboxRoot,
+    ComboboxViewport,
+} from 'radix-vue';
+import { useTagsStore } from '@/utils/useTags';
+import { storeToRefs } from 'pinia';
+
+const tagsStore = useTagsStore();
+const { tags } = storeToRefs(tagsStore);
+
+const emit = defineEmits(['changed']);
+
+const model = defineModel<string[]>({
+    default: [],
+});
+
+onMounted(async () => {
+    await tagsStore.fetchTags();
+});
+
+const searchInput = ref<Component | null>(null);
+const open = ref(false);
+const dropdownViewport = ref<Component | null>(null);
+
+const searchValue = ref('');
+
+function isTagSelected(id: string) {
+    return model.value.includes(id);
+}
+
+function addOrRemoveTagFromSelection(id: string) {
+    if (model.value.includes(id)) {
+        model.value = model.value.filter((tagId) => tagId !== id);
+    } else {
+        model.value.push(id);
+    }
+    emit('changed');
+}
+
+const iconColorClasses = computed(() => {
+    if (model.value.length > 0) {
+        return 'text-accent-200/80 focus:text-accent-200 hover:text-accent-200';
+    } else {
+        return 'text-icon-default hover:text-icon-active focus:text-icon-active';
+    }
+});
+
+watch(open, (isOpen) => {
+    if (isOpen) {
+        nextTick(() => {
+            // @ts-expect-error We need to access the actual HTML Element to focus as radix-vue does not support any other way right now
+            searchInput.value?.$el?.focus();
+        });
+
+        tags.value.sort((a) => {
+            return model.value.includes(a.id) ? -1 : 1;
+        });
+    }
+});
+
+const filteredTags = computed(() => {
+    return tags.value.filter((tag) => {
+        return tag.name
+            .toLowerCase()
+            .includes(searchValue.value?.toLowerCase()?.trim() || '');
+    });
+});
+
+const showAllTags = ref(false);
+
+const shownTags = computed(() => {
+    if (showAllTags.value) {
+        return filteredTags.value;
+    } else {
+        return filteredTags.value.slice(0, 5);
+    }
+});
+
+const moreTagsAvailable = computed(() => {
+    return filteredTags.value.length - shownTags.value.length;
+});
+
+async function addTagIfNoneExists() {
+    if (searchValue.value.length > 0 && filteredTags.value.length === 0) {
+        const newTag = await tagsStore.createTag(searchValue.value);
+        addOrRemoveTagFromSelection(newTag.id);
+        searchValue.value = '';
+    }
+}
+
+function removeTagLimit() {
+    showAllTags.value = true;
+}
+
+watchEffect(() => {
+    if (searchValue.value === ' ') {
+        nextTick(() => {
+            searchValue.value = '';
+            const currentSelectedItem =
+                // @ts-expect-error We need to access the actual HTML Element to focus as radix-vue does not support any other way right now
+                dropdownViewport.value?.$el?.querySelector(
+                    '[data-highlighted]'
+                );
+            const highlightedTagId = currentSelectedItem?.getAttribute(
+                'data-tag-id'
+            ) as string;
+            if (highlightedTagId) {
+                const highlightedTag = tags.value.find(
+                    (tag) => tag.id === highlightedTagId
+                );
+                if (highlightedTag) {
+                    addOrRemoveTagFromSelection(highlightedTag.id);
+                }
+            }
+        });
+    }
+});
+
+function updateValue(e: string[]) {
+    model.value = e;
+    emit('changed');
+}
+</script>
+
+<template>
+    <Dropdown width="120" v-model="open" :closeOnContentClick="false">
+        <template #trigger>
+            <button
+                data-testid="tag_dropdown"
+                :class="
+                    twMerge(
+                        iconColorClasses,
+                        'flex-shrink-0 ring-0 focus:outline-none focus:ring-0 transition focus:bg-card-background-seperator hover:bg-card-background-seperator rounded-full w-11 h-11 flex items-center justify-center'
+                    )
+                ">
+                <TagIcon class="w-7 h-7"></TagIcon>
+                <div
+                    v-if="model.length > 1"
+                    class="font-extrabold absolute rounded-full text-xs w-3 h-3 block top-[15px] rotate-[45deg] right-[14px] text-card-background">
+                    {{ model.length }}
+                </div>
+            </button>
+        </template>
+        <template #content>
+            <ComboboxRoot
+                multiple
+                :open="open"
+                @update:modelValue="updateValue"
+                v-model:searchTerm="searchValue"
+                class="relative">
+                <ComboboxAnchor>
+                    <ComboboxInput
+                        @keydown.enter="addTagIfNoneExists"
+                        data-testid="tag_dropdown_search"
+                        ref="searchInput"
+                        class="bg-card-background border-0 placeholder-muted text-white py-2.5 focus:ring-0 border-b border-card-background-seperator focus:border-card-background-seperator w-full"
+                        placeholder="Search for a tag..." />
+                </ComboboxAnchor>
+                <ComboboxContent>
+                    <ComboboxViewport ref="dropdownViewport" class="w-60">
+                        <ComboboxEmpty>
+                            <div
+                                v-if="searchValue.length > 0"
+                                class="bg-card-background-active">
+                                <div
+                                    class="flex space-x-3 items-center px-4 py-3 text-sm font-medium border-t rounded-b-lg border-card-background-seperator">
+                                    <PlusCircleIcon
+                                        class="w-5 flex-shrink-0"></PlusCircleIcon>
+                                    <span
+                                        >Add "{{ searchValue }}" as a new
+                                        Tag</span
+                                    >
+                                </div>
+                            </div>
+                            <div v-else></div>
+                        </ComboboxEmpty>
+                        <ComboboxItem
+                            v-for="tag in shownTags"
+                            :key="tag.id"
+                            :value="tag.id"
+                            class="data-[highlighted]:bg-card-background-active"
+                            data-testid="tag_dropdown_entries"
+                            :data-tag-id="tag.id">
+                            <TagDropdownItem
+                                :selected="isTagSelected(tag.id)"
+                                :name="tag.name"></TagDropdownItem>
+                        </ComboboxItem>
+                    </ComboboxViewport>
+                    <button
+                        @click="removeTagLimit"
+                        v-if="moreTagsAvailable > 0"
+                        class="border-t hover:text-white hover:bg-card-background-active px-2 text-center font-semibold py-2 border-t-card-background-seperator">
+                        Show all
+                    </button>
+                </ComboboxContent>
+            </ComboboxRoot>
+        </template>
+    </Dropdown>
+</template>
+
+<style scoped></style>
diff --git a/resources/js/Components/common/TagDropdownItem.vue b/resources/js/Components/common/TagDropdownItem.vue
new file mode 100644
index 00000000..0bee397e
--- /dev/null
+++ b/resources/js/Components/common/TagDropdownItem.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+import { CheckCircleIcon } from '@heroicons/vue/20/solid';
+import { computed } from 'vue';
+import { twMerge } from 'tailwind-merge';
+
+const props = defineProps<{
+    name: string;
+    selected: boolean;
+}>();
+
+const iconClasses = computed(() => {
+    if (props.selected) {
+        return 'text-accent-200';
+    } else {
+        return 'text-card-border';
+    }
+});
+</script>
+
+<template>
+    <div
+        class="flex items-center space-x-3 w-full px-4 py-2.5 text-start text-base 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">
+        <CheckCircleIcon :class="twMerge(iconClasses, 'w-6')"></CheckCircleIcon>
+        <span>{{ name }}</span>
+    </div>
+</template>
+
+<style scoped></style>
diff --git a/resources/js/Components/common/TimeTrackerStartStop.vue b/resources/js/Components/common/TimeTrackerStartStop.vue
new file mode 100644
index 00000000..f7b8d205
--- /dev/null
+++ b/resources/js/Components/common/TimeTrackerStartStop.vue
@@ -0,0 +1,89 @@
+<script setup lang="ts">
+import { twMerge } from 'tailwind-merge';
+import { computed } from 'vue';
+
+const emit = defineEmits(['changed']);
+
+const props = withDefaults(
+    defineProps<{
+        size: 'base' | 'large';
+        active: boolean;
+    }>(),
+    {
+        size: 'base',
+        active: false,
+    }
+);
+const buttonSizeClasses = {
+    base: 'w-8 h-8 !bg-accent-200/30 ',
+    large: 'w-11 h-11 ring-accent-200/10 focus:ring-accent-200/20 ring-8 hover:scale-110',
+};
+const iconClass = {
+    base: 'w-3.5 h-3.5',
+    large: 'w-4 h-4',
+};
+
+const buttonColorClasses = computed(() => {
+    if (props.active) {
+        return 'bg-red-400/80 hover:bg-red-500/80 focus:bg-red-500/80';
+    } else {
+        return 'bg-accent-300/70 hover:bg-accent-400/80 focus:bg-accent-400/80';
+    }
+});
+
+function toggleState() {
+    emit('changed', !props.active);
+}
+</script>
+
+<template>
+    <button
+        @click="toggleState"
+        data-testid="timer_button"
+        :class="
+            twMerge(
+                buttonSizeClasses[size],
+                buttonColorClasses,
+                'flex items-center justify-center py-1 transition  focus:outline-0 rounded-full text-white '
+            )
+        ">
+        <Transition name="fade" mode="out-in">
+            <svg
+                v-if="props.active"
+                :class="iconClass[size]"
+                viewBox="0 0 14 14"
+                fill="none"
+                xmlns="http://www.w3.org/2000/svg">
+                <path
+                    fill-rule="evenodd"
+                    clip-rule="evenodd"
+                    d="M0.461426 2.74913C0.461426 1.48677 1.48666 0.461538 2.75076 0.461538H11.249C12.5131 0.461538 13.5383 1.48677 13.5383 2.75087V11.2491C13.5383 12.5132 12.5131 13.5385 11.249 13.5385H2.7525C2.4518 13.5387 2.154 13.4796 1.87614 13.3647C1.59828 13.2497 1.34582 13.0811 1.13319 12.8684C0.920559 12.6558 0.751936 12.4033 0.636968 12.1255C0.521999 11.8476 0.462941 11.5498 0.46317 11.2491V2.75262L0.461426 2.74913Z"
+                    fill="currentColor" />
+            </svg>
+            <svg
+                v-else
+                :class="iconClass[size]"
+                viewBox="0 0 7 8"
+                fill="none"
+                xmlns="http://www.w3.org/2000/svg">
+                <path
+                    fill-rule="evenodd"
+                    clip-rule="evenodd"
+                    d="M6.56167 3.18089C6.70764 3.26214 6.82926 3.38092 6.91393 3.52494C6.99859 3.66896 7.04324 3.83299 7.04324 4.00005C7.04324 4.16712 6.99859 4.33115 6.91393 4.47517C6.82926 4.61919 6.70764 4.73797 6.56167 4.81922L1.8925 7.41339C1.74982 7.49259 1.58895 7.53317 1.42578 7.53113C1.26261 7.52909 1.1028 7.48449 0.962147 7.40175C0.821497 7.31901 0.704879 7.20099 0.623826 7.05937C0.542772 6.91774 0.50009 6.7574 0.5 6.59422V1.40589C0.5 0.691721 1.2675 0.239221 1.8925 0.586721L6.56167 3.18089Z"
+                    fill="currentColor" />
+            </svg>
+        </Transition>
+    </button>
+</template>
+
+<style scoped>
+.fade-enter-active,
+.fade-leave-active {
+    transition: opacity 0.2s ease;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+    opacity: 0;
+}
+</style>
diff --git a/resources/js/Layouts/AppLayout.vue b/resources/js/Layouts/AppLayout.vue
index f7c0dbc4..ff319201 100644
--- a/resources/js/Layouts/AppLayout.vue
+++ b/resources/js/Layouts/AppLayout.vue
@@ -1,484 +1,119 @@
 <script setup lang="ts">
-import { ref } from 'vue';
-import { Head, Link, router, usePage } from '@inertiajs/vue3';
-import ApplicationMark from '@/Components/ApplicationMark.vue';
+import { Head } from '@inertiajs/vue3';
 import Banner from '@/Components/Banner.vue';
-import Dropdown from '@/Components/Dropdown.vue';
-import DropdownLink from '@/Components/DropdownLink.vue';
-import NavLink from '@/Components/NavLink.vue';
-import ResponsiveNavLink from '@/Components/ResponsiveNavLink.vue';
 import route from 'ziggy-js';
-import type { Organization, User } from '@/types/models';
+import OrganizationSwitcher from '@/Components/OrganizationSwitcher.vue';
+import CurrentSidebarTimer from '@/Components/CurrentSidebarTimer.vue';
+import {
+    ChartBarIcon,
+    ClockIcon,
+    FolderIcon,
+    HomeIcon,
+    UserCircleIcon,
+    UserGroupIcon,
+    TagIcon,
+    Cog6ToothIcon,
+} from '@heroicons/vue/20/solid';
+import NavigationSidebarItem from '@/Components/NavigationSidebarItem.vue';
+import UserSettingsIcon from '@/Components/UserSettingsIcon.vue';
 
 defineProps({
     title: String,
 });
-
-const showingNavigationDropdown = ref(false);
-
-const page = usePage<{
-    jetstream: {
-        canCreateTeams: boolean;
-        hasTeamFeatures: boolean;
-        managesProfilePhotos: boolean;
-        hasApiFeatures: boolean;
-    };
-    auth: {
-        user: User & { all_teams: Organization[] };
-    };
-}>();
-
-const switchToTeam = (team: Organization) => {
-    router.put(
-        route('current-team.update'),
-        {
-            team_id: team.id,
-        },
-        {
-            preserveState: false,
-        }
-    );
-};
-
-const logout = () => {
-    router.post(route('logout'));
-};
 </script>
 
 <template>
-    <div>
-        <Head :title="title" />
-
-        <Banner />
-
-        <div class="min-h-screen bg-gray-100 dark:bg-gray-900">
-            <nav
-                class="bg-white dark:bg-gray-800 border-b border-gray-100 dark:border-gray-700">
-                <!-- Primary Navigation Menu -->
-                <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
-                    <div class="flex justify-between h-16">
-                        <div class="flex">
-                            <!-- Logo -->
-                            <div class="shrink-0 flex items-center">
-                                <Link :href="route('dashboard')">
-                                    <ApplicationMark class="block h-9 w-auto" />
-                                </Link>
-                            </div>
-
-                            <!-- Navigation Links -->
-                            <div
-                                class="hidden space-x-8 sm:-my-px sm:ms-10 sm:flex">
-                                <NavLink
-                                    :href="route('dashboard')"
-                                    :active="route().current('dashboard')">
-                                    Dashboard
-                                </NavLink>
-                            </div>
-                        </div>
-
-                        <div class="hidden sm:flex sm:items-center sm:ms-6">
-                            <div class="ms-3 relative">
-                                <!-- Teams Dropdown -->
-                                <Dropdown
-                                    v-if="page.props.jetstream.hasTeamFeatures"
-                                    align="right"
-                                    width="60">
-                                    <template #trigger>
-                                        <span class="inline-flex rounded-md">
-                                            <button
-                                                type="button"
-                                                id="currentTeamButton"
-                                                class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 dark:text-gray-400 bg-white dark:bg-gray-800 hover:text-gray-700 dark:hover:text-gray-300 focus:outline-none focus:bg-gray-50 dark:focus:bg-gray-700 active:bg-gray-50 dark:active:bg-gray-700 transition ease-in-out duration-150">
-                                                {{
-                                                    page.props.auth.user
-                                                        .current_team.name
-                                                }}
-
-                                                <svg
-                                                    class="ms-2 -me-0.5 h-4 w-4"
-                                                    xmlns="http://www.w3.org/2000/svg"
-                                                    fill="none"
-                                                    viewBox="0 0 24 24"
-                                                    stroke-width="1.5"
-                                                    stroke="currentColor">
-                                                    <path
-                                                        stroke-linecap="round"
-                                                        stroke-linejoin="round"
-                                                        d="M8.25 15L12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9" />
-                                                </svg>
-                                            </button>
-                                        </span>
-                                    </template>
-
-                                    <template #content>
-                                        <div class="w-60">
-                                            <!-- Organization Management -->
-                                            <div
-                                                class="block px-4 py-2 text-xs text-gray-400">
-                                                Manage Team
-                                            </div>
-
-                                            <!-- Organization Settings -->
-                                            <DropdownLink
-                                                :href="
-                                                    route(
-                                                        'teams.show',
-                                                        page.props.auth.user
-                                                            .current_team.id
-                                                    )
-                                                ">
-                                                Team Settings
-                                            </DropdownLink>
-
-                                            <DropdownLink
-                                                v-if="
-                                                    page.props.jetstream
-                                                        .canCreateTeams
-                                                "
-                                                :href="route('teams.create')">
-                                                Create New Team
-                                            </DropdownLink>
-
-                                            <!-- Organization Switcher -->
-                                            <template
-                                                v-if="
-                                                    page.props.auth.user
-                                                        .all_teams.length > 1
-                                                ">
-                                                <div
-                                                    class="border-t border-gray-200 dark:border-gray-600" />
-
-                                                <div
-                                                    class="block px-4 py-2 text-xs text-gray-400">
-                                                    Switch Teams
-                                                </div>
-
-                                                <template
-                                                    v-for="team in page.props
-                                                        .auth.user.all_teams"
-                                                    :key="team.id">
-                                                    <form
-                                                        @submit.prevent="
-                                                            switchToTeam(team)
-                                                        ">
-                                                        <DropdownLink
-                                                            as="button">
-                                                            <div
-                                                                class="flex items-center">
-                                                                <svg
-                                                                    v-if="
-                                                                        team.id ==
-                                                                        page
-                                                                            .props
-                                                                            .auth
-                                                                            .user
-                                                                            .current_team_id
-                                                                    "
-                                                                    class="me-2 h-5 w-5 text-green-400"
-                                                                    xmlns="http://www.w3.org/2000/svg"
-                                                                    fill="none"
-                                                                    viewBox="0 0 24 24"
-                                                                    stroke-width="1.5"
-                                                                    stroke="currentColor">
-                                                                    <path
-                                                                        stroke-linecap="round"
-                                                                        stroke-linejoin="round"
-                                                                        d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-                                                                </svg>
-
-                                                                <div>
-                                                                    {{
-                                                                        team.name
-                                                                    }}
-                                                                </div>
-                                                            </div>
-                                                        </DropdownLink>
-                                                    </form>
-                                                </template>
-                                            </template>
-                                        </div>
-                                    </template>
-                                </Dropdown>
-                            </div>
-
-                            <!-- Settings Dropdown -->
-                            <div class="ms-3 relative">
-                                <Dropdown align="right" width="48">
-                                    <template #trigger>
-                                        <button
-                                            v-if="
-                                                page.props.jetstream
-                                                    .managesProfilePhotos
-                                            "
-                                            id="currentUserButton"
-                                            class="flex text-sm border-2 border-transparent rounded-full focus:outline-none focus:border-gray-300 transition">
-                                            <img
-                                                class="h-8 w-8 rounded-full object-cover"
-                                                :src="
-                                                    page.props.auth.user
-                                                        .profile_photo_url
-                                                "
-                                                :alt="
-                                                    page.props.auth.user.name
-                                                " />
-                                        </button>
-
-                                        <span
-                                            v-else
-                                            class="inline-flex rounded-md">
-                                            <button
-                                                type="button"
-                                                class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 dark:text-gray-400 bg-white dark:bg-gray-800 hover:text-gray-700 dark:hover:text-gray-300 focus:outline-none focus:bg-gray-50 dark:focus:bg-gray-700 active:bg-gray-50 dark:active:bg-gray-700 transition ease-in-out duration-150">
-                                                {{ page.props.auth.user.name }}
-
-                                                <svg
-                                                    class="ms-2 -me-0.5 h-4 w-4"
-                                                    xmlns="http://www.w3.org/2000/svg"
-                                                    fill="none"
-                                                    viewBox="0 0 24 24"
-                                                    stroke-width="1.5"
-                                                    stroke="currentColor">
-                                                    <path
-                                                        stroke-linecap="round"
-                                                        stroke-linejoin="round"
-                                                        d="M19.5 8.25l-7.5 7.5-7.5-7.5" />
-                                                </svg>
-                                            </button>
-                                        </span>
-                                    </template>
-
-                                    <template #content>
-                                        <!-- Account Management -->
-                                        <div
-                                            class="block px-4 py-2 text-xs text-gray-400">
-                                            Manage Account
-                                        </div>
-
-                                        <DropdownLink
-                                            :href="route('profile.show')">
-                                            Profile
-                                        </DropdownLink>
-
-                                        <DropdownLink
-                                            v-if="
-                                                page.props.jetstream
-                                                    .hasApiFeatures
-                                            "
-                                            :href="route('api-tokens.index')">
-                                            API Tokens
-                                        </DropdownLink>
-
-                                        <div
-                                            class="border-t border-gray-200 dark:border-gray-600" />
-
-                                        <!-- Authentication -->
-                                        <form @submit.prevent="logout">
-                                            <DropdownLink as="button">
-                                                Log Out
-                                            </DropdownLink>
-                                        </form>
-                                    </template>
-                                </Dropdown>
-                            </div>
-                        </div>
-
-                        <!-- Hamburger -->
-                        <div class="-me-2 flex items-center sm:hidden">
-                            <button
-                                class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 dark:text-gray-500 hover:text-gray-500 dark:hover:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-900 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-900 focus:text-gray-500 dark:focus:text-gray-400 transition duration-150 ease-in-out"
-                                @click="
-                                    showingNavigationDropdown =
-                                        !showingNavigationDropdown
-                                ">
-                                <svg
-                                    class="h-6 w-6"
-                                    stroke="currentColor"
-                                    fill="none"
-                                    viewBox="0 0 24 24">
-                                    <path
-                                        :class="{
-                                            hidden: showingNavigationDropdown,
-                                            'inline-flex':
-                                                !showingNavigationDropdown,
-                                        }"
-                                        stroke-linecap="round"
-                                        stroke-linejoin="round"
-                                        stroke-width="2"
-                                        d="M4 6h16M4 12h16M4 18h16" />
-                                    <path
-                                        :class="{
-                                            hidden: !showingNavigationDropdown,
-                                            'inline-flex':
-                                                showingNavigationDropdown,
-                                        }"
-                                        stroke-linecap="round"
-                                        stroke-linejoin="round"
-                                        stroke-width="2"
-                                        d="M6 18L18 6M6 6l12 12" />
-                                </svg>
-                            </button>
-                        </div>
-                    </div>
+    <div class="flex flex-wrap bg-default-background text-muted">
+        <div
+            class="flex-shrink-0 h-screen fixed w-[250px] px-1.5 py-4 flex flex-col justify-between">
+            <div>
+                <div class="border-b border-default-background-seperator pb-2">
+                    <OrganizationSwitcher></OrganizationSwitcher>
                 </div>
-
-                <!-- Responsive Navigation Menu -->
-                <div
-                    :class="{
-                        block: showingNavigationDropdown,
-                        hidden: !showingNavigationDropdown,
-                    }"
-                    class="sm:hidden">
-                    <div class="pt-2 pb-3 space-y-1">
-                        <ResponsiveNavLink
+                <div class="border-b border-default-background-seperator">
+                    <CurrentSidebarTimer></CurrentSidebarTimer>
+                </div>
+                <nav>
+                    <ul class="space-y-1">
+                        <NavigationSidebarItem
+                            title="Dashboard"
+                            :icon="HomeIcon"
                             :href="route('dashboard')"
-                            :active="route().current('dashboard')">
-                            Dashboard
-                        </ResponsiveNavLink>
-                    </div>
-
-                    <!-- Responsive Settings Options -->
-                    <div
-                        class="pt-4 pb-1 border-t border-gray-200 dark:border-gray-600">
-                        <div class="flex items-center px-4">
-                            <div
-                                v-if="page.props.jetstream.managesProfilePhotos"
-                                class="shrink-0 me-3">
-                                <img
-                                    class="h-10 w-10 rounded-full object-cover"
-                                    :src="
-                                        page.props.auth.user.profile_photo_url
-                                    "
-                                    :alt="page.props.auth.user.name" />
-                            </div>
-
-                            <div>
-                                <div
-                                    class="font-medium text-base text-gray-800 dark:text-gray-200">
-                                    {{ page.props.auth.user.name }}
-                                </div>
-                                <div class="font-medium text-sm text-gray-500">
-                                    {{ page.props.auth.user.email }}
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="mt-3 space-y-1">
-                            <ResponsiveNavLink
-                                :href="route('profile.show')"
-                                :active="route().current('profile.show')">
-                                Profile
-                            </ResponsiveNavLink>
-
-                            <ResponsiveNavLink
-                                v-if="page.props.jetstream.hasApiFeatures"
-                                :href="route('api-tokens.index')"
-                                :active="route().current('api-tokens.index')">
-                                API Tokens
-                            </ResponsiveNavLink>
-
-                            <!-- Authentication -->
-                            <form method="POST" @submit.prevent="logout">
-                                <ResponsiveNavLink as="button">
-                                    Log Out
-                                </ResponsiveNavLink>
-                            </form>
-
-                            <!-- Organization Management -->
-                            <template
-                                v-if="page.props.jetstream.hasTeamFeatures">
-                                <div
-                                    class="border-t border-gray-200 dark:border-gray-600" />
-
-                                <div
-                                    class="block px-4 py-2 text-xs text-gray-400">
-                                    Manage Team
-                                </div>
-
-                                <!-- Organization Settings -->
-                                <ResponsiveNavLink
-                                    :href="
-                                        route(
-                                            'teams.show',
-                                            page.props.auth.user.current_team.id
-                                        )
-                                    "
-                                    :active="route().current('teams.show')">
-                                    Team Settings
-                                </ResponsiveNavLink>
-
-                                <ResponsiveNavLink
-                                    v-if="page.props.jetstream.canCreateTeams"
-                                    :href="route('teams.create')"
-                                    :active="route().current('teams.create')">
-                                    Create New Team
-                                </ResponsiveNavLink>
-
-                                <!-- Organization Switcher -->
-                                <template
-                                    v-if="
-                                        page.props.auth.user.all_teams.length >
-                                        1
-                                    ">
-                                    <div
-                                        class="border-t border-gray-200 dark:border-gray-600" />
-
-                                    <div
-                                        class="block px-4 py-2 text-xs text-gray-400">
-                                        Switch Teams
-                                    </div>
-
-                                    <template
-                                        v-for="team in page.props.auth.user
-                                            .all_teams"
-                                        :key="team.id">
-                                        <form
-                                            @submit.prevent="
-                                                switchToTeam(team)
-                                            ">
-                                            <ResponsiveNavLink as="button">
-                                                <div class="flex items-center">
-                                                    <svg
-                                                        v-if="
-                                                            team.id ==
-                                                            page.props.auth.user
-                                                                .current_team_id
-                                                        "
-                                                        class="me-2 h-5 w-5 text-green-400"
-                                                        xmlns="http://www.w3.org/2000/svg"
-                                                        fill="none"
-                                                        viewBox="0 0 24 24"
-                                                        stroke-width="1.5"
-                                                        stroke="currentColor">
-                                                        <path
-                                                            stroke-linecap="round"
-                                                            stroke-linejoin="round"
-                                                            d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-                                                    </svg>
-                                                    <div>{{ team.name }}</div>
-                                                </div>
-                                            </ResponsiveNavLink>
-                                        </form>
-                                    </template>
-                                </template>
-                            </template>
-                        </div>
-                    </div>
+                            :current="
+                                route().current('dashboard')
+                            "></NavigationSidebarItem>
+                        <NavigationSidebarItem
+                            title="Time"
+                            :icon="ClockIcon"
+                            :href="route('dashboard')"></NavigationSidebarItem>
+                        <NavigationSidebarItem
+                            title="Reporting"
+                            :icon="ChartBarIcon"
+                            :href="route('dashboard')"></NavigationSidebarItem>
+                    </ul>
+                </nav>
+
+                <div class="text-muted font-semibold text-sm pt-6 pb-4">
+                    Manage
                 </div>
-            </nav>
 
-            <!-- Page Heading -->
-            <header
-                v-if="$slots.header"
-                class="bg-white dark:bg-gray-800 shadow">
-                <div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
-                    <slot name="header" />
-                </div>
-            </header>
+                <nav>
+                    <ul class="space-y-1">
+                        <NavigationSidebarItem
+                            title="Projects"
+                            :icon="FolderIcon"
+                            :href="route('dashboard')"
+                            :current="
+                                route().current('dashboard')
+                            "></NavigationSidebarItem>
+                        <NavigationSidebarItem
+                            title="Clients"
+                            :icon="UserCircleIcon"
+                            :href="route('dashboard')"></NavigationSidebarItem>
+                        <NavigationSidebarItem
+                            title="Team"
+                            :icon="UserGroupIcon"
+                            :href="route('dashboard')"></NavigationSidebarItem>
+                        <NavigationSidebarItem
+                            title="Tags"
+                            :icon="TagIcon"
+                            :href="route('dashboard')"></NavigationSidebarItem>
+                    </ul>
+                </nav>
+            </div>
+
+            <ul
+                class="border-t border-default-background-seperator pt-3 flex justify-between pr-4 items-center">
+                <NavigationSidebarItem
+                    class="flex-1"
+                    title="Settings"
+                    :icon="Cog6ToothIcon"
+                    :href="route('dashboard')"></NavigationSidebarItem>
+
+                <UserSettingsIcon></UserSettingsIcon>
+            </ul>
+        </div>
+        <div class="flex-1 ml-[250px]">
+            <Head :title="title" />
+
+            <Banner />
+
+            <div
+                class="min-h-screen bg-default-background border-l border-default-background-seperator">
+                <!-- Page Heading -->
+                <header
+                    v-if="$slots.header"
+                    class="bg-default-background border-b border-default-background-seperator shadow">
+                    <div class="py-6 px-4 sm:px-6 lg:px-8">
+                        <slot name="header" />
+                    </div>
+                </header>
 
-            <!-- Page Content -->
-            <main>
-                <slot />
-            </main>
+                <!-- Page Content -->
+                <main>
+                    <slot />
+                </main>
+            </div>
         </div>
     </div>
 </template>
diff --git a/resources/js/Pages/API/Partials/ApiTokenManager.vue b/resources/js/Pages/API/Partials/ApiTokenManager.vue
index 19d8bd26..1efa13f2 100644
--- a/resources/js/Pages/API/Partials/ApiTokenManager.vue
+++ b/resources/js/Pages/API/Partials/ApiTokenManager.vue
@@ -129,10 +129,9 @@ const deleteApiToken = () => {
                                         createApiTokenForm.permissions
                                     "
                                     :value="permission" />
-                                <span
-                                    class="ms-2 text-sm text-gray-600 dark:text-gray-400"
-                                    >{{ permission }}</span
-                                >
+                                <span class="ms-2 text-sm text-muted">{{
+                                    permission
+                                }}</span>
                             </label>
                         </div>
                     </div>
@@ -246,10 +245,9 @@ const deleteApiToken = () => {
                             <Checkbox
                                 v-model:checked="updateApiTokenForm.permissions"
                                 :value="permission" />
-                            <span
-                                class="ms-2 text-sm text-gray-600 dark:text-gray-400"
-                                >{{ permission }}</span
-                            >
+                            <span class="ms-2 text-sm text-muted">{{
+                                permission
+                            }}</span>
                         </label>
                     </div>
                 </div>
diff --git a/resources/js/Pages/Auth/ConfirmPassword.vue b/resources/js/Pages/Auth/ConfirmPassword.vue
index 23606c18..107b3eba 100644
--- a/resources/js/Pages/Auth/ConfirmPassword.vue
+++ b/resources/js/Pages/Auth/ConfirmPassword.vue
@@ -33,7 +33,7 @@ const submit = () => {
             <AuthenticationCardLogo />
         </template>
 
-        <div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
+        <div class="mb-4 text-sm text-muted">
             This is a secure area of the application. Please confirm your
             password before continuing.
         </div>
diff --git a/resources/js/Pages/Auth/ForgotPassword.vue b/resources/js/Pages/Auth/ForgotPassword.vue
index 45fd4f97..6cdb1151 100644
--- a/resources/js/Pages/Auth/ForgotPassword.vue
+++ b/resources/js/Pages/Auth/ForgotPassword.vue
@@ -28,7 +28,7 @@ const submit = () => {
             <AuthenticationCardLogo />
         </template>
 
-        <div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
+        <div class="mb-4 text-sm text-muted">
             Forgot your password? No problem. Just let us know your email
             address and we will email you a password reset link that will allow
             you to choose a new one.
diff --git a/resources/js/Pages/Auth/Login.vue b/resources/js/Pages/Auth/Login.vue
index 35c3ab58..875bddfe 100644
--- a/resources/js/Pages/Auth/Login.vue
+++ b/resources/js/Pages/Auth/Login.vue
@@ -73,9 +73,7 @@ const submit = () => {
             <div class="block mt-4">
                 <label class="flex items-center">
                     <Checkbox v-model:checked="form.remember" name="remember" />
-                    <span class="ms-2 text-sm text-gray-600 dark:text-gray-400"
-                        >Remember me</span
-                    >
+                    <span class="ms-2 text-sm text-muted">Remember me</span>
                 </label>
             </div>
 
@@ -83,7 +81,7 @@ const submit = () => {
                 <Link
                     v-if="canResetPassword"
                     :href="route('password.request')"
-                    class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800">
+                    class="underline text-sm text-muted hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800">
                     Forgot your password?
                 </Link>
 
diff --git a/resources/js/Pages/Auth/Register.vue b/resources/js/Pages/Auth/Register.vue
index d5451702..0db0ba46 100644
--- a/resources/js/Pages/Auth/Register.vue
+++ b/resources/js/Pages/Auth/Register.vue
@@ -108,14 +108,14 @@ const page = usePage<{
                             <a
                                 target="_blank"
                                 :href="route('terms.show')"
-                                class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
+                                class="underline text-sm text-muted hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
                                 >Terms of Service</a
                             >
                             and
                             <a
                                 target="_blank"
                                 :href="route('policy.show')"
-                                class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
+                                class="underline text-sm text-muted hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
                                 >Privacy Policy</a
                             >
                         </div>
@@ -127,7 +127,7 @@ const page = usePage<{
             <div class="flex items-center justify-end mt-4">
                 <Link
                     :href="route('login')"
-                    class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800">
+                    class="underline text-sm text-muted hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800">
                     Already registered?
                 </Link>
 
diff --git a/resources/js/Pages/Auth/TwoFactorChallenge.vue b/resources/js/Pages/Auth/TwoFactorChallenge.vue
index 057b1344..b403fc64 100644
--- a/resources/js/Pages/Auth/TwoFactorChallenge.vue
+++ b/resources/js/Pages/Auth/TwoFactorChallenge.vue
@@ -45,7 +45,7 @@ const submit = () => {
             <AuthenticationCardLogo />
         </template>
 
-        <div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
+        <div class="mb-4 text-sm text-muted">
             <template v-if="!recovery">
                 Please confirm access to your account by entering the
                 authentication code provided by your authenticator application.
@@ -87,7 +87,7 @@ const submit = () => {
             <div class="flex items-center justify-end mt-4">
                 <button
                     type="button"
-                    class="text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 underline cursor-pointer"
+                    class="text-sm text-muted hover:text-gray-900 underline cursor-pointer"
                     @click.prevent="toggleRecovery">
                     <template v-if="!recovery"> Use a recovery code</template>
 
diff --git a/resources/js/Pages/Auth/VerifyEmail.vue b/resources/js/Pages/Auth/VerifyEmail.vue
index 5cb9df14..96bcdc20 100644
--- a/resources/js/Pages/Auth/VerifyEmail.vue
+++ b/resources/js/Pages/Auth/VerifyEmail.vue
@@ -28,7 +28,7 @@ const verificationLinkSent = computed(
             <AuthenticationCardLogo />
         </template>
 
-        <div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
+        <div class="mb-4 text-sm text-muted">
             Before continuing, could you verify your email address by clicking
             on the link we just emailed to you? If you didn't receive the email,
             we will gladly send you another.
@@ -52,7 +52,7 @@ const verificationLinkSent = computed(
                 <div>
                     <Link
                         :href="route('profile.show')"
-                        class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800">
+                        class="underline text-sm text-muted hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800">
                         Edit Profile</Link
                     >
 
@@ -60,7 +60,7 @@ const verificationLinkSent = computed(
                         :href="route('logout')"
                         method="post"
                         as="button"
-                        class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800 ms-2">
+                        class="underline text-sm text-muted hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800 ms-2">
                         Log Out
                     </Link>
                 </div>
diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/Dashboard.vue
index 6b98650e..41745c27 100644
--- a/resources/js/Pages/Dashboard.vue
+++ b/resources/js/Pages/Dashboard.vue
@@ -1,24 +1,98 @@
 <script setup lang="ts">
 import AppLayout from '@/Layouts/AppLayout.vue';
-import Welcome from '@/Components/Welcome.vue';
+import TimeTracker from '@/Components/TimeTracker.vue';
+import RecentlyTrackedTasksCard from '@/Components/Dashboard/RecentlyTrackedTasksCard.vue';
+import LastSevenDaysCard from '@/Components/Dashboard/LastSevenDaysCard.vue';
+import TeamActivityCard from '@/Components/Dashboard/TeamActivityCard.vue';
+import ThisWeekOverview from '@/Components/Dashboard/ThisWeekOverview.vue';
+import { usePage } from '@inertiajs/vue3';
+import type { Organization, User } from '@/types/models';
+import { onMounted } from 'vue';
+import { useProjectsStore } from '@/utils/useProjects';
+import ActivityGraphCard from '@/Components/Dashboard/ActivityGraphCard.vue';
+
+const page = usePage<{
+    auth: {
+        user: User & {
+            all_teams: Organization[];
+        };
+    };
+}>();
+
+onMounted(async () => {
+    if (page.props.auth.user.current_team_id) {
+        await useProjectsStore().fetchProjects(
+            page.props.auth.user.current_team_id
+        );
+    }
+});
+const props = defineProps<{
+    latestTasks: {
+        id: string;
+        name: string;
+        project_name: string;
+        project_id: string;
+    }[];
+    latestTeamActivity: {
+        user_id: string;
+        name: string;
+        description: string;
+        time_entry_id: string;
+        task_id: string;
+        status: boolean;
+    }[];
+    lastSevenDays: {
+        date: string;
+        duration: number; // Total duration in seconds
+        history: number[]; // Array representing the duration in seconds of the 3h windows for the day
+    }[];
+    dailyTrackedHours: [string, number][];
+    weeklyProjectOverview: {
+        value: number;
+        name: string;
+        color: string;
+    }[];
+    totalWeeklyTime: number;
+    totalWeeklyBillableTime: number;
+    totalWeeklyBillableAmount: {
+        value: number;
+        currency: string;
+    };
+    weeklyHistory: {
+        date: string;
+        duration: number;
+    }[];
+}>();
 </script>
 
 <template>
-    <AppLayout title="Dashboard">
-        <template #header>
-            <h2
-                class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
-                Dashboard
-            </h2>
-        </template>
-
-        <div class="py-12">
-            <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
-                <div
-                    class="bg-white dark:bg-gray-800 overflow-hidden shadow-xl sm:rounded-lg">
-                    <Welcome />
-                </div>
-            </div>
+    <AppLayout title="Dashboard" data-testid="dashboard_view">
+        <div
+            class="py-8 sm:px-6 lg:px-8 mx-auto border-b border-default-background-seperator">
+            <TimeTracker></TimeTracker>
+        </div>
+        <div
+            class="grid gap-x-6 grid-cols-4 sm:px-6 lg:px-8 pt-6 pb-7 border-b border-default-background-seperator">
+            <RecentlyTrackedTasksCard
+                :latestTasks="props.latestTasks"></RecentlyTrackedTasksCard>
+            <LastSevenDaysCard
+                :last7-days="props.lastSevenDays"></LastSevenDaysCard>
+            <ActivityGraphCard
+                :daily-hours-tracked="
+                    props.dailyTrackedHours
+                "></ActivityGraphCard>
+            <TeamActivityCard
+                :latestTeamActivity="
+                    props.latestTeamActivity
+                "></TeamActivityCard>
+        </div>
+        <div class="sm:px-6 lg:px-8 py-6">
+            <ThisWeekOverview
+                :weeklyProjectOverview="props.weeklyProjectOverview"
+                :total-weekly-billable-amount="props.totalWeeklyBillableAmount"
+                :total-weekly-billable-time="props.totalWeeklyBillableTime"
+                :total-weekly-time="props.totalWeeklyTime"
+                :weekly-history="props.weeklyHistory"></ThisWeekOverview>
         </div>
     </AppLayout>
 </template>
diff --git a/resources/js/Pages/Profile/Partials/DeleteUserForm.vue b/resources/js/Pages/Profile/Partials/DeleteUserForm.vue
index 619f621b..8d2c65cc 100644
--- a/resources/js/Pages/Profile/Partials/DeleteUserForm.vue
+++ b/resources/js/Pages/Profile/Partials/DeleteUserForm.vue
@@ -44,7 +44,7 @@ const closeModal = () => {
         <template #description> Permanently delete your account. </template>
 
         <template #content>
-            <div class="max-w-xl text-sm text-gray-600 dark:text-gray-400">
+            <div class="max-w-xl text-sm text-muted">
                 Once your account is deleted, all of its resources and data will
                 be permanently deleted. Before deleting your account, please
                 download any data or information that you wish to retain.
diff --git a/resources/js/Pages/Profile/Partials/LogoutOtherBrowserSessionsForm.vue b/resources/js/Pages/Profile/Partials/LogoutOtherBrowserSessionsForm.vue
index bddc2bf3..99c5924e 100644
--- a/resources/js/Pages/Profile/Partials/LogoutOtherBrowserSessionsForm.vue
+++ b/resources/js/Pages/Profile/Partials/LogoutOtherBrowserSessionsForm.vue
@@ -53,7 +53,7 @@ const closeModal = () => {
         </template>
 
         <template #content>
-            <div class="max-w-xl text-sm text-gray-600 dark:text-gray-400">
+            <div class="max-w-xl text-sm text-muted">
                 If necessary, you may log out of all of your other browser
                 sessions across all of your devices. Some of your recent
                 sessions are listed below; however, this list may not be
@@ -70,7 +70,7 @@ const closeModal = () => {
                     <div>
                         <svg
                             v-if="session.agent.is_desktop"
-                            class="w-8 h-8 text-gray-500"
+                            class="w-8 h-8 text-white"
                             xmlns="http://www.w3.org/2000/svg"
                             fill="none"
                             viewBox="0 0 24 24"
@@ -98,7 +98,7 @@ const closeModal = () => {
                     </div>
 
                     <div class="ms-3">
-                        <div class="text-sm text-gray-600 dark:text-gray-400">
+                        <div class="text-sm text-white font-medium">
                             {{
                                 session.agent.platform
                                     ? session.agent.platform
@@ -113,7 +113,7 @@ const closeModal = () => {
                         </div>
 
                         <div>
-                            <div class="text-xs text-gray-500">
+                            <div class="text-xs text-muted">
                                 {{ session.ip_address }},
 
                                 <span
diff --git a/resources/js/Pages/Profile/Partials/TwoFactorAuthenticationForm.vue b/resources/js/Pages/Profile/Partials/TwoFactorAuthenticationForm.vue
index 88c9a092..0d1ffac5 100644
--- a/resources/js/Pages/Profile/Partials/TwoFactorAuthenticationForm.vue
+++ b/resources/js/Pages/Profile/Partials/TwoFactorAuthenticationForm.vue
@@ -137,13 +137,11 @@ const disableTwoFactorAuthentication = () => {
                 Finish enabling two factor authentication.
             </h3>
 
-            <h3
-                v-else
-                class="text-lg font-medium text-gray-900 dark:text-gray-100">
+            <h3 v-else class="text-lg font-medium text-white">
                 You have not enabled two factor authentication.
             </h3>
 
-            <div class="mt-3 max-w-xl text-sm text-gray-600 dark:text-gray-400">
+            <div class="mt-3 max-w-xl text-sm text-muted">
                 <p>
                     When two factor authentication is enabled, you will be
                     prompted for a secure, random token during authentication.
@@ -154,8 +152,7 @@ const disableTwoFactorAuthentication = () => {
 
             <div v-if="twoFactorEnabled">
                 <div v-if="qrCode">
-                    <div
-                        class="mt-4 max-w-xl text-sm text-gray-600 dark:text-gray-400">
+                    <div class="mt-4 max-w-xl text-sm text-muted">
                         <p v-if="confirming" class="font-semibold">
                             To finish enabling two factor authentication, scan
                             the following QR code using your phone's
@@ -176,7 +173,7 @@ const disableTwoFactorAuthentication = () => {
 
                     <div
                         v-if="setupKey"
-                        class="mt-4 max-w-xl text-sm text-gray-600 dark:text-gray-400">
+                        class="mt-4 max-w-xl text-sm text-muted">
                         <p class="font-semibold">
                             Setup Key: <span v-html="setupKey"></span>
                         </p>
@@ -203,8 +200,7 @@ const disableTwoFactorAuthentication = () => {
                 </div>
 
                 <div v-if="recoveryCodes.length > 0 && !confirming">
-                    <div
-                        class="mt-4 max-w-xl text-sm text-gray-600 dark:text-gray-400">
+                    <div class="mt-4 max-w-xl text-sm text-muted">
                         <p class="font-semibold">
                             Store these recovery codes in a secure password
                             manager. They can be used to recover access to your
diff --git a/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue b/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue
index 02719322..e882b862 100644
--- a/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue
+++ b/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue
@@ -184,7 +184,7 @@ const page = usePage<{
                             :href="route('verification.send')"
                             method="post"
                             as="button"
-                            class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
+                            class="underline text-sm text-muted hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
                             @click.prevent="sendEmailVerification">
                             Click here to re-send the verification email.
                         </Link>
diff --git a/resources/js/Pages/Teams/Partials/DeleteTeamForm.vue b/resources/js/Pages/Teams/Partials/DeleteTeamForm.vue
index 33a69eb5..65b55a7e 100644
--- a/resources/js/Pages/Teams/Partials/DeleteTeamForm.vue
+++ b/resources/js/Pages/Teams/Partials/DeleteTeamForm.vue
@@ -31,7 +31,7 @@ const deleteTeam = () => {
         <template #description> Permanently delete this team. </template>
 
         <template #content>
-            <div class="max-w-xl text-sm text-gray-600 dark:text-gray-400">
+            <div class="max-w-xl text-sm text-muted">
                 Once a team is deleted, all of its resources and data will be
                 permanently deleted. Before deleting this team, please download
                 any data or information regarding this team that you wish to
diff --git a/resources/js/Pages/Teams/Partials/TeamMemberManager.vue b/resources/js/Pages/Teams/Partials/TeamMemberManager.vue
index 30a3f074..4ad53c44 100644
--- a/resources/js/Pages/Teams/Partials/TeamMemberManager.vue
+++ b/resources/js/Pages/Teams/Partials/TeamMemberManager.vue
@@ -138,8 +138,7 @@ const displayableRole = (role: string) => {
 
                 <template #form>
                     <div class="col-span-6">
-                        <div
-                            class="max-w-xl text-sm text-gray-600 dark:text-gray-400">
+                        <div class="max-w-xl text-sm text-muted">
                             Please provide the email address of the person you
                             would like to add to this team.
                         </div>
@@ -191,7 +190,7 @@ const displayableRole = (role: string) => {
                                     <!-- Role Name -->
                                     <div class="flex items-center">
                                         <div
-                                            class="text-sm text-gray-600 dark:text-gray-400"
+                                            class="text-sm text-muted"
                                             :class="{
                                                 'font-semibold':
                                                     addTeamMemberForm.role ==
@@ -220,7 +219,7 @@ const displayableRole = (role: string) => {
 
                                     <!-- Role Description -->
                                     <div
-                                        class="mt-2 text-xs text-gray-600 dark:text-gray-400 text-start">
+                                        class="mt-2 text-xs text-muted text-start">
                                         {{ role.description }}
                                     </div>
                                 </div>
@@ -269,7 +268,7 @@ const displayableRole = (role: string) => {
                             v-for="invitation in team.team_invitations"
                             :key="invitation.id"
                             class="flex items-center justify-between">
-                            <div class="text-gray-600 dark:text-gray-400">
+                            <div class="text-muted">
                                 {{ invitation.email }}
                             </div>
 
@@ -390,7 +389,7 @@ const displayableRole = (role: string) => {
                                 <!-- Role Name -->
                                 <div class="flex items-center">
                                     <div
-                                        class="text-sm text-gray-600 dark:text-gray-400"
+                                        class="text-sm text-muted"
                                         :class="{
                                             'font-semibold':
                                                 updateRoleForm.role ===
@@ -415,8 +414,7 @@ const displayableRole = (role: string) => {
                                 </div>
 
                                 <!-- Role Description -->
-                                <div
-                                    class="mt-2 text-xs text-gray-600 dark:text-gray-400">
+                                <div class="mt-2 text-xs text-muted">
                                     {{ role.description }}
                                 </div>
                             </div>
diff --git a/resources/js/app.ts b/resources/js/app.ts
index a7b1a506..17c482fa 100644
--- a/resources/js/app.ts
+++ b/resources/js/app.ts
@@ -6,8 +6,10 @@ import { createInertiaApp } from '@inertiajs/vue3';
 import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers';
 // @ts-expect-error - ziggy in composer is not typed
 import { ZiggyVue } from '../../vendor/tightenco/ziggy/dist/vue.m';
+import { createPinia } from 'pinia';
 
 const appName = import.meta.env.VITE_APP_NAME || 'Laravel';
+const pinia = createPinia();
 
 createInertiaApp({
     title: (title) => `${title} - ${appName}`,
@@ -19,6 +21,7 @@ createInertiaApp({
     setup({ el, App, props, plugin }) {
         createApp({ render: () => h(App, props) })
             .use(plugin)
+            .use(pinia)
             .use(ZiggyVue)
             .mount(el);
     },
diff --git a/resources/js/types/models.ts b/resources/js/types/models.ts
index 08fa5d7e..a2605dda 100644
--- a/resources/js/types/models.ts
+++ b/resources/js/types/models.ts
@@ -61,17 +61,6 @@ export interface Project {
     tasks: Task[];
 }
 
-export interface Tag {
-    // columns
-    id: string;
-    name: string;
-    organization_id: string;
-    created_at: string | null;
-    updated_at: string | null;
-    // relations
-    organization: Organization;
-}
-
 export interface Task {
     // columns
     id: string;
diff --git a/resources/js/utils/api.ts b/resources/js/utils/api.ts
new file mode 100644
index 00000000..ecc9ee43
--- /dev/null
+++ b/resources/js/utils/api.ts
@@ -0,0 +1,4 @@
+import type { ApiOf } from '@zodios/core';
+import { api } from '../../../openapi.json.client';
+
+export type SolidTimeApi = ApiOf<typeof api>;
diff --git a/resources/js/utils/color.ts b/resources/js/utils/color.ts
new file mode 100644
index 00000000..82f18618
--- /dev/null
+++ b/resources/js/utils/color.ts
@@ -0,0 +1,25 @@
+const colors = [
+    '#ef5350',
+    '#ec407a',
+    '#ab47bc',
+    '#7e57c2',
+    '#5c6bc0',
+    '#42a5f5',
+    '#29b6f6',
+    '#26c6da',
+    '#26a69a',
+    '#66bb6a',
+    '#9ccc65',
+    '#d4e157',
+    '#ffee58',
+    '#ffca28',
+    '#ffa726',
+    '#ff7043',
+    '#8d6e63',
+    '#bdbdbd',
+    '#78909c',
+];
+
+export function getRandomColor() {
+    return colors[Math.floor(Math.random() * colors.length)];
+}
diff --git a/resources/js/utils/money.ts b/resources/js/utils/money.ts
new file mode 100644
index 00000000..595bcb48
--- /dev/null
+++ b/resources/js/utils/money.ts
@@ -0,0 +1,6 @@
+export function formatMoney(amount: number, currency: string) {
+    return new Intl.NumberFormat('en-US', {
+        style: 'currency',
+        currency: currency,
+    }).format(amount);
+}
diff --git a/resources/js/utils/time.ts b/resources/js/utils/time.ts
new file mode 100644
index 00000000..f4dd4983
--- /dev/null
+++ b/resources/js/utils/time.ts
@@ -0,0 +1,8 @@
+import dayjs from 'dayjs';
+import duration from 'dayjs/plugin/duration';
+
+dayjs.extend(duration);
+
+export function formatHumanReadableDuration(duration: number): string {
+    return dayjs.duration(duration, 's').format('HH[h] mm[min]');
+}
diff --git a/resources/js/utils/useCurrentTimeEntry.ts b/resources/js/utils/useCurrentTimeEntry.ts
new file mode 100644
index 00000000..00dfc311
--- /dev/null
+++ b/resources/js/utils/useCurrentTimeEntry.ts
@@ -0,0 +1,151 @@
+import { defineStore } from 'pinia';
+import { computed, reactive, ref } from 'vue';
+import { api } from '../../../openapi.json.client';
+import type { ZodiosResponseByAlias } from '@zodios/core';
+import type { SolidTimeApi } from '@/utils/api';
+import dayjs from 'dayjs';
+import { getCurrentOrganizationId, getCurrentUserId } from '@/utils/useUser';
+
+type TimeEntryResponse = ZodiosResponseByAlias<SolidTimeApi, 'getTimeEntries'>;
+export type TimeEntry = TimeEntryResponse['data'][0];
+const emptyTimeEntry = {
+    id: '',
+    description: null,
+    user_id: '',
+    start: '',
+    end: null,
+    duration: null,
+    task_id: null,
+    project_id: null,
+    tags: [],
+} as TimeEntry;
+
+export const useCurrentTimeEntryStore = defineStore('currentTimeEntry', () => {
+    const currentTimeEntry = ref<TimeEntry>(reactive(emptyTimeEntry));
+
+    function $reset() {
+        currentTimeEntry.value = { ...emptyTimeEntry };
+    }
+
+    async function fetchCurrentTimeEntry() {
+        const organizationId = getCurrentOrganizationId();
+        if (organizationId) {
+            const timeEntriesResponse = await api.getTimeEntries({
+                queries: {
+                    active: 'true',
+                },
+                params: {
+                    organization: organizationId,
+                },
+            });
+
+            if (timeEntriesResponse.data.length === 1) {
+                currentTimeEntry.value = timeEntriesResponse.data[0];
+            } else {
+                currentTimeEntry.value = { ...emptyTimeEntry };
+            }
+        } else {
+            throw new Error(
+                'Failed to fetch current time entry because organization ID is missing.'
+            );
+        }
+    }
+
+    async function startTimer() {
+        const user = getCurrentUserId();
+        const organization = getCurrentOrganizationId();
+        if (organization) {
+            const startTime =
+                currentTimeEntry.value.start !== ''
+                    ? currentTimeEntry.value.start
+                    : dayjs().utc().format();
+            const response = await api.createTimeEntry(
+                {
+                    user_id: user,
+                    start: startTime,
+                    description: currentTimeEntry.value?.description,
+                },
+                { params: { organization: organization } }
+            );
+            currentTimeEntry.value = response.data;
+        } else {
+            throw new Error(
+                'Failed to fetch current time entry because organization ID is missing.'
+            );
+        }
+    }
+
+    async function stopTimer() {
+        const user = getCurrentUserId();
+        const organization = getCurrentOrganizationId();
+        if (organization) {
+            const currentDateTime = dayjs().utc().format();
+            await api.updateTimeEntry(
+                {
+                    user_id: user,
+                    start: currentTimeEntry.value.start,
+                    end: currentDateTime,
+                },
+                {
+                    params: {
+                        organization: organization,
+                        timeEntry: currentTimeEntry.value.id,
+                    },
+                }
+            );
+            $reset();
+        } else {
+            throw new Error(
+                'Failed to stop current timer because organization ID is missing.'
+            );
+        }
+    }
+
+    async function updateTimer() {
+        const user = getCurrentUserId();
+        const organization = getCurrentOrganizationId();
+        if (organization) {
+            await api.updateTimeEntry(
+                {
+                    description: currentTimeEntry.value.description,
+                    user_id: user,
+                    project_id: currentTimeEntry.value.project_id,
+                    start: currentTimeEntry.value.start,
+                    end: null,
+                    tags: currentTimeEntry.value.tags,
+                },
+                {
+                    params: {
+                        organization: organization,
+                        timeEntry: currentTimeEntry.value.id,
+                    },
+                }
+            );
+            //            currentTimeEntry.value = response.data;
+        } else {
+            throw new Error(
+                'Failed to fetch current time entry because organization ID is missing.'
+            );
+        }
+    }
+
+    const isActive = computed(() => {
+        if (currentTimeEntry.value) {
+            return (
+                currentTimeEntry.value.start !== '' &&
+                currentTimeEntry.value.start !== null &&
+                currentTimeEntry.value.end === null
+            );
+        }
+        return false;
+    });
+
+    return {
+        currentTimeEntry,
+        fetchCurrentTimeEntry,
+        startTimer,
+        stopTimer,
+        updateTimer,
+        isActive,
+    };
+});
diff --git a/resources/js/utils/useProjects.ts b/resources/js/utils/useProjects.ts
new file mode 100644
index 00000000..5b169713
--- /dev/null
+++ b/resources/js/utils/useProjects.ts
@@ -0,0 +1,24 @@
+import { defineStore } from 'pinia';
+import { api } from '../../../openapi.json.client';
+import { computed, ref } from 'vue';
+import type { ZodiosResponseByAlias } from '@zodios/core';
+import type { SolidTimeApi } from '@/utils/api';
+
+type ProjectResponse = ZodiosResponseByAlias<SolidTimeApi, 'getProjects'>;
+export type Project = ProjectResponse['data'][0];
+
+export const useProjectsStore = defineStore('projects', () => {
+    const projectResponse = ref<ProjectResponse | null>(null);
+
+    async function fetchProjects(organizationId: string) {
+        projectResponse.value = await api.getProjects({
+            params: {
+                organization: organizationId,
+            },
+        });
+    }
+
+    const projects = computed(() => projectResponse.value?.data || []);
+
+    return { projects, fetchProjects };
+});
diff --git a/resources/js/utils/useTags.ts b/resources/js/utils/useTags.ts
new file mode 100644
index 00000000..4c14fc7c
--- /dev/null
+++ b/resources/js/utils/useTags.ts
@@ -0,0 +1,53 @@
+import { defineStore } from 'pinia';
+import { ref } from 'vue';
+import type { ZodiosResponseByAlias } from '@zodios/core';
+import type { SolidTimeApi } from '@/utils/api';
+import { getCurrentOrganizationId } from '@/utils/useUser';
+import { api } from '../../../openapi.json.client';
+
+type TagIndexResponse = ZodiosResponseByAlias<SolidTimeApi, 'getTags'>;
+export type Tag = TagIndexResponse['data'][0];
+
+export const useTagsStore = defineStore('tags', () => {
+    const tags = ref<Tag[]>([]);
+
+    async function fetchTags() {
+        const organizationId = getCurrentOrganizationId();
+        if (organizationId) {
+            const response = await api.getTags({
+                params: {
+                    organization: organizationId,
+                },
+            });
+            tags.value = response.data;
+        } else {
+            throw new Error(
+                'Failed to fetch current tags because organization ID is missing.'
+            );
+        }
+    }
+
+    async function createTag(name: string) {
+        const organizationId = getCurrentOrganizationId();
+        if (organizationId) {
+            const response = await api.createTag(
+                {
+                    name: name,
+                },
+                {
+                    params: {
+                        organization: organizationId,
+                    },
+                }
+            );
+            tags.value.unshift(response.data);
+            return response.data;
+        } else {
+            throw new Error(
+                'Failed to create tag because organization ID is missing.'
+            );
+        }
+    }
+
+    return { tags, fetchTags, createTag };
+});
diff --git a/resources/js/utils/useUser.ts b/resources/js/utils/useUser.ts
new file mode 100644
index 00000000..e5c3de53
--- /dev/null
+++ b/resources/js/utils/useUser.ts
@@ -0,0 +1,17 @@
+import { usePage } from '@inertiajs/vue3';
+import type { User } from '@/types/models';
+
+const page = usePage<{
+    auth: {
+        user: User;
+    };
+}>();
+function getCurrentUserId() {
+    return page.props.auth.user.id;
+}
+
+function getCurrentOrganizationId() {
+    return page.props.auth.user.current_team_id;
+}
+
+export { getCurrentOrganizationId, getCurrentUserId };
diff --git a/routes/web.php b/routes/web.php
index f5cacf79..5ba80cbe 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Str;
 use Inertia\Inertia;
 
 /*
@@ -32,6 +33,308 @@
     'verified',
 ])->group(function () {
     Route::get('/dashboard', function () {
-        return Inertia::render('Dashboard');
+        return Inertia::render('Dashboard', [
+            'weeklyProjectOverview' => [
+                [
+                    'value' => 120,
+                    'name' => 'Project 11',
+                    'color' => '#26a69a',
+                ],
+                [
+                    'value' => 200,
+                    'name' => 'Project 2',
+                    'color' => '#d4e157',
+                ],
+                [
+                    'value' => 150,
+                    'name' => 'Project 3',
+                    'color' => '#ff7043',
+                ],
+            ],
+            'latestTasks' => [
+                // the 4 tasks with the most recent time entries
+                [
+                    'id' => Str::uuid(),
+                    'name' => 'Task 1',
+                    'project_name' => 'Research',
+                    'project_id' => Str::uuid(),
+                ],
+                [
+                    'id' => Str::uuid(),
+                    'name' => 'Task 2',
+                    'project_name' => 'Research',
+                    'project_id' => Str::uuid(),
+                ],
+                [
+                    'id' => Str::uuid(),
+                    'name' => 'Task 3',
+                    'project_name' => 'Research',
+                    'project_id' => Str::uuid(),
+                ],
+                [
+                    'id' => Str::uuid(),
+                    'name' => 'Task 4',
+                    'project_name' => 'Research',
+                    'project_id' => Str::uuid(),
+                ],
+            ],
+            'lastSevenDays' => [
+                // the last 7 days with statistics for the time entries
+                [
+                    'date' => '2024-02-26',
+                    'duration' => 3600, // in seconds
+                    // if that is too difficult we can just skip that for now
+                    'history' => [
+                        // duration in s of the 3h windows for the day starting at 00:00
+                        300,
+                        0,
+                        500,
+                        0,
+                        100,
+                        200,
+                        100,
+                        300,
+                    ],
+                ],
+                [
+                    'date' => '2024-02-25',
+                    'duration' => 7200, // in seconds
+                    'history' => [
+                        // duration in s of the 3h windows for the day starting at 00:00
+                        300,
+                        0,
+                        500,
+                        0,
+                        100,
+                        200,
+                        100,
+                        300,
+                    ],
+                ],
+                [
+                    'date' => '2024-02-24',
+                    'duration' => 10800, // in seconds
+                    'history' => [
+                        // duration in s of the 3h windows for the day starting at 00:00
+                        300,
+                        0,
+                        500,
+                        0,
+                        100,
+                        200,
+                        100,
+                        300,
+                    ],
+                ],
+                [
+                    'date' => '2024-02-23',
+                    'duration' => 14400, // in seconds
+                    'history' => [
+                        // duration in s of the 3h windows for the day starting at 00:00
+                        300,
+                        0,
+                        500,
+                        0,
+                        100,
+                        200,
+                        100,
+                        300,
+                    ],
+                ],
+                [
+                    'date' => '2024-02-22',
+                    'duration' => 18000, // in seconds
+                    'history' => [
+                        // duration in s of the 3h windows for the day starting at 00:00
+                        300,
+                        0,
+                        500,
+                        0,
+                        100,
+                        200,
+                        100,
+                        300,
+                    ],
+                ],
+                [
+                    'date' => '2024-02-21',
+                    'duration' => 21600, // in seconds
+                    'history' => [
+                        // duration in s of the 3h windows for the day starting at 00:00
+                        300,
+                        0,
+                        500,
+                        0,
+                        100,
+                        200,
+                        100,
+                        300,
+                    ],
+                ],
+                [
+                    'date' => '2024-02-20',
+                    'duration' => 25200, // in seconds
+                    'history' => [
+                        // duration in s of the 3h windows for the day starting at 00:00
+                        300,
+                        0,
+                        500,
+                        0,
+                        100,
+                        200,
+                        100,
+                        300,
+                    ],
+                ],
+
+            ],
+            'latestTeamActivity' => [
+                // the 4 most recently active members of your team with user_id, name, description of the latest time entry, time_entry_id, task_id and a boolean status if the team member is currently working
+                [
+                    'user_id' => Str::uuid(),
+                    'name' => 'John Doe',
+                    'description' => 'Working on the new feature',
+                    'time_entry_id' => Str::uuid(),
+                    'task_id' => Str::uuid(),
+                    'status' => true,
+                ],
+                [
+                    'user_id' => Str::uuid(),
+                    'name' => 'Jane Doe',
+                    'description' => 'Working on the new feature',
+                    'time_entry_id' => Str::uuid(),
+                    'task_id' => Str::uuid(),
+                    'status' => false,
+                ],
+                [
+                    'user_id' => Str::uuid(),
+                    'name' => 'John Smith',
+                    'description' => 'Working on the new feature',
+                    'time_entry_id' => Str::uuid(),
+                    'task_id' => Str::uuid(),
+                    'status' => true,
+                ],
+                [
+                    'user_id' => Str::uuid(),
+                    'name' => 'Jane Smith',
+                    'description' => 'Working on the new feature',
+                    'time_entry_id' => Str::uuid(),
+                    'task_id' => Str::uuid(),
+                    'status' => false,
+                ],
+            ],
+            'dailyTrackedHours' => [
+                // not really sure how many days we need here but probably around 60
+                // the second value is the duration in seconds
+                ['2024-01-21', 10],
+                ['2024-01-22', 10],
+                ['2024-01-23', 20],
+                ['2024-01-24', 10],
+                ['2024-01-25', 10],
+                ['2024-01-26', 10],
+                ['2024-01-27', 20],
+                ['2024-01-28', 10],
+                ['2024-01-29', 20],
+                ['2024-01-30', 10],
+                ['2024-01-31', 10],
+                ['2024-02-01', 20],
+                ['2024-02-02', 20],
+                ['2024-02-03', 10],
+                ['2024-02-04', 30],
+                ['2024-02-05', 10],
+                ['2024-02-06', 20],
+                ['2024-02-07', 10],
+                ['2024-02-08', 30],
+                ['2024-02-09', 10],
+                ['2024-02-10', 10],
+                ['2024-02-11', 10],
+                ['2024-02-12', 10],
+                ['2024-02-13', 10],
+                ['2024-02-14', 20],
+                ['2024-02-15', 10],
+                ['2024-02-16', 10],
+                ['2024-02-17', 10],
+                ['2024-02-18', 10],
+                ['2024-02-19', 10],
+                ['2024-02-20', 30],
+                ['2024-02-21', 20],
+                ['2024-02-22', 20],
+                ['2024-02-23', 30],
+                ['2024-02-24', 20],
+                ['2024-02-25', 10],
+                ['2024-02-26', 10],
+                ['2024-02-27', 10],
+                ['2024-02-28', 20],
+                ['2024-02-29', 10],
+                ['2024-03-01', 10],
+                ['2024-03-02', 20],
+                ['2024-03-03', 10],
+                ['2024-03-04', 30],
+                ['2024-03-05', 10],
+                ['2024-03-06', 20],
+                ['2024-03-07', 30],
+                ['2024-03-08', 10],
+                ['2024-03-09', 20],
+                ['2024-03-10', 10],
+                ['2024-03-11', 10],
+                ['2024-03-12', 10],
+                ['2024-03-13', 10],
+                ['2024-03-14', 10],
+                ['2024-03-15', 10],
+                ['2024-03-16', 10],
+                ['2024-03-17', 10],
+                ['2024-03-18', 10],
+                ['2024-03-19', 10],
+                ['2024-03-20', 10],
+                ['2024-03-21', 10],
+                ['2024-03-22', 10],
+                ['2024-03-23', 10],
+                ['2024-03-24', 10],
+                ['2024-03-25', 10],
+                ['2024-03-26', 10],
+                ['2024-03-27', 10],
+                ['2024-03-28', 10],
+                ['2024-03-29', 10],
+                ['2024-03-30', 10],
+                ['2024-03-31', 10],
+            ],
+            'totalWeeklyTime' => 400,
+            'totalWeeklyBillableTime' => 300,
+            'totalWeeklyBillableAmount' => [
+                'value' => 300.5,
+                'currency' => 'USD',
+            ],
+            'weeklyHistory' => [
+                // statistics for the current week starting at Monday / Sunday
+                [
+                    'date' => '2024-02-26',
+                    'duration' => 3600,
+                ],
+                [
+                    'date' => '2024-02-27',
+                    'duration' => 2000,
+                ],
+                [
+                    'date' => '2024-02-28',
+                    'duration' => 4000,
+                ],
+                [
+                    'date' => '2024-02-29',
+                    'duration' => 3000,
+                ],
+                [
+                    'date' => '2024-03-01',
+                    'duration' => 5000,
+                ],
+                [
+                    'date' => '2024-03-02',
+                    'duration' => 3000,
+                ],
+                [
+                    'date' => '2024-03-03',
+                    'duration' => 2000,
+                ],
+            ],
+        ]);
     })->name('dashboard');
 });
diff --git a/tailwind.config.js b/tailwind.config.js
index e7fb848c..50a708a3 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -15,7 +15,41 @@ export default {
     theme: {
         extend: {
             fontFamily: {
-                sans: ['Figtree', ...defaultTheme.fontFamily.sans],
+                sans: ['Outfit', ...defaultTheme.fontFamily.sans],
+            },
+            colors: {
+                'white': '#D9DCFB',
+                'default-background': '#040618',
+                'default-background-seperator': '#13152B',
+                'card-background': 'var(--theme-color-card-background)',
+                'card-background-active': '#1C1E34',
+                'card-background-seperator': '#262A51',
+                'card-border': '#242940',
+                'card-border-active': '#2A3461',
+                'muted': '#8F93B7',
+                'icon-default': 'var(--theme-color-icon-default)',
+                'icon-active': '#787DA8',
+                'menu-active': '#13152B',
+                'input-placeholder': '#42466C',
+                'input-border': '#242740',
+                'input-border-active': '#797EA8',
+                'input-background': '#030513',
+                'button-secondary-background': '#22243E',
+                'button-secondary-background-hover': '#292C4D',
+                'button-secondary-border': '#353961',
+                'accent': {
+                    '50': '#eff7ff',
+                    '100': '#daecff',
+                    '200': '#b0d7ff',
+                    '300': '#91caff',
+                    '400': '#5eadfc',
+                    '500': '#388bf9',
+                    '600': '#226cee',
+                    '700': '#1a57db',
+                    '800': '#1c46b1',
+                    '900': '#1c3f8c',
+                    '950': '#162755',
+                },
             },
         },
     },

From 2c9106cf62cae56d0390baf35bf90d79a43cc3d1 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregorvostrak@Gregors-MacBook-Pro.local>
Date: Mon, 11 Mar 2024 18:09:38 +0100
Subject: [PATCH 04/20] fix daysjs utc plugin extension

---
 resources/js/utils/useCurrentTimeEntry.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/js/utils/useCurrentTimeEntry.ts b/resources/js/utils/useCurrentTimeEntry.ts
index 00dfc311..6b603368 100644
--- a/resources/js/utils/useCurrentTimeEntry.ts
+++ b/resources/js/utils/useCurrentTimeEntry.ts
@@ -4,8 +4,11 @@ import { api } from '../../../openapi.json.client';
 import type { ZodiosResponseByAlias } from '@zodios/core';
 import type { SolidTimeApi } from '@/utils/api';
 import dayjs from 'dayjs';
+import utc from 'dayjs/plugin/utc';
 import { getCurrentOrganizationId, getCurrentUserId } from '@/utils/useUser';
 
+dayjs.extend(utc);
+
 type TimeEntryResponse = ZodiosResponseByAlias<SolidTimeApi, 'getTimeEntries'>;
 export type TimeEntry = TimeEntryResponse['data'][0];
 const emptyTimeEntry = {

From 82186e0df7626f122ed580cb0125d47ab520cff0 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregorvostrak@Gregors-MacBook-Pro.local>
Date: Mon, 11 Mar 2024 18:32:54 +0100
Subject: [PATCH 05/20] fix type errors

---
 resources/js/Components/TimeTracker.vue            | 2 +-
 resources/js/Components/common/ProjectDropdown.vue | 5 +++--
 resources/js/Components/common/TagDropdown.vue     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/js/Components/TimeTracker.vue b/resources/js/Components/TimeTracker.vue
index b5a0dffb..8ee41c85 100644
--- a/resources/js/Components/TimeTracker.vue
+++ b/resources/js/Components/TimeTracker.vue
@@ -97,7 +97,7 @@ async function onToggleButtonPress(newState: boolean) {
     }
 }
 
-const currentProject = ref<Project | null>(null);
+const currentProject = ref<Project>();
 watch(currentProject, () => {
     if (currentProject.value) {
         currentTimeEntry.value.project_id = currentProject.value.id;
diff --git a/resources/js/Components/common/ProjectDropdown.vue b/resources/js/Components/common/ProjectDropdown.vue
index 1fd896ee..9c83f238 100644
--- a/resources/js/Components/common/ProjectDropdown.vue
+++ b/resources/js/Components/common/ProjectDropdown.vue
@@ -20,8 +20,8 @@ import { getRandomColor } from '@/utils/color';
 
 const searchValue = ref('');
 const searchInput = ref<HTMLElement | null>(null);
-const model = defineModel<Project | null>({
-    default: null,
+const model = defineModel<Project>({
+    default: undefined,
 });
 const open = ref(false);
 const projectsStore = useProjectsStore();
@@ -63,6 +63,7 @@ async function addProjectIfNoneExists() {
 watch(open, (isOpen) => {
     if (isOpen) {
         nextTick(() => {
+            // @ts-expect-error We need to access the actual HTML Element to focus as radix-vue does not support any other way right now
             searchInput.value?.$el?.focus();
         });
 
diff --git a/resources/js/Components/common/TagDropdown.vue b/resources/js/Components/common/TagDropdown.vue
index 91160b40..f990d846 100644
--- a/resources/js/Components/common/TagDropdown.vue
+++ b/resources/js/Components/common/TagDropdown.vue
@@ -164,7 +164,7 @@ function updateValue(e: string[]) {
             <ComboboxRoot
                 multiple
                 :open="open"
-                @update:modelValue="updateValue"
+                @update:modelValue="updateValue as any"
                 v-model:searchTerm="searchValue"
                 class="relative">
                 <ComboboxAnchor>

From 6009d7cfce0359ddbdd43df8c9e8272f73be81c1 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregorvostrak@Gregors-MacBook-Pro.local>
Date: Mon, 11 Mar 2024 18:43:08 +0100
Subject: [PATCH 06/20] fix playwright action database connection

---
 .env.ci                          |  2 +-
 .github/workflows/playwright.yml | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.env.ci b/.env.ci
index 986ec588..5b3d9af2 100644
--- a/.env.ci
+++ b/.env.ci
@@ -8,7 +8,7 @@ LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
-DB_CONNECTION=sqlite
+DB_CONNECTION=pgsql
 DB_HOST=127.0.0.1
 DB_PORT=5432
 DB_DATABASE=laravel
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index 7c12dcf9..b988cf8f 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -11,6 +11,20 @@ jobs:
     services:
       mailpit:
         image: 'axllent/mailpit:latest'
+      pgsql:
+        image: postgres:15
+        env:
+          PGPASSWORD: 'root'
+          POSTGRES_DB: 'laravel'
+          POSTGRES_USER: 'root'
+          POSTGRES_PASSWORD: 'root'
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
 
     steps:
       - name: "Checkout code"

From 4b3ebb50769b66ea27752491b01d65fa4a88b503 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregorvostrak@Gregors-MacBook-Pro.local>
Date: Mon, 11 Mar 2024 18:45:00 +0100
Subject: [PATCH 07/20] remove sql lite database from playwright action

---
 .github/workflows/playwright.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index b988cf8f..141b73e2 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -38,15 +38,12 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.3'
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
           coverage: none
 
       - name: Run composer install
         run: composer install -n --prefer-dist
 
-      - name: Create SQLite database
-        run: touch database/database.sqlite
-
       - name: Prepare Laravel Application
         run: |
           cp .env.ci .env

From 8a2aeffc1916a81d4558f79800af06dcf8161df3 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregorvostrak@Gregors-MacBook-Pro.local>
Date: Mon, 11 Mar 2024 18:50:11 +0100
Subject: [PATCH 08/20] remove duplicate test

---
 e2e/timetracker.spec.ts | 69 -----------------------------------------
 1 file changed, 69 deletions(-)

diff --git a/e2e/timetracker.spec.ts b/e2e/timetracker.spec.ts
index ec0789b0..be1fd350 100644
--- a/e2e/timetracker.spec.ts
+++ b/e2e/timetracker.spec.ts
@@ -191,75 +191,6 @@ test('test that starting and updating the description while running works', asyn
     await assertThatTimerIsStoped(page);
 });
 
-test('test that starting and updating the description while running works', async ({
-    page,
-}) => {
-    await goToDashboard(page);
-    await startOrStopTimerWithButton(page);
-    await page.waitForResponse(async (response) => {
-        return (
-            response.status() === 201 &&
-            (await response.headerValue('Content-Type')) ===
-                'application/json' &&
-            (await response.json()).data.id !== null &&
-            (await response.json()).data.start !== null &&
-            (await response.json()).data.end === null &&
-            (await response.json()).data.project_id === null &&
-            (await response.json()).data.description === '' &&
-            (await response.json()).data.task_id === null &&
-            (await response.json()).data.duration === null &&
-            (await response.json()).data.user_id !== null &&
-            JSON.stringify((await response.json()).data.tags) ===
-                JSON.stringify([])
-        );
-    });
-    await assertThatTimerHasStarted(page);
-    await page.waitForTimeout(500);
-    await page
-        .getByTestId('time_entry_description')
-        .fill('New Time Entry Description');
-    await page.getByTestId('time_entry_description').press('Tab');
-    await page.waitForResponse(async (response) => {
-        return (
-            response.status() === 200 &&
-            (await response.headerValue('Content-Type')) ===
-                'application/json' &&
-            (await response.json()).data.id !== null &&
-            (await response.json()).data.start !== null &&
-            (await response.json()).data.end === null &&
-            (await response.json()).data.project_id === null &&
-            (await response.json()).data.description ===
-                'New Time Entry Description' &&
-            (await response.json()).data.task_id === null &&
-            (await response.json()).data.duration === null &&
-            (await response.json()).data.user_id !== null &&
-            JSON.stringify((await response.json()).data.tags) ===
-                JSON.stringify([])
-        );
-    });
-    await page.waitForTimeout(500);
-    await startOrStopTimerWithButton(page);
-    await page.waitForResponse(async (response) => {
-        return (
-            response.status() === 200 &&
-            (await response.headerValue('Content-Type')) ===
-                'application/json' &&
-            (await response.json()).data.id !== null &&
-            (await response.json()).data.start !== null &&
-            (await response.json()).data.end !== null &&
-            (await response.json()).data.project_id === null &&
-            (await response.json()).data.description ===
-                'New Time Entry Description' &&
-            (await response.json()).data.task_id === null &&
-            (await response.json()).data.duration !== null &&
-            (await response.json()).data.user_id !== null &&
-            JSON.stringify((await response.json()).data.tags) ===
-                JSON.stringify([])
-        );
-    });
-    await assertThatTimerIsStoped(page);
-});
-
 test('test that starting and updating the time while running works', async ({
     page,
 }) => {

From 4738b7577ac72b6fb0d56fce4edf876e2bc3e57f Mon Sep 17 00:00:00 2001
From: korridor <26689068+korridor@users.noreply.github.com>
Date: Mon, 11 Mar 2024 19:12:51 +0100
Subject: [PATCH 09/20] Added more imports

---
 .../Jetstream/AddOrganizationMember.php       |   3 +-
 .../Jetstream/InviteOrganizationMember.php    |   2 +-
 app/Exceptions/Api/ApiException.php           |  10 +-
 .../Api/TimeEntryStillRunningApiException.php |   2 +-
 .../Api/UserNotPlaceholderApiException.php    |   2 +-
 .../Resources/OrganizationResource.php        |   5 +-
 app/Filament/Resources/TaskResource.php       |  20 +-
 app/Filament/Resources/TimeEntryResource.php  |   6 +-
 .../Controllers/Api/V1/ImportController.php   |   3 +-
 .../V1/Project/ProjectStoreRequest.php        |   2 +
 .../V1/Project/ProjectUpdateRequest.php       |   2 +
 .../V1/TimeEntry/TimeEntryIndexRequest.php    |   5 +-
 .../V1/TimeEntry/TimeEntryStoreRequest.php    |   5 +-
 app/Models/Organization.php                   |  17 +-
 app/Providers/AppServiceProvider.php          |   1 +
 app/Providers/JetstreamServiceProvider.php    |   3 +
 app/Rules/ColorRule.php                       |  32 +++
 app/Service/ColorService.php                  |   7 +
 app/Service/Import/ImportDatabaseHelper.php   |  87 ++++++-
 app/Service/Import/ImportService.php          |   6 +-
 .../Importers/ClockifyProjectsImporter.php    | 143 +++++++++++
 .../Importers/ClockifyTimeEntriesImporter.php | 227 ++++++++++++++++++
 .../Import/Importers/ImporterContract.php     |   2 +-
 .../Import/Importers/ImporterProvider.php     |   3 +
 .../Import/Importers/TogglDataImporter.php    | 194 +++++++++++++++
 .../Importers/TogglTimeEntriesImporter.php    |  57 ++++-
 app/Service/UserService.php                   |   4 +-
 composer.json                                 |   2 +
 composer.lock                                 |  66 ++++-
 config/filesystems.php                        |   6 +
 database/factories/ProjectFactory.php         |   3 +-
 lang/en/auth.php                              |  22 ++
 lang/en/pagination.php                        |  21 ++
 lang/en/passwords.php                         |  24 ++
 lang/en/validation.php                        | 199 +++++++++++++++
 storage/tests/clockify_import_test_1.csv      |   1 -
 .../tests/clockify_projects_import_test_1.csv |   3 +
 .../clockify_time_entries_import_test_1.csv   |   3 +
 .../toggl_data_import_test_1/clients.json     |   9 +
 .../toggl_data_import_test_1/projects.json    |  58 +++++
 .../tests/toggl_data_import_test_1/tags.json  |  14 ++
 .../toggl_data_import_test_1/tasks/401.json   |   1 +
 .../toggl_data_import_test_1/tasks/402.json   |  13 +
 .../workspace_users.json                      |  19 ++
 ...v => toggl_time_entries_import_test_1.csv} |   2 +-
 tests/Unit/Rules/ColorRuleTest.php            |  66 +++++
 .../Import/ImportDatabaseHelperTest.php       |  61 +++++
 .../Importer/ClockifyProjectsImporterTest.php |  44 ++++
 .../ClockifyTimeEntriesImporterTest.php       |  77 ++++++
 .../Import/Importer/ImporterTestAbstract.php  |  50 +++-
 .../Import/Importer/TogglDataImporterTest.php |  64 +++++
 .../Importer/TogglTimeEntriesImporterTest.php |  24 +-
 52 files changed, 1646 insertions(+), 56 deletions(-)
 create mode 100644 app/Rules/ColorRule.php
 create mode 100644 app/Service/Import/Importers/ClockifyProjectsImporter.php
 create mode 100644 app/Service/Import/Importers/ClockifyTimeEntriesImporter.php
 create mode 100644 app/Service/Import/Importers/TogglDataImporter.php
 create mode 100644 lang/en/auth.php
 create mode 100644 lang/en/pagination.php
 create mode 100644 lang/en/passwords.php
 create mode 100644 lang/en/validation.php
 delete mode 100644 storage/tests/clockify_import_test_1.csv
 create mode 100644 storage/tests/clockify_projects_import_test_1.csv
 create mode 100644 storage/tests/clockify_time_entries_import_test_1.csv
 create mode 100644 storage/tests/toggl_data_import_test_1/clients.json
 create mode 100644 storage/tests/toggl_data_import_test_1/projects.json
 create mode 100644 storage/tests/toggl_data_import_test_1/tags.json
 create mode 100644 storage/tests/toggl_data_import_test_1/tasks/401.json
 create mode 100644 storage/tests/toggl_data_import_test_1/tasks/402.json
 create mode 100644 storage/tests/toggl_data_import_test_1/workspace_users.json
 rename storage/tests/{toggl_import_test_1.csv => toggl_time_entries_import_test_1.csv} (81%)
 create mode 100644 tests/Unit/Rules/ColorRuleTest.php
 create mode 100644 tests/Unit/Service/Import/Importer/ClockifyProjectsImporterTest.php
 create mode 100644 tests/Unit/Service/Import/Importer/ClockifyTimeEntriesImporterTest.php
 create mode 100644 tests/Unit/Service/Import/Importer/TogglDataImporterTest.php

diff --git a/app/Actions/Jetstream/AddOrganizationMember.php b/app/Actions/Jetstream/AddOrganizationMember.php
index 7a84d53f..dd43ee5d 100644
--- a/app/Actions/Jetstream/AddOrganizationMember.php
+++ b/app/Actions/Jetstream/AddOrganizationMember.php
@@ -8,6 +8,7 @@
 use App\Models\User;
 use Closure;
 use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
@@ -59,7 +60,7 @@ protected function validate(Organization $organization, string $email, ?string $
     /**
      * Get the validation rules for adding a team member.
      *
-     * @return array<string, array<Rule|string>>
+     * @return array<string, array<ValidationRule|Rule|string>>
      */
     protected function rules(): array
     {
diff --git a/app/Actions/Jetstream/InviteOrganizationMember.php b/app/Actions/Jetstream/InviteOrganizationMember.php
index 686a9978..a73ebac2 100644
--- a/app/Actions/Jetstream/InviteOrganizationMember.php
+++ b/app/Actions/Jetstream/InviteOrganizationMember.php
@@ -34,7 +34,7 @@ public function invite(User $user, Organization $organization, string $email, ?s
 
         InvitingTeamMember::dispatch($organization, $email, $role);
 
-        /** @var TeamInvitation $invitation */
+        /** @var OrganizationInvitation $invitation */
         $invitation = $organization->teamInvitations()->create([
             'email' => $email,
             'role' => $role,
diff --git a/app/Exceptions/Api/ApiException.php b/app/Exceptions/Api/ApiException.php
index bcd5ae01..e68bcc50 100644
--- a/app/Exceptions/Api/ApiException.php
+++ b/app/Exceptions/Api/ApiException.php
@@ -11,6 +11,8 @@
 
 abstract class ApiException extends Exception
 {
+    public const string KEY = 'api_exception';
+
     /**
      * Render the exception into an HTTP response.
      */
@@ -29,11 +31,13 @@ public function render(Request $request): JsonResponse
      */
     public function getKey(): string
     {
-        if (defined(static::class.'::KEY')) {
-            return static::KEY;
+        $key = static::KEY;
+
+        if ($key === ApiException::KEY) {
+            throw new LogicException('API exceptions need the KEY constant defined.');
         }
 
-        throw new LogicException('API exceptions need the KEY constant defined.');
+        return $key;
     }
 
     /**
diff --git a/app/Exceptions/Api/TimeEntryStillRunningApiException.php b/app/Exceptions/Api/TimeEntryStillRunningApiException.php
index e110a9ae..c153534c 100644
--- a/app/Exceptions/Api/TimeEntryStillRunningApiException.php
+++ b/app/Exceptions/Api/TimeEntryStillRunningApiException.php
@@ -6,5 +6,5 @@
 
 class TimeEntryStillRunningApiException extends ApiException
 {
-    const string KEY = 'time_entry_still_running';
+    public const string KEY = 'time_entry_still_running';
 }
diff --git a/app/Exceptions/Api/UserNotPlaceholderApiException.php b/app/Exceptions/Api/UserNotPlaceholderApiException.php
index 2aae88c9..92af4739 100644
--- a/app/Exceptions/Api/UserNotPlaceholderApiException.php
+++ b/app/Exceptions/Api/UserNotPlaceholderApiException.php
@@ -6,5 +6,5 @@
 
 class UserNotPlaceholderApiException extends ApiException
 {
-    const string KEY = 'user_not_placeholder';
+    public const string KEY = 'user_not_placeholder';
 }
diff --git a/app/Filament/Resources/OrganizationResource.php b/app/Filament/Resources/OrganizationResource.php
index 3c14a313..eb2a9e0d 100644
--- a/app/Filament/Resources/OrganizationResource.php
+++ b/app/Filament/Resources/OrganizationResource.php
@@ -74,7 +74,7 @@ public static function table(Table $table): Table
                         // TODO: different disk!
                         try {
                             /** @var ReportDto $report */
-                            $report = app(ImportService::class)->import($record, $data['type'], Storage::disk('public')->get($data['file']), []);
+                            $report = app(ImportService::class)->import($record, $data['type'], Storage::disk('public')->get($data['file']));
                             Notification::make()
                                 ->title('Import successful')
                                 ->success()
@@ -98,9 +98,10 @@ public static function table(Table $table): Table
                                 ->send();
                         }
                     })
-                    ->tooltip(fn (Organization $record): string => "Import into {$record->name}")
+                    ->tooltip(fn (Organization $record): string => 'Import into '.$record->name)
                     ->form([
                         Forms\Components\FileUpload::make('file')
+                            // TODO: disk!
                             ->label('File')
                             ->required(),
                         Select::make('type')
diff --git a/app/Filament/Resources/TaskResource.php b/app/Filament/Resources/TaskResource.php
index 0ed06bd6..d4be3651 100644
--- a/app/Filament/Resources/TaskResource.php
+++ b/app/Filament/Resources/TaskResource.php
@@ -6,9 +6,12 @@
 
 use App\Filament\Resources\TaskResource\Pages;
 use App\Models\Task;
+use Filament\Forms;
+use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
+use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
 
 class TaskResource extends Resource
@@ -25,7 +28,18 @@ public static function form(Form $form): Form
     {
         return $form
             ->schema([
-                //
+                Forms\Components\TextInput::make('name')
+                    ->label('Name')
+                    ->required()
+                    ->maxLength(255),
+                Select::make('project_id')
+                    ->relationship(name: 'project', titleAttribute: 'name')
+                    ->searchable(['name'])
+                    ->required(),
+                Select::make('organization_id')
+                    ->relationship(name: 'organization', titleAttribute: 'name')
+                    ->searchable(['name'])
+                    ->required(),
             ]);
     }
 
@@ -46,7 +60,9 @@ public static function table(Table $table): Table
                     ->sortable(),
             ])
             ->filters([
-                //
+                SelectFilter::make('organization')
+                    ->relationship('organization', 'name')
+                    ->searchable(),
             ])
             ->defaultSort('created_at', 'desc')
             ->actions([
diff --git a/app/Filament/Resources/TimeEntryResource.php b/app/Filament/Resources/TimeEntryResource.php
index ca70c0db..56ac3898 100644
--- a/app/Filament/Resources/TimeEntryResource.php
+++ b/app/Filament/Resources/TimeEntryResource.php
@@ -14,6 +14,7 @@
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
 
 class TimeEntryResource extends Resource
@@ -67,6 +68,7 @@ public static function table(Table $table): Table
         return $table
             ->columns([
                 TextColumn::make('description')
+                    ->searchable()
                     ->label('Description'),
                 TextColumn::make('user.email')
                     ->label('User'),
@@ -89,7 +91,9 @@ public static function table(Table $table): Table
                     ->sortable(),
             ])
             ->filters([
-                //
+                SelectFilter::make('organization')
+                    ->relationship('organization', 'name')
+                    ->searchable(),
             ])
             ->defaultSort('created_at', 'desc')
             ->actions([
diff --git a/app/Http/Controllers/Api/V1/ImportController.php b/app/Http/Controllers/Api/V1/ImportController.php
index 877c8c61..a3bd4040 100644
--- a/app/Http/Controllers/Api/V1/ImportController.php
+++ b/app/Http/Controllers/Api/V1/ImportController.php
@@ -26,8 +26,7 @@ public function import(Organization $organization, ImportRequest $request, Impor
             $report = $importService->import(
                 $organization,
                 $request->input('type'),
-                $request->input('data'),
-                $request->input('options')
+                $request->input('data')
             );
 
             return new JsonResponse([
diff --git a/app/Http/Requests/V1/Project/ProjectStoreRequest.php b/app/Http/Requests/V1/Project/ProjectStoreRequest.php
index 09bf72dc..ca57a537 100644
--- a/app/Http/Requests/V1/Project/ProjectStoreRequest.php
+++ b/app/Http/Requests/V1/Project/ProjectStoreRequest.php
@@ -6,6 +6,7 @@
 
 use App\Models\Client;
 use App\Models\Organization;
+use App\Rules\ColorRule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Http\FormRequest;
@@ -35,6 +36,7 @@ public function rules(): array
                 'required',
                 'string',
                 'max:255',
+                new ColorRule(),
             ],
             'client_id' => [
                 'nullable',
diff --git a/app/Http/Requests/V1/Project/ProjectUpdateRequest.php b/app/Http/Requests/V1/Project/ProjectUpdateRequest.php
index 28ed09ad..82259815 100644
--- a/app/Http/Requests/V1/Project/ProjectUpdateRequest.php
+++ b/app/Http/Requests/V1/Project/ProjectUpdateRequest.php
@@ -6,6 +6,7 @@
 
 use App\Models\Client;
 use App\Models\Organization;
+use App\Rules\ColorRule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Http\FormRequest;
@@ -34,6 +35,7 @@ public function rules(): array
                 'required',
                 'string',
                 'max:255',
+                new ColorRule(),
             ],
             'client_id' => [
                 'nullable',
diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php
index 0d3bb8be..92d9a591 100644
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php
@@ -30,10 +30,7 @@ public function rules(): array
                 'uuid',
                 new ExistsEloquent(User::class, null, function (Builder $builder): Builder {
                     /** @var Builder<User> $builder */
-                    return $builder->whereHas('organizations', function (Builder $builder) {
-                        /** @var Builder<Organization> $builder */
-                        return $builder->whereKey($this->organization->getKey());
-                    });
+                    return $builder->belongsToOrganization($this->organization);
                 }),
             ],
             // Filter only time entries that have a start date before (not including) the given date (example: 2021-12-31)
diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php
index b2441819..8cbfd2fb 100644
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php
@@ -33,10 +33,7 @@ public function rules(): array
                 'uuid',
                 new ExistsEloquent(User::class, null, function (Builder $builder): Builder {
                     /** @var Builder<User> $builder */
-                    return $builder->whereHas('organizations', function (Builder $builder) {
-                        /** @var Builder<Organization> $builder */
-                        return $builder->whereKey($this->organization->getKey());
-                    });
+                    return $builder->belongsToOrganization($this->organization);
                 }),
             ],
             // ID of the task that the time entry should belong to
diff --git a/app/Models/Organization.php b/app/Models/Organization.php
index 284675d4..5e6a99c3 100644
--- a/app/Models/Organization.php
+++ b/app/Models/Organization.php
@@ -13,6 +13,7 @@
 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;
 
 /**
@@ -21,6 +22,7 @@
  * @property bool $personal_team
  * @property User $owner
  * @property Collection<User> $users
+ * @property Collection<string, User> $realUsers
  *
  * @method HasMany<OrganizationInvitation> teamInvitations()
  * @method static OrganizationFactory factory()
@@ -64,7 +66,7 @@ class Organization extends JetstreamTeam
     /**
      * Get all the non-placeholder users of the organization including its owner.
      *
-     * @return Collection<User>
+     * @return Collection<string, User>
      */
     public function allRealUsers(): Collection
     {
@@ -78,6 +80,19 @@ public function hasRealUserWithEmail(string $email): bool
         });
     }
 
+    /**
+     * Get all the users that belong to the team.
+     *
+     * @return BelongsToMany<User>
+     */
+    public function users(): BelongsToMany
+    {
+        return $this->belongsToMany(Jetstream::userModel(), Jetstream::membershipModel())
+            ->withPivot('role')
+            ->withTimestamps()
+            ->as('membership');
+    }
+
     /**
      * @return BelongsToMany<User>
      */
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 1aa92645..2674c1bf 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -46,6 +46,7 @@ public function boot(): void
 
         Model::preventLazyLoading(! $this->app->isProduction());
         Model::preventSilentlyDiscardingAttributes(! $this->app->isProduction());
+        Model::preventAccessingMissingAttributes(! $this->app->isProduction());
         Relation::enforceMorphMap([
             'membership' => Membership::class,
             'organization' => Organization::class,
diff --git a/app/Providers/JetstreamServiceProvider.php b/app/Providers/JetstreamServiceProvider.php
index e3757c7c..414fe1b5 100644
--- a/app/Providers/JetstreamServiceProvider.php
+++ b/app/Providers/JetstreamServiceProvider.php
@@ -109,5 +109,8 @@ protected function configurePermissions(): void
             'time-entries:delete:own',
             'organizations:view',
         ])->description('Editor users have the ability to read, create, and update.');
+
+        Jetstream::role('placeholder', 'Placeholder', [
+        ])->description('Placeholders are used for importing data. They cannot log in and have no permissions.');
     }
 }
diff --git a/app/Rules/ColorRule.php b/app/Rules/ColorRule.php
new file mode 100644
index 00000000..68dda354
--- /dev/null
+++ b/app/Rules/ColorRule.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Rules;
+
+use App\Service\ColorService;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Translation\PotentiallyTranslatedString;
+
+class ColorRule implements ValidationRule
+{
+    /**
+     * Run the validation rule.
+     *
+     * @param  Closure(string): PotentiallyTranslatedString  $fail
+     */
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        if (! is_string($value)) {
+            $fail(__('validation.string'));
+
+            return;
+        }
+        if (! app(ColorService::class)->isValid($value)) {
+            $fail(__('validation.color'));
+
+            return;
+        }
+    }
+}
diff --git a/app/Service/ColorService.php b/app/Service/ColorService.php
index a58e459b..e9ff97c0 100644
--- a/app/Service/ColorService.php
+++ b/app/Service/ColorService.php
@@ -31,8 +31,15 @@ class ColorService
         '#78909c',
     ];
 
+    private const string VALID_REGEX = '/^#[0-9a-f]{6}$/';
+
     public function getRandomColor(): string
     {
         return self::COLORS[array_rand(self::COLORS)];
     }
+
+    public function isValid(string $color): bool
+    {
+        return preg_match(self::VALID_REGEX, $color) === 1;
+    }
 }
diff --git a/app/Service/Import/ImportDatabaseHelper.php b/app/Service/Import/ImportDatabaseHelper.php
index fa5551ae..4f169614 100644
--- a/app/Service/Import/ImportDatabaseHelper.php
+++ b/app/Service/Import/ImportDatabaseHelper.php
@@ -4,9 +4,11 @@
 
 namespace App\Service\Import;
 
+use App\Service\Import\Importers\ImportException;
 use Closure;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Log;
 
 /**
  * @template TModel of Model
@@ -23,9 +25,15 @@ class ImportDatabaseHelper
      */
     private array $identifiers;
 
+    /**
+     * @var array<string, string>|null
+     */
     private ?array $mapIdentifierToKey = null;
 
-    private array $mapNewAttach = [];
+    /**
+     * @var array<string, string>
+     */
+    private array $mapExternalIdentifierToInternalIdentifier = [];
 
     private bool $attachToExisting;
 
@@ -57,7 +65,11 @@ private function getModelInstance(): Builder
         return (new $this->model)->query();
     }
 
-    private function createEntity(array $identifierData, array $createValues): string
+    /**
+     * @param  array<string, mixed>  $identifierData
+     * @param  array<string, mixed>  $createValues
+     */
+    private function createEntity(array $identifierData, array $createValues, ?string $externalIdentifier): string
     {
         $model = new $this->model();
         foreach ($identifierData as $identifier => $identifierValue) {
@@ -72,34 +84,97 @@ private function createEntity(array $identifierData, array $createValues): strin
             ($this->afterCreate)($model);
         }
 
-        $this->mapIdentifierToKey[$this->getHash($identifierData)] = $model->getKey();
+        $hash = $this->getHash($identifierData);
+        $this->mapIdentifierToKey[$hash] = $model->getKey();
         $this->createdCount++;
 
+        if ($externalIdentifier !== null) {
+            $this->mapExternalIdentifierToInternalIdentifier[$externalIdentifier] = $hash;
+        }
+
         return $model->getKey();
     }
 
+    /**
+     * @param  array<string, mixed>  $data
+     */
     private function getHash(array $data): string
     {
-        return md5(json_encode($data));
+        $jsonData = json_encode($data);
+        if ($jsonData === false) {
+            throw new \RuntimeException('Failed to encode data to JSON');
+        }
+
+        return md5($jsonData);
     }
 
-    public function getKey(array $identifierData, array $createValues = []): string
+    /**
+     * @param  array<string, mixed>  $identifierData
+     * @param  array<string, mixed>  $createValues
+     *
+     * @throws ImportException
+     */
+    public function getKey(array $identifierData, array $createValues = [], ?string $externalIdentifier = null): string
     {
         $this->checkMap();
 
+        $this->validateIdentifierData($identifierData);
+
         $hash = $this->getHash($identifierData);
         if ($this->attachToExisting) {
             $key = $this->mapIdentifierToKey[$hash] ?? null;
             if ($key !== null) {
+                if ($externalIdentifier !== null) {
+                    $this->mapExternalIdentifierToInternalIdentifier[$externalIdentifier] = $hash;
+                }
+                Log::debug('HIT', [
+                    'class' => $this->model,
+                ]);
+
                 return $key;
             }
 
-            return $this->createEntity($identifierData, $createValues);
+            Log::debug('MISS', [
+                'class' => $this->model,
+            ]);
+
+            return $this->createEntity($identifierData, $createValues, $externalIdentifier);
         } else {
             throw new \RuntimeException('Not implemented');
         }
     }
 
+    /**
+     * @param  array<string, mixed>  $identifierData
+     *
+     * @throws ImportException
+     */
+    private function validateIdentifierData(array $identifierData): void
+    {
+        if (array_keys($identifierData) !== $this->identifiers) {
+            throw new ImportException('Invalid identifier data');
+        }
+    }
+
+    public function getKeyByExternalIdentifier(string $externalIdentifier): ?string
+    {
+        $hash = $this->mapExternalIdentifierToInternalIdentifier[$externalIdentifier] ?? null;
+        if ($hash === null) {
+            return null;
+        }
+
+        return $this->mapIdentifierToKey[$hash] ?? null;
+    }
+
+    /**
+     * @return array<string>
+     */
+    public function getExternalIds(): array
+    {
+        // Note: Otherwise the external ids are integers
+        return array_map(fn ($value) => (string) $value, array_keys($this->mapExternalIdentifierToInternalIdentifier));
+    }
+
     private function checkMap(): void
     {
         if ($this->mapIdentifierToKey === null) {
diff --git a/app/Service/Import/ImportService.php b/app/Service/Import/ImportService.php
index 0c442c15..8f42a756 100644
--- a/app/Service/Import/ImportService.php
+++ b/app/Service/Import/ImportService.php
@@ -16,13 +16,13 @@ class ImportService
     /**
      * @throws ImportException
      */
-    public function import(Organization $organization, string $importerType, string $data, array $options): ReportDto
+    public function import(Organization $organization, string $importerType, string $data): ReportDto
     {
         /** @var ImporterContract $importer */
         $importer = app(ImporterProvider::class)->getImporter($importerType);
         $importer->init($organization);
-        DB::transaction(function () use (&$importer, &$data, &$options, &$organization) {
-            $importer->importData($data, $options);
+        DB::transaction(function () use (&$importer, &$data) {
+            $importer->importData($data);
         });
 
         return $importer->getReport();
diff --git a/app/Service/Import/Importers/ClockifyProjectsImporter.php b/app/Service/Import/Importers/ClockifyProjectsImporter.php
new file mode 100644
index 00000000..5debbf91
--- /dev/null
+++ b/app/Service/Import/Importers/ClockifyProjectsImporter.php
@@ -0,0 +1,143 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Import\Importers;
+
+use App\Models\Client;
+use App\Models\Organization;
+use App\Models\Project;
+use App\Models\Task;
+use App\Service\ColorService;
+use App\Service\Import\ImportDatabaseHelper;
+use Exception;
+use Illuminate\Database\Eloquent\Builder;
+use League\Csv\Exception as CsvException;
+use League\Csv\Reader;
+
+class ClockifyProjectsImporter implements ImporterContract
+{
+    private Organization $organization;
+
+    /**
+     * @var ImportDatabaseHelper<Project>
+     */
+    private ImportDatabaseHelper $projectImportHelper;
+
+    /**
+     * @var ImportDatabaseHelper<Client>
+     */
+    private ImportDatabaseHelper $clientImportHelper;
+
+    /**
+     * @var ImportDatabaseHelper<Task>
+     */
+    private ImportDatabaseHelper $taskImportHelper;
+
+    #[\Override]
+    public function init(Organization $organization): void
+    {
+        $this->organization = $organization;
+        $this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+        $this->clientImportHelper = new ImportDatabaseHelper(Client::class, ['name', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+        $this->taskImportHelper = new ImportDatabaseHelper(Task::class, ['name', 'project_id', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+    }
+
+    /**
+     * @throws ImportException
+     */
+    #[\Override]
+    public function importData(string $data): void
+    {
+        try {
+            $colorService = app(ColorService::class);
+            $reader = Reader::createFromString($data);
+            $reader->setHeaderOffset(0);
+            $reader->setDelimiter(',');
+            $header = $reader->getHeader();
+            $this->validateHeader($header);
+            $records = $reader->getRecords();
+            foreach ($records as $record) {
+                $clientId = null;
+                if ($record['Client'] !== '') {
+                    $clientId = $this->clientImportHelper->getKey([
+                        'name' => $record['Client'],
+                        'organization_id' => $this->organization->id,
+                    ]);
+                }
+                $projectId = null;
+                if ($record['Name'] !== '') {
+                    $projectId = $this->projectImportHelper->getKey([
+                        'name' => $record['Name'],
+                        'organization_id' => $this->organization->id,
+                    ], [
+                        'client_id' => $clientId,
+                        'color' => $colorService->getRandomColor(),
+                    ]);
+                }
+
+                if ($record['Tasks'] !== '') {
+                    $tasks = explode(', ', $record['Tasks']);
+                    foreach ($tasks as $task) {
+                        if (strlen($task) > 255) {
+                            throw new ImportException('Task is too long');
+                        }
+                        $taskId = $this->taskImportHelper->getKey([
+                            'name' => $task,
+                            'project_id' => $projectId,
+                            'organization_id' => $this->organization->id,
+                        ]);
+                    }
+                }
+            }
+        } catch (ImportException $exception) {
+            throw $exception;
+        } catch (CsvException $exception) {
+            throw new ImportException('Invalid CSV data');
+        } catch (Exception $exception) {
+            report($exception);
+            throw new ImportException('Unknown error');
+        }
+    }
+
+    /**
+     * @param  array<string>  $header
+     *
+     * @throws ImportException
+     */
+    private function validateHeader(array $header): void
+    {
+        $requiredFields = [
+            'Name',
+            'Client',
+            'Status',
+            'Visibility',
+            'Billability',
+            'Tasks',
+        ];
+        foreach ($requiredFields as $requiredField) {
+            if (! in_array($requiredField, $header, true)) {
+                throw new ImportException('Invalid CSV header, missing field: '.$requiredField);
+            }
+        }
+    }
+
+    #[\Override]
+    public function getReport(): ReportDto
+    {
+        return new ReportDto(
+            clientsCreated: $this->clientImportHelper->getCreatedCount(),
+            projectsCreated: $this->projectImportHelper->getCreatedCount(),
+            tasksCreated: $this->taskImportHelper->getCreatedCount(),
+            timeEntriesCreated: 0,
+            tagsCreated: 0,
+            usersCreated: 0,
+        );
+    }
+}
diff --git a/app/Service/Import/Importers/ClockifyTimeEntriesImporter.php b/app/Service/Import/Importers/ClockifyTimeEntriesImporter.php
new file mode 100644
index 00000000..bb7075cc
--- /dev/null
+++ b/app/Service/Import/Importers/ClockifyTimeEntriesImporter.php
@@ -0,0 +1,227 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Import\Importers;
+
+use App\Models\Client;
+use App\Models\Organization;
+use App\Models\Project;
+use App\Models\Tag;
+use App\Models\Task;
+use App\Models\TimeEntry;
+use App\Models\User;
+use App\Service\ColorService;
+use App\Service\Import\ImportDatabaseHelper;
+use Exception;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+use League\Csv\Exception as CsvException;
+use League\Csv\Reader;
+
+class ClockifyTimeEntriesImporter implements ImporterContract
+{
+    private Organization $organization;
+
+    /**
+     * @var ImportDatabaseHelper<User>
+     */
+    private ImportDatabaseHelper $userImportHelper;
+
+    /**
+     * @var ImportDatabaseHelper<Project>
+     */
+    private ImportDatabaseHelper $projectImportHelper;
+
+    /**
+     * @var ImportDatabaseHelper<Tag>
+     */
+    private ImportDatabaseHelper $tagImportHelper;
+
+    /**
+     * @var ImportDatabaseHelper<Client>
+     */
+    private ImportDatabaseHelper $clientImportHelper;
+
+    /**
+     * @var ImportDatabaseHelper<Task>
+     */
+    private ImportDatabaseHelper $taskImportHelper;
+
+    private int $timeEntriesCreated;
+
+    #[\Override]
+    public function init(Organization $organization): void
+    {
+        $this->organization = $organization;
+        $this->userImportHelper = new ImportDatabaseHelper(User::class, ['email'], true, function (Builder $builder) {
+            /** @var Builder<User> $builder */
+            return $builder->belongsToOrganization($this->organization);
+        }, function (User $user) {
+            $user->organizations()->attach($this->organization, [
+                'role' => 'placeholder',
+            ]);
+        });
+        $this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+        $this->tagImportHelper = new ImportDatabaseHelper(Tag::class, ['name', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+        $this->clientImportHelper = new ImportDatabaseHelper(Client::class, ['name', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+        $this->taskImportHelper = new ImportDatabaseHelper(Task::class, ['name', 'project_id', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+        $this->timeEntriesCreated = 0;
+    }
+
+    /**
+     * @return array<string>
+     *
+     * @throws ImportException
+     */
+    private function getTags(string $tags): array
+    {
+        if (trim($tags) === '') {
+            return [];
+        }
+        $tagsParsed = explode(', ', $tags);
+        $tagIds = [];
+        foreach ($tagsParsed as $tagParsed) {
+            if (strlen($tagParsed) > 255) {
+                throw new ImportException('Tag is too long');
+            }
+            $tagId = $this->tagImportHelper->getKey([
+                'name' => $tagParsed,
+                'organization_id' => $this->organization->id,
+            ]);
+            $tagIds[] = $tagId;
+        }
+
+        return $tagIds;
+    }
+
+    /**
+     * @throws ImportException
+     */
+    #[\Override]
+    public function importData(string $data): void
+    {
+        try {
+            $colorService = app(ColorService::class);
+            $reader = Reader::createFromString($data);
+            $reader->setHeaderOffset(0);
+            $reader->setDelimiter(',');
+            $header = $reader->getHeader();
+            $this->validateHeader($header);
+            $records = $reader->getRecords();
+            foreach ($records as $record) {
+                $userId = $this->userImportHelper->getKey([
+                    'email' => $record['Email'],
+                ], [
+                    'name' => $record['User'],
+                    'is_placeholder' => true,
+                ]);
+                $clientId = null;
+                if ($record['Client'] !== '') {
+                    $clientId = $this->clientImportHelper->getKey([
+                        'name' => $record['Client'],
+                        'organization_id' => $this->organization->id,
+                    ]);
+                }
+                $projectId = null;
+                if ($record['Project'] !== '') {
+                    $projectId = $this->projectImportHelper->getKey([
+                        'name' => $record['Project'],
+                        'organization_id' => $this->organization->id,
+                    ], [
+                        'client_id' => $clientId,
+                        'color' => $colorService->getRandomColor(),
+                    ]);
+                }
+                $taskId = null;
+                if ($record['Task'] !== '') {
+                    $taskId = $this->taskImportHelper->getKey([
+                        'name' => $record['Task'],
+                        'project_id' => $projectId,
+                        'organization_id' => $this->organization->id,
+                    ]);
+                }
+                $timeEntry = new TimeEntry();
+                $timeEntry->user_id = $userId;
+                $timeEntry->task_id = $taskId;
+                $timeEntry->project_id = $projectId;
+                $timeEntry->organization_id = $this->organization->id;
+                $timeEntry->description = $record['Description'];
+                if (! in_array($record['Billable'], ['Yes', 'No'], true)) {
+                    throw new ImportException('Invalid billable value');
+                }
+                $timeEntry->billable = $record['Billable'] === 'Yes';
+                $timeEntry->tags = $this->getTags($record['Tags']);
+                $start = Carbon::createFromFormat('m/d/Y H:i:s A', $record['Start Date'].' '.$record['Start Time'], 'UTC');
+                if ($start === false) {
+                    throw new ImportException('Start date ("'.$record['Start Date'].'") or time ("'.$record['Start Time'].'") are invalid');
+                }
+                $timeEntry->start = $start;
+                $end = Carbon::createFromFormat('m/d/Y H:i:s A', $record['End Date'].' '.$record['End Time'], 'UTC');
+                if ($end === false) {
+                    throw new ImportException('End date ("'.$record['End Date'].'") or time ("'.$record['End Time'].'") are invalid');
+                }
+                $timeEntry->end = $end;
+                $timeEntry->save();
+                $this->timeEntriesCreated++;
+            }
+        } catch (ImportException $exception) {
+            throw $exception;
+        } catch (CsvException $exception) {
+            throw new ImportException('Invalid CSV data');
+        } catch (Exception $exception) {
+            report($exception);
+            throw new ImportException('Unknown error');
+        }
+    }
+
+    /**
+     * @param  array<string>  $header
+     *
+     * @throws ImportException
+     */
+    private function validateHeader(array $header): void
+    {
+        $requiredFields = [
+            'Project',
+            'Client',
+            'Description',
+            'Task',
+            'User',
+            'Group',
+            'Email',
+            'Tags',
+            'Billable',
+            'Start Date',
+            'Start Time',
+            'End Date',
+            'End Time',
+        ];
+        foreach ($requiredFields as $requiredField) {
+            if (! in_array($requiredField, $header, true)) {
+                throw new ImportException('Invalid CSV header, missing field: '.$requiredField);
+            }
+        }
+    }
+
+    #[\Override]
+    public function getReport(): ReportDto
+    {
+        return new ReportDto(
+            clientsCreated: $this->clientImportHelper->getCreatedCount(),
+            projectsCreated: $this->projectImportHelper->getCreatedCount(),
+            tasksCreated: $this->taskImportHelper->getCreatedCount(),
+            timeEntriesCreated: $this->timeEntriesCreated,
+            tagsCreated: $this->tagImportHelper->getCreatedCount(),
+            usersCreated: $this->userImportHelper->getCreatedCount(),
+        );
+    }
+}
diff --git a/app/Service/Import/Importers/ImporterContract.php b/app/Service/Import/Importers/ImporterContract.php
index 65ca1bb6..a4846167 100644
--- a/app/Service/Import/Importers/ImporterContract.php
+++ b/app/Service/Import/Importers/ImporterContract.php
@@ -10,7 +10,7 @@ interface ImporterContract
 {
     public function init(Organization $organization): void;
 
-    public function importData(string $data, array $options): void;
+    public function importData(string $data): void;
 
     public function getReport(): ReportDto;
 }
diff --git a/app/Service/Import/Importers/ImporterProvider.php b/app/Service/Import/Importers/ImporterProvider.php
index ed413566..56eacf08 100644
--- a/app/Service/Import/Importers/ImporterProvider.php
+++ b/app/Service/Import/Importers/ImporterProvider.php
@@ -11,6 +11,9 @@ class ImporterProvider
      */
     private array $importers = [
         'toggl_time_entries' => TogglTimeEntriesImporter::class,
+        'toggl_data_importer' => TogglDataImporter::class,
+        'clockify_time_entries' => ClockifyTimeEntriesImporter::class,
+        'clockify_projects' => ClockifyProjectsImporter::class,
     ];
 
     /**
diff --git a/app/Service/Import/Importers/TogglDataImporter.php b/app/Service/Import/Importers/TogglDataImporter.php
new file mode 100644
index 00000000..2183b2d9
--- /dev/null
+++ b/app/Service/Import/Importers/TogglDataImporter.php
@@ -0,0 +1,194 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Import\Importers;
+
+use App\Models\Client;
+use App\Models\Organization;
+use App\Models\Project;
+use App\Models\Tag;
+use App\Models\Task;
+use App\Models\User;
+use App\Service\ColorService;
+use App\Service\Import\ImportDatabaseHelper;
+use Exception;
+use Illuminate\Database\Eloquent\Builder;
+use Spatie\TemporaryDirectory\TemporaryDirectory;
+use ZipArchive;
+
+class TogglDataImporter implements ImporterContract
+{
+    private Organization $organization;
+
+    /**
+     * @var ImportDatabaseHelper<User>
+     */
+    private ImportDatabaseHelper $userImportHelper;
+
+    /**
+     * @var ImportDatabaseHelper<Project>
+     */
+    private ImportDatabaseHelper $projectImportHelper;
+
+    /**
+     * @var ImportDatabaseHelper<Tag>
+     */
+    private ImportDatabaseHelper $tagImportHelper;
+
+    /**
+     * @var ImportDatabaseHelper<Client>
+     */
+    private ImportDatabaseHelper $clientImportHelper;
+
+    /**
+     * @var ImportDatabaseHelper<Task>
+     */
+    private ImportDatabaseHelper $taskImportHelper;
+
+    private ColorService $colorService;
+
+    #[\Override]
+    public function init(Organization $organization): void
+    {
+        $this->organization = $organization;
+        $this->userImportHelper = new ImportDatabaseHelper(User::class, ['email'], true, function (Builder $builder) {
+            /** @var Builder<User> $builder */
+            return $builder->belongsToOrganization($this->organization);
+        }, function (User $user) {
+            $user->organizations()->attach($this->organization, [
+                'role' => 'placeholder',
+            ]);
+        });
+        $this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+        $this->tagImportHelper = new ImportDatabaseHelper(Tag::class, ['name', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+        $this->clientImportHelper = new ImportDatabaseHelper(Client::class, ['name', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+        $this->taskImportHelper = new ImportDatabaseHelper(Task::class, ['name', 'project_id', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        });
+        $this->colorService = app(ColorService::class);
+    }
+
+    /**
+     * @throws ImportException
+     */
+    #[\Override]
+    public function importData(string $data): void
+    {
+        try {
+            $zip = new ZipArchive();
+            $temporaryDirectory = TemporaryDirectory::make();
+            file_put_contents($temporaryDirectory->path('import.zip'), $data);
+            $zip->open($temporaryDirectory->path('import.zip'), ZipArchive::RDONLY);
+            $temporaryDirectory = TemporaryDirectory::make();
+            $zip->extractTo($temporaryDirectory->path());
+            $zip->close();
+            $clientsFileContent = file_get_contents($temporaryDirectory->path('clients.json'));
+            if ($clientsFileContent === false) {
+                throw new ImportException('File clients.json missing in ZIP');
+            }
+            $clients = json_decode($clientsFileContent);
+            $projectsFileContent = file_get_contents($temporaryDirectory->path('projects.json'));
+            if ($projectsFileContent === false) {
+                throw new ImportException('File projects.json missing in ZIP');
+            }
+            $projects = json_decode($projectsFileContent);
+            $tagsFileContent = file_get_contents($temporaryDirectory->path('tags.json'));
+            if ($tagsFileContent === false) {
+                throw new ImportException('File tags.json missing in ZIP');
+            }
+            $tags = json_decode($tagsFileContent);
+            $workspaceUsersFileContent = file_get_contents($temporaryDirectory->path('workspace_users.json'));
+            if ($workspaceUsersFileContent === false) {
+                throw new ImportException('File workspace_users.json missing in ZIP');
+            }
+            $workspaceUsers = json_decode($workspaceUsersFileContent);
+            foreach ($clients as $client) {
+                $this->clientImportHelper->getKey([
+                    'name' => $client->name,
+                    'organization_id' => $this->organization->id,
+                ], [], (string) $client->id);
+            }
+            foreach ($tags as $tag) {
+                $this->tagImportHelper->getKey([
+                    'name' => $tag->name,
+                    'organization_id' => $this->organization->id,
+                ], [], (string) $tag->id);
+            }
+
+            foreach ($projects as $project) {
+                $clientId = null;
+                if ($project->client_id !== null) {
+                    $clientId = $this->clientImportHelper->getKeyByExternalIdentifier((string) $project->client_id);
+                    if ($clientId === null) {
+                        throw new Exception('Client does not exist');
+                    }
+                }
+
+                if (! $this->colorService->isValid($project->color)) {
+                    throw new ImportException('Invalid color');
+                }
+
+                $this->projectImportHelper->getKey([
+                    'name' => $project->name,
+                    'organization_id' => $this->organization->getKey(),
+                ], [
+                    'client_id' => $clientId,
+                    'color' => $project->color,
+                ], (string) $project->id);
+            }
+            foreach ($workspaceUsers as $workspaceUser) {
+                $this->userImportHelper->getKey([
+                    'email' => $workspaceUser->email,
+                ], [
+                    'name' => $workspaceUser->name,
+                    'is_placeholder' => true,
+                ], (string) $workspaceUser->id);
+            }
+            $projectIds = $this->projectImportHelper->getExternalIds();
+            foreach ($projectIds as $projectIdExternal) {
+                $tasksFileContent = file_get_contents($temporaryDirectory->path('tasks/'.$projectIdExternal.'.json'));
+                if ($tasksFileContent === false) {
+                    throw new ImportException('File tasks/'.$projectIdExternal.'.json missing in ZIP');
+                }
+                $tasks = json_decode($tasksFileContent);
+                foreach ($tasks as $task) {
+                    $projectId = $this->projectImportHelper->getKeyByExternalIdentifier((string) $projectIdExternal);
+
+                    if ($projectId === null) {
+                        throw new Exception('Project does not exist');
+                    }
+                    $this->taskImportHelper->getKey([
+                        'name' => $task->name,
+                        'project_id' => $projectId,
+                        'organization_id' => $this->organization->getKey(),
+                    ], [], (string) $task->id);
+                }
+            }
+        } catch (ImportException $exception) {
+            throw $exception;
+        } catch (Exception $exception) {
+            report($exception);
+            throw new ImportException('Unknown error');
+        }
+    }
+
+    #[\Override]
+    public function getReport(): ReportDto
+    {
+        return new ReportDto(
+            clientsCreated: $this->clientImportHelper->getCreatedCount(),
+            projectsCreated: $this->projectImportHelper->getCreatedCount(),
+            tasksCreated: $this->taskImportHelper->getCreatedCount(),
+            timeEntriesCreated: 0,
+            tagsCreated: $this->tagImportHelper->getCreatedCount(),
+            usersCreated: $this->userImportHelper->getCreatedCount(),
+        );
+    }
+}
diff --git a/app/Service/Import/Importers/TogglTimeEntriesImporter.php b/app/Service/Import/Importers/TogglTimeEntriesImporter.php
index 0021bfb6..74740496 100644
--- a/app/Service/Import/Importers/TogglTimeEntriesImporter.php
+++ b/app/Service/Import/Importers/TogglTimeEntriesImporter.php
@@ -13,6 +13,7 @@
 use App\Models\User;
 use App\Service\ColorService;
 use App\Service\Import\ImportDatabaseHelper;
+use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 use League\Csv\Exception as CsvException;
@@ -22,14 +23,29 @@ class TogglTimeEntriesImporter implements ImporterContract
 {
     private Organization $organization;
 
+    /**
+     * @var ImportDatabaseHelper<User>
+     */
     private ImportDatabaseHelper $userImportHelper;
 
+    /**
+     * @var ImportDatabaseHelper<Project>
+     */
     private ImportDatabaseHelper $projectImportHelper;
 
+    /**
+     * @var ImportDatabaseHelper<Tag>
+     */
     private ImportDatabaseHelper $tagImportHelper;
 
+    /**
+     * @var ImportDatabaseHelper<Client>
+     */
     private ImportDatabaseHelper $clientImportHelper;
 
+    /**
+     * @var ImportDatabaseHelper<Task>
+     */
     private ImportDatabaseHelper $taskImportHelper;
 
     private int $timeEntriesCreated;
@@ -39,14 +55,13 @@ public function init(Organization $organization): void
     {
         $this->organization = $organization;
         $this->userImportHelper = new ImportDatabaseHelper(User::class, ['email'], true, function (Builder $builder) {
-            return $builder->whereHas('organizations', function (Builder $builder): Builder {
-                /** @var Builder<Organization> $builder */
-                return $builder->whereKey($this->organization->getKey());
-            });
+            /** @var Builder<User> $builder */
+            return $builder->belongsToOrganization($this->organization);
         }, function (User $user) {
-            $user->organizations()->attach([$this->organization->id]);
+            $user->organizations()->attach($this->organization, [
+                'role' => 'placeholder',
+            ]);
         });
-        // TODO: user special after import
         $this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true, function (Builder $builder) {
             return $builder->where('organization_id', $this->organization->id);
         });
@@ -62,6 +77,11 @@ public function init(Organization $organization): void
         $this->timeEntriesCreated = 0;
     }
 
+    /**
+     * @return array<string>
+     *
+     * @throws ImportException
+     */
     private function getTags(string $tags): array
     {
         if (trim($tags) === '') {
@@ -87,7 +107,7 @@ private function getTags(string $tags): array
      * @throws ImportException
      */
     #[\Override]
-    public function importData(string $data, array $options): void
+    public function importData(string $data): void
     {
         try {
             $colorService = app(ColorService::class);
@@ -140,17 +160,34 @@ public function importData(string $data, array $options): void
                 }
                 $timeEntry->billable = $record['Billable'] === 'Yes';
                 $timeEntry->tags = $this->getTags($record['Tags']);
-                $timeEntry->start = Carbon::createFromFormat('Y-m-d H:i:s', $record['Start date'].' '.$record['Start time'], 'UTC');
-                $timeEntry->end = Carbon::createFromFormat('Y-m-d H:i:s', $record['End date'].' '.$record['End time'], 'UTC');
+                $start = Carbon::createFromFormat('Y-m-d H:i:s', $record['Start date'].' '.$record['Start time'], 'UTC');
+                if ($start === false) {
+                    throw new ImportException('Start date ("'.$record['Start date'].'") or time ("'.$record['Start time'].'") are invalid');
+                }
+                $timeEntry->start = $start;
+                $end = Carbon::createFromFormat('Y-m-d H:i:s', $record['End date'].' '.$record['End time'], 'UTC');
+                if ($end === false) {
+                    throw new ImportException('End date ("'.$record['End date'].'") or time ("'.$record['End time'].'") are invalid');
+                }
+                $timeEntry->end = $end;
                 $timeEntry->save();
                 $this->timeEntriesCreated++;
             }
+        } catch (ImportException $exception) {
+            throw $exception;
         } catch (CsvException $exception) {
             throw new ImportException('Invalid CSV data');
+        } catch (Exception $exception) {
+            report($exception);
+            throw new ImportException('Unknown error');
         }
-
     }
 
+    /**
+     * @param  array<string>  $header
+     *
+     * @throws ImportException
+     */
     private function validateHeader(array $header): void
     {
         $requiredFields = [
diff --git a/app/Service/UserService.php b/app/Service/UserService.php
index e554e078..87be9978 100644
--- a/app/Service/UserService.php
+++ b/app/Service/UserService.php
@@ -13,11 +13,11 @@ class UserService
     public function assignOrganizationEntitiesToDifferentUser(Organization $organization, User $fromUser, User $toUser): void
     {
         // Time entries
-        dump(TimeEntry::query()
+        TimeEntry::query()
             ->whereBelongsTo($organization, 'organization')
             ->whereBelongsTo($fromUser, 'user')
             ->update([
                 'user_id' => $toUser->getKey(),
-            ]));
+            ]);
     }
 }
diff --git a/composer.json b/composer.json
index 8b895a38..8b84fdf8 100644
--- a/composer.json
+++ b/composer.json
@@ -6,6 +6,7 @@
     "license": "AGPL-3.0-or-later",
     "require": {
         "php": "8.3.*",
+        "ext-zip": "*",
         "dedoc/scramble": "^0.8.5",
         "filament/filament": "^3.2",
         "guzzlehttp/guzzle": "^7.2",
@@ -16,6 +17,7 @@
         "laravel/passport": "^11.10.2",
         "laravel/tinker": "^2.8",
         "pxlrbt/filament-environment-indicator": "^2.0",
+        "spatie/temporary-directory": "^2.2",
         "tightenco/ziggy": "^1.0",
         "tpetry/laravel-postgresql-enhanced": "^0.33.0"
     },
diff --git a/composer.lock b/composer.lock
index d39541ae..f3065194 100644
--- a/composer.lock
+++ b/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": "e83929e68d256367652d91e43a79288e",
+    "content-hash": "9e9c41ae5787e1aa711b04cc019cb7e7",
     "packages": [
         {
             "name": "anourvalar/eloquent-serialize",
@@ -6542,6 +6542,67 @@
             ],
             "time": "2024-01-11T08:43:00+00:00"
         },
+        {
+            "name": "spatie/temporary-directory",
+            "version": "2.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/temporary-directory.git",
+                "reference": "76949fa18f8e1a7f663fd2eaa1d00e0bcea0752a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/76949fa18f8e1a7f663fd2eaa1d00e0bcea0752a",
+                "reference": "76949fa18f8e1a7f663fd2eaa1d00e0bcea0752a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Spatie\\TemporaryDirectory\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alex Vanderbist",
+                    "email": "alex@spatie.be",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Easily create, use and destroy temporary directories",
+            "homepage": "https://github.com/spatie/temporary-directory",
+            "keywords": [
+                "php",
+                "spatie",
+                "temporary-directory"
+            ],
+            "support": {
+                "issues": "https://github.com/spatie/temporary-directory/issues",
+                "source": "https://github.com/spatie/temporary-directory/tree/2.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://spatie.be/open-source/support-us",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-25T11:46:58+00:00"
+        },
         {
             "name": "symfony/console",
             "version": "v6.4.4",
@@ -12424,7 +12485,8 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "8.3.*"
+        "php": "8.3.*",
+        "ext-zip": "*"
     },
     "platform-dev": [],
     "plugin-api-version": "2.6.0"
diff --git a/config/filesystems.php b/config/filesystems.php
index d307268d..508cc76c 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -58,6 +58,12 @@
             'throw' => false,
         ],
 
+        'testfiles' => [
+            'driver' => 'local',
+            'root' => storage_path('tests'),
+            'throw' => false,
+        ],
+
     ],
 
     /*
diff --git a/database/factories/ProjectFactory.php b/database/factories/ProjectFactory.php
index c05a79ff..f8654731 100644
--- a/database/factories/ProjectFactory.php
+++ b/database/factories/ProjectFactory.php
@@ -7,6 +7,7 @@
 use App\Models\Client;
 use App\Models\Organization;
 use App\Models\Project;
+use App\Service\ColorService;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
@@ -23,7 +24,7 @@ public function definition(): array
     {
         return [
             'name' => $this->faker->company(),
-            'color' => $this->faker->hexColor(),
+            'color' => app(ColorService::class)->getRandomColor(),
             'organization_id' => Organization::factory(),
             'client_id' => null,
         ];
diff --git a/lang/en/auth.php b/lang/en/auth.php
new file mode 100644
index 00000000..e2de2aca
--- /dev/null
+++ b/lang/en/auth.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'failed' => 'These credentials do not match our records.',
+    'password' => 'The provided password is incorrect.',
+    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+
+];
diff --git a/lang/en/pagination.php b/lang/en/pagination.php
new file mode 100644
index 00000000..f03c42c6
--- /dev/null
+++ b/lang/en/pagination.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Previous',
+    'next' => 'Next &raquo;',
+
+];
diff --git a/lang/en/passwords.php b/lang/en/passwords.php
new file mode 100644
index 00000000..43092321
--- /dev/null
+++ b/lang/en/passwords.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    'reset' => 'Your password has been reset.',
+    'sent' => 'We have emailed your password reset link.',
+    'throttled' => 'Please wait before retrying.',
+    'token' => 'This password reset token is invalid.',
+    'user' => "We can't find a user with that email address.",
+
+];
diff --git a/lang/en/validation.php b/lang/en/validation.php
new file mode 100644
index 00000000..9813d38a
--- /dev/null
+++ b/lang/en/validation.php
@@ -0,0 +1,199 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | as the size rules. Feel free to tweak each of these messages here.
+    |
+    */
+
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
+    ],
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
+    ],
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
+    ],
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
+    ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
+    'string' => 'The :attribute field must be a string.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap our attribute placeholder
+    | with something more reader friendly such as "E-Mail Address" instead
+    | of "email". This simply helps us make our message more expressive.
+    |
+    */
+
+    'attributes' => [],
+
+    /*
+     * Custom validation rules
+     */
+
+    'color' => 'The :attribute field must be a valid color.',
+
+];
diff --git a/storage/tests/clockify_import_test_1.csv b/storage/tests/clockify_import_test_1.csv
deleted file mode 100644
index 66b59c18..00000000
--- a/storage/tests/clockify_import_test_1.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Project","Client","Description","Task","User","Group","Email","Tags","Billable","Start Date","Start Time","End Date","End Time","Duration (h)","Duration (decimal)","Billable Rate (USD)","Billable Amount (USD)"
diff --git a/storage/tests/clockify_projects_import_test_1.csv b/storage/tests/clockify_projects_import_test_1.csv
new file mode 100644
index 00000000..d8c018fb
--- /dev/null
+++ b/storage/tests/clockify_projects_import_test_1.csv
@@ -0,0 +1,3 @@
+"Name","Client","Status","Visibility","Billability","Tasks","Tracked (h)","Estimated (h)","Remaining (h)","Overage (h)","Progress(%)","Billable (h)","Non-billable (h)","Billable Rate (USD)","Amount (USD)","Project members","Project manager","Note"
+"Project for Big Company","Big Company","Active","Public","Yes","Task 1, Task 2, Task 3","0.00","","","","","0.00","0.00","","0.00","Constantin Graf","",""
+"Project without Client","","Active","Public","Yes","","0.00","","","","","0.00","0.00","","0.00","Constantin Graf","",""
diff --git a/storage/tests/clockify_time_entries_import_test_1.csv b/storage/tests/clockify_time_entries_import_test_1.csv
new file mode 100644
index 00000000..b7b1f1ce
--- /dev/null
+++ b/storage/tests/clockify_time_entries_import_test_1.csv
@@ -0,0 +1,3 @@
+"Project","Client","Description","Task","User","Group","Email","Tags","Billable","Start Date","Start Time","End Date","End Time","Duration (h)","Duration (decimal)","Billable Rate (USD)","Billable Amount (USD)"
+"Project without Client","","","","Peter Tester","","peter.test@email.test","Development, Backend","No","03/04/2024","10:23:52 AM","03/04/2024","10:23:52 AM","00:00:00","0.00","0.00","0.00"
+"Project for Big Company","Big Company","Working hard","Task 1","Peter Tester","","peter.test@email.test","","Yes","03/04/2024","10:23:00 AM","03/04/2024","11:23:01 AM","01:00:01","0.00","0.00","0.00"
diff --git a/storage/tests/toggl_data_import_test_1/clients.json b/storage/tests/toggl_data_import_test_1/clients.json
new file mode 100644
index 00000000..9291eaef
--- /dev/null
+++ b/storage/tests/toggl_data_import_test_1/clients.json
@@ -0,0 +1,9 @@
+[
+    {
+        "archived": false,
+        "creator_id": 201,
+        "id": 301,
+        "name": "Big Company",
+        "wid": 0
+    }
+]
diff --git a/storage/tests/toggl_data_import_test_1/projects.json b/storage/tests/toggl_data_import_test_1/projects.json
new file mode 100644
index 00000000..7c28f2d7
--- /dev/null
+++ b/storage/tests/toggl_data_import_test_1/projects.json
@@ -0,0 +1,58 @@
+[
+    {
+        "active": true,
+        "actual_hours": null,
+        "actual_seconds": null,
+        "auto_estimates": false,
+        "billable": true,
+        "cid": null,
+        "client_id": null,
+        "color": "#ef5350",
+        "currency": "EUR",
+        "estimated_hours": null,
+        "estimated_seconds": null,
+        "fixed_fee": null,
+        "guid": "",
+        "id": 401,
+        "is_private": true,
+        "name": "Project without Client",
+        "rate": null,
+        "rate_last_updated": null,
+        "recurring": false,
+        "recurring_parameters": null,
+        "start_date": "2020-01-01",
+        "status": "active",
+        "template": false,
+        "template_id": null,
+        "wid": 0,
+        "workspace_id": 0
+    },
+    {
+        "active": true,
+        "actual_hours": null,
+        "actual_seconds": null,
+        "auto_estimates": false,
+        "billable": false,
+        "cid": 301,
+        "client_id": 301,
+        "color": "#ec407a",
+        "currency": null,
+        "estimated_hours": null,
+        "estimated_seconds": null,
+        "fixed_fee": null,
+        "guid": "",
+        "id": 402,
+        "is_private": true,
+        "name": "Project for Big Company",
+        "rate": null,
+        "rate_last_updated": null,
+        "recurring": false,
+        "recurring_parameters": null,
+        "start_date": "2020-01-01",
+        "status": "active",
+        "template": false,
+        "template_id": null,
+        "wid": 0,
+        "workspace_id": 0
+    }
+]
diff --git a/storage/tests/toggl_data_import_test_1/tags.json b/storage/tests/toggl_data_import_test_1/tags.json
new file mode 100644
index 00000000..4bc90b57
--- /dev/null
+++ b/storage/tests/toggl_data_import_test_1/tags.json
@@ -0,0 +1,14 @@
+[
+    {
+        "creator_id": 0,
+        "id": 501,
+        "name": "Development",
+        "workspace_id": 0
+    },
+    {
+        "creator_id": 0,
+        "id": 502,
+        "name": "Backend",
+        "workspace_id": 0
+    }
+]
diff --git a/storage/tests/toggl_data_import_test_1/tasks/401.json b/storage/tests/toggl_data_import_test_1/tasks/401.json
new file mode 100644
index 00000000..fe51488c
--- /dev/null
+++ b/storage/tests/toggl_data_import_test_1/tasks/401.json
@@ -0,0 +1 @@
+[]
diff --git a/storage/tests/toggl_data_import_test_1/tasks/402.json b/storage/tests/toggl_data_import_test_1/tasks/402.json
new file mode 100644
index 00000000..fc7d6934
--- /dev/null
+++ b/storage/tests/toggl_data_import_test_1/tasks/402.json
@@ -0,0 +1,13 @@
+[
+    {
+        "active": true,
+        "estimated_seconds": 0,
+        "id": 601,
+        "name": "Task 1",
+        "project_id": 402,
+        "recurring": false,
+        "tracked_seconds": 0,
+        "user_id": null,
+        "workspace_id": 0
+    }
+]
diff --git a/storage/tests/toggl_data_import_test_1/workspace_users.json b/storage/tests/toggl_data_import_test_1/workspace_users.json
new file mode 100644
index 00000000..356daa1f
--- /dev/null
+++ b/storage/tests/toggl_data_import_test_1/workspace_users.json
@@ -0,0 +1,19 @@
+[
+    {
+        "active": true,
+        "admin": true,
+        "email": "peter.test@email.test",
+        "group_ids": [],
+        "id": 201,
+        "inactive": false,
+        "labour_cost": null,
+        "name": "Peter Tester",
+        "rate": null,
+        "rate_last_updated": null,
+        "role": "admin",
+        "timezone": "Europe/Vienna",
+        "uid": 0,
+        "wid": 0,
+        "working_hours_in_minutes": null
+    }
+]
diff --git a/storage/tests/toggl_import_test_1.csv b/storage/tests/toggl_time_entries_import_test_1.csv
similarity index 81%
rename from storage/tests/toggl_import_test_1.csv
rename to storage/tests/toggl_time_entries_import_test_1.csv
index 1fdfc8d6..effd1dfb 100644
--- a/storage/tests/toggl_import_test_1.csv
+++ b/storage/tests/toggl_time_entries_import_test_1.csv
@@ -1,3 +1,3 @@
 User,Email,Client,Project,Task,Description,Billable,Start date,Start time,End date,End time,Duration,Tags,Amount (EUR)
-Peter Tester,peter.test@email.test,,Project without Client,,"",No,2024-03-04,10:23:52,2024-03-04,10:23:52,00:00:00,Development,
+Peter Tester,peter.test@email.test,,Project without Client,,"",No,2024-03-04,10:23:52,2024-03-04,10:23:52,00:00:00,"Development, Backend",
 Peter Tester,peter.test@email.test,Big Company,Project for Big Company,Task 1,Working hard,Yes,2024-03-04,10:23:00,2024-03-04,11:23:01,01:00:01,,111.11
diff --git a/tests/Unit/Rules/ColorRuleTest.php b/tests/Unit/Rules/ColorRuleTest.php
new file mode 100644
index 00000000..3df5ee22
--- /dev/null
+++ b/tests/Unit/Rules/ColorRuleTest.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Rules;
+
+use App\Rules\ColorRule;
+use Illuminate\Support\Facades\Validator;
+use Tests\TestCase;
+
+class ColorRuleTest extends TestCase
+{
+    public function test_validation_passes_if_value_is_valid_color(): void
+    {
+        // Arrange
+        $validator = Validator::make([
+            'color' => '#ef5350',
+        ], [
+            'color' => [new ColorRule()],
+        ]);
+
+        // Act
+        $isValid = $validator->passes();
+        $messages = $validator->messages()->toArray();
+
+        // Assert
+        $this->assertTrue($isValid);
+        $this->assertArrayNotHasKey('color', $messages);
+    }
+
+    public function test_validation_fails_if_value_is_not_a_string(): void
+    {
+        // Arrange
+        $validator = Validator::make([
+            'color' => true,
+        ], [
+            'color' => [new ColorRule()],
+        ]);
+
+        // Act
+        $isValid = $validator->passes();
+        $messages = $validator->messages()->toArray();
+
+        // Assert
+        $this->assertFalse($isValid);
+        $this->assertEquals('The color field must be a string.', $messages['color'][0]);
+    }
+
+    public function test_validation_fails_if_value_is_not_a_valid_color(): void
+    {
+        // Arrange
+        $validator = Validator::make([
+            'color' => 'rgb(0,0,0)',
+        ], [
+            'color' => [new ColorRule()],
+        ]);
+
+        // Act
+        $isValid = $validator->passes();
+        $messages = $validator->messages()->toArray();
+
+        // Assert
+        $this->assertFalse($isValid);
+        $this->assertEquals('The color field must be a valid color.', $messages['color'][0]);
+    }
+}
diff --git a/tests/Unit/Service/Import/ImportDatabaseHelperTest.php b/tests/Unit/Service/Import/ImportDatabaseHelperTest.php
index d1d156f2..9337b724 100644
--- a/tests/Unit/Service/Import/ImportDatabaseHelperTest.php
+++ b/tests/Unit/Service/Import/ImportDatabaseHelperTest.php
@@ -4,6 +4,7 @@
 
 namespace Tests\Unit\Service\Import;
 
+use App\Models\Organization;
 use App\Models\Project;
 use App\Models\User;
 use App\Service\Import\ImportDatabaseHelper;
@@ -74,4 +75,64 @@ public function test_get_key_not_attach_to_existing_is_not_implemented_yet(): vo
         // Assert
         $this->fail();
     }
+
+    public function test_get_key_by_external_identifier_returns_key_for_external_identifier(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $project = Project::factory()->forOrganization($organization)->create();
+        $externalIdentifier1 = '12345';
+        $externalIdentifier2 = '54321';
+        $helper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true);
+        $helper->getKey([
+            'name' => $project->name,
+            'organization_id' => $organization->getKey(),
+        ], [
+            'color' => '#000000',
+        ], $externalIdentifier1);
+        $helper->getKey([
+            'name' => 'Not existing project',
+            'organization_id' => $organization->getKey(),
+        ], [
+            'color' => '#000000',
+        ], $externalIdentifier2);
+
+        // Act
+        $key1 = $helper->getKeyByExternalIdentifier($externalIdentifier1);
+        $key2 = $helper->getKeyByExternalIdentifier($externalIdentifier2);
+
+        // Assert
+        $this->assertSame($project->getKey(), $key1);
+        $this->assertSame(Project::where('name', '=', 'Not existing project')->first()->getKey(), $key2);
+    }
+
+    public function test_get_external_ids_returns_all_external_ids_that_were_temporary_stored_via_get_key(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $project = Project::factory()->forOrganization($organization)->create();
+        $externalIdentifier1 = '12345';
+        $externalIdentifier2 = '54321';
+        $helper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true);
+        $helper->getKey([
+            'name' => $project->name,
+            'organization_id' => $organization->getKey(),
+        ], [
+            'color' => '#000000',
+        ], $externalIdentifier1);
+        $helper->getKey([
+            'name' => 'Not existing project',
+            'organization_id' => $organization->getKey(),
+        ], [
+            'color' => '#000000',
+        ], $externalIdentifier2);
+
+        // Act
+        $externalKeys = $helper->getExternalIds();
+
+        // Assert
+        $this->assertCount(2, $externalKeys);
+        $this->assertContains($externalIdentifier1, $externalKeys);
+        $this->assertContains($externalIdentifier2, $externalKeys);
+    }
 }
diff --git a/tests/Unit/Service/Import/Importer/ClockifyProjectsImporterTest.php b/tests/Unit/Service/Import/Importer/ClockifyProjectsImporterTest.php
new file mode 100644
index 00000000..598a7de7
--- /dev/null
+++ b/tests/Unit/Service/Import/Importer/ClockifyProjectsImporterTest.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Service\Import\Importer;
+
+use App\Models\Organization;
+use App\Service\Import\Importers\ClockifyProjectsImporter;
+
+class ClockifyProjectsImporterTest extends ImporterTestAbstract
+{
+    public function test_import_of_test_file_succeeds(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $importer = new ClockifyProjectsImporter();
+        $importer->init($organization);
+        $data = file_get_contents(storage_path('tests/clockify_projects_import_test_1.csv'));
+
+        // Act
+        $importer->importData($data, []);
+
+        // Assert
+        $this->checkTestScenarioProjectsOnlyAfterImport();
+    }
+
+    public function test_import_of_test_file_twice_succeeds(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $importer = new ClockifyProjectsImporter();
+        $importer->init($organization);
+        $data = file_get_contents(storage_path('tests/clockify_projects_import_test_1.csv'));
+        $importer->importData($data, []);
+        $importer = new ClockifyProjectsImporter();
+        $importer->init($organization);
+
+        // Act
+        $importer->importData($data, []);
+
+        // Assert
+        $this->checkTestScenarioProjectsOnlyAfterImport();
+    }
+}
diff --git a/tests/Unit/Service/Import/Importer/ClockifyTimeEntriesImporterTest.php b/tests/Unit/Service/Import/Importer/ClockifyTimeEntriesImporterTest.php
new file mode 100644
index 00000000..837646dc
--- /dev/null
+++ b/tests/Unit/Service/Import/Importer/ClockifyTimeEntriesImporterTest.php
@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Service\Import\Importer;
+
+use App\Models\Organization;
+use App\Models\TimeEntry;
+use App\Service\Import\Importers\ClockifyTimeEntriesImporter;
+
+class ClockifyTimeEntriesImporterTest extends ImporterTestAbstract
+{
+    public function test_import_of_test_file_succeeds(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $importer = new ClockifyTimeEntriesImporter();
+        $importer->init($organization);
+        $data = file_get_contents(storage_path('tests/clockify_time_entries_import_test_1.csv'));
+
+        // Act
+        $importer->importData($data, []);
+
+        // Assert
+        $testScenario = $this->checkTestScenarioAfterImportExcludingTimeEntries();
+        $timeEntries = TimeEntry::all();
+        $this->assertCount(2, $timeEntries);
+        $timeEntry1 = $timeEntries->firstWhere('description', '');
+        $this->assertNotNull($timeEntry1);
+        $this->assertSame('', $timeEntry1->description);
+        $this->assertSame('2024-03-04 10:23:52', $timeEntry1->start->toDateTimeString());
+        $this->assertSame('2024-03-04 10:23:52', $timeEntry1->end->toDateTimeString());
+        $this->assertFalse($timeEntry1->billable);
+        $this->assertSame([$testScenario->tag1->getKey(), $testScenario->tag2->getKey()], $timeEntry1->tags);
+        $timeEntry2 = $timeEntries->firstWhere('description', 'Working hard');
+        $this->assertNotNull($timeEntry2);
+        $this->assertSame('Working hard', $timeEntry2->description);
+        $this->assertSame('2024-03-04 10:23:00', $timeEntry2->start->toDateTimeString());
+        $this->assertSame('2024-03-04 11:23:01', $timeEntry2->end->toDateTimeString());
+        $this->assertTrue($timeEntry2->billable);
+        $this->assertSame([], $timeEntry2->tags);
+    }
+
+    public function test_import_of_test_file_twice_succeeds(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $importer = new ClockifyTimeEntriesImporter();
+        $importer->init($organization);
+        $data = file_get_contents(storage_path('tests/clockify_time_entries_import_test_1.csv'));
+        $importer->importData($data, []);
+        $importer = new ClockifyTimeEntriesImporter();
+        $importer->init($organization);
+
+        // Act
+        $importer->importData($data, []);
+
+        // Assert
+        $testScenario = $this->checkTestScenarioAfterImportExcludingTimeEntries();
+        $timeEntries = TimeEntry::all();
+        $this->assertCount(4, $timeEntries);
+        $timeEntry1 = $timeEntries->firstWhere('description', '');
+        $this->assertNotNull($timeEntry1);
+        $this->assertSame('', $timeEntry1->description);
+        $this->assertSame('2024-03-04 10:23:52', $timeEntry1->start->toDateTimeString());
+        $this->assertSame('2024-03-04 10:23:52', $timeEntry1->end->toDateTimeString());
+        $this->assertFalse($timeEntry1->billable);
+        $this->assertSame([$testScenario->tag1->getKey(), $testScenario->tag2->getKey()], $timeEntry1->tags);
+        $timeEntry2 = $timeEntries->firstWhere('description', 'Working hard');
+        $this->assertNotNull($timeEntry2);
+        $this->assertSame('Working hard', $timeEntry2->description);
+        $this->assertSame('2024-03-04 10:23:00', $timeEntry2->start->toDateTimeString());
+        $this->assertSame('2024-03-04 11:23:01', $timeEntry2->end->toDateTimeString());
+        $this->assertTrue($timeEntry2->billable);
+        $this->assertSame([], $timeEntry2->tags);
+    }
+}
diff --git a/tests/Unit/Service/Import/Importer/ImporterTestAbstract.php b/tests/Unit/Service/Import/Importer/ImporterTestAbstract.php
index 7b9c44ab..e22ed3a9 100644
--- a/tests/Unit/Service/Import/Importer/ImporterTestAbstract.php
+++ b/tests/Unit/Service/Import/Importer/ImporterTestAbstract.php
@@ -4,6 +4,7 @@
 
 namespace Tests\Unit\Service\Import\Importer;
 
+use App\Models\Client;
 use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
@@ -16,7 +17,7 @@ class ImporterTestAbstract extends TestCase
     use RefreshDatabase;
 
     /**
-     * @return object{user1: User, project1: Project, project2: Project, tag1: Tag}
+     * @return object{user1: User, project1: Project, project2: Project, tag1: Tag, tag2: Tag}
      */
     protected function checkTestScenarioAfterImportExcludingTimeEntries(): object
     {
@@ -27,20 +28,27 @@ protected function checkTestScenarioAfterImportExcludingTimeEntries(): object
         $this->assertSame(null, $user1->password);
         $this->assertSame('Peter Tester', $user1->name);
         $this->assertSame('peter.test@email.test', $user1->email);
+        $clients = Client::all();
+        $this->assertCount(1, $clients);
+        $client1 = $clients->firstWhere('name', 'Big Company');
+        $this->assertNotNull($client1);
         $projects = Project::all();
         $this->assertCount(2, $projects);
         $project1 = $projects->firstWhere('name', 'Project without Client');
         $this->assertNotNull($project1);
+        $this->assertNull($project1->client_id);
         $project2 = $projects->firstWhere('name', 'Project for Big Company');
         $this->assertNotNull($project2);
+        $this->assertSame($client1->getKey(), $project2->client_id);
         $tasks = Task::all();
         $this->assertCount(1, $tasks);
         $task1 = $tasks->firstWhere('name', 'Task 1');
         $this->assertNotNull($task1);
         $this->assertSame($project2->getKey(), $task1->project_id);
         $tags = Tag::all();
-        $this->assertCount(1, $tags);
+        $this->assertCount(2, $tags);
         $tag1 = $tags->firstWhere('name', 'Development');
+        $tag2 = $tags->firstWhere('name', 'Backend');
         $this->assertNotNull($tag1);
 
         return (object) [
@@ -48,6 +56,44 @@ protected function checkTestScenarioAfterImportExcludingTimeEntries(): object
             'project1' => $project1,
             'project2' => $project2,
             'tag1' => $tag1,
+            'tag2' => $tag2,
+        ];
+    }
+
+    /**
+     * @return object{client1: Client, project1: Project, project2: Project, task1: Task}
+     */
+    protected function checkTestScenarioProjectsOnlyAfterImport(): object
+    {
+        $clients = Client::all();
+        $this->assertCount(1, $clients);
+        $client1 = $clients->firstWhere('name', 'Big Company');
+        $this->assertNotNull($client1);
+        $projects = Project::all();
+        $this->assertCount(2, $projects);
+        $project1 = $projects->firstWhere('name', 'Project without Client');
+        $this->assertNotNull($project1);
+        $this->assertNull($project1->client_id);
+        $project2 = $projects->firstWhere('name', 'Project for Big Company');
+        $this->assertNotNull($project2);
+        $this->assertSame($client1->getKey(), $project2->client_id);
+        $tasks = Task::all();
+        $this->assertCount(3, $tasks);
+        $task1 = $tasks->firstWhere('name', 'Task 1');
+        $this->assertNotNull($task1);
+        $this->assertSame($project2->getKey(), $task1->project_id);
+        $task2 = $tasks->firstWhere('name', 'Task 2');
+        $this->assertNotNull($task2);
+        $this->assertSame($project2->getKey(), $task2->project_id);
+        $task3 = $tasks->firstWhere('name', 'Task 3');
+        $this->assertNotNull($task3);
+        $this->assertSame($project2->getKey(), $task3->project_id);
+
+        return (object) [
+            'client1' => $client1,
+            'project1' => $project1,
+            'project2' => $project2,
+            'task1' => $task1,
         ];
     }
 }
diff --git a/tests/Unit/Service/Import/Importer/TogglDataImporterTest.php b/tests/Unit/Service/Import/Importer/TogglDataImporterTest.php
new file mode 100644
index 00000000..a57c72b5
--- /dev/null
+++ b/tests/Unit/Service/Import/Importer/TogglDataImporterTest.php
@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Service\Import\Importer;
+
+use App\Models\Organization;
+use App\Service\Import\Importers\TogglDataImporter;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Spatie\TemporaryDirectory\TemporaryDirectory;
+use ZipArchive;
+
+class TogglDataImporterTest extends ImporterTestAbstract
+{
+    private function createTestZip(string $folder): string
+    {
+        $tempDir = TemporaryDirectory::make();
+        $zipPath = $tempDir->path('test.zip');
+        $zip = new ZipArchive();
+        $zip->open($zipPath, ZipArchive::CREATE);
+        foreach (Storage::disk('testfiles')->allFiles($folder) as $file) {
+            $zip->addFile(Storage::disk('testfiles')->path($file), Str::of($file)->after($folder.'/')->value());
+        }
+        $zip->close();
+
+        return $zipPath;
+    }
+
+    public function test_import_of_test_file_succeeds(): void
+    {
+        // Arrange
+        $zipPath = $this->createTestZip('toggl_data_import_test_1');
+        $organization = Organization::factory()->create();
+        $importer = new TogglDataImporter();
+        $importer->init($organization);
+        $data = file_get_contents($zipPath);
+
+        // Act
+        $importer->importData($data);
+
+        // Assert
+        $this->checkTestScenarioAfterImportExcludingTimeEntries();
+    }
+
+    public function test_import_of_test_file_twice_succeeds(): void
+    {
+        // Arrange
+        $zipPath = $this->createTestZip('toggl_data_import_test_1');
+        $organization = Organization::factory()->create();
+        $importer = new TogglDataImporter();
+        $importer->init($organization);
+        $data = file_get_contents($zipPath);
+        $importer->importData($data);
+        $importer = new TogglDataImporter();
+        $importer->init($organization);
+
+        // Act
+        $importer->importData($data);
+
+        // Assert
+        $this->checkTestScenarioAfterImportExcludingTimeEntries();
+    }
+}
diff --git a/tests/Unit/Service/Import/Importer/TogglTimeEntriesImporterTest.php b/tests/Unit/Service/Import/Importer/TogglTimeEntriesImporterTest.php
index 0e0f9ccf..28cca34b 100644
--- a/tests/Unit/Service/Import/Importer/TogglTimeEntriesImporterTest.php
+++ b/tests/Unit/Service/Import/Importer/TogglTimeEntriesImporterTest.php
@@ -16,13 +16,29 @@ public function test_import_of_test_file_succeeds(): void
         $organization = Organization::factory()->create();
         $importer = new TogglTimeEntriesImporter();
         $importer->init($organization);
-        $data = file_get_contents(storage_path('tests/toggl_import_test_1.csv'));
+        $data = file_get_contents(storage_path('tests/toggl_time_entries_import_test_1.csv'));
 
         // Act
         $importer->importData($data, []);
 
         // Assert
-        $this->checkTestScenarioAfterImportExcludingTimeEntries();
+        $testScenario = $this->checkTestScenarioAfterImportExcludingTimeEntries();
+        $timeEntries = TimeEntry::all();
+        $this->assertCount(2, $timeEntries);
+        $timeEntry1 = $timeEntries->firstWhere('description', '');
+        $this->assertNotNull($timeEntry1);
+        $this->assertSame('', $timeEntry1->description);
+        $this->assertSame('2024-03-04 10:23:52', $timeEntry1->start->toDateTimeString());
+        $this->assertSame('2024-03-04 10:23:52', $timeEntry1->end->toDateTimeString());
+        $this->assertFalse($timeEntry1->billable);
+        $this->assertSame([$testScenario->tag1->getKey(), $testScenario->tag2->getKey()], $timeEntry1->tags);
+        $timeEntry2 = $timeEntries->firstWhere('description', 'Working hard');
+        $this->assertNotNull($timeEntry2);
+        $this->assertSame('Working hard', $timeEntry2->description);
+        $this->assertSame('2024-03-04 10:23:00', $timeEntry2->start->toDateTimeString());
+        $this->assertSame('2024-03-04 11:23:01', $timeEntry2->end->toDateTimeString());
+        $this->assertTrue($timeEntry2->billable);
+        $this->assertSame([], $timeEntry2->tags);
     }
 
     public function test_import_of_test_file_twice_succeeds(): void
@@ -31,7 +47,7 @@ public function test_import_of_test_file_twice_succeeds(): void
         $organization = Organization::factory()->create();
         $importer = new TogglTimeEntriesImporter();
         $importer->init($organization);
-        $data = file_get_contents(storage_path('tests/toggl_import_test_1.csv'));
+        $data = file_get_contents(storage_path('tests/toggl_time_entries_import_test_1.csv'));
         $importer->importData($data, []);
         $importer = new TogglTimeEntriesImporter();
         $importer->init($organization);
@@ -49,7 +65,7 @@ public function test_import_of_test_file_twice_succeeds(): void
         $this->assertSame('2024-03-04 10:23:52', $timeEntry1->start->toDateTimeString());
         $this->assertSame('2024-03-04 10:23:52', $timeEntry1->end->toDateTimeString());
         $this->assertFalse($timeEntry1->billable);
-        $this->assertSame([$testScenario->tag1->getKey()], $timeEntry1->tags);
+        $this->assertSame([$testScenario->tag1->getKey(), $testScenario->tag2->getKey()], $timeEntry1->tags);
         $timeEntry2 = $timeEntries->firstWhere('description', 'Working hard');
         $this->assertNotNull($timeEntry2);
         $this->assertSame('Working hard', $timeEntry2->description);

From 0a6ec55be5b406739834d0b4d44241e19768ab0f Mon Sep 17 00:00:00 2001
From: korridor <26689068+korridor@users.noreply.github.com>
Date: Tue, 12 Mar 2024 17:46:27 +0100
Subject: [PATCH 10/20] Added default importer; Fixed bug in clockify importer

---
 .../V1/TimeEntry/TimeEntryStoreRequest.php    |   2 +-
 .../V1/TimeEntry/TimeEntryUpdateRequest.php   |   2 +-
 app/Service/Import/ImportDatabaseHelper.php   |  26 ++--
 .../Importers/ClockifyProjectsImporter.php    |  62 +---------
 .../Importers/ClockifyTimeEntriesImporter.php | 105 +++-------------
 .../Import/Importers/DefaultImporter.php      | 114 ++++++++++++++++++
 .../Import/Importers/TogglDataImporter.php    |  80 +-----------
 .../Importers/TogglTimeEntriesImporter.php    |  86 +------------
 .../2024_01_20_110444_create_tasks_table.php  |   2 +-
 ...01_20_110837_create_time_entries_table.php |   2 +-
 .../clockify_time_entries_import_test_1.csv   |   2 +-
 11 files changed, 157 insertions(+), 326 deletions(-)
 create mode 100644 app/Service/Import/Importers/DefaultImporter.php

diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php
index 8cbfd2fb..1a7850bd 100644
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php
@@ -61,7 +61,7 @@ public function rules(): array
             'description' => [
                 'nullable',
                 'string',
-                'max:255',
+                'max:500',
             ],
             // List of tag IDs
             'tags' => [
diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php
index f044ce72..ec7f1c5f 100644
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php
@@ -51,7 +51,7 @@ public function rules(): array
             'description' => [
                 'nullable',
                 'string',
-                'max:255',
+                'max:500',
             ],
             // List of tag IDs
             'tags' => [
diff --git a/app/Service/Import/ImportDatabaseHelper.php b/app/Service/Import/ImportDatabaseHelper.php
index 4f169614..12c785e6 100644
--- a/app/Service/Import/ImportDatabaseHelper.php
+++ b/app/Service/Import/ImportDatabaseHelper.php
@@ -8,7 +8,7 @@
 use Closure;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
 
 /**
  * @template TModel of Model
@@ -43,11 +43,13 @@ class ImportDatabaseHelper
 
     private int $createdCount;
 
+    private array $validate;
+
     /**
      * @param  class-string<TModel>  $model
      * @param  array<string>  $identifiers
      */
-    public function __construct(string $model, array $identifiers, bool $attachToExisting = false, ?Closure $queryModifier = null, ?Closure $afterCreate = null)
+    public function __construct(string $model, array $identifiers, bool $attachToExisting = false, ?Closure $queryModifier = null, ?Closure $afterCreate = null, array $validate = [])
     {
         $this->model = $model;
         $this->identifiers = $identifiers;
@@ -55,6 +57,7 @@ public function __construct(string $model, array $identifiers, bool $attachToExi
         $this->queryModifier = $queryModifier;
         $this->afterCreate = $afterCreate;
         $this->createdCount = 0;
+        $this->validate = $validate;
     }
 
     /**
@@ -71,11 +74,15 @@ private function getModelInstance(): Builder
      */
     private function createEntity(array $identifierData, array $createValues, ?string $externalIdentifier): string
     {
-        $model = new $this->model();
-        foreach ($identifierData as $identifier => $identifierValue) {
-            $model->{$identifier} = $identifierValue;
+        $data = array_merge($identifierData, $createValues);
+
+        $validator = Validator::make($data, $this->validate);
+        if ($validator->fails()) {
+            throw new ImportException('Invalid data: '.implode(', ', $validator->errors()->all()));
         }
-        foreach ($createValues as $key => $value) {
+
+        $model = new $this->model();
+        foreach ($data as $key => $value) {
             $model->{$key} = $value;
         }
         $model->save();
@@ -127,17 +134,10 @@ public function getKey(array $identifierData, array $createValues = [], ?string
                 if ($externalIdentifier !== null) {
                     $this->mapExternalIdentifierToInternalIdentifier[$externalIdentifier] = $hash;
                 }
-                Log::debug('HIT', [
-                    'class' => $this->model,
-                ]);
 
                 return $key;
             }
 
-            Log::debug('MISS', [
-                'class' => $this->model,
-            ]);
-
             return $this->createEntity($identifierData, $createValues, $externalIdentifier);
         } else {
             throw new \RuntimeException('Not implemented');
diff --git a/app/Service/Import/Importers/ClockifyProjectsImporter.php b/app/Service/Import/Importers/ClockifyProjectsImporter.php
index 5debbf91..d71c6cd9 100644
--- a/app/Service/Import/Importers/ClockifyProjectsImporter.php
+++ b/app/Service/Import/Importers/ClockifyProjectsImporter.php
@@ -4,51 +4,12 @@
 
 namespace App\Service\Import\Importers;
 
-use App\Models\Client;
-use App\Models\Organization;
-use App\Models\Project;
-use App\Models\Task;
-use App\Service\ColorService;
-use App\Service\Import\ImportDatabaseHelper;
 use Exception;
-use Illuminate\Database\Eloquent\Builder;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
 
-class ClockifyProjectsImporter implements ImporterContract
+class ClockifyProjectsImporter extends DefaultImporter
 {
-    private Organization $organization;
-
-    /**
-     * @var ImportDatabaseHelper<Project>
-     */
-    private ImportDatabaseHelper $projectImportHelper;
-
-    /**
-     * @var ImportDatabaseHelper<Client>
-     */
-    private ImportDatabaseHelper $clientImportHelper;
-
-    /**
-     * @var ImportDatabaseHelper<Task>
-     */
-    private ImportDatabaseHelper $taskImportHelper;
-
-    #[\Override]
-    public function init(Organization $organization): void
-    {
-        $this->organization = $organization;
-        $this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-        $this->clientImportHelper = new ImportDatabaseHelper(Client::class, ['name', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-        $this->taskImportHelper = new ImportDatabaseHelper(Task::class, ['name', 'project_id', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-    }
-
     /**
      * @throws ImportException
      */
@@ -56,7 +17,6 @@ public function init(Organization $organization): void
     public function importData(string $data): void
     {
         try {
-            $colorService = app(ColorService::class);
             $reader = Reader::createFromString($data);
             $reader->setHeaderOffset(0);
             $reader->setDelimiter(',');
@@ -78,17 +38,14 @@ public function importData(string $data): void
                         'organization_id' => $this->organization->id,
                     ], [
                         'client_id' => $clientId,
-                        'color' => $colorService->getRandomColor(),
+                        'color' => $this->colorService->getRandomColor(),
                     ]);
                 }
 
                 if ($record['Tasks'] !== '') {
                     $tasks = explode(', ', $record['Tasks']);
                     foreach ($tasks as $task) {
-                        if (strlen($task) > 255) {
-                            throw new ImportException('Task is too long');
-                        }
-                        $taskId = $this->taskImportHelper->getKey([
+                        $this->taskImportHelper->getKey([
                             'name' => $task,
                             'project_id' => $projectId,
                             'organization_id' => $this->organization->id,
@@ -127,17 +84,4 @@ private function validateHeader(array $header): void
             }
         }
     }
-
-    #[\Override]
-    public function getReport(): ReportDto
-    {
-        return new ReportDto(
-            clientsCreated: $this->clientImportHelper->getCreatedCount(),
-            projectsCreated: $this->projectImportHelper->getCreatedCount(),
-            tasksCreated: $this->taskImportHelper->getCreatedCount(),
-            timeEntriesCreated: 0,
-            tagsCreated: 0,
-            usersCreated: 0,
-        );
-    }
 }
diff --git a/app/Service/Import/Importers/ClockifyTimeEntriesImporter.php b/app/Service/Import/Importers/ClockifyTimeEntriesImporter.php
index bb7075cc..228b54df 100644
--- a/app/Service/Import/Importers/ClockifyTimeEntriesImporter.php
+++ b/app/Service/Import/Importers/ClockifyTimeEntriesImporter.php
@@ -4,79 +4,14 @@
 
 namespace App\Service\Import\Importers;
 
-use App\Models\Client;
-use App\Models\Organization;
-use App\Models\Project;
-use App\Models\Tag;
-use App\Models\Task;
 use App\Models\TimeEntry;
-use App\Models\User;
-use App\Service\ColorService;
-use App\Service\Import\ImportDatabaseHelper;
 use Exception;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
 
-class ClockifyTimeEntriesImporter implements ImporterContract
+class ClockifyTimeEntriesImporter extends DefaultImporter
 {
-    private Organization $organization;
-
-    /**
-     * @var ImportDatabaseHelper<User>
-     */
-    private ImportDatabaseHelper $userImportHelper;
-
-    /**
-     * @var ImportDatabaseHelper<Project>
-     */
-    private ImportDatabaseHelper $projectImportHelper;
-
-    /**
-     * @var ImportDatabaseHelper<Tag>
-     */
-    private ImportDatabaseHelper $tagImportHelper;
-
-    /**
-     * @var ImportDatabaseHelper<Client>
-     */
-    private ImportDatabaseHelper $clientImportHelper;
-
-    /**
-     * @var ImportDatabaseHelper<Task>
-     */
-    private ImportDatabaseHelper $taskImportHelper;
-
-    private int $timeEntriesCreated;
-
-    #[\Override]
-    public function init(Organization $organization): void
-    {
-        $this->organization = $organization;
-        $this->userImportHelper = new ImportDatabaseHelper(User::class, ['email'], true, function (Builder $builder) {
-            /** @var Builder<User> $builder */
-            return $builder->belongsToOrganization($this->organization);
-        }, function (User $user) {
-            $user->organizations()->attach($this->organization, [
-                'role' => 'placeholder',
-            ]);
-        });
-        $this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-        $this->tagImportHelper = new ImportDatabaseHelper(Tag::class, ['name', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-        $this->clientImportHelper = new ImportDatabaseHelper(Client::class, ['name', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-        $this->taskImportHelper = new ImportDatabaseHelper(Task::class, ['name', 'project_id', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-        $this->timeEntriesCreated = 0;
-    }
-
     /**
      * @return array<string>
      *
@@ -90,9 +25,6 @@ private function getTags(string $tags): array
         $tagsParsed = explode(', ', $tags);
         $tagIds = [];
         foreach ($tagsParsed as $tagParsed) {
-            if (strlen($tagParsed) > 255) {
-                throw new ImportException('Tag is too long');
-            }
             $tagId = $this->tagImportHelper->getKey([
                 'name' => $tagParsed,
                 'organization_id' => $this->organization->id,
@@ -110,7 +42,6 @@ private function getTags(string $tags): array
     public function importData(string $data): void
     {
         try {
-            $colorService = app(ColorService::class);
             $reader = Reader::createFromString($data);
             $reader->setHeaderOffset(0);
             $reader->setDelimiter(',');
@@ -138,7 +69,7 @@ public function importData(string $data): void
                         'organization_id' => $this->organization->id,
                     ], [
                         'client_id' => $clientId,
-                        'color' => $colorService->getRandomColor(),
+                        'color' => $this->colorService->getRandomColor(),
                     ]);
                 }
                 $taskId = null;
@@ -154,18 +85,33 @@ public function importData(string $data): void
                 $timeEntry->task_id = $taskId;
                 $timeEntry->project_id = $projectId;
                 $timeEntry->organization_id = $this->organization->id;
+                if (strlen($record['Description']) > 500) {
+                    throw new ImportException('Time entry description is too long');
+                }
                 $timeEntry->description = $record['Description'];
                 if (! in_array($record['Billable'], ['Yes', 'No'], true)) {
                     throw new ImportException('Invalid billable value');
                 }
                 $timeEntry->billable = $record['Billable'] === 'Yes';
                 $timeEntry->tags = $this->getTags($record['Tags']);
-                $start = Carbon::createFromFormat('m/d/Y H:i:s A', $record['Start Date'].' '.$record['Start Time'], 'UTC');
+
+                // Start
+                if (preg_match('/^[0-9]{1,2}:[0-9]{1,2} (AM|PM)$/', $record['Start Time']) === 1) {
+                    $start = Carbon::createFromFormat('m/d/Y h:i A', $record['Start Date'].' '.$record['Start Time'], 'UTC');
+                } else {
+                    $start = Carbon::createFromFormat('m/d/Y H:i:s A', $record['Start Date'].' '.$record['Start Time'], 'UTC');
+                }
                 if ($start === false) {
                     throw new ImportException('Start date ("'.$record['Start Date'].'") or time ("'.$record['Start Time'].'") are invalid');
                 }
                 $timeEntry->start = $start;
-                $end = Carbon::createFromFormat('m/d/Y H:i:s A', $record['End Date'].' '.$record['End Time'], 'UTC');
+
+                // End
+                if (preg_match('/^[0-9]{1,2}:[0-9]{1,2} (AM|PM)$/', $record['End Time']) === 1) {
+                    $end = Carbon::createFromFormat('m/d/Y h:i A', $record['End Date'].' '.$record['End Time'], 'UTC');
+                } else {
+                    $end = Carbon::createFromFormat('m/d/Y H:i:s A', $record['End Date'].' '.$record['End Time'], 'UTC');
+                }
                 if ($end === false) {
                     throw new ImportException('End date ("'.$record['End Date'].'") or time ("'.$record['End Time'].'") are invalid');
                 }
@@ -211,17 +157,4 @@ private function validateHeader(array $header): void
             }
         }
     }
-
-    #[\Override]
-    public function getReport(): ReportDto
-    {
-        return new ReportDto(
-            clientsCreated: $this->clientImportHelper->getCreatedCount(),
-            projectsCreated: $this->projectImportHelper->getCreatedCount(),
-            tasksCreated: $this->taskImportHelper->getCreatedCount(),
-            timeEntriesCreated: $this->timeEntriesCreated,
-            tagsCreated: $this->tagImportHelper->getCreatedCount(),
-            usersCreated: $this->userImportHelper->getCreatedCount(),
-        );
-    }
 }
diff --git a/app/Service/Import/Importers/DefaultImporter.php b/app/Service/Import/Importers/DefaultImporter.php
new file mode 100644
index 00000000..e60cef51
--- /dev/null
+++ b/app/Service/Import/Importers/DefaultImporter.php
@@ -0,0 +1,114 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Import\Importers;
+
+use App\Models\Client;
+use App\Models\Organization;
+use App\Models\Project;
+use App\Models\Tag;
+use App\Models\Task;
+use App\Models\User;
+use App\Service\ColorService;
+use App\Service\Import\ImportDatabaseHelper;
+use Illuminate\Database\Eloquent\Builder;
+
+abstract class DefaultImporter implements ImporterContract
+{
+    protected Organization $organization;
+
+    /**
+     * @var ImportDatabaseHelper<User>
+     */
+    protected ImportDatabaseHelper $userImportHelper;
+
+    /**
+     * @var ImportDatabaseHelper<Project>
+     */
+    protected ImportDatabaseHelper $projectImportHelper;
+
+    /**
+     * @var ImportDatabaseHelper<Tag>
+     */
+    protected ImportDatabaseHelper $tagImportHelper;
+
+    /**
+     * @var ImportDatabaseHelper<Client>
+     */
+    protected ImportDatabaseHelper $clientImportHelper;
+
+    /**
+     * @var ImportDatabaseHelper<Task>
+     */
+    protected ImportDatabaseHelper $taskImportHelper;
+
+    protected int $timeEntriesCreated;
+
+    protected ColorService $colorService;
+
+    public function init(Organization $organization): void
+    {
+        $this->organization = $organization;
+        $this->userImportHelper = new ImportDatabaseHelper(User::class, ['email'], true, function (Builder $builder) {
+            /** @var Builder<User> $builder */
+            return $builder->belongsToOrganization($this->organization);
+        }, function (User $user) {
+            $user->organizations()->attach($this->organization, [
+                'role' => 'placeholder',
+            ]);
+        }, validate: [
+            'name' => [
+                'required',
+                'max:255',
+            ],
+        ]);
+        $this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        }, validate: [
+            'name' => [
+                'required',
+                'max:255',
+            ],
+        ]);
+        $this->tagImportHelper = new ImportDatabaseHelper(Tag::class, ['name', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        }, validate: [
+            'name' => [
+                'required',
+                'max:255',
+            ],
+        ]);
+        $this->clientImportHelper = new ImportDatabaseHelper(Client::class, ['name', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        }, validate: [
+            'name' => [
+                'required',
+                'max:255',
+            ],
+        ]);
+        $this->taskImportHelper = new ImportDatabaseHelper(Task::class, ['name', 'project_id', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        }, validate: [
+            'name' => [
+                'required',
+                'max:500',
+            ],
+        ]);
+        $this->timeEntriesCreated = 0;
+        $this->colorService = app(ColorService::class);
+    }
+
+    #[\Override]
+    public function getReport(): ReportDto
+    {
+        return new ReportDto(
+            clientsCreated: $this->clientImportHelper->getCreatedCount(),
+            projectsCreated: $this->projectImportHelper->getCreatedCount(),
+            tasksCreated: $this->taskImportHelper->getCreatedCount(),
+            timeEntriesCreated: $this->timeEntriesCreated,
+            tagsCreated: $this->tagImportHelper->getCreatedCount(),
+            usersCreated: $this->userImportHelper->getCreatedCount(),
+        );
+    }
+}
diff --git a/app/Service/Import/Importers/TogglDataImporter.php b/app/Service/Import/Importers/TogglDataImporter.php
index 2183b2d9..d6c8415e 100644
--- a/app/Service/Import/Importers/TogglDataImporter.php
+++ b/app/Service/Import/Importers/TogglDataImporter.php
@@ -4,77 +4,12 @@
 
 namespace App\Service\Import\Importers;
 
-use App\Models\Client;
-use App\Models\Organization;
-use App\Models\Project;
-use App\Models\Tag;
-use App\Models\Task;
-use App\Models\User;
-use App\Service\ColorService;
-use App\Service\Import\ImportDatabaseHelper;
 use Exception;
-use Illuminate\Database\Eloquent\Builder;
 use Spatie\TemporaryDirectory\TemporaryDirectory;
 use ZipArchive;
 
-class TogglDataImporter implements ImporterContract
+class TogglDataImporter extends DefaultImporter
 {
-    private Organization $organization;
-
-    /**
-     * @var ImportDatabaseHelper<User>
-     */
-    private ImportDatabaseHelper $userImportHelper;
-
-    /**
-     * @var ImportDatabaseHelper<Project>
-     */
-    private ImportDatabaseHelper $projectImportHelper;
-
-    /**
-     * @var ImportDatabaseHelper<Tag>
-     */
-    private ImportDatabaseHelper $tagImportHelper;
-
-    /**
-     * @var ImportDatabaseHelper<Client>
-     */
-    private ImportDatabaseHelper $clientImportHelper;
-
-    /**
-     * @var ImportDatabaseHelper<Task>
-     */
-    private ImportDatabaseHelper $taskImportHelper;
-
-    private ColorService $colorService;
-
-    #[\Override]
-    public function init(Organization $organization): void
-    {
-        $this->organization = $organization;
-        $this->userImportHelper = new ImportDatabaseHelper(User::class, ['email'], true, function (Builder $builder) {
-            /** @var Builder<User> $builder */
-            return $builder->belongsToOrganization($this->organization);
-        }, function (User $user) {
-            $user->organizations()->attach($this->organization, [
-                'role' => 'placeholder',
-            ]);
-        });
-        $this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-        $this->tagImportHelper = new ImportDatabaseHelper(Tag::class, ['name', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-        $this->clientImportHelper = new ImportDatabaseHelper(Client::class, ['name', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-        $this->taskImportHelper = new ImportDatabaseHelper(Task::class, ['name', 'project_id', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-        $this->colorService = app(ColorService::class);
-    }
-
     /**
      * @throws ImportException
      */
@@ -178,17 +113,4 @@ public function importData(string $data): void
             throw new ImportException('Unknown error');
         }
     }
-
-    #[\Override]
-    public function getReport(): ReportDto
-    {
-        return new ReportDto(
-            clientsCreated: $this->clientImportHelper->getCreatedCount(),
-            projectsCreated: $this->projectImportHelper->getCreatedCount(),
-            tasksCreated: $this->taskImportHelper->getCreatedCount(),
-            timeEntriesCreated: 0,
-            tagsCreated: $this->tagImportHelper->getCreatedCount(),
-            usersCreated: $this->userImportHelper->getCreatedCount(),
-        );
-    }
 }
diff --git a/app/Service/Import/Importers/TogglTimeEntriesImporter.php b/app/Service/Import/Importers/TogglTimeEntriesImporter.php
index 74740496..99f301f5 100644
--- a/app/Service/Import/Importers/TogglTimeEntriesImporter.php
+++ b/app/Service/Import/Importers/TogglTimeEntriesImporter.php
@@ -4,79 +4,14 @@
 
 namespace App\Service\Import\Importers;
 
-use App\Models\Client;
-use App\Models\Organization;
-use App\Models\Project;
-use App\Models\Tag;
-use App\Models\Task;
 use App\Models\TimeEntry;
-use App\Models\User;
-use App\Service\ColorService;
-use App\Service\Import\ImportDatabaseHelper;
 use Exception;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
 
-class TogglTimeEntriesImporter implements ImporterContract
+class TogglTimeEntriesImporter extends DefaultImporter
 {
-    private Organization $organization;
-
-    /**
-     * @var ImportDatabaseHelper<User>
-     */
-    private ImportDatabaseHelper $userImportHelper;
-
-    /**
-     * @var ImportDatabaseHelper<Project>
-     */
-    private ImportDatabaseHelper $projectImportHelper;
-
-    /**
-     * @var ImportDatabaseHelper<Tag>
-     */
-    private ImportDatabaseHelper $tagImportHelper;
-
-    /**
-     * @var ImportDatabaseHelper<Client>
-     */
-    private ImportDatabaseHelper $clientImportHelper;
-
-    /**
-     * @var ImportDatabaseHelper<Task>
-     */
-    private ImportDatabaseHelper $taskImportHelper;
-
-    private int $timeEntriesCreated;
-
-    #[\Override]
-    public function init(Organization $organization): void
-    {
-        $this->organization = $organization;
-        $this->userImportHelper = new ImportDatabaseHelper(User::class, ['email'], true, function (Builder $builder) {
-            /** @var Builder<User> $builder */
-            return $builder->belongsToOrganization($this->organization);
-        }, function (User $user) {
-            $user->organizations()->attach($this->organization, [
-                'role' => 'placeholder',
-            ]);
-        });
-        $this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-        $this->tagImportHelper = new ImportDatabaseHelper(Tag::class, ['name', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-        $this->clientImportHelper = new ImportDatabaseHelper(Client::class, ['name', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-        $this->taskImportHelper = new ImportDatabaseHelper(Task::class, ['name', 'project_id', 'organization_id'], true, function (Builder $builder) {
-            return $builder->where('organization_id', $this->organization->id);
-        });
-        $this->timeEntriesCreated = 0;
-    }
-
     /**
      * @return array<string>
      *
@@ -90,9 +25,6 @@ private function getTags(string $tags): array
         $tagsParsed = explode(', ', $tags);
         $tagIds = [];
         foreach ($tagsParsed as $tagParsed) {
-            if (strlen($tagParsed) > 255) {
-                throw new ImportException('Tag is too long');
-            }
             $tagId = $this->tagImportHelper->getKey([
                 'name' => $tagParsed,
                 'organization_id' => $this->organization->id,
@@ -110,7 +42,6 @@ private function getTags(string $tags): array
     public function importData(string $data): void
     {
         try {
-            $colorService = app(ColorService::class);
             $reader = Reader::createFromString($data);
             $reader->setHeaderOffset(0);
             $reader->setDelimiter(',');
@@ -138,7 +69,7 @@ public function importData(string $data): void
                         'organization_id' => $this->organization->id,
                     ], [
                         'client_id' => $clientId,
-                        'color' => $colorService->getRandomColor(),
+                        'color' => $this->colorService->getRandomColor(),
                     ]);
                 }
                 $taskId = null;
@@ -210,17 +141,4 @@ private function validateHeader(array $header): void
             }
         }
     }
-
-    #[\Override]
-    public function getReport(): ReportDto
-    {
-        return new ReportDto(
-            clientsCreated: $this->clientImportHelper->getCreatedCount(),
-            projectsCreated: $this->projectImportHelper->getCreatedCount(),
-            tasksCreated: $this->taskImportHelper->getCreatedCount(),
-            timeEntriesCreated: $this->timeEntriesCreated,
-            tagsCreated: $this->tagImportHelper->getCreatedCount(),
-            usersCreated: $this->userImportHelper->getCreatedCount(),
-        );
-    }
 }
diff --git a/database/migrations/2024_01_20_110444_create_tasks_table.php b/database/migrations/2024_01_20_110444_create_tasks_table.php
index 876508f2..4a0a4848 100644
--- a/database/migrations/2024_01_20_110444_create_tasks_table.php
+++ b/database/migrations/2024_01_20_110444_create_tasks_table.php
@@ -15,7 +15,7 @@ public function up(): void
     {
         Schema::create('tasks', function (Blueprint $table) {
             $table->uuid('id')->primary();
-            $table->string('name', 255);
+            $table->string('name', 500);
             $table->uuid('project_id');
             $table->foreign('project_id')
                 ->references('id')
diff --git a/database/migrations/2024_01_20_110837_create_time_entries_table.php b/database/migrations/2024_01_20_110837_create_time_entries_table.php
index ed5ef5fb..5fa5e9fb 100644
--- a/database/migrations/2024_01_20_110837_create_time_entries_table.php
+++ b/database/migrations/2024_01_20_110837_create_time_entries_table.php
@@ -15,7 +15,7 @@ public function up(): void
     {
         Schema::create('time_entries', function (Blueprint $table) {
             $table->uuid('id')->primary();
-            $table->string('description', 255);
+            $table->string('description', 500);
             $table->dateTime('start');
             $table->dateTime('end')->nullable();
             $table->boolean('billable')->default(false);
diff --git a/storage/tests/clockify_time_entries_import_test_1.csv b/storage/tests/clockify_time_entries_import_test_1.csv
index b7b1f1ce..b8f3295c 100644
--- a/storage/tests/clockify_time_entries_import_test_1.csv
+++ b/storage/tests/clockify_time_entries_import_test_1.csv
@@ -1,3 +1,3 @@
 "Project","Client","Description","Task","User","Group","Email","Tags","Billable","Start Date","Start Time","End Date","End Time","Duration (h)","Duration (decimal)","Billable Rate (USD)","Billable Amount (USD)"
 "Project without Client","","","","Peter Tester","","peter.test@email.test","Development, Backend","No","03/04/2024","10:23:52 AM","03/04/2024","10:23:52 AM","00:00:00","0.00","0.00","0.00"
-"Project for Big Company","Big Company","Working hard","Task 1","Peter Tester","","peter.test@email.test","","Yes","03/04/2024","10:23:00 AM","03/04/2024","11:23:01 AM","01:00:01","0.00","0.00","0.00"
+"Project for Big Company","Big Company","Working hard","Task 1","Peter Tester","","peter.test@email.test","","Yes","03/04/2024","10:23 AM","03/04/2024","11:23:01 AM","01:00:01","0.00","0.00","0.00"

From 91d70694f088e1c1f37cf8ab1b4ae35083c4d1a1 Mon Sep 17 00:00:00 2001
From: korridor <26689068+korridor@users.noreply.github.com>
Date: Tue, 12 Mar 2024 17:46:48 +0100
Subject: [PATCH 11/20] Enhanced filament resources

---
 app/Filament/Resources/ClientResource.php     | 11 +++-
 .../Resources/OrganizationResource.php        | 11 ++--
 .../RelationManagers/UsersRelationManager.php | 51 +++++++++++++++++++
 app/Filament/Resources/UserResource.php       | 14 +++--
 .../UserResource/Pages/CreateUser.php         | 14 +++++
 .../OrganizationsRelationManager.php          | 50 ++++++++++++++++++
 .../OwnedOrganizationsRelationManager.php     | 47 +++++++++++++++++
 7 files changed, 189 insertions(+), 9 deletions(-)
 create mode 100644 app/Filament/Resources/OrganizationResource/RelationManagers/UsersRelationManager.php
 create mode 100644 app/Filament/Resources/UserResource/RelationManagers/OrganizationsRelationManager.php
 create mode 100644 app/Filament/Resources/UserResource/RelationManagers/OwnedOrganizationsRelationManager.php

diff --git a/app/Filament/Resources/ClientResource.php b/app/Filament/Resources/ClientResource.php
index 5e0b44d6..dee96260 100644
--- a/app/Filament/Resources/ClientResource.php
+++ b/app/Filament/Resources/ClientResource.php
@@ -6,6 +6,8 @@
 
 use App\Filament\Resources\ClientResource\Pages;
 use App\Models\Client;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
@@ -26,7 +28,14 @@ public static function form(Form $form): Form
     {
         return $form
             ->schema([
-                //
+                TextInput::make('name')
+                    ->label('Name')
+                    ->required(),
+                Select::make('organization_id')
+                    ->relationship(name: 'organization', titleAttribute: 'name')
+                    ->label('Organization')
+                    ->searchable(['name'])
+                    ->required(),
             ]);
     }
 
diff --git a/app/Filament/Resources/OrganizationResource.php b/app/Filament/Resources/OrganizationResource.php
index eb2a9e0d..080a5993 100644
--- a/app/Filament/Resources/OrganizationResource.php
+++ b/app/Filament/Resources/OrganizationResource.php
@@ -5,6 +5,7 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\OrganizationResource\Pages;
+use App\Filament\Resources\OrganizationResource\RelationManagers\UsersRelationManager;
 use App\Models\Organization;
 use App\Service\Import\Importers\ImporterProvider;
 use App\Service\Import\Importers\ImportException;
@@ -71,10 +72,13 @@ public static function table(Table $table): Table
                 Action::make('Import')
                     ->icon('heroicon-o-inbox-arrow-down')
                     ->action(function (Organization $record, array $data) {
-                        // TODO: different disk!
                         try {
                             /** @var ReportDto $report */
-                            $report = app(ImportService::class)->import($record, $data['type'], Storage::disk('public')->get($data['file']));
+                            $report = app(ImportService::class)->import(
+                                $record,
+                                $data['type'],
+                                Storage::disk(config('filament.default_filesystem_disk'))->get($data['file'])
+                            );
                             Notification::make()
                                 ->title('Import successful')
                                 ->success()
@@ -101,7 +105,6 @@ public static function table(Table $table): Table
                     ->tooltip(fn (Organization $record): string => 'Import into '.$record->name)
                     ->form([
                         Forms\Components\FileUpload::make('file')
-                            // TODO: disk!
                             ->label('File')
                             ->required(),
                         Select::make('type')
@@ -126,7 +129,7 @@ public static function table(Table $table): Table
     public static function getRelations(): array
     {
         return [
-            //
+            UsersRelationManager::class,
         ];
     }
 
diff --git a/app/Filament/Resources/OrganizationResource/RelationManagers/UsersRelationManager.php b/app/Filament/Resources/OrganizationResource/RelationManagers/UsersRelationManager.php
new file mode 100644
index 00000000..a923e49e
--- /dev/null
+++ b/app/Filament/Resources/OrganizationResource/RelationManagers/UsersRelationManager.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources\OrganizationResource\RelationManagers;
+
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class UsersRelationManager extends RelationManager
+{
+    protected static string $relationship = 'users';
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\TextInput::make('name')
+                    ->required()
+                    ->maxLength(255),
+            ]);
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->recordTitleAttribute('name')
+            ->columns([
+                Tables\Columns\TextColumn::make('name'),
+                Tables\Columns\TextColumn::make('role'),
+            ])
+            ->filters([
+                //
+            ])
+            ->headerActions([
+                Tables\Actions\CreateAction::make(),
+            ])
+            ->actions([
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DeleteAction::make(),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+}
diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php
index a5d3681b..c1568b10 100644
--- a/app/Filament/Resources/UserResource.php
+++ b/app/Filament/Resources/UserResource.php
@@ -5,12 +5,16 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\UserResource\Pages;
+use App\Filament\Resources\UserResource\RelationManagers\OrganizationsRelationManager;
+use App\Filament\Resources\UserResource\RelationManagers\OwnedOrganizationsRelationManager;
 use App\Models\User;
 use Filament\Forms;
+use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Illuminate\Support\Facades\Hash;
 
 class UserResource extends Resource
 {
@@ -41,10 +45,11 @@ public static function form(Form $form): Form
                     ->label('Email')
                     ->required()
                     ->maxLength(255),
-                Forms\Components\TextInput::make('password')
-                    ->label('Password')
-                    ->required()
+                TextInput::make('password')
                     ->password()
+                    ->dehydrateStateUsing(fn ($state) => Hash::make($state))
+                    ->dehydrated(fn ($state) => filled($state))
+                    ->required(fn (string $context): bool => $context === 'create')
                     ->maxLength(255),
             ]);
     }
@@ -77,7 +82,8 @@ public static function table(Table $table): Table
     public static function getRelations(): array
     {
         return [
-            //
+            OwnedOrganizationsRelationManager::class,
+            OrganizationsRelationManager::class,
         ];
     }
 
diff --git a/app/Filament/Resources/UserResource/Pages/CreateUser.php b/app/Filament/Resources/UserResource/Pages/CreateUser.php
index 72b81bb0..b5cac367 100644
--- a/app/Filament/Resources/UserResource/Pages/CreateUser.php
+++ b/app/Filament/Resources/UserResource/Pages/CreateUser.php
@@ -5,9 +5,23 @@
 namespace App\Filament\Resources\UserResource\Pages;
 
 use App\Filament\Resources\UserResource;
+use App\Models\Organization;
+use App\Models\User;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateUser extends CreateRecord
 {
     protected static string $resource = UserResource::class;
+
+    protected function afterCreate(): void
+    {
+        /** @var User $user */
+        $user = $this->record;
+
+        $user->ownedTeams()->save(Organization::forceCreate([
+            'user_id' => $user->id,
+            'name' => explode(' ', $user->name, 2)[0]."'s Organization",
+            'personal_team' => true,
+        ]));
+    }
 }
diff --git a/app/Filament/Resources/UserResource/RelationManagers/OrganizationsRelationManager.php b/app/Filament/Resources/UserResource/RelationManagers/OrganizationsRelationManager.php
new file mode 100644
index 00000000..ac67f248
--- /dev/null
+++ b/app/Filament/Resources/UserResource/RelationManagers/OrganizationsRelationManager.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources\UserResource\RelationManagers;
+
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class OrganizationsRelationManager extends RelationManager
+{
+    protected static string $relationship = 'organizations';
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\TextInput::make('name')
+                    ->required()
+                    ->maxLength(255),
+            ]);
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->recordTitleAttribute('name')
+            ->columns([
+                Tables\Columns\TextColumn::make('name'),
+            ])
+            ->filters([
+                //
+            ])
+            ->headerActions([
+                Tables\Actions\CreateAction::make(),
+            ])
+            ->actions([
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DeleteAction::make(),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+}
diff --git a/app/Filament/Resources/UserResource/RelationManagers/OwnedOrganizationsRelationManager.php b/app/Filament/Resources/UserResource/RelationManagers/OwnedOrganizationsRelationManager.php
new file mode 100644
index 00000000..7630ec26
--- /dev/null
+++ b/app/Filament/Resources/UserResource/RelationManagers/OwnedOrganizationsRelationManager.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources\UserResource\RelationManagers;
+
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class OwnedOrganizationsRelationManager extends RelationManager
+{
+    protected static ?string $title = 'Owned Organizations';
+
+    protected static string $relationship = 'ownedTeams';
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\TextInput::make('name')
+                    ->required()
+                    ->maxLength(255),
+            ]);
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->recordTitleAttribute('name')
+            ->columns([
+                Tables\Columns\TextColumn::make('name'),
+            ])
+            ->filters([
+                //
+            ])
+            ->headerActions([
+            ])
+            ->actions([
+                Tables\Actions\EditAction::make(),
+            ])
+            ->bulkActions([
+            ]);
+    }
+}

From a71ba54396020b2b10ee69a9f003e4528346e559 Mon Sep 17 00:00:00 2001
From: korridor <26689068+korridor@users.noreply.github.com>
Date: Tue, 12 Mar 2024 18:33:47 +0100
Subject: [PATCH 12/20] Fixes after merge

---
 .env.ci                                       |  17 +-
 .env.example                                  |   8 +
 .github/workflows/phpunit.yml                 |   2 +-
 .github/workflows/playwright.yml              |   2 +-
 .../V1/TimeEntry/TimeEntryIndexRequest.php    |   3 +-
 app/Service/Import/ImportDatabaseHelper.php   |   4 +
 config/database.php                           |  15 ++
 database/seeders/DatabaseSeeder.php           |   2 +
 openapi.json.client.ts                        | 160 +++++++++++++++++-
 phpunit.xml                                   |   3 +-
 playwright.config.ts                          |   2 +-
 .../Endpoint/Api/V1/TimeEntryEndpointTest.php |   2 +-
 12 files changed, 205 insertions(+), 15 deletions(-)

diff --git a/.env.ci b/.env.ci
index 5b3d9af2..d1ef4db2 100644
--- a/.env.ci
+++ b/.env.ci
@@ -1,19 +1,22 @@
-APP_NAME=Laravel
+APP_NAME=solidtime
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
+APP_FORCE_HTTPS=false
+SESSION_SECURE_COOKIE=false
 
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
-DB_CONNECTION=pgsql
-DB_HOST=127.0.0.1
-DB_PORT=5432
-DB_DATABASE=laravel
-DB_USERNAME=root
-DB_PASSWORD=root
+DB_CONNECTION=pgsql_test
+
+DB_TEST_HOST=127.0.0.1
+DB_TEST_PORT=5432
+DB_TEST_DATABASE=laravel
+DB_TEST_USERNAME=root
+DB_TEST_PASSWORD=root
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
diff --git a/.env.example b/.env.example
index ed50bd57..64023886 100644
--- a/.env.example
+++ b/.env.example
@@ -4,6 +4,7 @@ APP_KEY=base64:UNQNf1SXeASNkWux01Rj8EnHYx8FO0kAxWNDwktclkk=
 APP_DEBUG=true
 APP_URL=https://solidtime.test
 APP_FORCE_HTTPS=true
+SESSION_SECURE_COOKIE=true
 
 SUPER_ADMINS=admin@example.com
 
@@ -12,12 +13,19 @@ LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
 DB_CONNECTION=pgsql
+
 DB_HOST=pgsql
 DB_PORT=5432
 DB_DATABASE=laravel
 DB_USERNAME=root
 DB_PASSWORD=root
 
+DB_TEST_HOST=pgsql_test
+DB_TEST_PORT=5432
+DB_TEST_DATABASE=laravel
+DB_TEST_USERNAME=root
+DB_TEST_PASSWORD=root
+
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 FILESYSTEM_DISK=local
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index a5d7dd47..740d2d53 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
 
     services:
-      pgsql:
+      pgsql_test:
         image: postgres:15
         env:
           PGPASSWORD: 'root'
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index 141b73e2..5db1823b 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -11,7 +11,7 @@ jobs:
     services:
       mailpit:
         image: 'axllent/mailpit:latest'
-      pgsql:
+      pgsql_test:
         image: postgres:15
         env:
           PGPASSWORD: 'root'
diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php
index 92d9a591..de310a2d 100644
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php
@@ -48,7 +48,8 @@ public function rules(): array
             ],
             // Filter only time entries that are active (have no end date, are still running)
             'active' => [
-                'boolean',
+                'string',
+                'in:true,false',
             ],
             // Limit the number of returned time entries
             'limit' => [
diff --git a/app/Service/Import/ImportDatabaseHelper.php b/app/Service/Import/ImportDatabaseHelper.php
index 12c785e6..3c02285a 100644
--- a/app/Service/Import/ImportDatabaseHelper.php
+++ b/app/Service/Import/ImportDatabaseHelper.php
@@ -43,11 +43,15 @@ class ImportDatabaseHelper
 
     private int $createdCount;
 
+    /**
+     * @var array<string, array<int, string>>
+     */
     private array $validate;
 
     /**
      * @param  class-string<TModel>  $model
      * @param  array<string>  $identifiers
+     * @param  array<string, array<int, string>>  $validate
      */
     public function __construct(string $model, array $identifiers, bool $attachToExisting = false, ?Closure $queryModifier = null, ?Closure $afterCreate = null, array $validate = [])
     {
diff --git a/config/database.php b/config/database.php
index f75f0d9f..5ac598cc 100644
--- a/config/database.php
+++ b/config/database.php
@@ -80,6 +80,21 @@
             'sslmode' => 'prefer',
         ],
 
+        'pgsql_test' => [
+            'driver' => 'pgsql',
+            'url' => env('DATABASE_URL'),
+            'host' => env('DB_TEST_HOST', '127.0.0.1'),
+            'port' => env('DB_TEST_PORT', '5432'),
+            'database' => env('DB_TEST_DATABASE', 'forge'),
+            'username' => env('DB_TEST_USERNAME', 'forge'),
+            'password' => env('DB_TEST_PASSWORD', ''),
+            'charset' => 'utf8',
+            'prefix' => '',
+            'prefix_indexes' => true,
+            'search_path' => 'public',
+            'sslmode' => 'prefer',
+        ],
+
         'sqlsrv' => [
             'driver' => 'sqlsrv',
             'url' => env('DATABASE_URL'),
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index b59a486d..2e057b52 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -8,6 +8,7 @@
 use App\Models\Client;
 use App\Models\Organization;
 use App\Models\Project;
+use App\Models\Tag;
 use App\Models\Task;
 use App\Models\TimeEntry;
 use App\Models\User;
@@ -109,6 +110,7 @@ private function deleteAll(): void
     {
         DB::table((new TimeEntry())->getTable())->delete();
         DB::table((new Task())->getTable())->delete();
+        DB::table((new Tag())->getTable())->delete();
         DB::table((new Project())->getTable())->delete();
         DB::table((new Client())->getTable())->delete();
         DB::table((new User())->getTable())->delete();
diff --git a/openapi.json.client.ts b/openapi.json.client.ts
index 5366233e..d9208c6f 100644
--- a/openapi.json.client.ts
+++ b/openapi.json.client.ts
@@ -10,6 +10,9 @@ const ClientResource = z
     })
     .passthrough();
 const ClientCollection = z.array(ClientResource);
+const v1_import_import_Body = z
+    .object({ type: z.string(), data: z.string() })
+    .passthrough();
 const OrganizationResource = z
     .object({ id: z.string(), name: z.string(), is_personal: z.string() })
     .passthrough();
@@ -72,10 +75,21 @@ const updateTimeEntry_Body = z
         tags: z.union([z.array(z.string()), z.null()]).optional(),
     })
     .passthrough();
+const UserResource = z
+    .object({
+        id: z.string(),
+        name: z.string(),
+        email: z.string(),
+        role: z.string(),
+        is_placeholder: z.boolean(),
+    })
+    .passthrough();
+const UserCollection = z.array(UserResource);
 
 export const schemas = {
     ClientResource,
     ClientCollection,
+    v1_import_import_Body,
     OrganizationResource,
     ProjectResource,
     ProjectCollection,
@@ -87,6 +101,8 @@ export const schemas = {
     TimeEntryCollection,
     createTimeEntry_Body,
     updateTimeEntry_Body,
+    UserResource,
+    UserCollection,
 };
 
 const endpoints = makeApi([
@@ -306,6 +322,76 @@ const endpoints = makeApi([
             },
         ],
     },
+    {
+        method: 'post',
+        path: '/v1/organizations/:organization/import',
+        alias: 'v1.import.import',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: v1_import_import_Body,
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z
+            .object({
+                report: z
+                    .object({
+                        clients: z
+                            .object({ created: z.number().int() })
+                            .passthrough(),
+                        projects: z
+                            .object({ created: z.number().int() })
+                            .passthrough(),
+                        tasks: z
+                            .object({ created: z.number().int() })
+                            .passthrough(),
+                        'time-entries': z
+                            .object({ created: z.number().int() })
+                            .passthrough(),
+                        tags: z
+                            .object({ created: z.number().int() })
+                            .passthrough(),
+                        users: z
+                            .object({ created: z.number().int() })
+                            .passthrough(),
+                    })
+                    .passthrough(),
+            })
+            .passthrough(),
+        errors: [
+            {
+                status: 400,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
+                    .passthrough(),
+            },
+        ],
+    },
     {
         method: 'get',
         path: '/v1/organizations/:organization/projects',
@@ -664,7 +750,7 @@ const endpoints = makeApi([
             {
                 name: 'active',
                 type: 'Query',
-                schema: z.string().optional(),
+                schema: z.enum(['true', 'false']).optional(),
             },
             {
                 name: 'limit',
@@ -824,6 +910,78 @@ const endpoints = makeApi([
             },
         ],
     },
+    {
+        method: 'get',
+        path: '/v1/organizations/:organization/users',
+        alias: 'v1.users.index',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.object({ data: UserCollection }).passthrough(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({
+                        message: z.string(),
+                        errors: z.record(z.array(z.string())),
+                    })
+                    .passthrough(),
+            },
+        ],
+    },
+    {
+        method: 'post',
+        path: '/v1/organizations/:organization/users/:user/invite-placeholder',
+        alias: 'v1.users.invite-placeholder',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: z.object({}).partial().passthrough(),
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+            {
+                name: 'user',
+                type: 'Path',
+                schema: z.string().uuid(),
+            },
+        ],
+        response: z.string(),
+        errors: [
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
 ]);
 
 export const api = new Zodios('http://solidtime.test/api', endpoints);
diff --git a/phpunit.xml b/phpunit.xml
index f5ab132a..d5881ea7 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -21,8 +21,7 @@
         <env name="APP_ENV" value="testing"/>
         <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="CACHE_DRIVER" value="array"/>
-        <env name="DB_CONNECTION" value="pgsql"/>
-        <env name="DB_HOST" value="pgsql_test"/>
+        <env name="DB_CONNECTION" value="pgsql_test"/>
         <env name="MAIL_MAILER" value="array"/>
         <env name="PULSE_ENABLED" value="false"/>
         <env name="QUEUE_CONNECTION" value="sync"/>
diff --git a/playwright.config.ts b/playwright.config.ts
index 5a1b230e..1c552630 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -20,7 +20,7 @@ export default defineConfig({
     /* Opt out of parallel tests on CI. */
     workers: process.env.CI ? 1 : undefined,
     /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-    reporter: 'html',
+    reporter: process.env.CI ? 'list' : 'html',
     /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
     use: {
         /* Base URL to use in actions like `await page.goto('/')`. */
diff --git a/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php b/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php
index b4d30d26..cd9c146b 100644
--- a/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php
+++ b/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php
@@ -143,7 +143,7 @@ public function test_index_endpoint_returns_only_active_time_entries(): void
         // Act
         $response = $this->getJson(route('api.v1.time-entries.index', [
             $data->organization->getKey(),
-            'active' => true,
+            'active' => 'true',
             'user_id' => $data->user->getKey(),
         ]));
 

From d5ad57d141f753436aca6b6f600320b9be8303b8 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregorvostrak@Gregors-MacBook-Pro.local>
Date: Wed, 13 Mar 2024 14:15:56 +0100
Subject: [PATCH 13/20] fix tests, remove rate limit in non production
 environments

---
 app/Providers/RouteServiceProvider.php | 4 ++++
 e2e/timetracker.spec.ts                | 9 +++------
 package.json                           | 2 +-
 playwright.config.ts                   | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index d7e3c8fa..4ebf1e55 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -27,6 +27,10 @@ class RouteServiceProvider extends ServiceProvider
     public function boot(): void
     {
         RateLimiter::for('api', function (Request $request) {
+            if (! $this->app->isProduction()) {
+                return Limit::none();
+            }
+
             return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
         });
 
diff --git a/e2e/timetracker.spec.ts b/e2e/timetracker.spec.ts
index be1fd350..f7efd2ed 100644
--- a/e2e/timetracker.spec.ts
+++ b/e2e/timetracker.spec.ts
@@ -364,9 +364,7 @@ test('test that adding a new tag works', async ({ page }) => {
         );
     });
     await expect(page.getByTestId('tag_dropdown_search')).toHaveValue('');
-    await expect(page.getByTestId('tag_dropdown_entries')).toHaveText(
-        newTagName
-    );
+    await expect(page.getByRole('option', { name: newTagName })).toBeVisible();
 });
 
 test('test that adding a new tag when the timer is running', async ({
@@ -389,9 +387,8 @@ test('test that adding a new tag when the timer is running', async ({
         );
     });
     await expect(page.getByTestId('tag_dropdown_search')).toHaveValue('');
-    await expect(page.getByTestId('tag_dropdown_entries')).toHaveText(
-        newTagName
-    );
+
+    await expect(page.getByRole('option', { name: newTagName })).toBeVisible();
 
     await page.waitForResponse(async (response) => {
         return (
diff --git a/package.json b/package.json
index 9ecfa5fa..fa9f8876 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
         "lint": "eslint --ext .js,.vue,.ts --ignore-path .gitignore .",
         "lint:fix": "eslint --fix --ext .js,.vue,.ts --ignore-path .gitignore .",
         "type-check": "vue-tsc --noEmit",
-        "test:e2e": "npx playwright test",
+        "test:e2e": "rm -rf test-results/.auth && npx playwright test",
         "generate:zod": "npx openapi-zod-client http://localhost:80/docs/api.json --output openapi.json.client.ts --base-url http://solidtime.test/api"
     },
     "devDependencies": {
diff --git a/playwright.config.ts b/playwright.config.ts
index 1c552630..838b4745 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -20,14 +20,14 @@ export default defineConfig({
     /* Opt out of parallel tests on CI. */
     workers: process.env.CI ? 1 : undefined,
     /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-    reporter: process.env.CI ? 'list' : 'html',
+    reporter: process.env.CI ? 'github' : 'html',
     /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
     use: {
         /* Base URL to use in actions like `await page.goto('/')`. */
         // baseURL: 'http://127.0.0.1:3000',
 
         /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-        trace: 'on-first-retry',
+        trace: 'on',
     },
 
     /* Configure projects for major browsers */

From 331a11e1b9443c84d9fcc9fa4c4d988de77dad45 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregorvostrak@Gregors-MacBook-Pro.local>
Date: Wed, 13 Mar 2024 15:15:21 +0100
Subject: [PATCH 14/20] make api endpoint url dynamic to environment

---
 .github/workflows/playwright.yml | 4 ++--
 openapi.json.client.ts           | 2 +-
 package.json                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index 5db1823b..3673e53e 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -70,7 +70,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: playwright-report
-          path: playwright-report/
+          name: test-results
+          path: test-results/
           retention-days: 30
 
diff --git a/openapi.json.client.ts b/openapi.json.client.ts
index d9208c6f..5b7b3add 100644
--- a/openapi.json.client.ts
+++ b/openapi.json.client.ts
@@ -984,7 +984,7 @@ const endpoints = makeApi([
     },
 ]);
 
-export const api = new Zodios('http://solidtime.test/api', endpoints);
+export const api = new Zodios('/api', endpoints);
 
 export function createApiClient(baseUrl: string, options?: ZodiosOptions) {
     return new Zodios(baseUrl, endpoints, options);
diff --git a/package.json b/package.json
index fa9f8876..cb10fff8 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
         "lint:fix": "eslint --fix --ext .js,.vue,.ts --ignore-path .gitignore .",
         "type-check": "vue-tsc --noEmit",
         "test:e2e": "rm -rf test-results/.auth && npx playwright test",
-        "generate:zod": "npx openapi-zod-client http://localhost:80/docs/api.json --output openapi.json.client.ts --base-url http://solidtime.test/api"
+        "generate:zod": "npx openapi-zod-client http://localhost:80/docs/api.json --output openapi.json.client.ts --base-url /api"
     },
     "devDependencies": {
         "@inertiajs/vue3": "^1.0.0",

From bab34b09ec224ef403cf9aa4f20d47f3746d5490 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregorvostrak@Gregors-MacBook-Pro.local>
Date: Wed, 13 Mar 2024 15:25:15 +0100
Subject: [PATCH 15/20] change playwright timeout, retries and reporting
 options

---
 playwright.config.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/playwright.config.ts b/playwright.config.ts
index 838b4745..507e1c49 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -16,20 +16,22 @@ export default defineConfig({
     /* Fail the build on CI if you accidentally left test.only in the source code. */
     forbidOnly: !!process.env.CI,
     /* Retry on CI only */
-    retries: process.env.CI ? 2 : 0,
+    retries: process.env.CI ? 1 : 0,
     /* Opt out of parallel tests on CI. */
     workers: process.env.CI ? 1 : undefined,
     /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-    reporter: process.env.CI ? 'github' : 'html',
+    reporter: process.env.CI ? 'line' : 'html',
     /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
     use: {
         /* Base URL to use in actions like `await page.goto('/')`. */
         // baseURL: 'http://127.0.0.1:3000',
 
         /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-        trace: 'on',
+        trace: process.env.CI ? 'on-first-retry' : 'on',
     },
 
+    timeout: 10 * 1000,
+
     /* Configure projects for major browsers */
     projects: [
         {

From 6dca54f15d3321de21a0af1fb52b7e627edcc9e7 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregorvostrak@Gregors-MacBook-Pro.local>
Date: Wed, 13 Mar 2024 15:47:39 +0100
Subject: [PATCH 16/20] add passport:keys to playwright action

---
 .github/workflows/playwright.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index 3673e53e..56c2afd9 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -49,6 +49,7 @@ jobs:
           cp .env.ci .env
           php artisan key:generate
           php artisan migrate --seed
+          php artisan passport:keys
 
       - name: Install dependencies
         run: npm ci

From 15e7445f017c01dec881773f38a9ae132fa6ed60 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregorvostrak@Gregors-MacBook-Pro.local>
Date: Wed, 13 Mar 2024 15:59:09 +0100
Subject: [PATCH 17/20] make dashboard cards more compact

---
 .../Components/Dashboard/ActivityGraphCard.vue  |  2 +-
 .../Dashboard/DayOverviewCardEntry.vue          |  6 +++---
 .../Dashboard/RecentlyTrackedTasksCardEntry.vue |  2 +-
 .../Dashboard/TeamActivityCardEntry.vue         |  2 +-
 .../Components/Dashboard/ThisWeekOverview.vue   |  2 +-
 resources/js/Pages/Dashboard.vue                | 17 +++++++++--------
 resources/js/Pages/MainContainer.vue            | 13 +++++++++++++
 7 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 resources/js/Pages/MainContainer.vue

diff --git a/resources/js/Components/Dashboard/ActivityGraphCard.vue b/resources/js/Components/Dashboard/ActivityGraphCard.vue
index e0f9fb95..066ae6e8 100644
--- a/resources/js/Components/Dashboard/ActivityGraphCard.vue
+++ b/resources/js/Components/Dashboard/ActivityGraphCard.vue
@@ -79,7 +79,7 @@ const option = ref({
 <template>
     <DashboardCard title="Activity Graph" :icon="BoltIcon">
         <div class="px-2">
-            <v-chart class="chart" :option="option" style="height: 310px" />
+            <v-chart class="chart" :option="option" style="height: 290px" />
         </div>
     </DashboardCard>
 </template>
diff --git a/resources/js/Components/Dashboard/DayOverviewCardEntry.vue b/resources/js/Components/Dashboard/DayOverviewCardEntry.vue
index df8be660..9d9b5c96 100644
--- a/resources/js/Components/Dashboard/DayOverviewCardEntry.vue
+++ b/resources/js/Components/Dashboard/DayOverviewCardEntry.vue
@@ -26,13 +26,13 @@ function dayFormat(date: string) {
 <template>
     <div class="px-4 py-2 grid grid-cols-3">
         <div class="flex items-center">
-            <p class="font-semibold text-white pb-1">
+            <p class="font-medium text-base text-white">
                 {{ dayFormat(date) }}
             </p>
         </div>
-        <div class="flex items-center">
+        <div class="flex items-center justify-center">
             <svg
-                class="w-20"
+                class="w-20 opacity-70 transition hover:opacity-100"
                 viewBox="0 0 42 10"
                 fill="none"
                 xmlns="http://www.w3.org/2000/svg">
diff --git a/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue b/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
index 2356acfd..65c5c830 100644
--- a/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
+++ b/resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue
@@ -9,7 +9,7 @@ defineProps<{
 </script>
 
 <template>
-    <div class="px-4 py-2.5 grid grid-cols-5">
+    <div class="px-4 py-1.5 grid grid-cols-5">
         <div class="col-span-4">
             <p class="font-semibold text-white pb-1">
                 {{ title }}
diff --git a/resources/js/Components/Dashboard/TeamActivityCardEntry.vue b/resources/js/Components/Dashboard/TeamActivityCardEntry.vue
index eeb5fb36..a359d475 100644
--- a/resources/js/Components/Dashboard/TeamActivityCardEntry.vue
+++ b/resources/js/Components/Dashboard/TeamActivityCardEntry.vue
@@ -9,7 +9,7 @@ defineProps<{
 <template>
     <div class="px-4 py-3 grid grid-cols-3">
         <div class="col-span-2">
-            <p class="font-semibold text-white pb-1">
+            <p class="font-semibold text-white ">
                 {{ name }}
             </p>
             <div class="text-muted font-medium">
diff --git a/resources/js/Components/Dashboard/ThisWeekOverview.vue b/resources/js/Components/Dashboard/ThisWeekOverview.vue
index ad4fefaa..75a191ce 100644
--- a/resources/js/Components/Dashboard/ThisWeekOverview.vue
+++ b/resources/js/Components/Dashboard/ThisWeekOverview.vue
@@ -130,7 +130,7 @@ const option = ref({
 </script>
 
 <template>
-    <div class="grid gap-x-6 grid-cols-4">
+    <div class="grid gap-x-6 xl:gap-x-8 grid-cols-4">
         <div class="col-span-3">
             <CardTitle
                 title="This Week"
diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/Dashboard.vue
index 41745c27..4c223661 100644
--- a/resources/js/Pages/Dashboard.vue
+++ b/resources/js/Pages/Dashboard.vue
@@ -10,6 +10,7 @@ import type { Organization, User } from '@/types/models';
 import { onMounted } from 'vue';
 import { useProjectsStore } from '@/utils/useProjects';
 import ActivityGraphCard from '@/Components/Dashboard/ActivityGraphCard.vue';
+import MainContainer from "@/Pages/MainContainer.vue";
 
 const page = usePage<{
     auth: {
@@ -67,12 +68,12 @@ const props = defineProps<{
 
 <template>
     <AppLayout title="Dashboard" data-testid="dashboard_view">
-        <div
-            class="py-8 sm:px-6 lg:px-8 mx-auto border-b border-default-background-seperator">
+        <MainContainer
+            class="py-8 border-b border-default-background-seperator">
             <TimeTracker></TimeTracker>
-        </div>
-        <div
-            class="grid gap-x-6 grid-cols-4 sm:px-6 lg:px-8 pt-6 pb-7 border-b border-default-background-seperator">
+        </MainContainer>
+        <MainContainer
+            class="grid gap-x-6 xl:gap-x-8 grid-cols-4 pt-6 pb-7 border-b border-default-background-seperator">
             <RecentlyTrackedTasksCard
                 :latestTasks="props.latestTasks"></RecentlyTrackedTasksCard>
             <LastSevenDaysCard
@@ -85,14 +86,14 @@ const props = defineProps<{
                 :latestTeamActivity="
                     props.latestTeamActivity
                 "></TeamActivityCard>
-        </div>
-        <div class="sm:px-6 lg:px-8 py-6">
+        </MainContainer>
+        <MainContainer class="py-6">
             <ThisWeekOverview
                 :weeklyProjectOverview="props.weeklyProjectOverview"
                 :total-weekly-billable-amount="props.totalWeeklyBillableAmount"
                 :total-weekly-billable-time="props.totalWeeklyBillableTime"
                 :total-weekly-time="props.totalWeeklyTime"
                 :weekly-history="props.weeklyHistory"></ThisWeekOverview>
-        </div>
+        </MainContainer>
     </AppLayout>
 </template>
diff --git a/resources/js/Pages/MainContainer.vue b/resources/js/Pages/MainContainer.vue
new file mode 100644
index 00000000..a3c7dcf4
--- /dev/null
+++ b/resources/js/Pages/MainContainer.vue
@@ -0,0 +1,13 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+    <div class="sm:px-6 lg:px-8 xl:px-12 mx-auto">
+        <slot></slot>
+    </div>
+</template>
+
+<style scoped>
+
+</style>

From 4f8b9db9ea9e03752eeaeed562c468ffd451a39f Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregorvostrak@Gregors-MacBook-Pro.local>
Date: Wed, 13 Mar 2024 16:46:58 +0100
Subject: [PATCH 18/20] remove tailwind darkmode classes

---
 resources/js/Components/ApplicationLogo.vue      |  2 +-
 resources/js/Components/AuthenticationCard.vue   |  4 ++--
 resources/js/Components/Checkbox.vue             |  2 +-
 resources/js/Components/ConfirmationModal.vue    |  6 +++---
 resources/js/Components/DangerButton.vue         |  2 +-
 resources/js/Components/DialogModal.vue          |  2 +-
 resources/js/Components/InputError.vue           |  2 +-
 resources/js/Components/Modal.vue                |  4 ++--
 resources/js/Components/NavLink.vue              |  4 ++--
 resources/js/Components/PrimaryButton.vue        |  2 +-
 resources/js/Components/ResponsiveNavLink.vue    |  4 ++--
 resources/js/Components/SecondaryButton.vue      |  2 +-
 resources/js/Components/UserSettingsIcon.vue     |  4 ++--
 resources/js/Layouts/AppLayout.vue               |  4 ++--
 resources/js/Pages/API/Index.vue                 |  2 +-
 .../js/Pages/API/Partials/ApiTokenManager.vue    |  4 ++--
 resources/js/Pages/Auth/ForgotPassword.vue       |  2 +-
 resources/js/Pages/Auth/Login.vue                |  4 ++--
 resources/js/Pages/Auth/Register.vue             |  6 +++---
 resources/js/Pages/Auth/VerifyEmail.vue          |  6 +++---
 resources/js/Pages/PrivacyPolicy.vue             |  6 +++---
 .../Partials/TwoFactorAuthenticationForm.vue     |  6 +++---
 .../Partials/UpdateProfileInformationForm.vue    |  6 +++---
 resources/js/Pages/Profile/Show.vue              |  2 +-
 resources/js/Pages/Teams/Create.vue              |  2 +-
 .../js/Pages/Teams/Partials/CreateTeamForm.vue   |  4 ++--
 .../Pages/Teams/Partials/TeamMemberManager.vue   | 16 ++++++++--------
 .../Pages/Teams/Partials/UpdateTeamNameForm.vue  |  4 ++--
 resources/js/Pages/Teams/Show.vue                |  2 +-
 resources/js/Pages/TermsOfService.vue            |  6 +++---
 30 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/resources/js/Components/ApplicationLogo.vue b/resources/js/Components/ApplicationLogo.vue
index b8a554d0..bc90424a 100644
--- a/resources/js/Components/ApplicationLogo.vue
+++ b/resources/js/Components/ApplicationLogo.vue
@@ -2,7 +2,7 @@
     <svg viewBox="0 0 317 48" fill="none" xmlns="http://www.w3.org/2000/svg">
         <path
             d="M74.09 30.04V13h-4.14v21H82.1v-3.96h-8.01zM95.379 19v1.77c-1.08-1.35-2.7-2.19-4.89-2.19-3.99 0-7.29 3.45-7.29 7.92s3.3 7.92 7.29 7.92c2.19 0 3.81-.84 4.89-2.19V34h3.87V19h-3.87zm-4.17 11.73c-2.37 0-4.14-1.71-4.14-4.23 0-2.52 1.77-4.23 4.14-4.23 2.4 0 4.17 1.71 4.17 4.23 0 2.52-1.77 4.23-4.17 4.23zM106.628 21.58V19h-3.87v15h3.87v-7.17c0-3.15 2.55-4.05 4.56-3.81V18.7c-1.89 0-3.78.84-4.56 2.88zM124.295 19v1.77c-1.08-1.35-2.7-2.19-4.89-2.19-3.99 0-7.29 3.45-7.29 7.92s3.3 7.92 7.29 7.92c2.19 0 3.81-.84 4.89-2.19V34h3.87V19h-3.87zm-4.17 11.73c-2.37 0-4.14-1.71-4.14-4.23 0-2.52 1.77-4.23 4.14-4.23 2.4 0 4.17 1.71 4.17 4.23 0 2.52-1.77 4.23-4.17 4.23zM141.544 19l-3.66 10.5-3.63-10.5h-4.26l5.7 15h4.41l5.7-15h-4.26zM150.354 28.09h11.31c.09-.51.15-1.02.15-1.59 0-4.41-3.15-7.92-7.59-7.92-4.71 0-7.92 3.45-7.92 7.92s3.18 7.92 8.22 7.92c2.88 0 5.13-1.17 6.54-3.21l-3.12-1.8c-.66.87-1.86 1.5-3.36 1.5-2.04 0-3.69-.84-4.23-2.82zm-.06-3c.45-1.92 1.86-3.03 3.93-3.03 1.62 0 3.24.87 3.72 3.03h-7.65zM164.516 34h3.87V12.1h-3.87V34zM185.248 34.36c3.69 0 6.9-2.01 6.9-6.3V13h-2.1v15.06c0 3.03-2.07 4.26-4.8 4.26-2.19 0-3.93-.78-4.62-2.61l-1.77 1.05c1.05 2.43 3.57 3.6 6.39 3.6zM203.124 18.64c-4.65 0-7.83 3.45-7.83 7.86 0 4.53 3.24 7.86 7.98 7.86 3.03 0 5.34-1.41 6.6-3.45l-1.74-1.02c-.81 1.44-2.46 2.55-4.83 2.55-3.18 0-5.55-1.89-5.97-4.95h13.17c.03-.3.06-.63.06-.93 0-4.11-2.85-7.92-7.44-7.92zm0 1.92c2.58 0 4.98 1.71 5.4 5.01h-11.19c.39-2.94 2.64-5.01 5.79-5.01zM221.224 20.92V19h-4.32v-4.2l-1.98.6V19h-3.15v1.92h3.15v9.09c0 3.6 2.25 4.59 6.3 3.99v-1.74c-2.91.12-4.32.33-4.32-2.25v-9.09h4.32zM225.176 22.93c0-1.62 1.59-2.37 3.15-2.37 1.44 0 2.97.57 3.6 2.1l1.65-.96c-.87-1.86-2.79-3.06-5.25-3.06-3 0-5.13 1.89-5.13 4.29 0 5.52 8.76 3.39 8.76 7.11 0 1.77-1.68 2.4-3.45 2.4-2.01 0-3.57-.99-4.11-2.52l-1.68.99c.75 1.92 2.79 3.45 5.79 3.45 3.21 0 5.43-1.77 5.43-4.32 0-5.52-8.76-3.39-8.76-7.11zM244.603 20.92V19h-4.32v-4.2l-1.98.6V19h-3.15v1.92h3.15v9.09c0 3.6 2.25 4.59 6.3 3.99v-1.74c-2.91.12-4.32.33-4.32-2.25v-9.09h4.32zM249.883 21.49V19h-1.98v15h1.98v-8.34c0-3.72 2.34-4.98 4.74-4.98v-1.92c-1.92 0-3.69.63-4.74 2.73zM263.358 18.64c-4.65 0-7.83 3.45-7.83 7.86 0 4.53 3.24 7.86 7.98 7.86 3.03 0 5.34-1.41 6.6-3.45l-1.74-1.02c-.81 1.44-2.46 2.55-4.83 2.55-3.18 0-5.55-1.89-5.97-4.95h13.17c.03-.3.06-.63.06-.93 0-4.11-2.85-7.92-7.44-7.92zm0 1.92c2.58 0 4.98 1.71 5.4 5.01h-11.19c.39-2.94 2.64-5.01 5.79-5.01zM286.848 19v2.94c-1.26-2.01-3.39-3.3-6.06-3.3-4.23 0-7.74 3.42-7.74 7.86s3.51 7.86 7.74 7.86c2.67 0 4.8-1.29 6.06-3.3V34h1.98V19h-1.98zm-5.91 13.44c-3.33 0-5.91-2.61-5.91-5.94 0-3.33 2.58-5.94 5.91-5.94s5.91 2.61 5.91 5.94c0 3.33-2.58 5.94-5.91 5.94zM309.01 18.64c-1.92 0-3.75.87-4.86 2.73-.84-1.74-2.46-2.73-4.56-2.73-1.8 0-3.42.72-4.59 2.55V19h-1.98v15H295v-8.31c0-3.72 2.16-5.13 4.32-5.13 2.13 0 3.51 1.41 3.51 4.08V34h1.98v-8.31c0-3.72 1.86-5.13 4.17-5.13 2.13 0 3.66 1.41 3.66 4.08V34h1.98v-9.36c0-3.75-2.31-6-5.61-6z"
-            class="fill-black dark:fill-white" />
+            class="fill-white" />
         <path
             d="M11.395 44.428C4.557 40.198 0 32.632 0 24 0 10.745 10.745 0 24 0a23.891 23.891 0 0113.997 4.502c-.2 17.907-11.097 33.245-26.602 39.926z"
             fill="#6875F5" />
diff --git a/resources/js/Components/AuthenticationCard.vue b/resources/js/Components/AuthenticationCard.vue
index ee11110f..80c8a3d4 100644
--- a/resources/js/Components/AuthenticationCard.vue
+++ b/resources/js/Components/AuthenticationCard.vue
@@ -1,12 +1,12 @@
 <template>
     <div
-        class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0 bg-gray-100 dark:bg-gray-900">
+        class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0 bg-card-background">
         <div>
             <slot name="logo" />
         </div>
 
         <div
-            class="w-full sm:max-w-md mt-6 px-6 py-4 bg-white dark:bg-gray-800 shadow-md overflow-hidden sm:rounded-lg">
+            class="w-full sm:max-w-md mt-6 px-6 py-4 bg-card-background shadow-md overflow-hidden sm:rounded-lg">
             <slot />
         </div>
     </div>
diff --git a/resources/js/Components/Checkbox.vue b/resources/js/Components/Checkbox.vue
index e5ffd9a7..e2d0bda0 100644
--- a/resources/js/Components/Checkbox.vue
+++ b/resources/js/Components/Checkbox.vue
@@ -30,5 +30,5 @@ const proxyChecked = computed({
         v-model="proxyChecked"
         type="checkbox"
         :value="value"
-        class="rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800" />
+        class="rounded bg-input-background border-input-border text-indigo-600 shadow-sm focus:ring-indigo-500" />
 </template>
diff --git a/resources/js/Components/ConfirmationModal.vue b/resources/js/Components/ConfirmationModal.vue
index abea8f8f..e5f730db 100644
--- a/resources/js/Components/ConfirmationModal.vue
+++ b/resources/js/Components/ConfirmationModal.vue
@@ -29,12 +29,12 @@ const close = () => {
         :max-width="maxWidth"
         :closeable="closeable"
         @close="close">
-        <div class="bg-white dark:bg-gray-800 px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+        <div class="bg-card-background px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
             <div class="sm:flex sm:items-start">
                 <div
                     class="mx-auto shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10">
                     <svg
-                        class="h-6 w-6 text-red-600 dark:text-red-400"
+                        class="h-6 w-6 text-red-400"
                         xmlns="http://www.w3.org/2000/svg"
                         fill="none"
                         viewBox="0 0 24 24"
@@ -60,7 +60,7 @@ const close = () => {
         </div>
 
         <div
-            class="flex flex-row justify-end px-6 py-4 bg-gray-100 dark:bg-gray-800 text-end">
+            class="flex flex-row justify-end px-6 py-4 bg-card-background text-end">
             <slot name="footer" />
         </div>
     </Modal>
diff --git a/resources/js/Components/DangerButton.vue b/resources/js/Components/DangerButton.vue
index af1283bd..e2c756ac 100644
--- a/resources/js/Components/DangerButton.vue
+++ b/resources/js/Components/DangerButton.vue
@@ -14,7 +14,7 @@ Modal.vue
 <template>
     <button
         :type="type"
-        class="inline-flex items-center justify-center px-4 py-2 bg-red-600 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-red-500 active:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 transition ease-in-out duration-150">
+        class="inline-flex items-center justify-center px-4 py-2 bg-red-600 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-red-500 active:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 transition ease-in-out duration-150">
         <slot />
     </button>
 </template>
diff --git a/resources/js/Components/DialogModal.vue b/resources/js/Components/DialogModal.vue
index 0d2468fe..94b37f37 100644
--- a/resources/js/Components/DialogModal.vue
+++ b/resources/js/Components/DialogModal.vue
@@ -40,7 +40,7 @@ const close = () => {
         </div>
 
         <div
-            class="flex flex-row justify-end px-6 py-4 bg-gray-100 dark:bg-gray-800 text-end">
+            class="flex flex-row justify-end px-6 py-4 bg-gray-100 text-end">
             <slot name="footer" />
         </div>
     </Modal>
diff --git a/resources/js/Components/InputError.vue b/resources/js/Components/InputError.vue
index 5d225358..2c9b669c 100644
--- a/resources/js/Components/InputError.vue
+++ b/resources/js/Components/InputError.vue
@@ -6,7 +6,7 @@ defineProps({
 
 <template>
     <div v-show="message">
-        <p class="text-sm text-red-600 dark:text-red-400">
+        <p class="text-sm text-red-400">
             {{ message }}
         </p>
     </div>
diff --git a/resources/js/Components/Modal.vue b/resources/js/Components/Modal.vue
index 1cc933ba..7ff0c973 100644
--- a/resources/js/Components/Modal.vue
+++ b/resources/js/Components/Modal.vue
@@ -78,7 +78,7 @@ const maxWidthClass = computed(() => {
                         class="fixed inset-0 transform transition-all"
                         @click="close">
                         <div
-                            class="absolute inset-0 bg-gray-500 dark:bg-gray-900 opacity-75" />
+                            class="absolute inset-0 bg-card-background opacity-75" />
                     </div>
                 </transition>
 
@@ -91,7 +91,7 @@ const maxWidthClass = computed(() => {
                     leave-to-class="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95">
                     <div
                         v-show="show"
-                        class="mb-6 bg-white dark:bg-gray-800 rounded-lg overflow-hidden shadow-xl transform transition-all sm:w-full sm:mx-auto"
+                        class="mb-6 bg-card-background rounded-lg overflow-hidden shadow-xl transform transition-all sm:w-full sm:mx-auto"
                         :class="maxWidthClass">
                         <slot v-if="show" />
                     </div>
diff --git a/resources/js/Components/NavLink.vue b/resources/js/Components/NavLink.vue
index 5f0a9ece..afb8aee4 100644
--- a/resources/js/Components/NavLink.vue
+++ b/resources/js/Components/NavLink.vue
@@ -9,8 +9,8 @@ const props = defineProps<{
 
 const classes = computed(() => {
     return props.active
-        ? 'inline-flex items-center px-1 pt-1 border-b-2 border-indigo-400 dark:border-indigo-600 text-sm font-medium leading-5 text-gray-900 dark:text-gray-100 focus:outline-none focus:border-indigo-700 transition duration-150 ease-in-out'
-        : 'inline-flex items-center px-1 pt-1 border-b-2 border-transparent text-sm font-medium leading-5 text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 hover:border-gray-300 dark:hover:border-gray-700 focus:outline-none focus:text-gray-700 dark:focus:text-gray-300 focus:border-gray-300 dark:focus:border-gray-700 transition duration-150 ease-in-out';
+        ? 'inline-flex items-center px-1 pt-1 border-b-2 border-indigo-400 text-sm font-medium leading-5 text-gray-900 focus:outline-none focus:border-indigo-700 transition duration-150 ease-in-out'
+        : 'inline-flex items-center px-1 pt-1 border-b-2 border-transparent text-sm font-medium leading-5 text-gray-500 hover:text-gray-700 hover:border-gray-300 focus:outline-none focus:text-gray-700 focus:border-gray-300 transition duration-150 ease-in-out';
 });
 </script>
 
diff --git a/resources/js/Components/PrimaryButton.vue b/resources/js/Components/PrimaryButton.vue
index 8bbff2b9..d03b2adc 100644
--- a/resources/js/Components/PrimaryButton.vue
+++ b/resources/js/Components/PrimaryButton.vue
@@ -14,7 +14,7 @@ withDefaults(
 <template>
     <button
         :type="type"
-        class="inline-flex items-center px-4 py-2 bg-gray-800 dark:bg-gray-200 border border-transparent rounded-md font-semibold text-xs text-white dark:text-gray-800 uppercase tracking-widest hover:bg-gray-700 dark:hover:bg-white focus:bg-gray-700 dark:focus:bg-white active:bg-gray-900 dark:active:bg-gray-300 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 transition ease-in-out duration-150">
+        class="inline-flex items-center px-4 py-2 bg-white/90 border border-transparent rounded-md font-semibold text-xs text-black uppercase tracking-widest hover:bg-white focus:bg-white active:bg-gray-900 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 transition ease-in-out duration-150">
         <slot />
     </button>
 </template>
diff --git a/resources/js/Components/ResponsiveNavLink.vue b/resources/js/Components/ResponsiveNavLink.vue
index 2db6027f..780b96cc 100644
--- a/resources/js/Components/ResponsiveNavLink.vue
+++ b/resources/js/Components/ResponsiveNavLink.vue
@@ -10,8 +10,8 @@ const props = defineProps<{
 
 const classes = computed(() => {
     return props.active
-        ? 'block w-full ps-3 pe-4 py-2 border-l-4 border-indigo-400 dark:border-indigo-600 text-start text-base font-medium text-indigo-700 dark:text-indigo-300 bg-indigo-50 dark:bg-indigo-900/50 focus:outline-none focus:text-indigo-800 dark:focus:text-indigo-200 focus:bg-indigo-100 dark:focus:bg-indigo-900 focus:border-indigo-700 dark:focus:border-indigo-300 transition duration-150 ease-in-out'
-        : 'block w-full ps-3 pe-4 py-2 border-l-4 border-transparent text-start text-base font-medium text-muted hover:text-gray-800 dark:hover:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700 hover:border-gray-300 dark:hover:border-gray-600 focus:outline-none focus:text-gray-800 dark:focus:text-gray-200 focus:bg-gray-50 dark:focus:bg-gray-700 focus:border-gray-300 dark:focus:border-gray-600 transition duration-150 ease-in-out';
+        ? 'block w-full ps-3 pe-4 py-2 border-l-4 border-indigo-400 text-start text-base font-medium text-indigo-700 bg-indigo-50 focus:outline-none focus:text-indigo-800 focus:bg-indigo-100 focus:border-indigo-700 transition duration-150 ease-in-out'
+        : 'block w-full ps-3 pe-4 py-2 border-l-4 border-transparent text-start text-base font-medium text-muted hover:text-gray-800 hover:bg-gray-50 hover:border-gray-300 focus:outline-none focus:text-gray-800 focus:bg-gray-50 focus:border-gray-300 transition duration-150 ease-in-out';
 });
 </script>
 
diff --git a/resources/js/Components/SecondaryButton.vue b/resources/js/Components/SecondaryButton.vue
index 8f61fb22..9259349e 100644
--- a/resources/js/Components/SecondaryButton.vue
+++ b/resources/js/Components/SecondaryButton.vue
@@ -14,7 +14,7 @@ withDefaults(
 <template>
     <button
         :type="type"
-        class="inline-flex items-center px-4 py-2 bg-button-secondary-background border border-button-secondary-border hover:bg-button-secondary-background-hover rounded-md font-semibold text-xs text-white uppercase tracking-widest shadow-sm focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 disabled:opacity-25 transition ease-in-out duration-150">
+        class="inline-flex items-center px-4 py-2 bg-button-secondary-background border border-button-secondary-border hover:bg-button-secondary-background-hover rounded-md font-semibold text-xs text-white uppercase tracking-widest shadow-sm focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 disabled:opacity-25 transition ease-in-out duration-150">
         <slot />
     </button>
 </template>
diff --git a/resources/js/Components/UserSettingsIcon.vue b/resources/js/Components/UserSettingsIcon.vue
index 5f64d59c..586c2b0d 100644
--- a/resources/js/Components/UserSettingsIcon.vue
+++ b/resources/js/Components/UserSettingsIcon.vue
@@ -40,7 +40,7 @@ const logout = () => {
                 <span v-else class="inline-flex rounded-md">
                     <button
                         type="button"
-                        class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 dark:text-gray-400 bg-white dark:bg-gray-800 hover:text-gray-700 dark:hover:text-gray-300 focus:outline-none focus:bg-gray-50 dark:focus:bg-gray-700 active:bg-gray-50 dark:active:bg-gray-700 transition ease-in-out duration-150">
+                        class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 bg-white hover:text-gray-700 focus:outline-none focus:bg-gray-50 active:bg-gray-50 transition ease-in-out duration-150">
                         {{ page.props.auth.user.name }}
 
                         <svg
@@ -75,7 +75,7 @@ const logout = () => {
                     API Tokens
                 </DropdownLink>
 
-                <div class="border-t border-gray-200 dark:border-gray-600" />
+                <div class="border-t border-card-border" />
 
                 <!-- Authentication -->
                 <form @submit.prevent="logout">
diff --git a/resources/js/Layouts/AppLayout.vue b/resources/js/Layouts/AppLayout.vue
index ff319201..e102764a 100644
--- a/resources/js/Layouts/AppLayout.vue
+++ b/resources/js/Layouts/AppLayout.vue
@@ -25,7 +25,7 @@ defineProps({
 <template>
     <div class="flex flex-wrap bg-default-background text-muted">
         <div
-            class="flex-shrink-0 h-screen fixed w-[250px] px-1.5 py-4 flex flex-col justify-between">
+            class="flex-shrink-0 h-screen fixed w-[250px] xl:w-[300px] px-2.5 xl:px-4 py-4 flex flex-col justify-between">
             <div>
                 <div class="border-b border-default-background-seperator pb-2">
                     <OrganizationSwitcher></OrganizationSwitcher>
@@ -93,7 +93,7 @@ defineProps({
                 <UserSettingsIcon></UserSettingsIcon>
             </ul>
         </div>
-        <div class="flex-1 ml-[250px]">
+        <div class="flex-1 ml-[250px] xl:ml-[300px]">
             <Head :title="title" />
 
             <Banner />
diff --git a/resources/js/Pages/API/Index.vue b/resources/js/Pages/API/Index.vue
index 48d22ff9..54e357dd 100644
--- a/resources/js/Pages/API/Index.vue
+++ b/resources/js/Pages/API/Index.vue
@@ -14,7 +14,7 @@ defineProps<{
     <AppLayout title="API Tokens">
         <template #header>
             <h2
-                class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
+                class="font-semibold text-xl text-white leading-tight">
                 API Tokens
             </h2>
         </template>
diff --git a/resources/js/Pages/API/Partials/ApiTokenManager.vue b/resources/js/Pages/API/Partials/ApiTokenManager.vue
index 1efa13f2..2dd0bac7 100644
--- a/resources/js/Pages/API/Partials/ApiTokenManager.vue
+++ b/resources/js/Pages/API/Partials/ApiTokenManager.vue
@@ -173,7 +173,7 @@ const deleteApiToken = () => {
                                 v-for="token in tokens"
                                 :key="token.id"
                                 class="flex items-center justify-between">
-                                <div class="break-all dark:text-white">
+                                <div class="break-all text-white">
                                     {{ token.name }}
                                 </div>
 
@@ -218,7 +218,7 @@ const deleteApiToken = () => {
 
                 <div
                     v-if="page.props.jetstream.flash.token"
-                    class="mt-4 bg-gray-100 dark:bg-gray-900 px-4 py-2 rounded font-mono text-sm text-gray-500 break-all">
+                    class="mt-4 bg-card-backgroundpx-4 py-2 rounded font-mono text-sm text-gray-500 break-all">
                     {{ page.props.jetstream.flash.token }}
                 </div>
             </template>
diff --git a/resources/js/Pages/Auth/ForgotPassword.vue b/resources/js/Pages/Auth/ForgotPassword.vue
index 6cdb1151..ef298f0d 100644
--- a/resources/js/Pages/Auth/ForgotPassword.vue
+++ b/resources/js/Pages/Auth/ForgotPassword.vue
@@ -36,7 +36,7 @@ const submit = () => {
 
         <div
             v-if="status"
-            class="mb-4 font-medium text-sm text-green-600 dark:text-green-400">
+            class="mb-4 font-medium text-sm text-green-400">
             {{ status }}
         </div>
 
diff --git a/resources/js/Pages/Auth/Login.vue b/resources/js/Pages/Auth/Login.vue
index 875bddfe..3cfd2784 100644
--- a/resources/js/Pages/Auth/Login.vue
+++ b/resources/js/Pages/Auth/Login.vue
@@ -40,7 +40,7 @@ const submit = () => {
 
         <div
             v-if="status"
-            class="mb-4 font-medium text-sm text-green-600 dark:text-green-400">
+            class="mb-4 font-medium text-sm text-green-400">
             {{ status }}
         </div>
 
@@ -81,7 +81,7 @@ const submit = () => {
                 <Link
                     v-if="canResetPassword"
                     :href="route('password.request')"
-                    class="underline text-sm text-muted hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800">
+                    class="underline text-sm text-muted hover:text-gray-900 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
                     Forgot your password?
                 </Link>
 
diff --git a/resources/js/Pages/Auth/Register.vue b/resources/js/Pages/Auth/Register.vue
index 0db0ba46..31fc664d 100644
--- a/resources/js/Pages/Auth/Register.vue
+++ b/resources/js/Pages/Auth/Register.vue
@@ -108,14 +108,14 @@ const page = usePage<{
                             <a
                                 target="_blank"
                                 :href="route('terms.show')"
-                                class="underline text-sm text-muted hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
+                                class="underline text-sm text-muted hover:text-gray-900 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
                                 >Terms of Service</a
                             >
                             and
                             <a
                                 target="_blank"
                                 :href="route('policy.show')"
-                                class="underline text-sm text-muted hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
+                                class="underline text-sm text-muted hover:text-gray-900 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
                                 >Privacy Policy</a
                             >
                         </div>
@@ -127,7 +127,7 @@ const page = usePage<{
             <div class="flex items-center justify-end mt-4">
                 <Link
                     :href="route('login')"
-                    class="underline text-sm text-muted hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800">
+                    class="underline text-sm text-muted hover:text-gray-900 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
                     Already registered?
                 </Link>
 
diff --git a/resources/js/Pages/Auth/VerifyEmail.vue b/resources/js/Pages/Auth/VerifyEmail.vue
index 96bcdc20..45ca9ce6 100644
--- a/resources/js/Pages/Auth/VerifyEmail.vue
+++ b/resources/js/Pages/Auth/VerifyEmail.vue
@@ -36,7 +36,7 @@ const verificationLinkSent = computed(
 
         <div
             v-if="verificationLinkSent"
-            class="mb-4 font-medium text-sm text-green-600 dark:text-green-400">
+            class="mb-4 font-medium text-sm text-green-400">
             A new verification link has been sent to the email address you
             provided in your profile settings.
         </div>
@@ -52,7 +52,7 @@ const verificationLinkSent = computed(
                 <div>
                     <Link
                         :href="route('profile.show')"
-                        class="underline text-sm text-muted hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800">
+                        class="underline text-sm text-muted hover:text-gray-900 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
                         Edit Profile</Link
                     >
 
@@ -60,7 +60,7 @@ const verificationLinkSent = computed(
                         :href="route('logout')"
                         method="post"
                         as="button"
-                        class="underline text-sm text-muted hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800 ms-2">
+                        class="underline text-sm text-muted hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800 ms-2">
                         Log Out
                     </Link>
                 </div>
diff --git a/resources/js/Pages/PrivacyPolicy.vue b/resources/js/Pages/PrivacyPolicy.vue
index dbdac341..1f949db8 100644
--- a/resources/js/Pages/PrivacyPolicy.vue
+++ b/resources/js/Pages/PrivacyPolicy.vue
@@ -10,15 +10,15 @@ defineProps({
 <template>
     <Head title="Privacy Policy" />
 
-    <div class="font-sans text-gray-900 dark:text-gray-100 antialiased">
-        <div class="pt-4 bg-gray-100 dark:bg-gray-900">
+    <div class="font-sans text-gray-100 antialiased">
+        <div class="pt-4 bg-gray-900">
             <div class="min-h-screen flex flex-col items-center pt-6 sm:pt-0">
                 <div>
                     <AuthenticationCardLogo />
                 </div>
 
                 <div
-                    class="w-full sm:max-w-2xl mt-6 p-6 bg-white dark:bg-gray-800 shadow-md overflow-hidden sm:rounded-lg prose dark:prose-invert"
+                    class="w-full sm:max-w-2xl mt-6 p-6 bg-gray-800 shadow-md overflow-hidden sm:rounded-lg prose dark:prose-invert"
                     v-html="policy" />
             </div>
         </div>
diff --git a/resources/js/Pages/Profile/Partials/TwoFactorAuthenticationForm.vue b/resources/js/Pages/Profile/Partials/TwoFactorAuthenticationForm.vue
index 0d1ffac5..db242c98 100644
--- a/resources/js/Pages/Profile/Partials/TwoFactorAuthenticationForm.vue
+++ b/resources/js/Pages/Profile/Partials/TwoFactorAuthenticationForm.vue
@@ -127,13 +127,13 @@ const disableTwoFactorAuthentication = () => {
         <template #content>
             <h3
                 v-if="twoFactorEnabled && !confirming"
-                class="text-lg font-medium text-gray-900 dark:text-gray-100">
+                class="text-lg font-medium text-gray-100">
                 You have enabled two factor authentication.
             </h3>
 
             <h3
                 v-else-if="twoFactorEnabled && confirming"
-                class="text-lg font-medium text-gray-900 dark:text-gray-100">
+                class="text-lg font-medium text-gray-100">
                 Finish enabling two factor authentication.
             </h3>
 
@@ -210,7 +210,7 @@ const disableTwoFactorAuthentication = () => {
                     </div>
 
                     <div
-                        class="grid gap-1 max-w-xl mt-4 px-4 py-4 font-mono text-sm bg-gray-100 dark:bg-gray-900 dark:text-gray-100 rounded-lg">
+                        class="grid gap-1 max-w-xl mt-4 px-4 py-4 font-mono text-sm bg-gray-100 text-gray-100 rounded-lg">
                         <div v-for="code in recoveryCodes" :key="code">
                             {{ code }}
                         </div>
diff --git a/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue b/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue
index e882b862..bb0e1e02 100644
--- a/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue
+++ b/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue
@@ -177,14 +177,14 @@ const page = usePage<{
                         page.props.jetstream.hasEmailVerification &&
                         user.email_verified_at === null
                     ">
-                    <p class="text-sm mt-2 dark:text-white">
+                    <p class="text-sm mt-2 text-white">
                         Your email address is unverified.
 
                         <Link
                             :href="route('verification.send')"
                             method="post"
                             as="button"
-                            class="underline text-sm text-muted hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
+                            class="underline text-sm text-muted hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
                             @click.prevent="sendEmailVerification">
                             Click here to re-send the verification email.
                         </Link>
@@ -192,7 +192,7 @@ const page = usePage<{
 
                     <div
                         v-show="verificationLinkSent"
-                        class="mt-2 font-medium text-sm text-green-600 dark:text-green-400">
+                        class="mt-2 font-medium text-sm text-green-400">
                         A new verification link has been sent to your email
                         address.
                     </div>
diff --git a/resources/js/Pages/Profile/Show.vue b/resources/js/Pages/Profile/Show.vue
index 76762c9a..a213dad3 100644
--- a/resources/js/Pages/Profile/Show.vue
+++ b/resources/js/Pages/Profile/Show.vue
@@ -32,7 +32,7 @@ const page = usePage<{
     <AppLayout title="Profile">
         <template #header>
             <h2
-                class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
+                class="font-semibold text-xl text-white leading-tight">
                 Profile
             </h2>
         </template>
diff --git a/resources/js/Pages/Teams/Create.vue b/resources/js/Pages/Teams/Create.vue
index bc92928d..a6127db6 100644
--- a/resources/js/Pages/Teams/Create.vue
+++ b/resources/js/Pages/Teams/Create.vue
@@ -7,7 +7,7 @@ import CreateTeamForm from '@/Pages/Teams/Partials/CreateTeamForm.vue';
     <AppLayout title="Create Team">
         <template #header>
             <h2
-                class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
+                class="font-semibold text-xl text-white leading-tight">
                 Create Team
             </h2>
         </template>
diff --git a/resources/js/Pages/Teams/Partials/CreateTeamForm.vue b/resources/js/Pages/Teams/Partials/CreateTeamForm.vue
index 9c79556e..91d58b9a 100644
--- a/resources/js/Pages/Teams/Partials/CreateTeamForm.vue
+++ b/resources/js/Pages/Teams/Partials/CreateTeamForm.vue
@@ -43,10 +43,10 @@ const page = usePage<{
                         :alt="page.props.auth.user.name" />
 
                     <div class="ms-4 leading-tight">
-                        <div class="text-gray-900 dark:text-white">
+                        <div class="text-white">
                             {{ page.props.auth.user.name }}
                         </div>
-                        <div class="text-sm text-gray-700 dark:text-gray-300">
+                        <div class="text-sm text-muted">
                             {{ page.props.auth.user.email }}
                         </div>
                     </div>
diff --git a/resources/js/Pages/Teams/Partials/TeamMemberManager.vue b/resources/js/Pages/Teams/Partials/TeamMemberManager.vue
index 4ad53c44..dff06326 100644
--- a/resources/js/Pages/Teams/Partials/TeamMemberManager.vue
+++ b/resources/js/Pages/Teams/Partials/TeamMemberManager.vue
@@ -167,14 +167,14 @@ const displayableRole = (role: string) => {
                             class="mt-2" />
 
                         <div
-                            class="relative z-0 mt-1 border border-gray-200 dark:border-gray-700 rounded-lg cursor-pointer">
+                            class="relative z-0 mt-1 border border-card-border rounded-lg cursor-pointer">
                             <button
                                 v-for="(role, i) in availableRoles"
                                 :key="role.key"
                                 type="button"
-                                class="relative px-4 py-3 inline-flex w-full rounded-lg focus:z-10 focus:outline-none focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-2 focus:ring-indigo-500 dark:focus:ring-indigo-600"
+                                class="relative px-4 py-3 inline-flex w-full rounded-lg focus:z-10 focus:outline-none focus:border-indigo-500 focus:ring-2 focus:ring-indigo-500"
                                 :class="{
-                                    'border-t border-gray-200 dark:border-gray-700 focus:border-none rounded-t-none':
+                                    'border-t border-card-border focus:border-none rounded-t-none':
                                         i > 0,
                                     'rounded-b-none':
                                         i !=
@@ -190,7 +190,7 @@ const displayableRole = (role: string) => {
                                     <!-- Role Name -->
                                     <div class="flex items-center">
                                         <div
-                                            class="text-sm text-muted"
+                                            class="text-sm text-white"
                                             :class="{
                                                 'font-semibold':
                                                     addTeamMemberForm.role ==
@@ -310,7 +310,7 @@ const displayableRole = (role: string) => {
                                     class="w-8 h-8 rounded-full object-cover"
                                     :src="user.profile_photo_url"
                                     :alt="user.name" />
-                                <div class="ms-4 dark:text-white">
+                                <div class="ms-4 text-whites">
                                     {{ user.name }}
                                 </div>
                             </div>
@@ -366,14 +366,14 @@ const displayableRole = (role: string) => {
             <template #content>
                 <div v-if="managingRoleFor">
                     <div
-                        class="relative z-0 mt-1 border border-gray-200 dark:border-gray-700 rounded-lg cursor-pointer">
+                        class="relative z-0 mt-1 border border-card-border rounded-lg cursor-pointer">
                         <button
                             v-for="(role, i) in availableRoles"
                             :key="role.key"
                             type="button"
-                            class="relative px-4 py-3 inline-flex w-full rounded-lg focus:z-10 focus:outline-none focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-2 focus:ring-indigo-500 dark:focus:ring-indigo-600"
+                            class="relative px-4 py-3 inline-flex w-full rounded-lg focus:z-10 focus:outline-none focus:border-indigo-500 focus:ring-2 focus:ring-indigo-500"
                             :class="{
-                                'border-t border-gray-200 dark:border-gray-700 focus:border-none rounded-t-none':
+                                'border-t border-card-border focus:border-none rounded-t-none':
                                     i > 0,
                                 'rounded-b-none':
                                     i !==
diff --git a/resources/js/Pages/Teams/Partials/UpdateTeamNameForm.vue b/resources/js/Pages/Teams/Partials/UpdateTeamNameForm.vue
index ba008cdb..f021589b 100644
--- a/resources/js/Pages/Teams/Partials/UpdateTeamNameForm.vue
+++ b/resources/js/Pages/Teams/Partials/UpdateTeamNameForm.vue
@@ -46,10 +46,10 @@ const updateTeamName = () => {
                         :alt="team.owner.name" />
 
                     <div class="ms-4 leading-tight">
-                        <div class="text-gray-900 dark:text-white">
+                        <div class="text-white">
                             {{ team.owner.name }}
                         </div>
-                        <div class="text-gray-700 dark:text-gray-300 text-sm">
+                        <div class="text-muted text-sm">
                             {{ team.owner.email }}
                         </div>
                     </div>
diff --git a/resources/js/Pages/Teams/Show.vue b/resources/js/Pages/Teams/Show.vue
index cafd3319..cbca621a 100644
--- a/resources/js/Pages/Teams/Show.vue
+++ b/resources/js/Pages/Teams/Show.vue
@@ -18,7 +18,7 @@ defineProps<{
     <AppLayout title="Team Settings">
         <template #header>
             <h2
-                class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
+                class="font-semibold text-xl text-white leading-tight">
                 Team Settings
             </h2>
         </template>
diff --git a/resources/js/Pages/TermsOfService.vue b/resources/js/Pages/TermsOfService.vue
index 2bdc68cc..45ad655d 100644
--- a/resources/js/Pages/TermsOfService.vue
+++ b/resources/js/Pages/TermsOfService.vue
@@ -10,15 +10,15 @@ defineProps({
 <template>
     <Head title="Terms of Service" />
 
-    <div class="font-sans text-gray-900 dark:text-gray-100 antialiased">
-        <div class="pt-4 bg-gray-100 dark:bg-gray-900">
+    <div class="font-sans text-gray-100 antialiased">
+        <div class="pt-4 bg-gray-900">
             <div class="min-h-screen flex flex-col items-center pt-6 sm:pt-0">
                 <div>
                     <AuthenticationCardLogo />
                 </div>
 
                 <div
-                    class="w-full sm:max-w-2xl mt-6 p-6 bg-white dark:bg-gray-800 shadow-md overflow-hidden sm:rounded-lg prose dark:prose-invert"
+                    class="w-full sm:max-w-2xl mt-6 p-6 bg-gray-800 shadow-md overflow-hidden sm:rounded-lg prose dark:prose-invert"
                     v-html="terms" />
             </div>
         </div>

From fbea4be0b1694398022ad237c4c9b80f3fb6970e Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregorvostrak@Gregors-MacBook-Pro.local>
Date: Wed, 13 Mar 2024 17:12:27 +0100
Subject: [PATCH 19/20] turn trace on for all tests

---
 playwright.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playwright.config.ts b/playwright.config.ts
index 507e1c49..0194e5ea 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -27,7 +27,7 @@ export default defineConfig({
         // baseURL: 'http://127.0.0.1:3000',
 
         /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-        trace: process.env.CI ? 'on-first-retry' : 'on',
+        trace: 'on',
     },
 
     timeout: 10 * 1000,

From 9c216cd1c7422099b8c1937368f7a72107560cf6 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregorvostrak@Gregors-MacBook-Pro.local>
Date: Wed, 13 Mar 2024 17:38:32 +0100
Subject: [PATCH 20/20] update dependencies

---
 package-lock.json                  | 1423 ++++++++++++++--------------
 playwright.config.ts               |    2 +-
 resources/js/Layouts/AppLayout.vue |    2 +-
 3 files changed, 730 insertions(+), 697 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f1d717a5..496c0b7a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -338,15 +338,6 @@
                 "node": ">=6.9.0"
             }
         },
-        "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-            "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-            "dev": true,
-            "dependencies": {
-                "yallist": "^3.0.2"
-            }
-        },
         "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
             "version": "6.3.1",
             "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -356,12 +347,6 @@
                 "semver": "bin/semver.js"
             }
         },
-        "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-            "dev": true
-        },
         "node_modules/@babel/helper-environment-visitor": {
             "version": "7.22.20",
             "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
@@ -589,9 +574,9 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.23.9",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.9.tgz",
-            "integrity": "sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==",
+            "version": "7.24.0",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz",
+            "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==",
             "dependencies": {
                 "regenerator-runtime": "^0.14.0"
             },
@@ -658,9 +643,9 @@
             }
         },
         "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.11.tgz",
-            "integrity": "sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
+            "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
             "cpu": [
                 "ppc64"
             ],
@@ -674,9 +659,9 @@
             }
         },
         "node_modules/@esbuild/android-arm": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.11.tgz",
-            "integrity": "sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
+            "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
             "cpu": [
                 "arm"
             ],
@@ -690,9 +675,9 @@
             }
         },
         "node_modules/@esbuild/android-arm64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.11.tgz",
-            "integrity": "sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
+            "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
             "cpu": [
                 "arm64"
             ],
@@ -706,9 +691,9 @@
             }
         },
         "node_modules/@esbuild/android-x64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.11.tgz",
-            "integrity": "sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
+            "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
             "cpu": [
                 "x64"
             ],
@@ -722,9 +707,9 @@
             }
         },
         "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.11.tgz",
-            "integrity": "sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
+            "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
             "cpu": [
                 "arm64"
             ],
@@ -738,9 +723,9 @@
             }
         },
         "node_modules/@esbuild/darwin-x64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.11.tgz",
-            "integrity": "sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
+            "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
             "cpu": [
                 "x64"
             ],
@@ -754,9 +739,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.11.tgz",
-            "integrity": "sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
+            "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
             "cpu": [
                 "arm64"
             ],
@@ -770,9 +755,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.11.tgz",
-            "integrity": "sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
+            "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
             "cpu": [
                 "x64"
             ],
@@ -786,9 +771,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.11.tgz",
-            "integrity": "sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
+            "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
             "cpu": [
                 "arm"
             ],
@@ -802,9 +787,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.11.tgz",
-            "integrity": "sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
+            "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
             "cpu": [
                 "arm64"
             ],
@@ -818,9 +803,9 @@
             }
         },
         "node_modules/@esbuild/linux-ia32": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.11.tgz",
-            "integrity": "sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
+            "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
             "cpu": [
                 "ia32"
             ],
@@ -834,9 +819,9 @@
             }
         },
         "node_modules/@esbuild/linux-loong64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.11.tgz",
-            "integrity": "sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
+            "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
             "cpu": [
                 "loong64"
             ],
@@ -850,9 +835,9 @@
             }
         },
         "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.11.tgz",
-            "integrity": "sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
+            "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
             "cpu": [
                 "mips64el"
             ],
@@ -866,9 +851,9 @@
             }
         },
         "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.11.tgz",
-            "integrity": "sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
+            "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
             "cpu": [
                 "ppc64"
             ],
@@ -882,9 +867,9 @@
             }
         },
         "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.11.tgz",
-            "integrity": "sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
+            "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
             "cpu": [
                 "riscv64"
             ],
@@ -898,9 +883,9 @@
             }
         },
         "node_modules/@esbuild/linux-s390x": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.11.tgz",
-            "integrity": "sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
+            "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
             "cpu": [
                 "s390x"
             ],
@@ -914,9 +899,9 @@
             }
         },
         "node_modules/@esbuild/linux-x64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.11.tgz",
-            "integrity": "sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
+            "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
             "cpu": [
                 "x64"
             ],
@@ -930,9 +915,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.11.tgz",
-            "integrity": "sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
+            "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
             "cpu": [
                 "x64"
             ],
@@ -946,9 +931,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.11.tgz",
-            "integrity": "sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
+            "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
             "cpu": [
                 "x64"
             ],
@@ -962,9 +947,9 @@
             }
         },
         "node_modules/@esbuild/sunos-x64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.11.tgz",
-            "integrity": "sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
+            "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
             "cpu": [
                 "x64"
             ],
@@ -978,9 +963,9 @@
             }
         },
         "node_modules/@esbuild/win32-arm64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.11.tgz",
-            "integrity": "sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
+            "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
             "cpu": [
                 "arm64"
             ],
@@ -994,9 +979,9 @@
             }
         },
         "node_modules/@esbuild/win32-ia32": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.11.tgz",
-            "integrity": "sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
+            "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
             "cpu": [
                 "ia32"
             ],
@@ -1010,9 +995,9 @@
             }
         },
         "node_modules/@esbuild/win32-x64": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.11.tgz",
-            "integrity": "sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
+            "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
             "cpu": [
                 "x64"
             ],
@@ -1093,9 +1078,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "8.56.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
-            "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
+            "version": "8.57.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+            "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
             "peer": true,
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1222,24 +1207,24 @@
             "peer": true
         },
         "node_modules/@inertiajs/core": {
-            "version": "1.0.14",
-            "resolved": "https://registry.npmjs.org/@inertiajs/core/-/core-1.0.14.tgz",
-            "integrity": "sha512-S33PU6mWEYbn/s2Op+CJ6MN7ON354vWw8Y+UvtQzPt0r7pVgOuIArrqqsoulf9oQz9sbP1+vp/tCvyBzm4XmpA==",
+            "version": "1.0.15",
+            "resolved": "https://registry.npmjs.org/@inertiajs/core/-/core-1.0.15.tgz",
+            "integrity": "sha512-7h73+manxkpXdSPlVa2uSjo10AbSS0z9Q1jV7r/otqHfTYCNp7JJxHUX4QpKq/3Z88U8bDUe1RRix1o76pyd5Q==",
             "dev": true,
             "dependencies": {
-                "axios": "^1.2.0",
+                "axios": "^1.6.0",
                 "deepmerge": "^4.0.0",
                 "nprogress": "^0.2.0",
                 "qs": "^6.9.0"
             }
         },
         "node_modules/@inertiajs/vue3": {
-            "version": "1.0.14",
-            "resolved": "https://registry.npmjs.org/@inertiajs/vue3/-/vue3-1.0.14.tgz",
-            "integrity": "sha512-lKL3Bm9k95Gw1GAq4RxgjfwSMfklkeMbvEfzwmsEBsZ4BbbWwfpC/+KS+4O4faTjjijczvkDPhMKv4duzFxtGw==",
+            "version": "1.0.15",
+            "resolved": "https://registry.npmjs.org/@inertiajs/vue3/-/vue3-1.0.15.tgz",
+            "integrity": "sha512-9Im1DAei5OrMDGu3XkVBE45hb5KEyujqGq9D3eE/Va1/NMHF76+SpGUQc+A5cJcBDjo3JG31Fl2R4li7WiIecw==",
             "dev": true,
             "dependencies": {
-                "@inertiajs/core": "1.0.14",
+                "@inertiajs/core": "1.0.15",
                 "lodash.clonedeep": "^4.5.0",
                 "lodash.isequal": "^4.5.0"
             },
@@ -1247,6 +1232,14 @@
                 "vue": "^3.0.0"
             }
         },
+        "node_modules/@internationalized/date": {
+            "version": "3.5.2",
+            "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.5.2.tgz",
+            "integrity": "sha512-vo1yOMUt2hzp63IutEaTUxROdvQg1qlMRsbCvbay2AK2Gai7wIgCyK5weEX3nHkiLgo4qCXHijFNC/ILhlRpOQ==",
+            "dependencies": {
+                "@swc/helpers": "^0.5.0"
+            }
+        },
         "node_modules/@isaacs/cliui": {
             "version": "8.0.2",
             "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -1264,6 +1257,33 @@
                 "node": ">=12"
             }
         },
+        "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+            "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+            }
+        },
+        "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+            "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+            "dev": true,
+            "dependencies": {
+                "ansi-regex": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+            }
+        },
         "node_modules/@jridgewell/gen-mapping": {
             "version": "0.3.5",
             "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
@@ -1279,9 +1299,9 @@
             }
         },
         "node_modules/@jridgewell/resolve-uri": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-            "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+            "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
             "dev": true,
             "engines": {
                 "node": ">=6.0.0"
@@ -1302,9 +1322,9 @@
             "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
         },
         "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.24",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.24.tgz",
-            "integrity": "sha512-+VaWXDa6+l6MhflBvVXjIEAzb59nQ2JUK3bwRp2zRpPtU+8TFRy9Gg/5oIcNlkEL5PGlBFGfemUVvIgLnTzq7Q==",
+            "version": "0.3.25",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+            "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
             "dev": true,
             "dependencies": {
                 "@jridgewell/resolve-uri": "^3.1.0",
@@ -1327,20 +1347,6 @@
                 "fs-extra": "^10.1.0"
             }
         },
-        "node_modules/@liuli-util/fs-extra/node_modules/fs-extra": {
-            "version": "10.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-            "dev": true,
-            "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -1395,12 +1401,12 @@
             }
         },
         "node_modules/@playwright/test": {
-            "version": "1.41.1",
-            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.41.1.tgz",
-            "integrity": "sha512-9g8EWTjiQ9yFBXc6HjCWe41msLpxEX0KhmfmPl9RPLJdfzL4F0lg2BdJ91O9azFdl11y1pmpwdjBiSxvqc+btw==",
+            "version": "1.42.1",
+            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.42.1.tgz",
+            "integrity": "sha512-Gq9rmS54mjBL/7/MvBaNOBwbfnh7beHvS6oS4srqXFcQHpQCV1+c8JXWE8VLPyRDhgS3H8x8A7hztqI9VnwrAQ==",
             "dev": true,
             "dependencies": {
-                "playwright": "1.41.1"
+                "playwright": "1.42.1"
             },
             "bin": {
                 "playwright": "cli.js"
@@ -1410,9 +1416,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.5.tgz",
-            "integrity": "sha512-idWaG8xeSRCfRq9KpRysDHJ/rEHBEXcHuJ82XY0yYFIWnLMjZv9vF/7DOq8djQ2n3Lk6+3qfSH8AqlmHlmi1MA==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz",
+            "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==",
             "cpu": [
                 "arm"
             ],
@@ -1423,9 +1429,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.5.tgz",
-            "integrity": "sha512-f14d7uhAMtsCGjAYwZGv6TwuS3IFaM4ZnGMUn3aCBgkcHAYErhV1Ad97WzBvS2o0aaDv4mVz+syiN0ElMyfBPg==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz",
+            "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==",
             "cpu": [
                 "arm64"
             ],
@@ -1436,9 +1442,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.5.tgz",
-            "integrity": "sha512-ndoXeLx455FffL68OIUrVr89Xu1WLzAG4n65R8roDlCoYiQcGGg6MALvs2Ap9zs7AHg8mpHtMpwC8jBBjZrT/w==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz",
+            "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==",
             "cpu": [
                 "arm64"
             ],
@@ -1449,9 +1455,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.5.tgz",
-            "integrity": "sha512-UmElV1OY2m/1KEEqTlIjieKfVwRg0Zwg4PLgNf0s3glAHXBN99KLpw5A5lrSYCa1Kp63czTpVll2MAqbZYIHoA==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz",
+            "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==",
             "cpu": [
                 "x64"
             ],
@@ -1462,9 +1468,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.5.tgz",
-            "integrity": "sha512-Q0LcU61v92tQB6ae+udZvOyZ0wfpGojtAKrrpAaIqmJ7+psq4cMIhT/9lfV6UQIpeItnq/2QDROhNLo00lOD1g==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz",
+            "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==",
             "cpu": [
                 "arm"
             ],
@@ -1475,9 +1481,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.5.tgz",
-            "integrity": "sha512-dkRscpM+RrR2Ee3eOQmRWFjmV/payHEOrjyq1VZegRUa5OrZJ2MAxBNs05bZuY0YCtpqETDy1Ix4i/hRqX98cA==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz",
+            "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==",
             "cpu": [
                 "arm64"
             ],
@@ -1488,9 +1494,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.5.tgz",
-            "integrity": "sha512-QaKFVOzzST2xzY4MAmiDmURagWLFh+zZtttuEnuNn19AiZ0T3fhPyjPPGwLNdiDT82ZE91hnfJsUiDwF9DClIQ==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz",
+            "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==",
             "cpu": [
                 "arm64"
             ],
@@ -1501,9 +1507,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.5.tgz",
-            "integrity": "sha512-HeGqmRJuyVg6/X6MpE2ur7GbymBPS8Np0S/vQFHDmocfORT+Zt76qu+69NUoxXzGqVP1pzaY6QIi0FJWLC3OPA==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz",
+            "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==",
             "cpu": [
                 "riscv64"
             ],
@@ -1514,9 +1520,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.5.tgz",
-            "integrity": "sha512-Dq1bqBdLaZ1Gb/l2e5/+o3B18+8TI9ANlA1SkejZqDgdU/jK/ThYaMPMJpVMMXy2uRHvGKbkz9vheVGdq3cJfA==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz",
+            "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==",
             "cpu": [
                 "x64"
             ],
@@ -1527,9 +1533,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.5.tgz",
-            "integrity": "sha512-ezyFUOwldYpj7AbkwyW9AJ203peub81CaAIVvckdkyH8EvhEIoKzaMFJj0G4qYJ5sw3BpqhFrsCc30t54HV8vg==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz",
+            "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==",
             "cpu": [
                 "x64"
             ],
@@ -1540,9 +1546,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.5.tgz",
-            "integrity": "sha512-aHSsMnUw+0UETB0Hlv7B/ZHOGY5bQdwMKJSzGfDfvyhnpmVxLMGnQPGNE9wgqkLUs3+gbG1Qx02S2LLfJ5GaRQ==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz",
+            "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==",
             "cpu": [
                 "arm64"
             ],
@@ -1553,9 +1559,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.5.tgz",
-            "integrity": "sha512-AiqiLkb9KSf7Lj/o1U3SEP9Zn+5NuVKgFdRIZkvd4N0+bYrTOovVd0+LmYCPQGbocT4kvFyK+LXCDiXPBF3fyA==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz",
+            "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==",
             "cpu": [
                 "ia32"
             ],
@@ -1566,9 +1572,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.5.tgz",
-            "integrity": "sha512-1q+mykKE3Vot1kaFJIDoUFv5TuW+QQVaf2FmTT9krg86pQrGStOSJJ0Zil7CFagyxDuouTepzt5Y5TVzyajOdQ==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz",
+            "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==",
             "cpu": [
                 "x64"
             ],
@@ -1579,9 +1585,22 @@
             ]
         },
         "node_modules/@rushstack/eslint-patch": {
-            "version": "1.7.0",
-            "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.7.0.tgz",
-            "integrity": "sha512-Jh4t/593gxs0lJZ/z3NnasKlplXT2f+4y/LZYuaKZW5KAaiVFL/fThhs+17EbUd53jUVJ0QudYCBGbN/psvaqg=="
+            "version": "1.7.2",
+            "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.7.2.tgz",
+            "integrity": "sha512-RbhOOTCNoCrbfkRyoXODZp75MlpiHMgbE5MEBZAnnnLyQNgrigEj4p0lzsMDyc1zVsJDLrivB58tgg3emX0eEA=="
+        },
+        "node_modules/@swc/helpers": {
+            "version": "0.5.6",
+            "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.6.tgz",
+            "integrity": "sha512-aYX01Ke9hunpoCexYAgQucEpARGQ5w/cqHFrIR+e9gdKb1QWTsVJuTJ2ozQzIAxLyRQe/m+2RqzkyOOGiMKRQA==",
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@swc/helpers/node_modules/tslib": {
+            "version": "2.6.2",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+            "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
         },
         "node_modules/@tailwindcss/forms": {
             "version": "0.5.7",
@@ -1631,29 +1650,29 @@
             "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
         },
         "node_modules/@types/node": {
-            "version": "20.11.5",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.5.tgz",
-            "integrity": "sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==",
+            "version": "20.11.27",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.27.tgz",
+            "integrity": "sha512-qyUZfMnCg1KEz57r7pzFtSGt49f6RPkPBis3Vo4PbS7roQEDn22hiHzl/Lo1q4i4hDEgBJmBF/NTNg2XR0HbFg==",
             "dev": true,
             "dependencies": {
                 "undici-types": "~5.26.4"
             }
         },
         "node_modules/@types/semver": {
-            "version": "7.5.6",
-            "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",
-            "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A=="
+            "version": "7.5.8",
+            "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+            "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ=="
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "6.19.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.19.0.tgz",
-            "integrity": "sha512-DUCUkQNklCQYnrBSSikjVChdc84/vMPDQSgJTHBZ64G9bA9w0Crc0rd2diujKbTdp6w2J47qkeHQLoi0rpLCdg==",
+            "version": "6.21.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz",
+            "integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.5.1",
-                "@typescript-eslint/scope-manager": "6.19.0",
-                "@typescript-eslint/type-utils": "6.19.0",
-                "@typescript-eslint/utils": "6.19.0",
-                "@typescript-eslint/visitor-keys": "6.19.0",
+                "@typescript-eslint/scope-manager": "6.21.0",
+                "@typescript-eslint/type-utils": "6.21.0",
+                "@typescript-eslint/utils": "6.21.0",
+                "@typescript-eslint/visitor-keys": "6.21.0",
                 "debug": "^4.3.4",
                 "graphemer": "^1.4.0",
                 "ignore": "^5.2.4",
@@ -1679,14 +1698,14 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "6.19.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.19.0.tgz",
-            "integrity": "sha512-1DyBLG5SH7PYCd00QlroiW60YJ4rWMuUGa/JBV0iZuqi4l4IK3twKPq5ZkEebmGqRjXWVgsUzfd3+nZveewgow==",
-            "dependencies": {
-                "@typescript-eslint/scope-manager": "6.19.0",
-                "@typescript-eslint/types": "6.19.0",
-                "@typescript-eslint/typescript-estree": "6.19.0",
-                "@typescript-eslint/visitor-keys": "6.19.0",
+            "version": "6.21.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz",
+            "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==",
+            "dependencies": {
+                "@typescript-eslint/scope-manager": "6.21.0",
+                "@typescript-eslint/types": "6.21.0",
+                "@typescript-eslint/typescript-estree": "6.21.0",
+                "@typescript-eslint/visitor-keys": "6.21.0",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -1706,12 +1725,12 @@
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "6.19.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz",
-            "integrity": "sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==",
+            "version": "6.21.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz",
+            "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==",
             "dependencies": {
-                "@typescript-eslint/types": "6.19.0",
-                "@typescript-eslint/visitor-keys": "6.19.0"
+                "@typescript-eslint/types": "6.21.0",
+                "@typescript-eslint/visitor-keys": "6.21.0"
             },
             "engines": {
                 "node": "^16.0.0 || >=18.0.0"
@@ -1722,12 +1741,12 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "6.19.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.19.0.tgz",
-            "integrity": "sha512-mcvS6WSWbjiSxKCwBcXtOM5pRkPQ6kcDds/juxcy/727IQr3xMEcwr/YLHW2A2+Fp5ql6khjbKBzOyjuPqGi/w==",
+            "version": "6.21.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz",
+            "integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==",
             "dependencies": {
-                "@typescript-eslint/typescript-estree": "6.19.0",
-                "@typescript-eslint/utils": "6.19.0",
+                "@typescript-eslint/typescript-estree": "6.21.0",
+                "@typescript-eslint/utils": "6.21.0",
                 "debug": "^4.3.4",
                 "ts-api-utils": "^1.0.1"
             },
@@ -1748,9 +1767,9 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "6.19.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.0.tgz",
-            "integrity": "sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==",
+            "version": "6.21.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz",
+            "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==",
             "engines": {
                 "node": "^16.0.0 || >=18.0.0"
             },
@@ -1760,12 +1779,12 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "6.19.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz",
-            "integrity": "sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==",
+            "version": "6.21.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz",
+            "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==",
             "dependencies": {
-                "@typescript-eslint/types": "6.19.0",
-                "@typescript-eslint/visitor-keys": "6.19.0",
+                "@typescript-eslint/types": "6.21.0",
+                "@typescript-eslint/visitor-keys": "6.21.0",
                 "debug": "^4.3.4",
                 "globby": "^11.1.0",
                 "is-glob": "^4.0.3",
@@ -1787,16 +1806,16 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "6.19.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.0.tgz",
-            "integrity": "sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==",
+            "version": "6.21.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz",
+            "integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.4.0",
                 "@types/json-schema": "^7.0.12",
                 "@types/semver": "^7.5.0",
-                "@typescript-eslint/scope-manager": "6.19.0",
-                "@typescript-eslint/types": "6.19.0",
-                "@typescript-eslint/typescript-estree": "6.19.0",
+                "@typescript-eslint/scope-manager": "6.21.0",
+                "@typescript-eslint/types": "6.21.0",
+                "@typescript-eslint/typescript-estree": "6.21.0",
                 "semver": "^7.5.4"
             },
             "engines": {
@@ -1811,11 +1830,11 @@
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "6.19.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz",
-            "integrity": "sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==",
+            "version": "6.21.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz",
+            "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==",
             "dependencies": {
-                "@typescript-eslint/types": "6.19.0",
+                "@typescript-eslint/types": "6.21.0",
                 "eslint-visitor-keys": "^3.4.1"
             },
             "engines": {
@@ -1874,49 +1893,49 @@
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.4.14",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.14.tgz",
-            "integrity": "sha512-ro4Zzl/MPdWs7XwxT7omHRxAjMbDFRZEEjD+2m3NBf8YzAe3HuoSEZosXQo+m1GQ1G3LQ1LdmNh1RKTYe+ssEg==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.21.tgz",
+            "integrity": "sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==",
             "dependencies": {
-                "@babel/parser": "^7.23.6",
-                "@vue/shared": "3.4.14",
+                "@babel/parser": "^7.23.9",
+                "@vue/shared": "3.4.21",
                 "entities": "^4.5.0",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.0.2"
             }
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.4.14",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.14.tgz",
-            "integrity": "sha512-nOZTY+veWNa0DKAceNWxorAbWm0INHdQq7cejFaWM1WYnoNSJbSEKYtE7Ir6lR/+mo9fttZpPVI9ZFGJ1juUEQ==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.21.tgz",
+            "integrity": "sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==",
             "dependencies": {
-                "@vue/compiler-core": "3.4.14",
-                "@vue/shared": "3.4.14"
+                "@vue/compiler-core": "3.4.21",
+                "@vue/shared": "3.4.21"
             }
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.4.14",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.14.tgz",
-            "integrity": "sha512-1vHc9Kv1jV+YBZC/RJxQJ9JCxildTI+qrhtDh6tPkR1O8S+olBUekimY0km0ZNn8nG1wjtFAe9XHij+YLR8cRQ==",
-            "dependencies": {
-                "@babel/parser": "^7.23.6",
-                "@vue/compiler-core": "3.4.14",
-                "@vue/compiler-dom": "3.4.14",
-                "@vue/compiler-ssr": "3.4.14",
-                "@vue/shared": "3.4.14",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.21.tgz",
+            "integrity": "sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==",
+            "dependencies": {
+                "@babel/parser": "^7.23.9",
+                "@vue/compiler-core": "3.4.21",
+                "@vue/compiler-dom": "3.4.21",
+                "@vue/compiler-ssr": "3.4.21",
+                "@vue/shared": "3.4.21",
                 "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.5",
-                "postcss": "^8.4.33",
+                "magic-string": "^0.30.7",
+                "postcss": "^8.4.35",
                 "source-map-js": "^1.0.2"
             }
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.4.14",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.14.tgz",
-            "integrity": "sha512-bXT6+oAGlFjTYVOTtFJ4l4Jab1wjsC0cfSfOe2B4Z0N2vD2zOBSQ9w694RsCfhjk+bC2DY5Gubb1rHZVii107Q==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.21.tgz",
+            "integrity": "sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==",
             "dependencies": {
-                "@vue/compiler-dom": "3.4.14",
-                "@vue/shared": "3.4.14"
+                "@vue/compiler-dom": "3.4.21",
+                "@vue/shared": "3.4.21"
             }
         },
         "node_modules/@vue/devtools-api": {
@@ -1986,48 +2005,48 @@
             }
         },
         "node_modules/@vue/reactivity": {
-            "version": "3.4.14",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.14.tgz",
-            "integrity": "sha512-xRYwze5Q4tK7tT2J4uy4XLhK/AIXdU5EBUu9PLnIHcOKXO0uyXpNNMzlQKuq7B+zwtq6K2wuUL39pHA6ZQzObw==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.21.tgz",
+            "integrity": "sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==",
             "dependencies": {
-                "@vue/shared": "3.4.14"
+                "@vue/shared": "3.4.21"
             }
         },
         "node_modules/@vue/runtime-core": {
-            "version": "3.4.14",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.14.tgz",
-            "integrity": "sha512-qu+NMkfujCoZL6cfqK5NOfxgXJROSlP2ZPs4CTcVR+mLrwl4TtycF5Tgo0QupkdBL+2kigc6EsJlTcuuZC1NaQ==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.21.tgz",
+            "integrity": "sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==",
             "dependencies": {
-                "@vue/reactivity": "3.4.14",
-                "@vue/shared": "3.4.14"
+                "@vue/reactivity": "3.4.21",
+                "@vue/shared": "3.4.21"
             }
         },
         "node_modules/@vue/runtime-dom": {
-            "version": "3.4.14",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.14.tgz",
-            "integrity": "sha512-B85XmcR4E7XsirEHVqhmy4HPbRT9WLFWV9Uhie3OapV9m1MEN9+Er6hmUIE6d8/l2sUygpK9RstFM2bmHEUigA==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.21.tgz",
+            "integrity": "sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==",
             "dependencies": {
-                "@vue/runtime-core": "3.4.14",
-                "@vue/shared": "3.4.14",
+                "@vue/runtime-core": "3.4.21",
+                "@vue/shared": "3.4.21",
                 "csstype": "^3.1.3"
             }
         },
         "node_modules/@vue/server-renderer": {
-            "version": "3.4.14",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.14.tgz",
-            "integrity": "sha512-pwSKXQfYdJBTpvWHGEYI+akDE18TXAiLcGn+Q/2Fj8wQSHWztoo7PSvfMNqu6NDhp309QXXbPFEGCU5p85HqkA==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.21.tgz",
+            "integrity": "sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==",
             "dependencies": {
-                "@vue/compiler-ssr": "3.4.14",
-                "@vue/shared": "3.4.14"
+                "@vue/compiler-ssr": "3.4.21",
+                "@vue/shared": "3.4.21"
             },
             "peerDependencies": {
-                "vue": "3.4.14"
+                "vue": "3.4.21"
             }
         },
         "node_modules/@vue/shared": {
-            "version": "3.4.14",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.14.tgz",
-            "integrity": "sha512-nmi3BtLpvqXAWoRZ6HQ+pFJOHBU4UnH3vD3opgmwXac7vhaHKA9nj1VeGjMggdB9eLtW83eHyPCmOU1qzdsC7Q=="
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g=="
         },
         "node_modules/@vue/tsconfig": {
             "version": "0.5.1",
@@ -2108,24 +2127,22 @@
             }
         },
         "node_modules/ansi-regex": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-            "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-            "dev": true,
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
             "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+                "node": ">=8"
             }
         },
         "node_modules/ansi-styles": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-            "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-            "dev": true,
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=8"
             },
             "funding": {
                 "url": "https://github.com/chalk/ansi-styles?sponsor=1"
@@ -2177,9 +2194,9 @@
             "dev": true
         },
         "node_modules/autoprefixer": {
-            "version": "10.4.16",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz",
-            "integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==",
+            "version": "10.4.18",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.18.tgz",
+            "integrity": "sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==",
             "dev": true,
             "funding": [
                 {
@@ -2196,9 +2213,9 @@
                 }
             ],
             "dependencies": {
-                "browserslist": "^4.21.10",
-                "caniuse-lite": "^1.0.30001538",
-                "fraction.js": "^4.3.6",
+                "browserslist": "^4.23.0",
+                "caniuse-lite": "^1.0.30001591",
+                "fraction.js": "^4.3.7",
                 "normalize-range": "^0.1.2",
                 "picocolors": "^1.0.0",
                 "postcss-value-parser": "^4.2.0"
@@ -2214,9 +2231,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.6.5",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
-            "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
+            "version": "1.6.7",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
+            "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
             "dev": true,
             "dependencies": {
                 "follow-redirects": "^1.15.4",
@@ -2264,9 +2281,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.22.2",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
-            "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
+            "version": "4.23.0",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
+            "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
             "dev": true,
             "funding": [
                 {
@@ -2283,8 +2300,8 @@
                 }
             ],
             "dependencies": {
-                "caniuse-lite": "^1.0.30001565",
-                "electron-to-chromium": "^1.4.601",
+                "caniuse-lite": "^1.0.30001587",
+                "electron-to-chromium": "^1.4.668",
                 "node-releases": "^2.0.14",
                 "update-browserslist-db": "^1.0.13"
             },
@@ -2305,14 +2322,19 @@
             }
         },
         "node_modules/call-bind": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-            "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+            "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
             "dev": true,
             "dependencies": {
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
                 "function-bind": "^1.1.2",
-                "get-intrinsic": "^1.2.1",
-                "set-function-length": "^1.1.1"
+                "get-intrinsic": "^1.2.4",
+                "set-function-length": "^1.2.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -2343,9 +2365,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001577",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001577.tgz",
-            "integrity": "sha512-rs2ZygrG1PNXMfmncM0B5H1hndY5ZCC9b5TkFaVNfZ+AUlyqcMyVIQtc3fsezi0NUCk5XZfDf9WS6WxMxnfdrg==",
+            "version": "1.0.30001597",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001597.tgz",
+            "integrity": "sha512-7LjJvmQU6Sj7bL0j5b5WY/3n7utXUJvAe1lxhsHDbLmwX9mdL86Yjtr+5SRCyf8qME4M7pU2hswj0FpyBVCv9w==",
             "dev": true,
             "funding": [
                 {
@@ -2377,31 +2399,11 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/chalk/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
         "node_modules/chokidar": {
-            "version": "3.5.3",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-            "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+            "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
             "dev": true,
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://paulmillr.com/funding/"
-                }
-            ],
             "dependencies": {
                 "anymatch": "~3.1.2",
                 "braces": "~3.0.2",
@@ -2414,6 +2416,9 @@
             "engines": {
                 "node": ">= 8.10.0"
             },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            },
             "optionalDependencies": {
                 "fsevents": "~2.3.2"
             }
@@ -2556,17 +2561,20 @@
             }
         },
         "node_modules/define-data-property": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-            "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+            "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
             "dev": true,
             "dependencies": {
-                "get-intrinsic": "^1.2.1",
-                "gopd": "^1.0.1",
-                "has-property-descriptors": "^1.0.0"
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
+                "gopd": "^1.0.1"
             },
             "engines": {
                 "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
         "node_modules/delayed-stream": {
@@ -2628,15 +2636,10 @@
                 "zrender": "5.5.0"
             }
         },
-        "node_modules/echarts/node_modules/tslib": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-            "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-        },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.632",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.632.tgz",
-            "integrity": "sha512-JGmudTwg7yxMYvR/gWbalqqQiyu7WTFv2Xu3vw4cJHXPFxNgAk0oy8UHaer8nLF4lZJa+rNoj6GsrKIVJTV6Tw==",
+            "version": "1.4.703",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.703.tgz",
+            "integrity": "sha512-094ZZC4nHXPKl/OwPinSMtLN9+hoFkdfQGKnvXbY+3WEAYtVDpz9UhJIViiY6Zb8agvqxiaJzNG9M+pRZWvSZw==",
             "dev": true
         },
         "node_modules/emoji-regex": {
@@ -2656,10 +2659,31 @@
                 "url": "https://github.com/fb55/entities?sponsor=1"
             }
         },
+        "node_modules/es-define-property": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+            "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+            "dev": true,
+            "dependencies": {
+                "get-intrinsic": "^1.2.4"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-errors": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+            "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/esbuild": {
-            "version": "0.19.11",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.11.tgz",
-            "integrity": "sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA==",
+            "version": "0.19.12",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
+            "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
             "dev": true,
             "hasInstallScript": true,
             "bin": {
@@ -2669,35 +2693,35 @@
                 "node": ">=12"
             },
             "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.19.11",
-                "@esbuild/android-arm": "0.19.11",
-                "@esbuild/android-arm64": "0.19.11",
-                "@esbuild/android-x64": "0.19.11",
-                "@esbuild/darwin-arm64": "0.19.11",
-                "@esbuild/darwin-x64": "0.19.11",
-                "@esbuild/freebsd-arm64": "0.19.11",
-                "@esbuild/freebsd-x64": "0.19.11",
-                "@esbuild/linux-arm": "0.19.11",
-                "@esbuild/linux-arm64": "0.19.11",
-                "@esbuild/linux-ia32": "0.19.11",
-                "@esbuild/linux-loong64": "0.19.11",
-                "@esbuild/linux-mips64el": "0.19.11",
-                "@esbuild/linux-ppc64": "0.19.11",
-                "@esbuild/linux-riscv64": "0.19.11",
-                "@esbuild/linux-s390x": "0.19.11",
-                "@esbuild/linux-x64": "0.19.11",
-                "@esbuild/netbsd-x64": "0.19.11",
-                "@esbuild/openbsd-x64": "0.19.11",
-                "@esbuild/sunos-x64": "0.19.11",
-                "@esbuild/win32-arm64": "0.19.11",
-                "@esbuild/win32-ia32": "0.19.11",
-                "@esbuild/win32-x64": "0.19.11"
+                "@esbuild/aix-ppc64": "0.19.12",
+                "@esbuild/android-arm": "0.19.12",
+                "@esbuild/android-arm64": "0.19.12",
+                "@esbuild/android-x64": "0.19.12",
+                "@esbuild/darwin-arm64": "0.19.12",
+                "@esbuild/darwin-x64": "0.19.12",
+                "@esbuild/freebsd-arm64": "0.19.12",
+                "@esbuild/freebsd-x64": "0.19.12",
+                "@esbuild/linux-arm": "0.19.12",
+                "@esbuild/linux-arm64": "0.19.12",
+                "@esbuild/linux-ia32": "0.19.12",
+                "@esbuild/linux-loong64": "0.19.12",
+                "@esbuild/linux-mips64el": "0.19.12",
+                "@esbuild/linux-ppc64": "0.19.12",
+                "@esbuild/linux-riscv64": "0.19.12",
+                "@esbuild/linux-s390x": "0.19.12",
+                "@esbuild/linux-x64": "0.19.12",
+                "@esbuild/netbsd-x64": "0.19.12",
+                "@esbuild/openbsd-x64": "0.19.12",
+                "@esbuild/sunos-x64": "0.19.12",
+                "@esbuild/win32-arm64": "0.19.12",
+                "@esbuild/win32-ia32": "0.19.12",
+                "@esbuild/win32-x64": "0.19.12"
             }
         },
         "node_modules/escalade": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+            "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
             "dev": true,
             "engines": {
                 "node": ">=6"
@@ -2716,16 +2740,16 @@
             }
         },
         "node_modules/eslint": {
-            "version": "8.56.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
-            "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
+            "version": "8.57.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+            "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
             "peer": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.6.1",
                 "@eslint/eslintrc": "^2.1.4",
-                "@eslint/js": "8.56.0",
-                "@humanwhocodes/config-array": "^0.11.13",
+                "@eslint/js": "8.57.0",
+                "@humanwhocodes/config-array": "^0.11.14",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@nodelib/fs.walk": "^1.2.8",
                 "@ungap/structured-clone": "^1.2.0",
@@ -2811,17 +2835,17 @@
             }
         },
         "node_modules/eslint-plugin-vue": {
-            "version": "9.20.1",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.20.1.tgz",
-            "integrity": "sha512-GyCs8K3lkEvoyC1VV97GJhP1SvqsKCiWGHnbn0gVUYiUhaH2+nB+Dv1uekv1THFMPbBfYxukrzQdltw950k+LQ==",
+            "version": "9.23.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.23.0.tgz",
+            "integrity": "sha512-Bqd/b7hGYGrlV+wP/g77tjyFmp81lh5TMw0be9093X02SyelxRRfCI6/IsGq/J7Um0YwB9s0Ry0wlFyjPdmtUw==",
             "peer": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.4.0",
                 "natural-compare": "^1.4.0",
                 "nth-check": "^2.1.1",
-                "postcss-selector-parser": "^6.0.13",
-                "semver": "^7.5.4",
-                "vue-eslint-parser": "^9.4.0",
+                "postcss-selector-parser": "^6.0.15",
+                "semver": "^7.6.0",
+                "vue-eslint-parser": "^9.4.2",
                 "xml-name-validator": "^4.0.0"
             },
             "engines": {
@@ -2832,9 +2856,9 @@
             }
         },
         "node_modules/eslint-plugin-vue/node_modules/postcss-selector-parser": {
-            "version": "6.0.15",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz",
-            "integrity": "sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==",
+            "version": "6.0.16",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
+            "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
             "peer": true,
             "dependencies": {
                 "cssesc": "^3.0.0",
@@ -2870,15 +2894,6 @@
                 "url": "https://opencollective.com/eslint"
             }
         },
-        "node_modules/eslint/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "peer": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/eslint/node_modules/brace-expansion": {
             "version": "1.1.11",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -2901,18 +2916,6 @@
                 "node": "*"
             }
         },
-        "node_modules/eslint/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "peer": true,
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/espree": {
             "version": "9.6.1",
             "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
@@ -3041,9 +3044,9 @@
             "peer": true
         },
         "node_modules/fastq": {
-            "version": "1.16.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
-            "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
+            "version": "1.17.1",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+            "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
             "dependencies": {
                 "reusify": "^1.0.4"
             }
@@ -3102,9 +3105,9 @@
             }
         },
         "node_modules/flatted": {
-            "version": "3.2.9",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-            "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+            "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
             "peer": true
         },
         "node_modules/follow-redirects": {
@@ -3171,9 +3174,9 @@
             }
         },
         "node_modules/fs-extra": {
-            "version": "11.2.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-            "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
             "dev": true,
             "dependencies": {
                 "graceful-fs": "^4.2.0",
@@ -3181,7 +3184,7 @@
                 "universalify": "^2.0.0"
             },
             "engines": {
-                "node": ">=14.14"
+                "node": ">=12"
             }
         },
         "node_modules/fs.realpath": {
@@ -3191,9 +3194,9 @@
             "peer": true
         },
         "node_modules/fsevents": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
             "dev": true,
             "hasInstallScript": true,
             "optional": true,
@@ -3223,37 +3226,39 @@
             }
         },
         "node_modules/get-intrinsic": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-            "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+            "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
             "dev": true,
             "dependencies": {
+                "es-errors": "^1.3.0",
                 "function-bind": "^1.1.2",
                 "has-proto": "^1.0.1",
                 "has-symbols": "^1.0.3",
                 "hasown": "^2.0.0"
             },
+            "engines": {
+                "node": ">= 0.4"
+            },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
         "node_modules/glob": {
-            "version": "10.3.10",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
-            "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
-            "dev": true,
+            "version": "7.2.3",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "peer": true,
             "dependencies": {
-                "foreground-child": "^3.1.0",
-                "jackspeak": "^2.3.5",
-                "minimatch": "^9.0.1",
-                "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-                "path-scurry": "^1.10.1"
-            },
-            "bin": {
-                "glob": "dist/esm/bin.mjs"
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
             },
             "engines": {
-                "node": ">=16 || 14 >=14.17"
+                "node": "*"
             },
             "funding": {
                 "url": "https://github.com/sponsors/isaacs"
@@ -3270,6 +3275,28 @@
                 "node": ">=10.13.0"
             }
         },
+        "node_modules/glob/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "peer": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/glob/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "peer": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/globals": {
             "version": "13.24.0",
             "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
@@ -3357,21 +3384,21 @@
             }
         },
         "node_modules/has-property-descriptors": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-            "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+            "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
             "dev": true,
             "dependencies": {
-                "get-intrinsic": "^1.2.2"
+                "es-define-property": "^1.0.0"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
         "node_modules/has-proto": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-            "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+            "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
             "dev": true,
             "engines": {
                 "node": ">= 0.4"
@@ -3393,9 +3420,9 @@
             }
         },
         "node_modules/hasown": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-            "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
             "dev": true,
             "dependencies": {
                 "function-bind": "^1.1.2"
@@ -3414,9 +3441,9 @@
             }
         },
         "node_modules/ignore": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-            "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+            "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
             "engines": {
                 "node": ">= 4"
             }
@@ -3645,9 +3672,9 @@
             }
         },
         "node_modules/laravel-vite-plugin": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.1.tgz",
-            "integrity": "sha512-laLEZUnSskIDZtLb2FNRdcjsRUhh1VOVvapbVGVTeaBPJTCF/b6gbPiX2dZdcH1RKoOE0an7L+2gnInk6K33Zw==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.2.tgz",
+            "integrity": "sha512-Mcclml10khYzBVxDwJro8wnVDwD4i7XOSEMACQNnarvTnHjrjXLLL+B/Snif2wYAyElsOqagJZ7VAinb/2vF5g==",
             "dev": true,
             "dependencies": {
                 "picocolors": "^1.0.0",
@@ -3723,12 +3750,6 @@
             "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
             "dev": true
         },
-        "node_modules/lodash.debounce": {
-            "version": "4.0.8",
-            "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-            "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-            "dev": true
-        },
         "node_modules/lodash.isequal": {
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
@@ -3746,25 +3767,19 @@
             "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
             "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
         },
-        "node_modules/lodash.pick": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-            "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==",
-            "dev": true
-        },
         "node_modules/lru-cache": {
-            "version": "10.1.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz",
-            "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==",
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+            "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
             "dev": true,
-            "engines": {
-                "node": "14 || >=16.14"
+            "dependencies": {
+                "yallist": "^3.0.2"
             }
         },
         "node_modules/magic-string": {
-            "version": "0.30.5",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-            "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+            "version": "0.30.8",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
+            "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
             "dependencies": {
                 "@jridgewell/sourcemap-codec": "^1.4.15"
             },
@@ -4205,6 +4220,15 @@
                 "url": "https://github.com/sponsors/isaacs"
             }
         },
+        "node_modules/path-scurry/node_modules/lru-cache": {
+            "version": "10.2.0",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
+            "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
+            "dev": true,
+            "engines": {
+                "node": "14 || >=16.14"
+            }
+        },
         "node_modules/path-type": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -4298,12 +4322,12 @@
             }
         },
         "node_modules/playwright": {
-            "version": "1.41.1",
-            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.41.1.tgz",
-            "integrity": "sha512-gdZAWG97oUnbBdRL3GuBvX3nDDmUOuqzV/D24dytqlKt+eI5KbwusluZRGljx1YoJKZ2NRPaeWiFTeGZO7SosQ==",
+            "version": "1.42.1",
+            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.42.1.tgz",
+            "integrity": "sha512-PgwB03s2DZBcNRoW+1w9E+VkLBxweib6KTXM0M3tkiT4jVxKSi6PmVJ591J+0u10LUrgxB7dLRbiJqO5s2QPMg==",
             "dev": true,
             "dependencies": {
-                "playwright-core": "1.41.1"
+                "playwright-core": "1.42.1"
             },
             "bin": {
                 "playwright": "cli.js"
@@ -4316,9 +4340,9 @@
             }
         },
         "node_modules/playwright-core": {
-            "version": "1.41.1",
-            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.41.1.tgz",
-            "integrity": "sha512-/KPO5DzXSMlxSX77wy+HihKGOunh3hqndhqeo/nMxfigiKzogn8kfL0ZBDu0L1RKgan5XHCPmn6zXd2NUJgjhg==",
+            "version": "1.42.1",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.42.1.tgz",
+            "integrity": "sha512-mxz6zclokgrke9p1vtdy/COWBH+eOZgYUVVU34C73M+4j4HLlQJHtfcqiqqxpP0o8HhMkflvfbquLX5dg6wlfA==",
             "dev": true,
             "bin": {
                 "playwright-core": "cli.js"
@@ -4327,24 +4351,10 @@
                 "node": ">=16"
             }
         },
-        "node_modules/playwright/node_modules/fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-            "dev": true,
-            "hasInstallScript": true,
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
-            "engines": {
-                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-            }
-        },
         "node_modules/postcss": {
-            "version": "8.4.33",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
-            "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
+            "version": "8.4.35",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
+            "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -4440,12 +4450,15 @@
             }
         },
         "node_modules/postcss-load-config/node_modules/lilconfig": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz",
-            "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==",
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.1.tgz",
+            "integrity": "sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==",
             "dev": true,
             "engines": {
                 "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antonk52"
             }
         },
         "node_modules/postcss-nested": {
@@ -4468,9 +4481,9 @@
             }
         },
         "node_modules/postcss-nested/node_modules/postcss-selector-parser": {
-            "version": "6.0.15",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz",
-            "integrity": "sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==",
+            "version": "6.0.16",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
+            "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
             "dev": true,
             "dependencies": {
                 "cssesc": "^3.0.0",
@@ -4509,9 +4522,9 @@
             }
         },
         "node_modules/prettier": {
-            "version": "3.2.4",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.4.tgz",
-            "integrity": "sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==",
+            "version": "3.2.5",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
+            "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
             "peer": true,
             "bin": {
                 "prettier": "bin/prettier.cjs"
@@ -4549,12 +4562,12 @@
             }
         },
         "node_modules/qs": {
-            "version": "6.11.2",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
-            "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+            "version": "6.12.0",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.0.tgz",
+            "integrity": "sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==",
             "dev": true,
             "dependencies": {
-                "side-channel": "^1.0.4"
+                "side-channel": "^1.0.6"
             },
             "engines": {
                 "node": ">=0.6"
@@ -4583,13 +4596,32 @@
             ]
         },
         "node_modules/radix-vue": {
-            "version": "1.4.9",
-            "resolved": "https://registry.npmjs.org/radix-vue/-/radix-vue-1.4.9.tgz",
-            "integrity": "sha512-xGY29nUqaAJTncubdhevwGuv5ZSHGvZjUinWBXVrwHvo6oeJ/SLudxYuc3qRcAU+DK+OcthEQFq255wLJJe4Rw==",
+            "version": "1.5.2",
+            "resolved": "https://registry.npmjs.org/radix-vue/-/radix-vue-1.5.2.tgz",
+            "integrity": "sha512-XyXB6mYm7dthW56LDHG4ttR3x+XtspTi48nSq4vHoHldgGZzAEa5VXlqUCr2J21fNKrt3NIYhIIRLB6kKwWwrA==",
             "dependencies": {
                 "@floating-ui/dom": "^1.5.4",
                 "@floating-ui/vue": "^1.0.4",
-                "fast-deep-equal": "^3.1.3"
+                "@internationalized/date": "^3.5.2",
+                "fast-deep-equal": "^3.1.3",
+                "nanoid": "^5.0.6"
+            }
+        },
+        "node_modules/radix-vue/node_modules/nanoid": {
+            "version": "5.0.6",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.0.6.tgz",
+            "integrity": "sha512-rRq0eMHoGZxlvaFOUdK1Ev83Bd1IgzzR+WJ3IbDJ7QOSdAxYjlurSPqFs9s4lJg29RT6nPwizFtJhQS6V5xgiA==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "bin": {
+                "nanoid": "bin/nanoid.js"
+            },
+            "engines": {
+                "node": "^18 || >=20"
             }
         },
         "node_modules/read-cache": {
@@ -4682,52 +4714,10 @@
                 "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "node_modules/rimraf/node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "peer": true,
-            "dependencies": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-            }
-        },
-        "node_modules/rimraf/node_modules/glob": {
-            "version": "7.2.3",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-            "peer": true,
-            "dependencies": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.1.1",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-            },
-            "engines": {
-                "node": "*"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/rimraf/node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-            "peer": true,
-            "dependencies": {
-                "brace-expansion": "^1.1.7"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
         "node_modules/rollup": {
-            "version": "4.9.5",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.5.tgz",
-            "integrity": "sha512-E4vQW0H/mbNMw2yLSqJyjtkHY9dslf/p0zuT1xehNRqUTBOFMqEjguDvqhXr7N7r/4ttb2jr4T41d3dncmIgbQ==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz",
+            "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==",
             "dev": true,
             "dependencies": {
                 "@types/estree": "1.0.5"
@@ -4740,19 +4730,19 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.9.5",
-                "@rollup/rollup-android-arm64": "4.9.5",
-                "@rollup/rollup-darwin-arm64": "4.9.5",
-                "@rollup/rollup-darwin-x64": "4.9.5",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.9.5",
-                "@rollup/rollup-linux-arm64-gnu": "4.9.5",
-                "@rollup/rollup-linux-arm64-musl": "4.9.5",
-                "@rollup/rollup-linux-riscv64-gnu": "4.9.5",
-                "@rollup/rollup-linux-x64-gnu": "4.9.5",
-                "@rollup/rollup-linux-x64-musl": "4.9.5",
-                "@rollup/rollup-win32-arm64-msvc": "4.9.5",
-                "@rollup/rollup-win32-ia32-msvc": "4.9.5",
-                "@rollup/rollup-win32-x64-msvc": "4.9.5",
+                "@rollup/rollup-android-arm-eabi": "4.13.0",
+                "@rollup/rollup-android-arm64": "4.13.0",
+                "@rollup/rollup-darwin-arm64": "4.13.0",
+                "@rollup/rollup-darwin-x64": "4.13.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.13.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.13.0",
+                "@rollup/rollup-linux-arm64-musl": "4.13.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.13.0",
+                "@rollup/rollup-linux-x64-gnu": "4.13.0",
+                "@rollup/rollup-linux-x64-musl": "4.13.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.13.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.13.0",
+                "@rollup/rollup-win32-x64-msvc": "4.13.0",
                 "fsevents": "~2.3.2"
             }
         },
@@ -4779,9 +4769,9 @@
             }
         },
         "node_modules/semver": {
-            "version": "7.5.4",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+            "version": "7.6.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+            "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
             "dependencies": {
                 "lru-cache": "^6.0.0"
             },
@@ -4803,17 +4793,23 @@
                 "node": ">=10"
             }
         },
+        "node_modules/semver/node_modules/yallist": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        },
         "node_modules/set-function-length": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.0.tgz",
-            "integrity": "sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==",
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+            "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
             "dev": true,
             "dependencies": {
-                "define-data-property": "^1.1.1",
+                "define-data-property": "^1.1.4",
+                "es-errors": "^1.3.0",
                 "function-bind": "^1.1.2",
-                "get-intrinsic": "^1.2.2",
+                "get-intrinsic": "^1.2.4",
                 "gopd": "^1.0.1",
-                "has-property-descriptors": "^1.0.1"
+                "has-property-descriptors": "^1.0.2"
             },
             "engines": {
                 "node": ">= 0.4"
@@ -4839,14 +4835,18 @@
             }
         },
         "node_modules/side-channel": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+            "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
             "dev": true,
             "dependencies": {
-                "call-bind": "^1.0.0",
-                "get-intrinsic": "^1.0.2",
-                "object-inspect": "^1.9.0"
+                "call-bind": "^1.0.7",
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.4",
+                "object-inspect": "^1.13.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -4927,34 +4927,25 @@
                 "node": ">=8"
             }
         },
-        "node_modules/string-width-cjs/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/string-width-cjs/node_modules/emoji-regex": {
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
             "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
             "dev": true
         },
-        "node_modules/string-width-cjs/node_modules/strip-ansi": {
+        "node_modules/string-width/node_modules/ansi-regex": {
             "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+            "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
             "dev": true,
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
             "engines": {
-                "node": ">=8"
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
             }
         },
-        "node_modules/strip-ansi": {
+        "node_modules/string-width/node_modules/strip-ansi": {
             "version": "7.1.0",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
             "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
@@ -4969,12 +4960,10 @@
                 "url": "https://github.com/chalk/strip-ansi?sponsor=1"
             }
         },
-        "node_modules/strip-ansi-cjs": {
-            "name": "strip-ansi",
+        "node_modules/strip-ansi": {
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -4982,11 +4971,15 @@
                 "node": ">=8"
             }
         },
-        "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+        "node_modules/strip-ansi-cjs": {
+            "name": "strip-ansi",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "dev": true,
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
             "engines": {
                 "node": ">=8"
             }
@@ -5025,6 +5018,28 @@
                 "node": ">=16 || 14 >=14.17"
             }
         },
+        "node_modules/sucrase/node_modules/glob": {
+            "version": "10.3.10",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+            "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+            "dev": true,
+            "dependencies": {
+                "foreground-child": "^3.1.0",
+                "jackspeak": "^2.3.5",
+                "minimatch": "^9.0.1",
+                "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+                "path-scurry": "^1.10.1"
+            },
+            "bin": {
+                "glob": "dist/esm/bin.mjs"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
         "node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -5063,6 +5078,11 @@
                 "url": "https://opencollective.com/unts"
             }
         },
+        "node_modules/synckit/node_modules/tslib": {
+            "version": "2.6.2",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+            "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+        },
         "node_modules/tailwind-merge": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.2.1.tgz",
@@ -5113,9 +5133,9 @@
             }
         },
         "node_modules/tailwindcss/node_modules/postcss-selector-parser": {
-            "version": "6.0.15",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz",
-            "integrity": "sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==",
+            "version": "6.0.16",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
+            "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
             "dev": true,
             "dependencies": {
                 "cssesc": "^3.0.0",
@@ -5135,6 +5155,12 @@
                 "typescript": "^4.7.4"
             }
         },
+        "node_modules/tanu/node_modules/tslib": {
+            "version": "2.6.2",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+            "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+            "dev": true
+        },
         "node_modules/tanu/node_modules/typescript": {
             "version": "4.9.5",
             "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
@@ -5176,9 +5202,9 @@
             }
         },
         "node_modules/tiny-invariant": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
-            "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==",
+            "version": "1.3.3",
+            "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
+            "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
             "dev": true
         },
         "node_modules/to-fast-properties": {
@@ -5202,11 +5228,11 @@
             }
         },
         "node_modules/ts-api-utils": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
-            "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+            "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
             "engines": {
-                "node": ">=16.13.0"
+                "node": ">=16"
             },
             "peerDependencies": {
                 "typescript": ">=4.2.0"
@@ -5231,9 +5257,9 @@
             "dev": true
         },
         "node_modules/tslib": {
-            "version": "2.6.2",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-            "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+            "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
         },
         "node_modules/type-check": {
             "version": "0.4.0",
@@ -5260,9 +5286,9 @@
             }
         },
         "node_modules/typescript": {
-            "version": "5.3.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
-            "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+            "version": "5.4.2",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz",
+            "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==",
             "bin": {
                 "tsc": "bin/tsc",
                 "tsserver": "bin/tsserver"
@@ -5343,13 +5369,13 @@
             "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
         },
         "node_modules/vite": {
-            "version": "5.0.11",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.11.tgz",
-            "integrity": "sha512-XBMnDjZcNAw/G1gEiskiM1v6yzM4GE5aMGvhWTlHAYYhxb7S3/V1s3m2LDHa8Vh6yIWYYB0iJwsEaS523c4oYA==",
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.6.tgz",
+            "integrity": "sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==",
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.19.3",
-                "postcss": "^8.4.32",
+                "postcss": "^8.4.35",
                 "rollup": "^4.2.0"
             },
             "bin": {
@@ -5398,9 +5424,9 @@
             }
         },
         "node_modules/vite-plugin-checker": {
-            "version": "0.6.2",
-            "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.6.2.tgz",
-            "integrity": "sha512-YvvvQ+IjY09BX7Ab+1pjxkELQsBd4rPhWNw8WLBeFVxu/E7O+n6VYAqNsKdK/a2luFlX/sMpoWdGFfg4HvwdJQ==",
+            "version": "0.6.4",
+            "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.6.4.tgz",
+            "integrity": "sha512-2zKHH5oxr+ye43nReRbC2fny1nyARwhxdm0uNYp/ERy4YvU9iZpNOsueoi/luXw5gnpqRSvjcEPxXbS153O2wA==",
             "dev": true,
             "dependencies": {
                 "@babel/code-frame": "^7.12.13",
@@ -5410,8 +5436,6 @@
                 "commander": "^8.0.0",
                 "fast-glob": "^3.2.7",
                 "fs-extra": "^11.1.0",
-                "lodash.debounce": "^4.0.8",
-                "lodash.pick": "^4.4.0",
                 "npm-run-path": "^4.0.1",
                 "semver": "^7.5.0",
                 "strip-ansi": "^6.0.0",
@@ -5462,15 +5486,6 @@
                 }
             }
         },
-        "node_modules/vite-plugin-checker/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/vite-plugin-checker/node_modules/commander": {
             "version": "8.3.0",
             "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
@@ -5480,16 +5495,18 @@
                 "node": ">= 12"
             }
         },
-        "node_modules/vite-plugin-checker/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+        "node_modules/vite-plugin-checker/node_modules/fs-extra": {
+            "version": "11.2.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+            "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
             "dev": true,
             "dependencies": {
-                "ansi-regex": "^5.0.1"
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=14.14"
             }
         },
         "node_modules/vite-plugin-full-reload": {
@@ -5502,6 +5519,20 @@
                 "picomatch": "^2.3.1"
             }
         },
+        "node_modules/vite/node_modules/fsevents": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+            "dev": true,
+            "hasInstallScript": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
         "node_modules/vscode-jsonrpc": {
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
@@ -5588,15 +5619,15 @@
             "dev": true
         },
         "node_modules/vue": {
-            "version": "3.4.14",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.14.tgz",
-            "integrity": "sha512-Rop5Al/ZcBbBz+KjPZaZDgHDX0kUP4duEzDbm+1o91uxYUNmJrZSBuegsNIJvUGy+epLevNRNhLjm08VKTgGyw==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.21.tgz",
+            "integrity": "sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==",
             "dependencies": {
-                "@vue/compiler-dom": "3.4.14",
-                "@vue/compiler-sfc": "3.4.14",
-                "@vue/runtime-dom": "3.4.14",
-                "@vue/server-renderer": "3.4.14",
-                "@vue/shared": "3.4.14"
+                "@vue/compiler-dom": "3.4.21",
+                "@vue/compiler-sfc": "3.4.21",
+                "@vue/runtime-dom": "3.4.21",
+                "@vue/server-renderer": "3.4.21",
+                "@vue/shared": "3.4.21"
             },
             "peerDependencies": {
                 "typescript": "*"
@@ -5657,9 +5688,9 @@
             }
         },
         "node_modules/vue-eslint-parser": {
-            "version": "9.4.0",
-            "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.0.tgz",
-            "integrity": "sha512-7KsNBb6gHFA75BtneJsoK/dbZ281whUIwFYdQxA68QrCrGMXYzUMbPDHGcOQ0OocIVKrWSKWXZ4mL7tonCXoUw==",
+            "version": "9.4.2",
+            "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.2.tgz",
+            "integrity": "sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==",
             "dependencies": {
                 "debug": "^4.3.4",
                 "eslint-scope": "^7.1.1",
@@ -5774,30 +5805,6 @@
                 "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
             }
         },
-        "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
         "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -5818,16 +5825,43 @@
                 "node": ">=8"
             }
         },
-        "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+        "node_modules/wrap-ansi/node_modules/ansi-regex": {
             "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+            "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/ansi-styles": {
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+            "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/strip-ansi": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+            "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
             "dev": true,
             "dependencies": {
-                "ansi-regex": "^5.0.1"
+                "ansi-regex": "^6.0.1"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
             }
         },
         "node_modules/wrappy": {
@@ -5846,15 +5880,19 @@
             }
         },
         "node_modules/yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+            "dev": true
         },
         "node_modules/yaml": {
-            "version": "2.3.4",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
-            "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
+            "version": "2.4.1",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz",
+            "integrity": "sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==",
             "dev": true,
+            "bin": {
+                "yaml": "bin.mjs"
+            },
             "engines": {
                 "node": ">= 14"
             }
@@ -5872,9 +5910,9 @@
             }
         },
         "node_modules/ziggy-js": {
-            "version": "1.8.1",
-            "resolved": "https://registry.npmjs.org/ziggy-js/-/ziggy-js-1.8.1.tgz",
-            "integrity": "sha512-fnf30uG0yvUQBPL4T8YPgmkBHUdjYaOFgUb1K1gj0+rclnLTNr9/K/cxC3xkCZyYCZz8oTnXkdf3oJXRPSzavw==",
+            "version": "1.8.2",
+            "resolved": "https://registry.npmjs.org/ziggy-js/-/ziggy-js-1.8.2.tgz",
+            "integrity": "sha512-lCtJkecWwAIinVs2aQgKMSheFbZ60VHnEBXMdJ5I/n7C8kFt2NNd0iuFCc0fLYMBzLl25qhVeYTK+1aZr3jGVA==",
             "dev": true,
             "dependencies": {
                 "qs": "~6.9.7"
@@ -5908,11 +5946,6 @@
             "dependencies": {
                 "tslib": "2.3.0"
             }
-        },
-        "node_modules/zrender/node_modules/tslib": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-            "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
         }
     }
 }
diff --git a/playwright.config.ts b/playwright.config.ts
index 0194e5ea..507e1c49 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -27,7 +27,7 @@ export default defineConfig({
         // baseURL: 'http://127.0.0.1:3000',
 
         /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-        trace: 'on',
+        trace: process.env.CI ? 'on-first-retry' : 'on',
     },
 
     timeout: 10 * 1000,
diff --git a/resources/js/Layouts/AppLayout.vue b/resources/js/Layouts/AppLayout.vue
index e102764a..94a54c25 100644
--- a/resources/js/Layouts/AppLayout.vue
+++ b/resources/js/Layouts/AppLayout.vue
@@ -88,7 +88,7 @@ defineProps({
                     class="flex-1"
                     title="Settings"
                     :icon="Cog6ToothIcon"
-                    :href="route('dashboard')"></NavigationSidebarItem>
+                    :href="route('profile.show')"></NavigationSidebarItem>
 
                 <UserSettingsIcon></UserSettingsIcon>
             </ul>