fix billable default when starting time entry from recently tracked tasks

.env.production

@@ -1,6 +1,4 @@
 APP_NAME=solidtime
-APP_VERSION=0.0.0
-APP_BUILD=0
 VITE_APP_NAME=solidtime
 APP_ENV=production
 APP_DEBUG=false

.github/workflows/build-private.yml

@@ -20,55 +20,15 @@ jobs:
     steps:
       - name: "Check out code"
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
-
-      - name: "Get build"
-        id: build
-        run: echo "build=$(git rev-parse --short=8 HEAD)" >> "$GITHUB_OUTPUT"
-
-      - name: "Get Previous tag (normal push)"
-        id: previoustag
-        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        uses: "WyriHaximus/github-action-get-previous-tag@v1"
-        with:
-          prefix: "v"
-
-      - name: "Get version"
-        id: version
-        run: |
-          if ${{ !startsWith(github.ref, 'refs/tags/v') }}; then
-            if ${{ startsWith(steps.previoustag.outputs.tag, 'v') }}; then
-              version=$(echo "${{ steps.previoustag.outputs.tag }}" | cut -c 2-)
-              echo "app_version=${version}" >> "$GITHUB_OUTPUT"
-            else
-              echo "ERROR: No previous tag found";
-              exit 1;
-            fi
-          else
-            version=$(echo "${{ github.ref }}" | cut -c 12-)
-            echo "app_version=${version}" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: "Copy .env template for production"
-        run: |
-          cp .env.production .env
-          rm .env.production .env.ci .env.example
-
-      - name: "Add version to .env"
-        run: sed -i 's/APP_VERSION=0.0.0/APP_VERSION=${{ steps.version.outputs.app_version }}/g' .env
-
-      - name: "Add build to .env"
-        run: sed -i 's/APP_BUILD=0/APP_BUILD=${{ steps.build.outputs.build }}/g' .env
-
-      - name: "Output .env"
-        run: cat .env
 
       - name: "Use Node.js"
         uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 
+      - name: "Copy .env template for production"
+        run: cp .env.production .env && cat .env
+
       - name: "Checkout billing extension"
         uses: actions/checkout@v4
         with:

.github/workflows/build-public-release.yml

@@ -0,0 +1,90 @@
+on:
+  push:
+    tags:
+      - '*'
+  pull_request:
+    paths:
+      - '.github/workflows/build-public.yml'
+      - 'docker/prod/**'
+  workflow_dispatch:
+
+name: Build - Public (Release)
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+      id-token: write
+    timeout-minutes: 90
+
+    steps:
+      - name: "Check out code"
+        uses: actions/checkout@v4
+
+      - name: "Copy .env template for production"
+        run: cp .env.production .env
+
+      - name: "Install dependencies"
+        uses: php-actions/composer@v6
+        if: steps.cache-vendor.outputs.cache-hit != 'true' # Skip if cache hit
+        with:
+          command: install
+          only_args: --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
+          php_version: 8.3
+
+      - name: "Use Node.js"
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+
+      - name: "Install npm dependencies"
+        run: npm ci
+
+      - name: "Build"
+        run: npm run build
+
+      - name: "Login to GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: "Login to GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: "Docker meta"
+        id: "meta"
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            solidtime/solidtime
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+
+      - name: "Set up QEMU"
+        uses: docker/setup-qemu-action@v3
+
+      - name: "Set up Docker Buildx"
+        uses: docker/setup-buildx-action@v3
+
+      - name: "Build and push"
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: docker/prod/Dockerfile
+          build-args: |
+            DOCKER_FILES_BASE_PATH=docker/prod/
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/build-public.yml

@@ -3,8 +3,6 @@ on:
     branches:
       - main
       - develop
-    tags:
-      - '*'
   pull_request:
     paths:
       - '.github/workflows/build-public.yml'
@@ -25,49 +23,9 @@ jobs:
     steps:
       - name: "Check out code"
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
-
-      - name: "Get build"
-        id: build
-        run: echo "build=$(git rev-parse --short=8 HEAD)" >> "$GITHUB_OUTPUT"
-
-      - name: "Get Previous tag (normal push)"
-        id: previoustag
-        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        uses: "WyriHaximus/github-action-get-previous-tag@v1"
-        with:
-          prefix: "v"
-
-      - name: "Get version"
-        id: version
-        run: |
-          if ${{ !startsWith(github.ref, 'refs/tags/v') }}; then
-            if ${{ startsWith(steps.previoustag.outputs.tag, 'v') }}; then
-              version=$(echo "${{ steps.previoustag.outputs.tag }}" | cut -c 2-)
-              echo "app_version=${version}" >> "$GITHUB_OUTPUT"
-            else
-              echo "ERROR: No previous tag found";
-              exit 1;
-            fi
-          else
-            version=$(echo "${{ github.ref }}" | cut -c 12-)
-            echo "app_version=${version}" >> "$GITHUB_OUTPUT"
-          fi
 
       - name: "Copy .env template for production"
-        run: |
-          cp .env.production .env
-          rm .env.production .env.ci .env.example
-
-      - name: "Add version to .env"
-        run: sed -i 's/APP_VERSION=0.0.0/APP_VERSION=${{ steps.version.outputs.app_version }}/g' .env
-
-      - name: "Add build to .env"
-        run: sed -i 's/APP_BUILD=0/APP_BUILD=${{ steps.build.outputs.build }}/g' .env
-
-      - name: "Output .env"
-        run: cat .env
+        run: cp .env.production .env
 
       - name: "Install dependencies"
         uses: php-actions/composer@v6

app/Actions/Fortify/CreateNewUser.php

@@ -45,7 +45,7 @@ class CreateNewUser implements CreatesNewUsers
                 'string',
                 'email',
                 'max:255',
-                UniqueEloquent::make(User::class, 'email', function (Builder $builder): Builder {
+                new UniqueEloquent(User::class, 'email', function (Builder $builder): Builder {
                     /** @var Builder<User> $builder */
                     return $builder->where('is_placeholder', '=', false);
                 }),

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -35,7 +35,7 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
                 'required',
                 'email',
                 'max:255',
-                UniqueEloquent::make(User::class, 'email')->ignore($user->id)->query(function (Builder $query) {
+                (new UniqueEloquent(User::class, 'email'))->ignore($user->id)->query(function (Builder $query) {
                     /** @var Builder<User> $query */
                     return $query->where('is_placeholder', '=', false);
                 }),

app/Actions/Jetstream/AddOrganizationMember.php

@@ -71,10 +71,10 @@ class AddOrganizationMember implements AddsTeamMembers
             'email' => [
                 'required',
                 'email',
-                ExistsEloquent::make(User::class, 'email', function (Builder $builder) {
+                (new ExistsEloquent(User::class, 'email', function (Builder $builder) {
                     /** @var Builder<User> $builder */
                     return $builder->where('is_placeholder', '=', false);
-                })->withMessage(__('We were unable to find a registered user with this email address.')),
+                }))->withMessage(__('We were unable to find a registered user with this email address.')),
             ],
             'role' => [
                 'required',

app/Console/Commands/SelfHost/SelfHostCheckForUpdateCommand.php

@@ -1,46 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Console\Commands\SelfHost;
-
-use App\Service\ApiService;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Cache;
-
-class SelfHostCheckForUpdateCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'self-host:check-for-update';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = '';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
-    {
-        $apiService = app(ApiService::class);
-
-        $latestVersion = $apiService->checkForUpdate();
-        if ($latestVersion === null) {
-            $this->error('Failed to check for update, check the logs for more information.');
-
-            return self::FAILURE;
-        }
-
-        // Note: Cache for 13 hours, because the command runs twice daily (every 12 hours).
-        Cache::put('latest_version', $latestVersion, 60 * 60 * 12);
-
-        return self::SUCCESS;
-    }
-}

app/Console/Commands/SelfHost/SelfHostTelemetryCommand.php

@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Console\Commands\SelfHost;
-
-use App\Service\ApiService;
-use Illuminate\Console\Command;
-
-class SelfHostTelemetryCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'self-host:telemetry';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = '';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
-    {
-        $apiService = app(ApiService::class);
-
-        $success = $apiService->telemetry();
-
-        if (! $success) {
-            $this->error('Failed to send telemetry data, check the logs for more information.');
-
-            return self::FAILURE;
-
-        }
-
-        return self::SUCCESS;
-    }
-}

app/Console/Kernel.php

@@ -17,14 +17,6 @@ class Kernel extends ConsoleKernel
         $schedule->command('time-entry:send-still-running-mails')
             ->when(fn (): bool => config('scheduling.tasks.time_entry_send_still_running_mails'))
             ->everyTenMinutes();
-
-        $schedule->command('self-host:check-for-update')
-            ->when(fn (): bool => config('scheduling.tasks.self_hosting_check_for_update'))
-            ->twiceDaily();
-
-        $schedule->command('self-host:telemetry')
-            ->when(fn (): bool => config('scheduling.tasks.self_hosting_telemetry'))
-            ->twiceDaily();
     }
 
     /**

app/Enums/ProjectMemberRole.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enums;
+
+enum ProjectMemberRole: string
+{
+    case Manager = 'manager';
+    case Normal = 'normal';
+}

app/Extensions/Scramble/PaginatedResourceCollectionTypeToSchema.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Extensions\Scramble;
 
 use App\Http\Resources\PaginatedResourceCollection;
-use App\Http\Resources\V1\TimeEntry\TimeEntryCollection;
 use Dedoc\Scramble\Extensions\TypeToSchemaExtension;
 use Dedoc\Scramble\Support\Generator\Response;
 use Dedoc\Scramble\Support\Generator\Schema;
@@ -45,49 +44,39 @@ class PaginatedResourceCollectionTypeToSchema extends TypeToSchemaExtension
             return null;
         }
 
-        $newType = new OpenApiObjectType;
-        $newType->addProperty('data', (new ArrayType)->setItems($collectingType));
-        if ($type instanceof ObjectType && $type->isInstanceOf(TimeEntryCollection::class)) {
-            $newType->addProperty(
-                'meta',
-                (new OpenApiObjectType)
-                    ->addProperty('total', (new IntegerType)->setDescription('Total number of items being paginated.'))
-                    ->setRequired(['total'])
-            );
-            $newType->setRequired(['data', 'meta']);
-        } else {
-            $newType->addProperty(
-                'links',
-                (new OpenApiObjectType)
-                    ->addProperty('first', (new StringType)->nullable(true))
-                    ->addProperty('last', (new StringType)->nullable(true))
-                    ->addProperty('prev', (new StringType)->nullable(true))
-                    ->addProperty('next', (new StringType)->nullable(true))
-                    ->setRequired(['first', 'last', 'prev', 'next'])
-            );
-            $newType->addProperty(
-                'meta',
-                (new OpenApiObjectType)
-                    ->addProperty('current_page', new IntegerType)
-                    ->addProperty('from', (new IntegerType)->nullable(true))
-                    ->addProperty('last_page', new IntegerType)
-                    ->addProperty('links', (new ArrayType)->setItems(
-                        (new OpenApiObjectType)
-                            ->addProperty('url', (new StringType)->nullable(true))
-                            ->addProperty('label', new StringType)
-                            ->addProperty('active', new BooleanType)
-                            ->setRequired(['url', 'label', 'active'])
-                    )->setDescription('Generated paginator links.'))
-                    ->addProperty('path', (new StringType)->nullable(true)->setDescription('Base path for paginator generated URLs.'))
-                    ->addProperty('per_page', (new IntegerType)->setDescription('Number of items shown per page.'))
-                    ->addProperty('to', (new IntegerType)->nullable(true)->setDescription('Number of the last item in the slice.'))
-                    ->addProperty('total', (new IntegerType)->setDescription('Total number of items being paginated.'))
-                    ->setRequired(['current_page', 'from', 'last_page', 'links', 'path', 'per_page', 'to', 'total'])
-            );
-            $newType->setRequired(['data', 'links', 'meta']);
-        }
+        $type = new OpenApiObjectType;
+        $type->addProperty('data', (new ArrayType)->setItems($collectingType));
+        $type->addProperty(
+            'links',
+            (new OpenApiObjectType)
+                ->addProperty('first', (new StringType)->nullable(true))
+                ->addProperty('last', (new StringType)->nullable(true))
+                ->addProperty('prev', (new StringType)->nullable(true))
+                ->addProperty('next', (new StringType)->nullable(true))
+                ->setRequired(['first', 'last', 'prev', 'next'])
+        );
+        $type->addProperty(
+            'meta',
+            (new OpenApiObjectType)
+                ->addProperty('current_page', new IntegerType)
+                ->addProperty('from', (new IntegerType)->nullable(true))
+                ->addProperty('last_page', new IntegerType)
+                ->addProperty('links', (new ArrayType)->setItems(
+                    (new OpenApiObjectType)
+                        ->addProperty('url', (new StringType)->nullable(true))
+                        ->addProperty('label', new StringType)
+                        ->addProperty('active', new BooleanType)
+                        ->setRequired(['url', 'label', 'active'])
+                )->setDescription('Generated paginator links.'))
+                ->addProperty('path', (new StringType)->nullable(true)->setDescription('Base path for paginator generated URLs.'))
+                ->addProperty('per_page', (new IntegerType)->setDescription('Number of items shown per page.'))
+                ->addProperty('to', (new IntegerType)->nullable(true)->setDescription('Number of the last item in the slice.'))
+                ->addProperty('total', (new IntegerType)->setDescription('Total number of items being paginated.'))
+                ->setRequired(['current_page', 'from', 'last_page', 'links', 'path', 'per_page', 'to', 'total'])
+        );
+        $type->setRequired(['data', 'links', 'meta']);
 
-        return $newType;
+        return $type;
     }
 
     /**

app/Filament/Resources/OrganizationResource.php

@@ -70,7 +70,6 @@ class OrganizationResource extends Resource
                         'nullable',
                         'integer',
                         'gt:0',
-                        'max:2147483647',
                     ])
                     ->numeric(),
                 Forms\Components\DateTimePicker::make('created_at')

app/Filament/Resources/ProjectMemberResource.php

@@ -29,7 +29,6 @@ class ProjectMemberResource extends Resource
                         'nullable',
                         'integer',
                         'gt:0',
-                        'max:2147483647',
                     ])
                     ->numeric(),
                 Forms\Components\Select::make('user_id')

app/Filament/Resources/ProjectResource.php

@@ -45,7 +45,6 @@ class ProjectResource extends Resource
                         'nullable',
                         'integer',
                         'gt:0',
-                        'max:2147483647',
                     ])
                     ->numeric(),
                 Forms\Components\Select::make('organization_id')

app/Filament/Widgets/ServerOverview.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Widgets;
-
-use Filament\Widgets\Widget;
-use Illuminate\Support\Facades\Cache;
-
-class ServerOverview extends Widget
-{
-    protected static string $view = 'filament.widgets.server-overview';
-
-    /**
-     * @return array<string, mixed>
-     */
-    protected function getViewData(): array
-    {
-        /** @var string|null $currentVersion */
-        $currentVersion = config('app.version');
-        /** @var string|null $build */
-        $build = config('app.build');
-        $latestVersion = Cache::get('latest_version', null);
-
-        $needsUpdate = false;
-        if ($latestVersion !== null && $currentVersion !== null && version_compare($latestVersion, $currentVersion) > 0) {
-            $needsUpdate = true;
-        }
-
-        return [
-            'version' => $currentVersion,
-            'build' => $build,
-            'environment' => config('app.env'),
-            'currentVersion' => $latestVersion,
-            'needsUpdate' => $needsUpdate,
-        ];
-    }
-}

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

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Enums\Role;
 use App\Http\Requests\V1\Organization\OrganizationUpdateRequest;
 use App\Http\Resources\V1\Organization\OrganizationResource;
 use App\Models\Organization;
@@ -24,9 +23,7 @@ class OrganizationController extends Controller
     {
         $this->checkPermission($organization, 'organizations:view');
 
-        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
-
-        return new OrganizationResource($organization, $showBillableRate);
+        return new OrganizationResource($organization);
     }
 
     /**
@@ -42,9 +39,6 @@ class OrganizationController extends Controller
 
         $organization->name = $request->input('name');
         $oldBillableRate = $organization->billable_rate;
-        if ($request->has('employees_can_see_billable_rates')) {
-            $organization->employees_can_see_billable_rates = $request->validated('employees_can_see_billable_rates');
-        }
         $organization->billable_rate = $request->getBillableRate();
         $organization->save();
 
@@ -52,6 +46,6 @@ class OrganizationController extends Controller
             $billableRateService->updateTimeEntriesBillableRateForOrganization($organization);
         }
 
-        return new OrganizationResource($organization, true);
+        return new OrganizationResource($organization);
     }
 }

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

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Enums\Role;
+use App\Enums\ProjectMemberRole;
 use App\Exceptions\Api\EntityStillInUseApiException;
 use App\Http\Requests\V1\Project\ProjectIndexRequest;
 use App\Http\Requests\V1\Project\ProjectStoreRequest;
@@ -14,9 +14,10 @@ use App\Http\Resources\V1\Project\ProjectResource;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
-use App\Models\TimeEntry;
 use App\Service\BillableRateService;
 use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Carbon;
@@ -52,6 +53,12 @@ class ProjectController extends Controller
 
         if (! $canViewAllProjects) {
             $projectsQuery->visibleByEmployee($user);
+            $projectsQuery->with([
+                'members' => function (HasMany $query): void {
+                    /** @var Builder<ProjectMember> $query */
+                    $query->whereBelongsTo($this->user(), 'user');
+                },
+            ]);
         }
         $filterArchived = $request->getFilterArchived();
         if ($filterArchived === 'true') {
@@ -62,9 +69,15 @@ class ProjectController extends Controller
 
         $projects = $projectsQuery->paginate(config('app.pagination_per_page_default'));
 
-        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
+        foreach ($projects->items() as $project) {
+            if ($canViewAllProjects) {
+                $project->setAttribute('limited_visibility', false);
+            } else {
+                $project->setAttribute('limited_visibility', $project->members->firstWhere('user_id', $this->user()->id)?->role !== ProjectMemberRole::Manager);
+            }
+        }
 
-        return new ProjectCollection($projects, $showBillableRate);
+        return new ProjectCollection($projects);
     }
 
     /**
@@ -77,13 +90,30 @@ class ProjectController extends Controller
     public function show(Organization $organization, Project $project): JsonResource
     {
         $this->checkPermission($organization, 'projects:view', $project);
+        $canViewAllProjects = $this->hasPermission($organization, 'projects:view:all');
 
-        // Note: There is currently no need to check if a user is a member of the project,
-        // since this is only relevant for users with the role "employee" and they can not access this endpoint.
+        $project->load([
+            'members' => function (HasMany $query): void {
+                /** @var Builder<ProjectMember> $query */
+                $query->whereBelongsTo($this->user(), 'user');
+            },
+        ]);
+
+        if (! $canViewAllProjects) {
+            if (! $project->is_public && $project->members->firstWhere('user_id', '=', $this->user()->id) === null) {
+                throw new AuthorizationException('No access to project');
+            }
+        }
+
+        if ($canViewAllProjects) {
+            $project->setAttribute('limited_visibility', false);
+        } else {
+            $project->setAttribute('limited_visibility', $project->members->firstWhere('user_id', $this->user()->id)?->role !== ProjectMemberRole::Manager);
+        }
 
         $project->load('organization');
 
-        return new ProjectResource($project, true);
+        return new ProjectResource($project);
     }
 
     /**
@@ -108,7 +138,9 @@ class ProjectController extends Controller
         $project->organization()->associate($organization);
         $project->save();
 
-        return new ProjectResource($project, true);
+        $project->setAttribute('limited_visibility', false);
+
+        return new ProjectResource($project);
     }
 
     /**
@@ -131,25 +163,17 @@ class ProjectController extends Controller
             $project->estimated_time = $request->getEstimatedTime();
         }
         $oldBillableRate = $project->billable_rate;
-        $clientIdChanged = false;
         $project->billable_rate = $request->getBillableRate();
-        if ($project->client_id !== $request->input('client_id')) {
-            $project->client_id = $request->input('client_id');
-            $clientIdChanged = true;
-        }
+        $project->client_id = $request->input('client_id');
         $project->save();
 
         if ($oldBillableRate !== $request->getBillableRate()) {
             $billableRateService->updateTimeEntriesBillableRateForProject($project);
         }
-        if ($clientIdChanged) {
-            TimeEntry::query()
-                ->whereBelongsTo($organization, 'organization')
-                ->whereBelongsTo($project, 'project')
-                ->update(['client_id' => $project->client_id]);
-        }
 
-        return new ProjectResource($project, true);
+        $project->setAttribute('limited_visibility', false);
+
+        return new ProjectResource($project);
     }
 
     /**

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

@@ -72,6 +72,7 @@ class ProjectMemberController extends Controller
         }
 
         $projectMember = new ProjectMember;
+        $projectMember->role = $request->getRole();
         $projectMember->billable_rate = $request->getBillableRate();
         $projectMember->member()->associate($member);
         $projectMember->user()->associate($member->user);
@@ -95,11 +96,17 @@ class ProjectMemberController extends Controller
     public function update(Organization $organization, ProjectMember $projectMember, ProjectMemberUpdateRequest $request, BillableRateService $billableRateService): JsonResource
     {
         $this->checkPermission($organization, 'project-members:update', projectMember: $projectMember);
-        $oldBillableRate = $projectMember->billable_rate;
-        $projectMember->billable_rate = $request->getBillableRate();
+        $hasBillableRate = $request->has('billable_rate');
+        if ($hasBillableRate) {
+            $oldBillableRate = $projectMember->billable_rate;
+            $projectMember->billable_rate = $request->getBillableRate();
+        }
+        if ($request->getRole() !== null) {
+            $projectMember->role = $request->getRole();
+        }
         $projectMember->save();
 
-        if ($oldBillableRate !== $request->getBillableRate()) {
+        if ($hasBillableRate && $oldBillableRate !== $request->getBillableRate()) {
             $billableRateService->updateTimeEntriesBillableRateForProjectMember($projectMember);
         }
 

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

@@ -7,7 +7,6 @@ namespace App\Http\Controllers\Api\V1;
 use App\Exceptions\Api\TimeEntryCanNotBeRestartedApiException;
 use App\Exceptions\Api\TimeEntryStillRunningApiException;
 use App\Http\Requests\V1\TimeEntry\TimeEntryAggregateRequest;
-use App\Http\Requests\V1\TimeEntry\TimeEntryDestroyMultipleRequest;
 use App\Http\Requests\V1\TimeEntry\TimeEntryIndexRequest;
 use App\Http\Requests\V1\TimeEntry\TimeEntryStoreRequest;
 use App\Http\Requests\V1\TimeEntry\TimeEntryUpdateMultipleRequest;
@@ -47,8 +46,6 @@ class TimeEntryController extends Controller
      * If you only need time entries for a specific user, you can filter by `user_id`.
      * Users with the permission `time-entries:view:own` can only use this endpoint with their own user ID in the user_id filter.
      *
-     * @return TimeEntryCollection<TimeEntryResource>
-     *
      * @throws AuthorizationException
      *
      * @operationId getTimeEntries
@@ -79,14 +76,11 @@ class TimeEntryController extends Controller
         $filter->addClientIdsFilter($request->input('client_ids'));
         $filter->addBillableFilter($request->input('billable'));
 
-        $totalCount = $timeEntriesQuery->count();
-
-        $limit = $request->getLimit();
+        $limit = $request->has('limit') ? (int) $request->input('limit', 100) : 100;
         if ($limit > 1000) {
             $limit = 1000;
         }
         $timeEntriesQuery->limit($limit);
-        $timeEntriesQuery->skip($request->getOffset());
 
         $timeEntries = $timeEntriesQuery->get();
 
@@ -120,12 +114,7 @@ class TimeEntryController extends Controller
             }
         }
 
-        return (new TimeEntryCollection($timeEntries))
-            ->additional([
-                'meta' => [
-                    'total' => $totalCount,
-                ],
-            ]);
+        return new TimeEntryCollection($timeEntries);
     }
 
     /**
@@ -373,10 +362,6 @@ class TimeEntryController extends Controller
             $oldTask = $timeEntry->task;
 
             $timeEntry->fill($changes);
-            // If project is changed, but task is not, we remove the old task from the time entry
-            if ($oldProject !== null && $project !== null && $oldProject->isNot($project) && $task === null) {
-                $timeEntry->task()->disassociate();
-            }
             if ($overwriteClient) {
                 $timeEntry->client()->associate($client);
             }
@@ -434,66 +419,4 @@ class TimeEntryController extends Controller
         return response()
             ->json(null, 204);
     }
-
-    /**
-     * Delete multiple time entries
-     *
-     * @throws AuthorizationException
-     *
-     * @operationId deleteTimeEntries
-     */
-    public function destroyMultiple(Organization $organization, TimeEntryDestroyMultipleRequest $request): JsonResponse
-    {
-        $this->checkAnyPermission($organization, ['time-entries:delete:all', 'time-entries:delete:own']);
-        $canDeleteAll = $this->hasPermission($organization, 'time-entries:delete:all');
-
-        $ids = $request->validated('ids');
-        $timeEntries = TimeEntry::query()
-            ->whereBelongsTo($organization, 'organization')
-            ->with([
-                'project',
-                'task',
-            ])
-            ->whereIn('id', $ids)
-            ->get();
-
-        $success = new Collection;
-        $error = new Collection;
-
-        foreach ($ids as $id) {
-            /** @var TimeEntry|null $timeEntry */
-            $timeEntry = $timeEntries->firstWhere('id', $id);
-            if ($timeEntry === null) {
-                // Note: ID wrong or time entry in different organization
-                $error->push($id);
-
-                continue;
-            }
-
-            if (! $canDeleteAll && $timeEntry->user_id !== Auth::id()) {
-                $error->push($id);
-
-                continue;
-
-            }
-
-            $project = $timeEntry->project;
-            $task = $timeEntry->task;
-
-            $timeEntry->delete();
-
-            if ($project !== null) {
-                RecalculateSpentTimeForProject::dispatch($project);
-            }
-            if ($task !== null) {
-                RecalculateSpentTimeForTask::dispatch($task);
-            }
-            $success->push($id);
-        }
-
-        return response()->json([
-            'success' => $success->toArray(),
-            'error' => $error->toArray(),
-        ]);
-    }
 }

app/Http/Requests/V1/Client/ClientIndexRequest.php

@@ -20,7 +20,6 @@ class ClientIndexRequest extends FormRequest
             'page' => [
                 'integer',
                 'min:1',
-                'max:2147483647',
             ],
             'archived' => [
                 'string',

app/Http/Requests/V1/Client/ClientStoreRequest.php

@@ -29,10 +29,10 @@ class ClientStoreRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                UniqueEloquent::make(Client::class, 'name', function (Builder $builder): Builder {
+                (new UniqueEloquent(Client::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Client> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->withCustomTranslation('validation.client_name_already_exists'),
+                }))->withCustomTranslation('validation.client_name_already_exists'),
             ],
         ];
     }

app/Http/Requests/V1/Client/ClientUpdateRequest.php

@@ -31,10 +31,10 @@ class ClientUpdateRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                UniqueEloquent::make(Client::class, 'name', function (Builder $builder): Builder {
+                (new UniqueEloquent(Client::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Client> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->ignore($this->client?->getKey())->withCustomTranslation('validation.client_name_already_exists'),
+                }))->ignore($this->client?->getKey())->withCustomTranslation('validation.client_name_already_exists'),
             ],
             'is_archived' => [
                 'boolean',

app/Http/Requests/V1/Invitation/InvitationStoreRequest.php

@@ -29,10 +29,10 @@ class InvitationStoreRequest extends FormRequest
             'email' => [
                 'required',
                 'email',
-                UniqueEloquent::make(OrganizationInvitation::class, 'email', function (Builder $builder): Builder {
+                (new UniqueEloquent(OrganizationInvitation::class, 'email', function (Builder $builder): Builder {
                     /** @var Builder<OrganizationInvitation> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->withCustomTranslation('validation.invitation_already_exists'),
+                }))->withCustomTranslation('validation.invitation_already_exists'),
             ],
             'role' => [
                 'required',

app/Http/Requests/V1/Member/MemberUpdateRequest.php

@@ -31,7 +31,6 @@ class MemberUpdateRequest extends FormRequest
                 'nullable',
                 'integer',
                 'min:0',
-                'max:2147483647',
             ],
         ];
     }

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

@@ -30,10 +30,6 @@ class OrganizationUpdateRequest extends FormRequest
                 'nullable',
                 'integer',
                 'min:0',
-                'max:2147483647',
-            ],
-            'employees_can_see_billable_rates' => [
-                'boolean',
             ],
         ];
     }

app/Http/Requests/V1/Project/ProjectIndexRequest.php

@@ -20,7 +20,6 @@ class ProjectIndexRequest extends FormRequest
             'page' => [
                 'integer',
                 'min:1',
-                'max:2147483647',
             ],
             'archived' => [
                 'string',

app/Http/Requests/V1/Project/ProjectStoreRequest.php

@@ -32,10 +32,10 @@ class ProjectStoreRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                UniqueEloquent::make(Project::class, 'name', function (Builder $builder): Builder {
+                (new UniqueEloquent(Project::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->withCustomTranslation('validation.project_name_already_exists'),
+                }))->withCustomTranslation('validation.project_name_already_exists'),
             ],
             'color' => [
                 'required',
@@ -51,22 +51,20 @@ class ProjectStoreRequest extends FormRequest
                 'nullable',
                 'integer',
                 'min:0',
-                'max:2147483647',
             ],
             // ID of the client
             'client_id' => [
                 'nullable',
-                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(Client::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Client> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // Estimated time in seconds
             'estimated_time' => [
                 'nullable',
                 'integer',
                 'min:0',
-                'max:2147483647',
             ],
         ];
     }

app/Http/Requests/V1/Project/ProjectUpdateRequest.php

@@ -32,10 +32,10 @@ class ProjectUpdateRequest extends FormRequest
                 'required',
                 'string',
                 'max:255',
-                UniqueEloquent::make(Project::class, 'name', function (Builder $builder): Builder {
+                (new UniqueEloquent(Project::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->ignore($this->project?->getKey())->withCustomTranslation('validation.project_name_already_exists'),
+                }))->ignore($this->project?->getKey())->withCustomTranslation('validation.project_name_already_exists'),
             ],
             'color' => [
                 'required',
@@ -52,23 +52,21 @@ class ProjectUpdateRequest extends FormRequest
             ],
             'client_id' => [
                 'nullable',
-                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(Client::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Client> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             'billable_rate' => [
                 'nullable',
                 'integer',
                 'min:0',
-                'max:2147483647',
             ],
             // Estimated time in seconds
             'estimated_time' => [
                 'nullable',
                 'integer',
                 'min:0',
-                'max:2147483647',
             ],
         ];
     }

app/Http/Requests/V1/ProjectMember/ProjectMemberStoreRequest.php

@@ -4,11 +4,13 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\ProjectMember;
 
+use App\Enums\ProjectMemberRole;
 use App\Models\Member;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 
 /**
@@ -19,23 +21,28 @@ class ProjectMemberStoreRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule>>
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
      */
     public function rules(): array
     {
         return [
             'member_id' => [
                 'required',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             'billable_rate' => [
                 'nullable',
                 'integer',
                 'min:0',
-                'max:2147483647',
+            ],
+            'role' => [
+                'required',
+                'string',
+                Rule::enum(ProjectMemberRole::class),
             ],
         ];
     }
@@ -46,4 +53,9 @@ class ProjectMemberStoreRequest extends FormRequest
 
         return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
     }
+
+    public function getRole(): ProjectMemberRole
+    {
+        return ProjectMemberRole::from($this->validated('role'));
+    }
 }

app/Http/Requests/V1/ProjectMember/ProjectMemberUpdateRequest.php

@@ -4,9 +4,11 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\ProjectMember;
 
+use App\Enums\ProjectMemberRole;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 
 /**
  * @property Organization $organization Organization from model binding
@@ -16,7 +18,7 @@ class ProjectMemberUpdateRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule>>
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
      */
     public function rules(): array
     {
@@ -25,7 +27,10 @@ class ProjectMemberUpdateRequest extends FormRequest
                 'nullable',
                 'integer',
                 'min:0',
-                'max:2147483647',
+            ],
+            'role' => [
+                'string',
+                Rule::enum(ProjectMemberRole::class),
             ],
         ];
     }
@@ -34,6 +39,11 @@ class ProjectMemberUpdateRequest extends FormRequest
     {
         $input = $this->input('billable_rate');
 
-        return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
+        return $input !== null && ((int) $input) !== 0 ? (int) $this->validated('billable_rate') : null;
+    }
+
+    public function getRole(): ?ProjectMemberRole
+    {
+        return $this->has('role') ? ProjectMemberRole::from($this->validated('role')) : null;
     }
 }

app/Http/Requests/V1/Tag/TagStoreRequest.php

@@ -29,10 +29,10 @@ class TagStoreRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                UniqueEloquent::make(Tag::class, 'name', function (Builder $builder): Builder {
+                (new UniqueEloquent(Tag::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Tag> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->withCustomTranslation('validation.tag_name_already_exists'),
+                }))->withCustomTranslation('validation.tag_name_already_exists'),
             ],
         ];
     }

app/Http/Requests/V1/Tag/TagUpdateRequest.php

@@ -30,10 +30,10 @@ class TagUpdateRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                UniqueEloquent::make(Tag::class, 'name', function (Builder $builder): Builder {
+                (new UniqueEloquent(Tag::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Tag> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->ignore($this->tag?->getKey())->withCustomTranslation('validation.tag_name_already_exists'),
+                }))->ignore($this->tag?->getKey())->withCustomTranslation('validation.tag_name_already_exists'),
             ],
         ];
     }

app/Http/Requests/V1/Task/TaskIndexRequest.php

@@ -27,7 +27,8 @@ class TaskIndexRequest extends FormRequest
     {
         return [
             'project_id' => [
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     $builder = $builder->whereBelongsTo($this->organization, 'organization');
 
@@ -36,7 +37,7 @@ class TaskIndexRequest extends FormRequest
                     }
 
                     return $builder;
-                })->uuid(),
+                }),
             ],
             'done' => [
                 'string',

app/Http/Requests/V1/Task/TaskStoreRequest.php

@@ -31,24 +31,23 @@ class TaskStoreRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                UniqueEloquent::make(Task::class, 'name', function (Builder $builder): Builder {
+                (new UniqueEloquent(Task::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->where('project_id', '=', $this->input('project_id'));
-                })->withCustomTranslation('validation.task_name_already_exists'),
+                }))->withCustomTranslation('validation.task_name_already_exists'),
             ],
             'project_id' => [
                 'required',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // Estimated time in seconds
             'estimated_time' => [
                 'nullable',
                 'integer',
                 'min:0',
-                'max:2147483647',
             ],
         ];
     }

app/Http/Requests/V1/Task/TaskUpdateRequest.php

@@ -30,10 +30,10 @@ class TaskUpdateRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                UniqueEloquent::make(Task::class, 'name', function (Builder $builder): Builder {
+                (new UniqueEloquent(Task::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->where('project_id', '=', $this->task->project_id);
-                })->ignore($this->task?->getKey())->withCustomTranslation('validation.task_name_already_exists'),
+                }))->ignore($this->task?->getKey())->withCustomTranslation('validation.task_name_already_exists'),
             ],
             'is_done' => [
                 'boolean',
@@ -43,7 +43,6 @@ class TaskUpdateRequest extends FormRequest
                 'nullable',
                 'integer',
                 'min:0',
-                'max:2147483647',
             ],
         ];
     }

app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php

@@ -45,10 +45,11 @@ class TimeEntryAggregateRequest extends FormRequest
             // Filter by member ID
             'member_id' => [
                 'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // Filter by multiple member IDs, member IDs are OR combined, but AND combined with the member_id parameter
             'member_ids' => [
@@ -57,19 +58,21 @@ class TimeEntryAggregateRequest extends FormRequest
             ],
             'member_ids.*' => [
                 'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
 
             // Filter by user ID
             'user_id' => [
                 'string',
-                ExistsEloquent::make(User::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(User::class, null, function (Builder $builder): Builder {
                     /** @var Builder<User> $builder */
                     return $builder->belongsToOrganization($this->organization);
-                })->uuid(),
+                }),
             ],
             // Filter by project IDs, project IDs are OR combined
             'project_ids' => [
@@ -78,10 +81,11 @@ class TimeEntryAggregateRequest extends FormRequest
             ],
             'project_ids.*' => [
                 'string',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // Filter by client IDs, client IDs are OR combined
             'client_ids' => [
@@ -90,10 +94,11 @@ class TimeEntryAggregateRequest extends FormRequest
             ],
             'client_ids.*' => [
                 'string',
-                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Client::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Client> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // Filter by tag IDs, tag IDs are AND combined
             'tag_ids' => [
@@ -102,10 +107,11 @@ class TimeEntryAggregateRequest extends FormRequest
             ],
             'tag_ids.*' => [
                 'string',
-                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Tag::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Tag> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
@@ -114,9 +120,10 @@ class TimeEntryAggregateRequest extends FormRequest
             ],
             'task_ids.*' => [
                 'string',
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // Filter only time entries that have a start date after the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
             'start' => [

app/Http/Requests/V1/TimeEntry/TimeEntryDestroyMultipleRequest.php

@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Requests\V1\TimeEntry;
-
-use App\Models\Organization;
-use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Foundation\Http\FormRequest;
-
-/**
- * @property Organization $organization Organization from model binding
- */
-class TimeEntryDestroyMultipleRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, array<string|ValidationRule>>
-     */
-    public function rules(): array
-    {
-        return [
-            'ids' => [
-                'required',
-                'array',
-            ],
-            'ids.*' => [
-                'string',
-                'uuid',
-            ],
-        ];
-    }
-}

app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Models\Client;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
@@ -31,10 +30,11 @@ class TimeEntryIndexRequest extends FormRequest
             // Filter by member ID
             'member_id' => [
                 'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // Filter by multiple member IDs, member IDs are OR combined, but AND combined with the member_id parameter
             'member_ids' => [
@@ -43,22 +43,11 @@ class TimeEntryIndexRequest extends FormRequest
             ],
             'member_ids.*' => [
                 'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
-            ],
-            // Filter by client IDs, client IDs are OR combined
-            'client_ids' => [
-                'array',
-                'min:1',
-            ],
-            'client_ids.*' => [
-                'string',
-                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Client> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // Filter by project IDs, project IDs are OR combined
             'project_ids' => [
@@ -67,10 +56,11 @@ class TimeEntryIndexRequest extends FormRequest
             ],
             'project_ids.*' => [
                 'string',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // Filter by tag IDs, tag IDs are AND combined
             'tag_ids' => [
@@ -79,10 +69,11 @@ class TimeEntryIndexRequest extends FormRequest
             ],
             'tag_ids.*' => [
                 'string',
-                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Tag::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Tag> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
@@ -91,10 +82,11 @@ class TimeEntryIndexRequest extends FormRequest
             ],
             'task_ids.*' => [
                 'string',
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // Filter only time entries that have a start date after the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
             'start' => [
@@ -125,12 +117,6 @@ class TimeEntryIndexRequest extends FormRequest
                 'min:1',
                 'max:500',
             ],
-            // Skip the first n time entries (default: 0)
-            'offset' => [
-                'integer',
-                'min:0',
-                'max:2147483647',
-            ],
             // Filter makes sure that only time entries of a whole date are returned
             'only_full_dates' => [
                 'string',
@@ -143,14 +129,4 @@ class TimeEntryIndexRequest extends FormRequest
     {
         return $this->input('only_full_dates', 'false') === 'true';
     }
-
-    public function getLimit(): int
-    {
-        return $this->has('limit') ? (int) $this->validated('limit', 100) : 100;
-    }
-
-    public function getOffset(): int
-    {
-        return $this->has('offset') ? (int) $this->validated('offset', 0) : 0;
-    }
 }

app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php

@@ -31,33 +31,36 @@ class TimeEntryStoreRequest extends FormRequest
             'member_id' => [
                 'required',
                 'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             'project_id' => [
                 'nullable',
                 'string',
+                'uuid',
                 'required_with:task_id',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // ID of the task that the time entry should belong to
             'task_id' => [
                 'nullable',
                 'string',
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                }),
+                (new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization')
                         ->where('project_id', $this->input('project_id'));
-                })->uuid()->withMessage(__('validation.task_belongs_to_project')),
+                }))->withMessage(__('validation.task_belongs_to_project')),
             ],
             // Start of time entry (ISO 8601 format, UTC timezone)
             'start' => [
@@ -87,10 +90,12 @@ class TimeEntryStoreRequest extends FormRequest
                 'array',
             ],
             'tags.*' => [
-                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                'string',
+                'uuid',
+                new ExistsEloquent(Tag::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Tag> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
         ];
     }

app/Http/Requests/V1/TimeEntry/TimeEntryUpdateMultipleRequest.php

@@ -42,34 +42,37 @@ class TimeEntryUpdateMultipleRequest extends FormRequest
             // ID of the organization member that the time entry should belong to
             'changes.member_id' => [
                 'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // ID of the project that the time entry should belong to
             'changes.project_id' => [
                 'nullable',
                 'string',
+                'uuid',
                 'required_with:task_id',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // ID of the task that the time entry should belong to
             'changes.task_id' => [
                 'nullable',
                 'string',
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                }),
+                (new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization')
                         ->where('project_id', $this->input('changes.project_id'));
-                })->uuid()->withMessage(__('validation.task_belongs_to_project')),
+                }))->withMessage(__('validation.task_belongs_to_project')),
             ],
             // Whether time entry is billable
             'changes.billable' => [
@@ -88,10 +91,11 @@ class TimeEntryUpdateMultipleRequest extends FormRequest
             ],
             'changes.tags.*' => [
                 'string',
-                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Tag::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Tag> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
         ];
     }

app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php

@@ -30,34 +30,37 @@ class TimeEntryUpdateRequest extends FormRequest
             // ID of the organization member that the time entry should belong to
             'member_id' => [
                 'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // ID of the project that the time entry should belong to
             'project_id' => [
                 'nullable',
                 'string',
+                'uuid',
                 'required_with:task_id',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
             // ID of the task that the time entry should belong to
             'task_id' => [
                 'nullable',
                 'string',
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                }),
+                (new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization')
                         ->where('project_id', $this->input('project_id'));
-                })->uuid()->withMessage(__('validation.task_belongs_to_project')),
+                }))->withMessage(__('validation.task_belongs_to_project')),
             ],
             // Start of time entry (ISO 8601 format, UTC timezone)
             'start' => [
@@ -86,10 +89,11 @@ class TimeEntryUpdateRequest extends FormRequest
             ],
             'tags.*' => [
                 'string',
-                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Tag::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Tag> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
         ];
     }

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

@@ -13,20 +13,6 @@ use Illuminate\Http\Request;
  */
 class OrganizationResource extends BaseResource
 {
-    private bool $showBillableRate;
-
-    /**
-     * Create a new resource instance.
-     *
-     * @return void
-     */
-    public function __construct(Organization $resource, bool $showBillableRate)
-    {
-        parent::__construct($resource);
-
-        $this->showBillableRate = $showBillableRate;
-    }
-
     /**
      * Transform the resource into an array.
      *
@@ -42,9 +28,7 @@ class OrganizationResource extends BaseResource
             /** @var bool $color Personal organizations automatically created after registration */
             'is_personal' => $this->resource->personal_team,
             /** @var int|null $billable_rate Billable rate in cents per hour */
-            'billable_rate' => $this->showBillableRate ? $this->resource->billable_rate : null,
-            /** @var bool $employees_can_see_billable_rates Can members of the organization with role "employee" see the billable rates */
-            'employees_can_see_billable_rates' => $this->resource->employees_can_see_billable_rates,
+            'billable_rate' => $this->resource->billable_rate,
         ];
     }
 }

app/Http/Resources/V1/Project/ProjectCollection.php

@@ -5,39 +5,14 @@ declare(strict_types=1);
 namespace App\Http\Resources\V1\Project;
 
 use App\Http\Resources\PaginatedResourceCollection;
-use App\Models\Project;
-use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
-use Illuminate\Pagination\LengthAwarePaginator;
 
 class ProjectCollection extends ResourceCollection implements PaginatedResourceCollection
 {
-    private bool $showBillableRates;
-
     /**
-     * @param  LengthAwarePaginator<Project>  $resource
-     */
-    public function __construct($resource, bool $showBillableRates)
-    {
-        parent::__construct($resource);
-        $this->showBillableRates = $showBillableRates;
-    }
-
-    protected function collects(): ?string
-    {
-        return null;
-    }
-
-    /**
-     * Transform the resource collection into an array.
+     * The resource that this resource collects.
      *
-     * @return array<array<string, string|bool|int|null>>
+     * @var string
      */
-    public function toArray(Request $request): array
-    {
-        return $this->collection->map(function (Project $project) use ($request): array {
-            return (new ProjectResource($project, $this->showBillableRates))
-                ->toArray($request);
-        })->all();
-    }
+    public $collects = ProjectResource::class;
 }

app/Http/Resources/V1/Project/ProjectResource.php

@@ -13,15 +13,6 @@ use Illuminate\Http\Request;
  */
 class ProjectResource extends BaseResource
 {
-    private bool $showBillableRate;
-
-    public function __construct(Project $resource, bool $showBillableRate)
-    {
-        parent::__construct($resource);
-
-        $this->showBillableRate = $showBillableRate;
-    }
-
     /**
      * Transform the resource into an array.
      *
@@ -29,6 +20,8 @@ class ProjectResource extends BaseResource
      */
     public function toArray(Request $request): array
     {
+        $limitedVisibility = is_bool($this->resource->getAttributeValue('limited_visibility')) ? $this->resource->getAttributeValue('limited_visibility') : true;
+
         return [
             /** @var string $id ID of project */
             'id' => $this->resource->id,
@@ -41,13 +34,15 @@ class ProjectResource extends BaseResource
             /** @var bool $is_archived Whether the client is archived */
             'is_archived' => $this->resource->is_archived,
             /** @var int|null $billable_rate Billable rate in cents per hour */
-            'billable_rate' => $this->showBillableRate ? $this->resource->billable_rate : null,
+            'billable_rate' => $limitedVisibility ? null : $this->resource->billable_rate,
             /** @var bool $is_billable Project time entries billable default */
             'is_billable' => $this->resource->is_billable,
             /** @var int|null $estimated_time Estimated time in seconds */
-            'estimated_time' => $this->resource->estimated_time,
+            'estimated_time' => $limitedVisibility ? null : $this->resource->estimated_time,
             /** @var int $spent_time Spent time on this project in seconds (sum of the duration of all associated time entries, excl. still running time entries) */
-            'spent_time' => $this->resource->spent_time,
+            'spent_time' => $limitedVisibility ? null : $this->resource->spent_time,
+            /** @var bool $limited_visibility */
+            'limited_visibility' => $limitedVisibility,
         ];
     }
 }

app/Http/Resources/V1/ProjectMember/ProjectMemberResource.php

@@ -29,6 +29,8 @@ class ProjectMemberResource extends BaseResource
             'member_id' => $this->resource->member_id,
             /** @var string $project_id ID of the project */
             'project_id' => $this->resource->project_id,
+            /** @var string $role Role of the project member */
+            'role' => $this->resource->role->value,
         ];
     }
 }

app/Http/Resources/V1/TimeEntry/TimeEntryCollection.php

@@ -4,10 +4,9 @@ declare(strict_types=1);
 
 namespace App\Http\Resources\V1\TimeEntry;
 
-use App\Http\Resources\PaginatedResourceCollection;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
-class TimeEntryCollection extends ResourceCollection implements PaginatedResourceCollection
+class TimeEntryCollection extends ResourceCollection
 {
     /**
      * The resource that this resource collects.

app/Models/Organization.php

@@ -29,7 +29,6 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property string $currency
  * @property int|null $billable_rate
  * @property string $user_id
- * @property bool $employees_can_see_billable_rates
  * @property User $owner
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
@@ -59,7 +58,6 @@ class Organization extends JetstreamTeam implements AuditableContract
         'name' => 'string',
         'personal_team' => 'boolean',
         'currency' => 'string',
-        'employees_can_see_billable_rates' => 'boolean',
     ];
 
     /**

app/Models/ProjectMember.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\Enums\ProjectMemberRole;
 use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\ProjectMemberFactory;
@@ -22,6 +23,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property string $user_id User ID (legacy)
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
+ * @property ProjectMemberRole $role
  * @property-read Project $project
  * @property-read Member $member
  * @property-read User $user
@@ -45,6 +47,7 @@ class ProjectMember extends Model implements AuditableContract
      */
     protected $casts = [
         'billable_rate' => 'int',
+        'role' => ProjectMemberRole::class,
     ];
 
     /**

app/Models/TimeEntry.php

@@ -13,7 +13,6 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Carbon;
 use Korridor\LaravelComputedAttributes\ComputedAttributes;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
@@ -80,7 +79,6 @@ class TimeEntry extends Model implements AuditableContract
      */
     protected array $computed = [
         'billable_rate',
-        'client_id',
     ];
 
     /**
@@ -97,44 +95,6 @@ class TimeEntry extends Model implements AuditableContract
         return app(BillableRateService::class)->getBillableRateForTimeEntry($this);
     }
 
-    public function getClientIdComputed(): ?string
-    {
-        return $this->project_id === null ? null : $this->project->client_id;
-    }
-
-    /**
-     * This scope will be applied during the computed property generation with artisan computed-attributes:generate.
-     *
-     * @param  Builder<TimeEntry>  $builder
-     * @param  array<string>  $attributes  Attributes that will be generated.
-     * @return Builder<TimeEntry>
-     */
-    public function scopeComputedAttributesGenerate(Builder $builder, array $attributes): Builder
-    {
-        if (in_array('client_id', $attributes, true)) {
-            $builder->with([
-                'project' => function (Relation $builder): void {
-                    /** @var Builder<Project> $builder */
-                    $builder->select('id', 'client_id');
-                },
-            ]);
-        }
-
-        return $builder;
-    }
-
-    /**
-     * This scope will be applied during the computed property validation with artisan computed-attributes:validate.
-     *
-     * @param  Builder<TimeEntry>  $builder
-     * @param  array<string>  $attributes  Attributes that will be validated.
-     * @return Builder<TimeEntry>
-     */
-    public function scopeComputedAttributesValidate(Builder $builder, array $attributes): Builder
-    {
-        return $this->scopeComputedAttributesGenerate($builder, $attributes);
-    }
-
     public function getDuration(): ?CarbonInterval
     {
         return $this->end === null ? null : $this->start->diffAsCarbonInterval($this->end);

app/Providers/Filament/AdminPanelProvider.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Providers\Filament;
 
 use App\Filament\Widgets\ActiveUserOverview;
-use App\Filament\Widgets\ServerOverview;
 use App\Filament\Widgets\TimeEntriesCreated;
 use App\Filament\Widgets\TimeEntriesImported;
 use App\Filament\Widgets\UserRegistrations;
@@ -45,13 +44,11 @@ class AdminPanelProvider extends PanelProvider
             ])
             ->discoverWidgets(in: app_path('Filament/Widgets'), for: 'App\\Filament\\Widgets')
             ->widgets([
-                ServerOverview::class,
                 ActiveUserOverview::class,
                 UserRegistrations::class,
                 TimeEntriesCreated::class,
                 TimeEntriesImported::class,
             ])
-            ->viteTheme('resources/css/filament/admin/theme.css')
             ->plugins([
                 EnvironmentIndicatorPlugin::make()
                     ->color(fn () => match (App::environment()) {

app/Service/ApiService.php

@@ -1,93 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service;
-
-use App\Models\Audit;
-use App\Models\Client;
-use App\Models\Organization;
-use App\Models\Project;
-use App\Models\ProjectMember;
-use App\Models\Task;
-use App\Models\TimeEntry;
-use App\Models\User;
-use Exception;
-use Illuminate\Support\Facades\Http;
-use Log;
-
-class ApiService
-{
-    private const string API_URL = 'https://app.solidtime.io/api/v1';
-
-    public function checkForUpdate(): ?string
-    {
-        try {
-            $response = Http::asJson()
-                ->timeout(3)
-                ->connectTimeout(2)
-                ->post(self::API_URL.'/ping/version', [
-                    'version' => config('app.version'),
-                    'build' => config('app.build'),
-                    'url' => config('app.url'),
-                ]);
-
-            if ($response->status() === 200 && isset($response->json()['version']) && is_string($response->json()['version'])) {
-                return $response->json()['version'];
-            } else {
-                Log::warning('Failed to check for update', [
-                    'status' => $response->status(),
-                    'body' => $response->body(),
-                ]);
-
-                return null;
-            }
-        } catch (\Throwable $e) {
-            Log::warning('Failed to check for update', [
-                'message' => $e->getMessage(),
-            ]);
-
-            return null;
-        }
-    }
-
-    public function telemetry(): bool
-    {
-        try {
-            $response = Http::asJson()
-                ->timeout(3)
-                ->connectTimeout(2)
-                ->post(self::API_URL.'/ping/telemetry', [
-                    'version' => config('app.version'),
-                    'build' => config('app.build'),
-                    'url' => config('app.url'),
-                    // telemetry data
-                    'user_count' => User::count(),
-                    'organization_count' => Organization::count(),
-                    'audit_count' => Audit::count(),
-                    'project_count' => Project::count(),
-                    'project_member_count' => ProjectMember::count(),
-                    'client_count' => Client::count(),
-                    'task_count' => Task::count(),
-                    'time_entry_count' => TimeEntry::count(),
-                ]);
-
-            if ($response->status() === 200) {
-                return true;
-            } else {
-                Log::warning('Failed send telemetry data', [
-                    'status' => $response->status(),
-                    'body' => $response->body(),
-                ]);
-
-                return false;
-            }
-        } catch (Exception $e) {
-            Log::warning('Failed send telemetry data', [
-                'message' => $e->getMessage(),
-            ]);
-
-            return false;
-        }
-    }
-}

app/Service/Export/ExportService.php

@@ -47,9 +47,6 @@ class ExportService
         // Organizations
         try {
             $writer = Writer::createFromPath($temporaryDirectory->path('organizations.csv'), 'w+');
-            $writer->setDelimiter(',');
-            $writer->setEnclosure('"');
-            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'name',
@@ -69,9 +66,6 @@ class ExportService
 
             // Organization invitations
             $writer = Writer::createFromPath($temporaryDirectory->path('organization_invitations.csv'), 'w+');
-            $writer->setDelimiter(',');
-            $writer->setEnclosure('"');
-            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'email',
@@ -97,9 +91,6 @@ class ExportService
 
             // Time entries
             $writer = Writer::createFromPath($temporaryDirectory->path('time_entries.csv'), 'w+');
-            $writer->setDelimiter(',');
-            $writer->setEnclosure('"');
-            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'description',
@@ -148,9 +139,6 @@ class ExportService
 
             // Clients
             $writer = Writer::createFromPath($temporaryDirectory->path('clients.csv'), 'w+');
-            $writer->setDelimiter(',');
-            $writer->setEnclosure('"');
-            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'name',
@@ -176,9 +164,6 @@ class ExportService
 
             // Projects
             $writer = Writer::createFromPath($temporaryDirectory->path('projects.csv'), 'w+');
-            $writer->setDelimiter(',');
-            $writer->setEnclosure('"');
-            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'name',
@@ -214,9 +199,6 @@ class ExportService
 
             // Project members
             $writer = Writer::createFromPath($temporaryDirectory->path('project_members.csv'), 'w+');
-            $writer->setDelimiter(',');
-            $writer->setEnclosure('"');
-            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'billable_rate',
@@ -244,9 +226,6 @@ class ExportService
 
             // Members
             $writer = Writer::createFromPath($temporaryDirectory->path('members.csv'), 'w+');
-            $writer->setDelimiter(',');
-            $writer->setEnclosure('"');
-            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'user_id',
@@ -281,9 +260,6 @@ class ExportService
 
             // Tasks
             $writer = Writer::createFromPath($temporaryDirectory->path('tasks.csv'), 'w+');
-            $writer->setDelimiter(',');
-            $writer->setEnclosure('"');
-            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'name',
@@ -311,9 +287,6 @@ class ExportService
 
             // Tags
             $writer = Writer::createFromPath($temporaryDirectory->path('tags.csv'), 'w+');
-            $writer->setDelimiter(',');
-            $writer->setEnclosure('"');
-            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'name',

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -47,8 +47,6 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
             $reader = Reader::createFromString($data);
             $reader->setHeaderOffset(0);
             $reader->setDelimiter(',');
-            $reader->setEnclosure('"');
-            $reader->setEscape('');
             $header = $reader->getHeader();
             $this->validateHeader($header);
             $records = $reader->getRecords();

app/Service/Import/Importers/DefaultImporter.php

@@ -112,7 +112,6 @@ abstract class DefaultImporter implements ImporterContract
             'billable_rate' => [
                 'nullable',
                 'integer',
-                'max:2147483647',
             ],
         ], beforeSave: function (Project $project): void {
             if ($project->billable_rate === 0) {
@@ -126,7 +125,6 @@ abstract class DefaultImporter implements ImporterContract
             'billable_rate' => [
                 'nullable',
                 'integer',
-                'max:2147483647',
             ],
         ], beforeSave: function (ProjectMember $projectMember): void {
             if ($projectMember->billable_rate === 0) {

app/Service/Import/Importers/SolidtimeImporter.php

@@ -60,8 +60,6 @@ class SolidtimeImporter extends DefaultImporter
             $clientsReader = Reader::createFromPath($temporaryDirectory->path('clients.csv'));
             $clientsReader->setHeaderOffset(0);
             $clientsReader->setDelimiter(',');
-            $clientsReader->setEnclosure('"');
-            $clientsReader->setEscape('');
 
             if (! file_exists($temporaryDirectory->path('members.csv'))) {
                 throw new ImportException('File "members.csv" missing in ZIP');
@@ -69,8 +67,6 @@ class SolidtimeImporter extends DefaultImporter
             $membersReader = Reader::createFromPath($temporaryDirectory->path('members.csv'));
             $membersReader->setHeaderOffset(0);
             $membersReader->setDelimiter(',');
-            $membersReader->setEnclosure('"');
-            $membersReader->setEscape('');
 
             if (! file_exists($temporaryDirectory->path('organization_invitations.csv'))) {
                 throw new ImportException('File "organization_invitations.csv" missing in ZIP');
@@ -78,8 +74,6 @@ class SolidtimeImporter extends DefaultImporter
             $organizationInvitationsReader = Reader::createFromPath($temporaryDirectory->path('organization_invitations.csv'));
             $organizationInvitationsReader->setHeaderOffset(0);
             $organizationInvitationsReader->setDelimiter(',');
-            $organizationInvitationsReader->setEnclosure('"');
-            $organizationInvitationsReader->setEscape('');
 
             if (! file_exists($temporaryDirectory->path('project_members.csv'))) {
                 throw new ImportException('File "project_members.csv" missing in ZIP');
@@ -87,8 +81,6 @@ class SolidtimeImporter extends DefaultImporter
             $projectMembersReader = Reader::createFromPath($temporaryDirectory->path('project_members.csv'));
             $projectMembersReader->setHeaderOffset(0);
             $projectMembersReader->setDelimiter(',');
-            $projectMembersReader->setEnclosure('"');
-            $projectMembersReader->setEscape('');
 
             if (! file_exists($temporaryDirectory->path('projects.csv'))) {
                 throw new ImportException('File "projects.csv" missing in ZIP');
@@ -96,8 +88,6 @@ class SolidtimeImporter extends DefaultImporter
             $projectsReader = Reader::createFromPath($temporaryDirectory->path('projects.csv'));
             $projectsReader->setHeaderOffset(0);
             $projectsReader->setDelimiter(',');
-            $projectsReader->setEnclosure('"');
-            $projectsReader->setEscape('');
 
             if (! file_exists($temporaryDirectory->path('tags.csv'))) {
                 throw new ImportException('File "tags.csv" missing in ZIP');
@@ -105,8 +95,6 @@ class SolidtimeImporter extends DefaultImporter
             $tagsReader = Reader::createFromPath($temporaryDirectory->path('tags.csv'));
             $tagsReader->setHeaderOffset(0);
             $tagsReader->setDelimiter(',');
-            $tagsReader->setEnclosure('"');
-            $tagsReader->setEscape('');
 
             if (! file_exists($temporaryDirectory->path('tasks.csv'))) {
                 throw new ImportException('File "tasks.csv" missing in ZIP');
@@ -114,8 +102,6 @@ class SolidtimeImporter extends DefaultImporter
             $tasksReader = Reader::createFromPath($temporaryDirectory->path('tasks.csv'));
             $tasksReader->setHeaderOffset(0);
             $tasksReader->setDelimiter(',');
-            $tasksReader->setEnclosure('"');
-            $tasksReader->setEscape('');
 
             if (! file_exists($temporaryDirectory->path('time_entries.csv'))) {
                 throw new ImportException('File "time_entries.csv" missing in ZIP');
@@ -123,8 +109,6 @@ class SolidtimeImporter extends DefaultImporter
             $timeEntriesReader = Reader::createFromPath($temporaryDirectory->path('time_entries.csv'));
             $timeEntriesReader->setHeaderOffset(0);
             $timeEntriesReader->setDelimiter(',');
-            $timeEntriesReader->setEnclosure('"');
-            $timeEntriesReader->setEscape('');
 
             foreach ($clientsReader as $client) {
                 $this->clientImportHelper->getKey([

app/Service/Import/Importers/TogglTimeEntriesImporter.php

@@ -47,8 +47,6 @@ class TogglTimeEntriesImporter extends DefaultImporter
             $reader = Reader::createFromString($data);
             $reader->setHeaderOffset(0);
             $reader->setDelimiter(',');
-            $reader->setEnclosure('"');
-            $reader->setEscape('');
             $header = $reader->getHeader();
             $this->validateHeader($header);
             $records = $reader->getRecords();

composer.json

@@ -2,6 +2,7 @@
     "name": "solidtime-io/solidtime",
     "type": "project",
     "description": "An open-source time-tracking app",
+    "version": "0.0.1",
     "keywords": [],
     "license": "AGPL-3.0-or-later",
     "require": {
@@ -28,7 +29,7 @@
         "spatie/temporary-directory": "^2.2",
         "stechstudio/filament-impersonate": "^3.8",
         "tightenco/ziggy": "^2.1.0",
-        "tpetry/laravel-postgresql-enhanced": "^2.0.0",
+        "tpetry/laravel-postgresql-enhanced": "^1.0.0",
         "wikimedia/composer-merge-plugin": "^2.1.0"
     },
     "require-dev": {

config/app.php

@@ -18,11 +18,7 @@ return [
     |
     */
 
-    'name' => 'solidtime',
-
-    'version' => env('APP_VERSION'),
-
-    'build' => env('APP_BUILD'),
+    'name' => env('APP_NAME', 'solidtime'),
 
     /*
     |--------------------------------------------------------------------------

config/scheduling.php

@@ -6,7 +6,5 @@ return [
 
     'tasks' => [
         'time_entry_send_still_running_mails' => (bool) env('SCHEDULING_TASK_TIME_ENTRY_SEND_STILL_RUNNING_MAILS', true),
-        'self_hosting_check_for_update' => (bool) env('SCHEDULING_TASK_SELF_HOSTING_CHECK_FOR_UPDATE', true),
-        'self_hosting_telemetry' => (bool) env('SCHEDULING_TASK_SELF_HOSTING_TELEMETRY', true),
     ],
 ];

database/factories/OrganizationFactory.php

@@ -26,7 +26,6 @@ class OrganizationFactory extends Factory
             'billable_rate' => null,
             'user_id' => User::factory(),
             'personal_team' => true,
-            'employees_can_see_billable_rates' => false,
         ];
     }
 

database/factories/ProjectFactory.php

@@ -11,7 +11,6 @@ use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Service\ColorService;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Carbon;
 
 /**
  * @extends Factory<Project>
@@ -47,21 +46,12 @@ class ProjectFactory extends Factory
         });
     }
 
-    public function billable(?int $billableRate = null): self
+    public function billable(): self
     {
-        return $this->state(function (array $attributes) use ($billableRate): array {
+        return $this->state(function (array $attributes): array {
             return [
                 'is_billable' => true,
-                'billable_rate' => $billableRate === null ? $this->faker->numberBetween(50, 1000) * 100 : $billableRate,
-            ];
-        });
-    }
-
-    public function createdAt(Carbon $createdAt): self
-    {
-        return $this->state(function (array $attributes) use ($createdAt): array {
-            return [
-                'created_at' => $createdAt,
+                'billable_rate' => $this->faker->numberBetween(50, 1000) * 100,
             ];
         });
     }

database/factories/ProjectMemberFactory.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Database\Factories;
 
+use App\Enums\ProjectMemberRole;
 use App\Models\Member;
 use App\Models\Project;
 use App\Models\ProjectMember;
@@ -24,12 +25,22 @@ class ProjectMemberFactory extends Factory
     {
         return [
             'billable_rate' => $this->faker->numberBetween(10, 10000) * 100,
+            'role' => ProjectMemberRole::Normal,
             'project_id' => Project::factory(),
             'user_id' => User::factory(),
             'member_id' => Member::factory(),
         ];
     }
 
+    public function role(ProjectMemberRole $role): self
+    {
+        return $this->state(function (array $attributes) use ($role) {
+            return [
+                'role' => $role,
+            ];
+        });
+    }
+
     /**
      * @deprecated Use forMember instead
      */

database/migrations/2024_09_30_155934_add_role_to_project_members_table.php

@@ -13,8 +13,8 @@ return new class extends Migration
      */
     public function up(): void
     {
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->boolean('employees_can_see_billable_rates')->default(false);
+        Schema::table('project_members', function (Blueprint $table): void {
+            $table->string('role')->default('normal');
         });
     }
 
@@ -23,8 +23,8 @@ return new class extends Migration
      */
     public function down(): void
     {
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->dropColumn('employees_can_see_billable_rates');
+        Schema::table('project_members', function (Blueprint $table): void {
+            $table->dropColumn('role');
         });
     }
 };

docker/prod/Dockerfile

@@ -41,7 +41,6 @@ FROM composer:${COMPOSER_VERSION} AS vendor
 FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-php${PHP_VERSION}
 
 ARG DOCKER_FILES_BASE_PATH
-ARG TARGETPLATFORM
 
 LABEL maintainer="solidtime <hello@solidtime.io>"
 LABEL org.opencontainers.image.title="solidtime"
@@ -78,7 +77,6 @@ RUN apt-get update; \
     apt-get install -yqq --no-install-recommends --show-progress \
     apt-utils \
     curl \
-    gcc \
     wget \
     nano \
     ncdu \
@@ -135,16 +133,6 @@ RUN chown -R ${USER}:${USER} ${ROOT} /var/{log,run} \
 
 RUN cp ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini
 
-COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane-default.ini
-COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/php-arm.ini ${PHP_INI_DIR}/conf.d/99-octane-arm.ini
-
-RUN echo "TARGETPLATFORM is equal to ${TARGETPLATFORM}"
-RUN if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
-    rm ${PHP_INI_DIR}/conf.d/99-octane-default.ini; \
-    else \
-    rm ${PHP_INI_DIR}/conf.d/99-octane-arm.ini; \
-    fi
-
 USER ${USER}
 
 COPY --chown=${USER}:${USER} --from=vendor /usr/bin/composer /usr/bin/composer
@@ -170,6 +158,7 @@ COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/supervisord.con
 COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/octane/FrankenPHP/supervisord.frankenphp.conf /etc/supervisor/conf.d/
 COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/supervisord.*.conf /etc/supervisor/conf.d/
 COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/start-container /usr/local/bin/start-container
+COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini
 
 # FrankenPHP embedded PHP configuration
 COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/php.ini /lib/php.ini

docker/prod/deployment/php-arm.ini

@@ -1,30 +0,0 @@
-[PHP]
-post_max_size = 100M
-upload_max_filesize = 100M
-expose_php = 0
-realpath_cache_size = 16M
-realpath_cache_ttl = 360
-max_input_time = 5
-
-[Opcache]
-opcache.enable = 1
-opcache.enable_cli = 1
-opcache.memory_consumption = 256M
-opcache.use_cwd = 0
-opcache.max_file_size = 0
-opcache.max_accelerated_files = 32531
-opcache.validate_timestamps = 0
-opcache.file_update_protection = 0
-opcache.interned_strings_buffer = 16
-opcache.file_cache = 60
-
-[JIT]
-opcache.jit_buffer_size = 128M
-opcache.jit = disable
-opcache.jit_prof_threshold = 0.001
-opcache.jit_max_root_traces = 2048
-opcache.jit_max_side_traces = 256
-
-[zlib]
-zlib.output_compression = On
-zlib.output_compression_level = 9

e2e/time.spec.ts

@@ -365,5 +365,3 @@ test.skip('test that load more works when the end of page is reached', async ({
 // TODO: Add Test for Date Update
 
 // TODO: Test that project can be created in the time entry row
-
-// TODO: Add Tests for Mass Update

package-lock.json

@@ -1,5 +1,5 @@
 {
-    "name": "solidtime",
+    "name": "html",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
@@ -10,37 +10,33 @@
                 "@heroicons/vue": "^2.1.1",
                 "@rushstack/eslint-patch": "^1.7.0",
                 "@tailwindcss/container-queries": "^0.1.1",
-                "@tanstack/vue-query": "^5.56.2",
-                "@tanstack/vue-query-devtools": "^5.58.0",
                 "@vue/eslint-config-prettier": "^9.0.0",
                 "@vue/eslint-config-typescript": "^13.0.0",
                 "@vueuse/core": "^10.11.0",
-                "@vueuse/integrations": "^11.1.0",
                 "dayjs": "^1.11.11",
                 "echarts": "^5.5.0",
-                "focus-trap": "^7.6.0",
                 "parse-duration": "^1.1.0",
                 "pinia": "^2.1.7",
-                "radix-vue": "^1.9.6",
+                "radix-vue": "^1.5.2",
                 "tailwind-merge": "^2.2.1",
                 "vue-echarts": "^6.7.2"
             },
             "devDependencies": {
                 "@inertiajs/vue3": "^1.0.0",
                 "@playwright/test": "^1.41.1",
-                "@tailwindcss/forms": "^0.5.9",
-                "@tailwindcss/typography": "^0.5.15",
+                "@tailwindcss/forms": "^0.5.2",
+                "@tailwindcss/typography": "^0.5.2",
                 "@types/node": "^20.11.5",
                 "@vitejs/plugin-vue": "^4.5.0",
                 "@vue/tsconfig": "^0.5.1",
-                "autoprefixer": "^10.4.20",
+                "autoprefixer": "^10.4.7",
                 "axios": "^1.6.4",
                 "eslint-plugin-unused-imports": "^3.1.0",
                 "laravel-vite-plugin": "^1.0.0",
                 "openapi-zod-client": "^1.16.2",
-                "postcss": "^8.4.47",
-                "postcss-nesting": "^12.1.5",
-                "tailwindcss": "^3.4.13",
+                "postcss": "^8.4.14",
+                "postcss-nesting": "^12.1.0",
+                "tailwindcss": "^3.1.0",
                 "typescript": "^5.3.3",
                 "vite": "^5.0.0",
                 "vite-plugin-checker": "^0.7.2",
@@ -1639,22 +1635,24 @@
             }
         },
         "node_modules/@tailwindcss/forms": {
-            "version": "0.5.9",
-            "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.9.tgz",
-            "integrity": "sha512-tM4XVr2+UVTxXJzey9Twx48c1gcxFStqn1pQz0tRsX8o3DvxhN5oY5pvyAbUx7VTaZxpej4Zzvc6h+1RJBzpIg==",
+            "version": "0.5.7",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.7.tgz",
+            "integrity": "sha512-QE7X69iQI+ZXwldE+rzasvbJiyV/ju1FGHH0Qn2W3FKbuYtqp8LKcy6iSw79fVUT5/Vvf+0XgLCeYVG+UV6hOw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "mini-svg-data-uri": "^1.2.3"
             },
             "peerDependencies": {
-                "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1 || >= 4.0.0-alpha.20"
+                "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1"
             }
         },
         "node_modules/@tailwindcss/typography": {
-            "version": "0.5.15",
-            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.15.tgz",
-            "integrity": "sha512-AqhlCXl+8grUz8uqExv5OTtgpjuVIwFTSXTrh8y9/pw6q2ek7fJ+Y8ZEVw7EB2DCcuCOtEjf9w3+J3rzts01uA==",
+            "version": "0.5.14",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.14.tgz",
+            "integrity": "sha512-ZvOCjUbsJBjL9CxQBn+VEnFpouzuKhxh2dH8xMIWHILL+HfOYtlAkWcyoon8LlzE53d2Yo6YO6pahKKNW3q1YQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "lodash.castarray": "^4.4.0",
                 "lodash.isplainobject": "^4.0.6",
@@ -1662,43 +1660,7 @@
                 "postcss-selector-parser": "6.0.10"
             },
             "peerDependencies": {
-                "tailwindcss": ">=3.0.0 || insiders || >=4.0.0-alpha.20"
-            }
-        },
-        "node_modules/@tanstack/match-sorter-utils": {
-            "version": "8.19.4",
-            "resolved": "https://registry.npmjs.org/@tanstack/match-sorter-utils/-/match-sorter-utils-8.19.4.tgz",
-            "integrity": "sha512-Wo1iKt2b9OT7d+YGhvEPD3DXvPv2etTusIMhMUoG7fbhmxcXCtIjJDEygy91Y2JFlwGyjqiBPRozme7UD8hoqg==",
-            "license": "MIT",
-            "dependencies": {
-                "remove-accents": "0.5.0"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/tannerlinsley"
-            }
-        },
-        "node_modules/@tanstack/query-core": {
-            "version": "5.56.2",
-            "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.56.2.tgz",
-            "integrity": "sha512-gor0RI3/R5rVV3gXfddh1MM+hgl0Z4G7tj6Xxpq6p2I03NGPaJ8dITY9Gz05zYYb/EJq9vPas/T4wn9EaDPd4Q==",
-            "license": "MIT",
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/tannerlinsley"
-            }
-        },
-        "node_modules/@tanstack/query-devtools": {
-            "version": "5.58.0",
-            "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.58.0.tgz",
-            "integrity": "sha512-iFdQEFXaYYxqgrv63ots+65FGI+tNp5ZS5PdMU1DWisxk3fez5HG3FyVlbUva+RdYS5hSLbxZ9aw3yEs97GNTw==",
-            "license": "MIT",
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/tannerlinsley"
+                "tailwindcss": ">=3.0.0 || insiders"
             }
         },
         "node_modules/@tanstack/virtual-core": {
@@ -1711,74 +1673,6 @@
                 "url": "https://github.com/sponsors/tannerlinsley"
             }
         },
-        "node_modules/@tanstack/vue-query": {
-            "version": "5.56.2",
-            "resolved": "https://registry.npmjs.org/@tanstack/vue-query/-/vue-query-5.56.2.tgz",
-            "integrity": "sha512-VW7qS8JXwC3SZpawJHxQ+mWwWa5WVIQUUOh/OD6WI85eLcbJPg83ezjGupPXGKF9h31gl7CIRrnJDi4g5pK3Jg==",
-            "license": "MIT",
-            "dependencies": {
-                "@tanstack/match-sorter-utils": "^8.15.1",
-                "@tanstack/query-core": "5.56.2",
-                "@vue/devtools-api": "^6.6.3",
-                "vue-demi": "^0.14.10"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/tannerlinsley"
-            },
-            "peerDependencies": {
-                "@vue/composition-api": "^1.1.2",
-                "vue": "^2.6.0 || ^3.3.0"
-            },
-            "peerDependenciesMeta": {
-                "@vue/composition-api": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@tanstack/vue-query-devtools": {
-            "version": "5.58.0",
-            "resolved": "https://registry.npmjs.org/@tanstack/vue-query-devtools/-/vue-query-devtools-5.58.0.tgz",
-            "integrity": "sha512-OdCXA7cTt0qkgw87JhLeLdGLmGIXsldXHERZ+Wm2up52H6TqZbWGCs4jvBF3AafiUHl5ibCRoynQ5r114+YPXw==",
-            "license": "MIT",
-            "dependencies": {
-                "@tanstack/query-devtools": "5.58.0"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/tannerlinsley"
-            },
-            "peerDependencies": {
-                "@tanstack/vue-query": "^5.56.2",
-                "vue": "^3.3.0"
-            }
-        },
-        "node_modules/@tanstack/vue-query/node_modules/vue-demi": {
-            "version": "0.14.10",
-            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
-            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
-            "hasInstallScript": true,
-            "license": "MIT",
-            "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/@tanstack/vue-virtual": {
             "version": "3.9.0",
             "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.9.0.tgz",
@@ -2291,134 +2185,6 @@
                 }
             }
         },
-        "node_modules/@vueuse/integrations": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-11.1.0.tgz",
-            "integrity": "sha512-O2ZgrAGPy0qAjpoI2YR3egNgyEqwG85fxfwmA9BshRIGjV4G6yu6CfOPpMHAOoCD+UfsIl7Vb1bXJ6ifrHYDDA==",
-            "license": "MIT",
-            "dependencies": {
-                "@vueuse/core": "11.1.0",
-                "@vueuse/shared": "11.1.0",
-                "vue-demi": ">=0.14.10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            },
-            "peerDependencies": {
-                "async-validator": "^4",
-                "axios": "^1",
-                "change-case": "^5",
-                "drauu": "^0.4",
-                "focus-trap": "^7",
-                "fuse.js": "^7",
-                "idb-keyval": "^6",
-                "jwt-decode": "^4",
-                "nprogress": "^0.2",
-                "qrcode": "^1.5",
-                "sortablejs": "^1",
-                "universal-cookie": "^7"
-            },
-            "peerDependenciesMeta": {
-                "async-validator": {
-                    "optional": true
-                },
-                "axios": {
-                    "optional": true
-                },
-                "change-case": {
-                    "optional": true
-                },
-                "drauu": {
-                    "optional": true
-                },
-                "focus-trap": {
-                    "optional": true
-                },
-                "fuse.js": {
-                    "optional": true
-                },
-                "idb-keyval": {
-                    "optional": true
-                },
-                "jwt-decode": {
-                    "optional": true
-                },
-                "nprogress": {
-                    "optional": true
-                },
-                "qrcode": {
-                    "optional": true
-                },
-                "sortablejs": {
-                    "optional": true
-                },
-                "universal-cookie": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@vueuse/integrations/node_modules/@vueuse/core": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-11.1.0.tgz",
-            "integrity": "sha512-P6dk79QYA6sKQnghrUz/1tHi0n9mrb/iO1WTMk/ElLmTyNqgDeSZ3wcDf6fRBGzRJbeG1dxzEOvLENMjr+E3fg==",
-            "license": "MIT",
-            "dependencies": {
-                "@types/web-bluetooth": "^0.0.20",
-                "@vueuse/metadata": "11.1.0",
-                "@vueuse/shared": "11.1.0",
-                "vue-demi": ">=0.14.10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            }
-        },
-        "node_modules/@vueuse/integrations/node_modules/@vueuse/metadata": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-11.1.0.tgz",
-            "integrity": "sha512-l9Q502TBTaPYGanl1G+hPgd3QX5s4CGnpXriVBR5fEZ/goI6fvDaVmIl3Td8oKFurOxTmbXvBPSsgrd6eu6HYg==",
-            "license": "MIT",
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            }
-        },
-        "node_modules/@vueuse/integrations/node_modules/@vueuse/shared": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-11.1.0.tgz",
-            "integrity": "sha512-YUtIpY122q7osj+zsNMFAfMTubGz0sn5QzE5gPzAIiCmtt2ha3uQUY1+JPyL4gRCTsLPX82Y9brNbo/aqlA91w==",
-            "license": "MIT",
-            "dependencies": {
-                "vue-demi": ">=0.14.10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            }
-        },
-        "node_modules/@vueuse/integrations/node_modules/vue-demi": {
-            "version": "0.14.10",
-            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
-            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
-            "hasInstallScript": true,
-            "license": "MIT",
-            "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/@vueuse/metadata": {
             "version": "10.11.1",
             "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.11.1.tgz",
@@ -2625,7 +2391,7 @@
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
             "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-            "devOptional": true,
+            "dev": true,
             "license": "MIT"
         },
         "node_modules/autoprefixer": {
@@ -2647,6 +2413,7 @@
                     "url": "https://github.com/sponsors/ai"
                 }
             ],
+            "license": "MIT",
             "dependencies": {
                 "browserslist": "^4.23.3",
                 "caniuse-lite": "^1.0.30001646",
@@ -2669,7 +2436,7 @@
             "version": "1.7.4",
             "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
             "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
-            "devOptional": true,
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "follow-redirects": "^1.15.6",
@@ -2907,7 +2674,7 @@
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
             "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-            "devOptional": true,
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "delayed-stream": "~1.0.0"
@@ -3052,7 +2819,7 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
             "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-            "devOptional": true,
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=0.4.0"
@@ -3661,20 +3428,11 @@
             "license": "ISC",
             "peer": true
         },
-        "node_modules/focus-trap": {
-            "version": "7.6.0",
-            "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.0.tgz",
-            "integrity": "sha512-1td0l3pMkWJLFipobUcGaf+5DTY4PLDDrcqoSaKP8ediO/CoWCCYk/fT/Y2A4e6TNB+Sh6clRJCjOPPnKoNHnQ==",
-            "license": "MIT",
-            "dependencies": {
-                "tabbable": "^6.2.0"
-            }
-        },
         "node_modules/follow-redirects": {
             "version": "1.15.6",
             "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
             "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
-            "devOptional": true,
+            "dev": true,
             "funding": [
                 {
                     "type": "individual",
@@ -3711,7 +3469,7 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
             "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-            "devOptional": true,
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "asynckit": "^0.4.0",
@@ -4424,7 +4182,7 @@
             "version": "1.52.0",
             "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
             "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-            "devOptional": true,
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.6"
@@ -4434,7 +4192,7 @@
             "version": "2.1.35",
             "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
             "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-            "devOptional": true,
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "mime-db": "1.52.0"
@@ -4585,7 +4343,7 @@
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
             "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==",
-            "devOptional": true,
+            "dev": true,
             "license": "MIT"
         },
         "node_modules/nth-check": {
@@ -4889,9 +4647,10 @@
             }
         },
         "node_modules/picocolors": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-            "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+            "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+            "license": "ISC"
         },
         "node_modules/picomatch": {
             "version": "2.3.1",
@@ -5008,9 +4767,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.47",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
-            "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+            "version": "8.4.41",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
+            "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -5025,10 +4784,11 @@
                     "url": "https://github.com/sponsors/ai"
                 }
             ],
+            "license": "MIT",
             "dependencies": {
                 "nanoid": "^3.3.7",
-                "picocolors": "^1.1.0",
-                "source-map-js": "^1.2.1"
+                "picocolors": "^1.0.1",
+                "source-map-js": "^1.2.0"
             },
             "engines": {
                 "node": "^10 || ^12 || >=14"
@@ -5170,6 +4930,7 @@
                     "url": "https://opencollective.com/csstools"
                 }
             ],
+            "license": "MIT-0",
             "dependencies": {
                 "@csstools/selector-resolve-nested": "^1.1.0",
                 "@csstools/selector-specificity": "^3.1.1",
@@ -5304,7 +5065,7 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
             "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-            "devOptional": true,
+            "dev": true,
             "license": "MIT"
         },
         "node_modules/punycode": {
@@ -5354,9 +5115,9 @@
             "license": "MIT"
         },
         "node_modules/radix-vue": {
-            "version": "1.9.6",
-            "resolved": "https://registry.npmjs.org/radix-vue/-/radix-vue-1.9.6.tgz",
-            "integrity": "sha512-legrn9jHbEpbJS4QYrA0VmIafj1bmc4MSVzN55WZatGiXMJg3oFrQL5QxpiURJciS+OlATbKA2KAGkMuuLA0LA==",
+            "version": "1.9.4",
+            "resolved": "https://registry.npmjs.org/radix-vue/-/radix-vue-1.9.4.tgz",
+            "integrity": "sha512-d950wxB+MVVU6L9h39OsNzAdk2BiGDDfhXJiHsksPAIK5pCR8W4U0RB0WLQEdjmmL9p1aXOYm4FBDq0oIo2G/w==",
             "license": "MIT",
             "dependencies": {
                 "@floating-ui/dom": "^1.6.7",
@@ -5414,12 +5175,6 @@
                 "node": ">=8.10.0"
             }
         },
-        "node_modules/remove-accents": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.5.0.tgz",
-            "integrity": "sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==",
-            "license": "MIT"
-        },
         "node_modules/require-from-string": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -5651,9 +5406,10 @@
             }
         },
         "node_modules/source-map-js": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+            "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+            "license": "BSD-3-Clause",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -5856,12 +5612,6 @@
             "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
             "license": "0BSD"
         },
-        "node_modules/tabbable": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
-            "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==",
-            "license": "MIT"
-        },
         "node_modules/tailwind-merge": {
             "version": "2.5.2",
             "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.2.tgz",
@@ -5873,9 +5623,10 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.13",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.13.tgz",
-            "integrity": "sha512-KqjHOJKogOUt5Bs752ykCeiwvi0fKVkr5oqsFNt/8px/tA8scFPIlkygsf6jXrfCqGHz7VflA6+yytWuM+XhFw==",
+            "version": "3.4.10",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.10.tgz",
+            "integrity": "sha512-KWZkVPm7yJRhdu4SRSl9d4AK2wM3a50UsvgHZO7xY77NQr2V+fIrEuoDGQcbvswWvFGbS2f6e+jC/6WJm1Dl0w==",
+            "license": "MIT",
             "dependencies": {
                 "@alloc/quick-lru": "^5.2.0",
                 "arg": "^5.0.2",

package.json

@@ -13,19 +13,19 @@
     "devDependencies": {
         "@inertiajs/vue3": "^1.0.0",
         "@playwright/test": "^1.41.1",
-        "@tailwindcss/forms": "^0.5.9",
-        "@tailwindcss/typography": "^0.5.15",
+        "@tailwindcss/forms": "^0.5.2",
+        "@tailwindcss/typography": "^0.5.2",
         "@types/node": "^20.11.5",
         "@vitejs/plugin-vue": "^4.5.0",
         "@vue/tsconfig": "^0.5.1",
-        "autoprefixer": "^10.4.20",
+        "autoprefixer": "^10.4.7",
         "axios": "^1.6.4",
         "eslint-plugin-unused-imports": "^3.1.0",
         "laravel-vite-plugin": "^1.0.0",
         "openapi-zod-client": "^1.16.2",
-        "postcss": "^8.4.47",
-        "postcss-nesting": "^12.1.5",
-        "tailwindcss": "^3.4.13",
+        "postcss": "^8.4.14",
+        "postcss-nesting": "^12.1.0",
+        "tailwindcss": "^3.1.0",
         "typescript": "^5.3.3",
         "vite": "^5.0.0",
         "vite-plugin-checker": "^0.7.2",
@@ -38,18 +38,14 @@
         "@heroicons/vue": "^2.1.1",
         "@rushstack/eslint-patch": "^1.7.0",
         "@tailwindcss/container-queries": "^0.1.1",
-        "@tanstack/vue-query": "^5.56.2",
-        "@tanstack/vue-query-devtools": "^5.58.0",
         "@vue/eslint-config-prettier": "^9.0.0",
         "@vue/eslint-config-typescript": "^13.0.0",
         "@vueuse/core": "^10.11.0",
-        "@vueuse/integrations": "^11.1.0",
         "dayjs": "^1.11.11",
         "echarts": "^5.5.0",
-        "focus-trap": "^7.6.0",
         "parse-duration": "^1.1.0",
         "pinia": "^2.1.7",
-        "radix-vue": "^1.9.6",
+        "radix-vue": "^1.5.2",
         "tailwind-merge": "^2.2.1",
         "vue-echarts": "^6.7.2"
     }

resources/css/filament/admin/tailwind.config.js

@@ -1,10 +0,0 @@
-import preset from '../../../../vendor/filament/filament/tailwind.config.preset';
-
-export default {
-    presets: [preset],
-    content: [
-        './app/Filament/**/*.php',
-        './resources/views/filament/**/*.blade.php',
-        './vendor/filament/**/*.blade.php',
-    ],
-};

resources/css/filament/admin/theme.css

@@ -1,3 +0,0 @@
-@import '/vendor/filament/filament/resources/css/theme.css';
-
-@config 'tailwind.config.js';

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

@@ -2,7 +2,7 @@
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
 import { FolderPlusIcon } from '@heroicons/vue/24/solid';
 import { PlusIcon } from '@heroicons/vue/16/solid';
-import { computed, ref } from 'vue';
+import { ref } from 'vue';
 import ProjectCreateModal from '@/packages/ui/src/Project/ProjectCreateModal.vue';
 import ProjectTableHeading from '@/Components/Common/Project/ProjectTableHeading.vue';
 import ProjectTableRow from '@/Components/Common/Project/ProjectTableRow.vue';
@@ -18,9 +18,8 @@ import { useClientsStore } from '@/utils/useClients';
 import { storeToRefs } from 'pinia';
 import { getOrganizationCurrencyString } from '@/utils/money';
 
-const props = defineProps<{
+defineProps<{
     projects: Project[];
-    showBillableRate: boolean;
 }>();
 
 const showCreateProjectModal = ref(false);
@@ -36,9 +35,6 @@ async function createClient(
     return await useClientsStore().createClient(client);
 }
 const { clients } = storeToRefs(useClientsStore());
-const gridTemplate = computed(() => {
-    return `grid-template-columns: minmax(300px, 1fr) minmax(150px, auto) minmax(140px, auto) minmax(130px, auto) ${props.showBillableRate ? 'minmax(130px, auto)' : ''} minmax(120px, auto) 80px;`;
-});
 </script>
 
 <template>
@@ -53,11 +49,19 @@ const gridTemplate = computed(() => {
             <div
                 data-testid="project_table"
                 class="grid min-w-full"
-                :style="gridTemplate">
-                <ProjectTableHeading
-                    :showBillableRate="
-                        props.showBillableRate
-                    "></ProjectTableHeading>
+                style="
+                    grid-template-columns:
+                        minmax(300px, 1fr) minmax(150px, auto) minmax(
+                            140px,
+                            auto
+                        )
+                        minmax(130px, auto) minmax(130px, auto) minmax(
+                            120px,
+                            auto
+                        )
+                        80px;
+                ">
+                <ProjectTableHeading></ProjectTableHeading>
                 <div
                     class="col-span-5 py-24 text-center"
                     v-if="projects.length === 0">
@@ -75,9 +79,7 @@ const gridTemplate = computed(() => {
                     </SecondaryButton>
                 </div>
                 <template v-for="project in projects" :key="project.id">
-                    <ProjectTableRow
-                        :showBillableRate="props.showBillableRate"
-                        :project="project"></ProjectTableRow>
+                    <ProjectTableRow :project="project"></ProjectTableRow>
                 </template>
             </div>
         </div>

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

@@ -1,8 +1,5 @@
 <script setup lang="ts">
 import TableHeading from '@/Components/Common/TableHeading.vue';
-defineProps<{
-    showBillableRate: boolean;
-}>();
 </script>
 
 <template>
@@ -18,9 +15,7 @@ defineProps<{
         <div class="px-3 py-1.5 text-left font-semibold text-white">
             Progress
         </div>
-        <div
-            class="px-3 py-1.5 text-left font-semibold text-white"
-            v-if="showBillableRate">
+        <div class="px-3 py-1.5 text-left font-semibold text-white">
             Billable Rate
         </div>
         <div class="px-3 py-1.5 text-left font-semibold text-white">Status</div>

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

@@ -21,7 +21,6 @@ const { tasks } = storeToRefs(useTasksStore());
 
 const props = defineProps<{
     project: Project;
-    showBillableRate: boolean;
 }>();
 
 const client = computed(() => {
@@ -105,9 +104,7 @@ const showEditProjectModal = ref(false);
                 :current="project.spent_time"></EstimatedTimeProgress>
             <span v-else> -- </span>
         </div>
-        <div
-            class="whitespace-nowrap px-3 py-4 text-sm text-muted"
-            v-if="showBillableRate">
+        <div class="whitespace-nowrap px-3 py-4 text-sm text-muted">
             {{ billableRateInfo }}
         </div>
         <div

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

@@ -12,6 +12,8 @@ import { useProjectMembersStore } from '@/utils/useProjectMembers';
 import MemberCombobox from '@/Components/Common/Member/MemberCombobox.vue';
 import BillableRateInput from '@/packages/ui/src/Input/BillableRateInput.vue';
 import { getOrganizationCurrencyString } from '@/utils/money';
+import { InputLabel } from '@/packages/ui/src';
+import ProjectMemberRoleSelect from '@/Components/Common/ProjectMember/ProjectMemberRoleSelect.vue';
 const { createProjectMember } = useProjectMembersStore();
 const show = defineModel('show', { default: false });
 const saving = ref(false);
@@ -24,6 +26,7 @@ const props = defineProps<{
 const projectMember = ref<CreateProjectMemberBody>({
     member_id: '',
     billable_rate: null,
+    role: 'normal',
 });
 
 async function submit() {
@@ -32,6 +35,7 @@ async function submit() {
     projectMember.value = {
         member_id: '',
         billable_rate: null,
+        role: 'normal',
     };
 }
 
@@ -49,13 +53,17 @@ useFocus(projectNameInput, { initialValue: true });
         </template>
 
         <template #content>
-            <div class="grid grid-cols-3 items-center space-x-4">
-                <div class="col-span-3 sm:col-span-2">
+            <div class="items-center space-y-4">
+                <div>
+                    <InputLabel value="Member" class="mb-2"></InputLabel>
                     <MemberCombobox
                         :hidden-members="props.existingMembers"
                         v-model="projectMember.member_id"></MemberCombobox>
                 </div>
-                <div class="col-span-3 sm:col-span-1 flex-1">
+                <div>
+                    <InputLabel
+                        value="Billable Rate"
+                        for="billable_rate"></InputLabel>
                     <BillableRateInput
                         name="billable_rate"
                         :currency="getOrganizationCurrencyString()"
@@ -63,6 +71,11 @@ useFocus(projectNameInput, { initialValue: true });
                             projectMember.billable_rate
                         "></BillableRateInput>
                 </div>
+                <div>
+                    <InputLabel value="Role" class="mb-2"></InputLabel>
+                    <ProjectMemberRoleSelect
+                        v-model="projectMember.role"></ProjectMemberRoleSelect>
+                </div>
             </div>
         </template>
         <template #footer>

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

@@ -8,12 +8,15 @@ import type {
 } from '@/packages/api/src';
 import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
 import { useFocus } from '@vueuse/core';
-import { useProjectMembersStore } from '@/utils/useProjectMembers';
+import {
+    type ProjectMemberRole,
+    useProjectMembersStore,
+} from '@/utils/useProjectMembers';
 import BillableRateInput from '@/packages/ui/src/Input/BillableRateInput.vue';
-import { UserIcon } from '@heroicons/vue/24/solid';
 import ProjectMemberBillableRateModal from '@/Components/Common/ProjectMember/ProjectMemberBillableRateModal.vue';
 import InputLabel from '@/packages/ui/src/Input/InputLabel.vue';
 import { getOrganizationCurrencyString } from '@/utils/money';
+import ProjectMemberRoleSelect from '@/Components/Common/ProjectMember/ProjectMemberRoleSelect.vue';
 const { updateProjectMember } = useProjectMembersStore();
 
 const show = defineModel('show', { default: false });
@@ -26,6 +29,7 @@ const props = defineProps<{
 
 const projectMemberBody = ref<UpdateProjectMemberBody>({
     billable_rate: props.projectMember.billable_rate,
+    role: props.projectMember.role as ProjectMemberRole,
 });
 const showBillableRateModal = ref(false);
 async function submit() {
@@ -40,6 +44,7 @@ async function submit() {
     show.value = false;
     projectMemberBody.value = {
         billable_rate: null,
+        role: 'normal',
     };
 }
 
@@ -55,6 +60,7 @@ watch(
         if (value) {
             projectMemberBody.value = {
                 billable_rate: props.projectMember.billable_rate,
+                role: props.projectMember.role as ProjectMemberRole,
             };
         }
     }
@@ -69,7 +75,7 @@ useFocus(projectNameInput, { initialValue: true });
     <DialogModal closeable :show="show" @close="show = false">
         <template #title>
             <div class="flex space-x-2">
-                <span>Edit Project Member</span>
+                <span>Edit Project Member "{{ props.name }}"</span>
             </div>
         </template>
 
@@ -80,23 +86,26 @@ useFocus(projectNameInput, { initialValue: true });
                 :new-billable-rate="projectMemberBody.billable_rate"
                 @close="showBillableRateModal = false"
                 @submit="submitBillableRate"></ProjectMemberBillableRateModal>
-            <div class="grid grid-cols-3 items-center space-x-4">
-                <div
-                    class="col-span-3 sm:col-span-2 space-x-2 flex items-center">
-                    <UserIcon class="w-4 text-muted"></UserIcon>
-                    <span>{{ props.name }}</span>
-                </div>
-                <div class="col-span-3 sm:col-span-1 flex-1">
-                    <InputLabel
-                        for="billable_rate"
-                        value="Billable Rate"></InputLabel>
-                    <BillableRateInput
-                        @keydown.enter="submit"
-                        :currency="getOrganizationCurrencyString()"
-                        name="billable_rate"
-                        v-model="
-                            projectMemberBody.billable_rate
-                        "></BillableRateInput>
+            <div>
+                <div class="items-center space-y-4">
+                    <div>
+                        <InputLabel
+                            value="Billable Rate"
+                            for="billable_rate"></InputLabel>
+                        <BillableRateInput
+                            name="billable_rate"
+                            :currency="getOrganizationCurrencyString()"
+                            v-model="
+                                projectMemberBody.billable_rate
+                            "></BillableRateInput>
+                    </div>
+                    <div>
+                        <InputLabel value="Role" class="mb-2"></InputLabel>
+                        <ProjectMemberRoleSelect
+                            v-model="
+                                projectMemberBody.role
+                            "></ProjectMemberRoleSelect>
+                    </div>
                 </div>
             </div>
         </template>

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

@@ -0,0 +1,54 @@
+<script setup lang="ts">
+import SelectDropdown from '@/packages/ui/src/Input/SelectDropdown.vue';
+import Badge from '@/packages/ui/src/Badge.vue';
+import { ChevronDownIcon } from '@heroicons/vue/20/solid';
+import type { ProjectMemberRole } from '@/utils/useProjectMembers';
+
+type ProjectMemberRoleItem = { key: ProjectMemberRole; name: string };
+
+const projectMemberRoles: ProjectMemberRoleItem[] = [
+    {
+        key: 'normal',
+        name: 'Normal',
+    },
+    {
+        key: 'manager',
+        name: 'Manager',
+    },
+];
+
+const model = defineModel<string>({
+    default: 'normal',
+});
+
+function getKeyFromItem(item: ProjectMemberRoleItem) {
+    return item.key;
+}
+
+function getNameFromItem(item: ProjectMemberRoleItem) {
+    return item.name;
+}
+
+function getNameForKey(key: string | undefined) {
+    return projectMemberRoles.find((item) => item.key === key)?.name ?? '';
+}
+</script>
+
+<template>
+    <SelectDropdown
+        v-model="model"
+        :get-key-from-item="getKeyFromItem"
+        :get-name-for-item="getNameFromItem"
+        :items="projectMemberRoles">
+        <template #trigger>
+            <Badge size="xlarge" class="bg-input-background cursor-pointer">
+                <span>
+                    {{ getNameForKey(model) }}
+                </span>
+                <ChevronDownIcon class="text-muted w-5"></ChevronDownIcon>
+            </Badge>
+        </template>
+    </SelectDropdown>
+</template>
+
+<style scoped></style>

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

@@ -57,7 +57,7 @@ const showEditModal = ref(false);
             }}
         </div>
         <div class="whitespace-nowrap px-3 py-4 text-sm text-muted">
-            {{ capitalizeFirstLetter(member?.role ?? '') }}
+            {{ capitalizeFirstLetter(projectMember?.role ?? '') }}
         </div>
         <div
             class="relative whitespace-nowrap flex items-center pl-3 text-right text-sm font-medium sm:pr-0 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">

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

@@ -103,7 +103,7 @@ const option = ref({
 
 <template>
     <v-chart
-        class="background-transparent max-w-[300px] mx-auto h-[460px]"
+        class="background-transparent h-[460px]"
         :autoresize="true"
         :option="option" />
 </template>

resources/js/Components/Common/TimeEntry/TimeEntryMassActionRow.vue

@@ -1,74 +0,0 @@
-<script setup lang="ts">
-import MainContainer from '@/packages/ui/src/MainContainer.vue';
-import { PencilSquareIcon, TrashIcon } from '@heroicons/vue/20/solid';
-import TimeEntryMassUpdateModal from '@/Components/Common/TimeEntry/TimeEntryMassUpdateModal.vue';
-import type { TimeEntry } from '@/packages/api/src';
-import { ref } from 'vue';
-import { twMerge } from 'tailwind-merge';
-import { Checkbox, InputLabel } from '@/packages/ui/src';
-
-const props = defineProps<{
-    selectedTimeEntries: TimeEntry[];
-    deleteSelected: () => void;
-    class?: string;
-    allSelected: boolean;
-}>();
-
-const emit = defineEmits<{
-    submit: [];
-    selectAll: [];
-    unselectAll: [];
-}>();
-
-const showMassUpdateModal = ref(false);
-</script>
-
-<template>
-    <TimeEntryMassUpdateModal
-        :time-entries="selectedTimeEntries"
-        @submit="emit('submit')"
-        v-model:show="showMassUpdateModal"></TimeEntryMassUpdateModal>
-    <MainContainer
-        :class="
-            twMerge(
-                props.class,
-                'text-sm py-1.5 font-medium border-b border-t border-border-secondary flex items-center space-x-3'
-            )
-        ">
-        <Checkbox
-            :checked="allSelected"
-            id="selectAll"
-            @update:checked="
-                allSelected ? emit('unselectAll') : emit('selectAll')
-            ">
-        </Checkbox>
-        <InputLabel
-            for="selectAll"
-            class="select-none text-text-secondary"
-            v-if="selectedTimeEntries.length > 0">
-            {{ selectedTimeEntries.length }} selected
-        </InputLabel>
-        <InputLabel
-            for="selectAll"
-            class="text-text-secondary select-none"
-            v-else
-            >Select All</InputLabel
-        >
-        <button
-            class="text-text-tertiary flex space-x-1 items-center hover:text-text-secondary transition focus-visible:ring-2 outline-0 focus-visible:text-text-primary focus-visible:ring-white/80 rounded h-full px-2"
-            @click="showMassUpdateModal = true"
-            v-if="selectedTimeEntries.length">
-            <PencilSquareIcon class="w-4"></PencilSquareIcon>
-            <span> Edit </span>
-        </button>
-        <button
-            class="text-red-400 h-full px-2 space-x-1 items-center flex hover:text-red-500 transition focus-visible:ring-2 outline-0 focus-visible:text-red-500 focus-visible:ring-white/80 rounded"
-            @click="deleteSelected"
-            v-if="selectedTimeEntries.length">
-            <TrashIcon class="w-3.5"></TrashIcon>
-            <span> Delete </span>
-        </button>
-    </MainContainer>
-</template>
-
-<style scoped></style>

resources/js/Components/Common/TimeEntry/TimeEntryMassUpdateModal.vue

@@ -1,290 +0,0 @@
-<script setup lang="ts">
-import TextInput from '@/packages/ui/src/Input/TextInput.vue';
-import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
-import DialogModal from '@/packages/ui/src/DialogModal.vue';
-import { computed, nextTick, ref, watch } from 'vue';
-import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
-import TimeTrackerProjectTaskDropdown from '@/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue';
-import InputLabel from '@/packages/ui/src/Input/InputLabel.vue';
-
-import { storeToRefs } from 'pinia';
-import { useTasksStore } from '@/utils/useTasks';
-import { useProjectsStore } from '@/utils/useProjects';
-import { useTagsStore } from '@/utils/useTags';
-import {
-    type CreateClientBody,
-    type CreateProjectBody,
-    type Project,
-    type Client,
-    api,
-    type TimeEntry,
-    type UpdateMultipleTimeEntriesChangeset,
-} from '@/packages/api/src';
-import { useClientsStore } from '@/utils/useClients';
-import { getOrganizationCurrencyString } from '@/utils/money';
-import { Badge, Checkbox } from '@/packages/ui/src';
-import SelectDropdown from '../../../packages/ui/src/Input/SelectDropdown.vue';
-import { getCurrentOrganizationId } from '@/utils/useUser';
-import { useNotificationsStore } from '@/utils/notification';
-import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
-const projectStore = useProjectsStore();
-const { projects } = storeToRefs(projectStore);
-const taskStore = useTasksStore();
-const { tasks } = storeToRefs(taskStore);
-const clientStore = useClientsStore();
-const { clients } = storeToRefs(clientStore);
-
-const show = defineModel('show', { default: false });
-const saving = ref(false);
-
-async function createProject(
-    project: CreateProjectBody
-): Promise<Project | undefined> {
-    return await useProjectsStore().createProject(project);
-}
-
-const props = defineProps<{
-    timeEntries: TimeEntry[];
-}>();
-
-const emit = defineEmits<{
-    submit: [];
-}>();
-
-async function createClient(
-    body: CreateClientBody
-): Promise<Client | undefined> {
-    return await useClientsStore().createClient(body);
-}
-
-const descriptionInput = ref<HTMLInputElement | null>(null);
-
-const { handleApiRequestNotifications } = useNotificationsStore();
-
-watch(show, (value) => {
-    if (value) {
-        nextTick(() => {
-            descriptionInput.value?.focus();
-        });
-    }
-});
-
-const description = ref<string>('');
-const taskId = ref<string | null | undefined>(undefined);
-const projectId = ref<string | null>(null);
-const billable = ref<boolean | undefined>(undefined);
-const selectedTags = ref<string[]>([]);
-
-const { tags } = storeToRefs(useTagsStore());
-async function createTag(tag: string) {
-    return await useTagsStore().createTag(tag);
-}
-
-const timeEntryBillable = computed({
-    get: () => {
-        if (billable.value === undefined) {
-            return 'do-not-update';
-        }
-        return billable.value ? 'billable' : 'non-billable';
-    },
-    set: (value) => {
-        if (value === 'do-not-update') {
-            billable.value = undefined;
-        } else if (value === 'billable') {
-            billable.value = true;
-        } else {
-            billable.value = false;
-        }
-    },
-});
-
-async function submit() {
-    const organizationId = getCurrentOrganizationId();
-    saving.value = true;
-    if (organizationId) {
-        const timeEntryUpdatesBody = {} as UpdateMultipleTimeEntriesChangeset;
-        if (description.value && description.value !== '') {
-            timeEntryUpdatesBody.description = description.value;
-        }
-        if (projectId.value !== null) {
-            if (projectId.value === '') {
-                // "No Project" is selected
-                timeEntryUpdatesBody.project_id = null;
-            } else {
-                timeEntryUpdatesBody.project_id = projectId.value;
-            }
-            timeEntryUpdatesBody.task_id = null;
-            if (taskId.value !== undefined) {
-                timeEntryUpdatesBody.task_id = taskId.value;
-            }
-        }
-
-        if (billable.value !== undefined) {
-            timeEntryUpdatesBody.billable = billable.value;
-        }
-        if (selectedTags.value.length > 0) {
-            timeEntryUpdatesBody.tags = selectedTags.value;
-        }
-        if (removeAllTags.value) {
-            timeEntryUpdatesBody.tags = [];
-        }
-
-        try {
-            await handleApiRequestNotifications(
-                () =>
-                    api.updateMultipleTimeEntries(
-                        {
-                            ids: props.timeEntries.map(
-                                (timeEntry) => timeEntry.id
-                            ),
-                            changes: {
-                                ...timeEntryUpdatesBody,
-                            },
-                        },
-                        {
-                            params: {
-                                organization: organizationId,
-                            },
-                        }
-                    ),
-                'Time entries updated',
-                'Failed to update time entries',
-                () => {
-                    show.value = false;
-                    emit('submit');
-                    description.value = '';
-                    projectId.value = null;
-                    taskId.value = undefined;
-                    selectedTags.value = [];
-                    billable.value = undefined;
-                    saving.value = false;
-                    removeAllTags.value = false;
-                }
-            );
-        } catch (e) {
-            saving.value = false;
-        }
-    }
-}
-const removeAllTags = ref(false);
-watch(removeAllTags, () => {
-    if (removeAllTags.value) {
-        selectedTags.value = [];
-    }
-});
-</script>
-
-<template>
-    <DialogModal closeable :show="show" @close="show = false">
-        <template #title>
-            <div class="flex space-x-2">
-                <span> Update {{ timeEntries.length }} time entries </span>
-            </div>
-        </template>
-
-        <template #content>
-            <div class="space-y-4">
-                <div class="space-y-2">
-                    <InputLabel for="description" value="Description" />
-                    <TextInput
-                        id="description"
-                        ref="descriptionInput"
-                        v-model="description"
-                        @keydown.enter="submit"
-                        type="text"
-                        class="mt-1 block w-full" />
-                </div>
-                <div class="space-y-2">
-                    <InputLabel for="project" value="Project" />
-                    <TimeTrackerProjectTaskDropdown
-                        :clients
-                        :createProject
-                        :createClient
-                        :currency="getOrganizationCurrencyString()"
-                        class="mt-1"
-                        empty-placeholder="Select project..."
-                        allow-reset
-                        size="xlarge"
-                        :projects="projects"
-                        :tasks="tasks"
-                        v-model:project="projectId"
-                        v-model:task="taskId"></TimeTrackerProjectTaskDropdown>
-                </div>
-                <div class="space-y-2">
-                    <InputLabel for="project" value="Tag" />
-                    <div class="flex space-x-5">
-                        <TagDropdown
-                            :createTag
-                            v-model="selectedTags"
-                            :tags="tags">
-                            <template #trigger>
-                                <Badge
-                                    :disabled="removeAllTags"
-                                    tag="button"
-                                    size="xlarge">
-                                    <span v-if="selectedTags.length > 0">
-                                        Set {{ selectedTags.length }} tags
-                                    </span>
-                                    <span v-else> Select Tags... </span>
-                                </Badge>
-                            </template>
-                        </TagDropdown>
-                        <div class="flex items-center space-x-2">
-                            <Checkbox
-                                v-model:checked="removeAllTags"
-                                id="no_tags"></Checkbox>
-                            <InputLabel for="no_tags" value="Remove all tags" />
-                        </div>
-                    </div>
-                </div>
-                <div class="space-y-2">
-                    <InputLabel for="project" value="Billable" />
-                    <div class="flex">
-                        <SelectDropdown
-                            v-model="timeEntryBillable"
-                            :get-key-from-item="(item) => item.value"
-                            :get-name-for-item="(item) => item.label"
-                            :items="[
-                                {
-                                    label: 'Keep current billable status',
-                                    value: 'do-not-update',
-                                },
-                                {
-                                    label: 'Billable',
-                                    value: 'billable',
-                                },
-                                {
-                                    label: 'Non Billable',
-                                    value: 'non-billable',
-                                },
-                            ]">
-                            <template v-slot:trigger>
-                                <Badge tag="button" size="xlarge">
-                                    <span v-if="billable === undefined">
-                                        Set billable status
-                                    </span>
-                                    <span v-else-if="billable === true">
-                                        Billable
-                                    </span>
-                                    <span v-else> Non Billable </span></Badge
-                                >
-                            </template>
-                        </SelectDropdown>
-                    </div>
-                </div>
-            </div>
-        </template>
-        <template #footer>
-            <SecondaryButton @click="show = false"> Cancel</SecondaryButton>
-            <PrimaryButton
-                class="ms-3"
-                :class="{ 'opacity-25': saving }"
-                :disabled="saving"
-                @click="submit">
-                Update Time Entries
-            </PrimaryButton>
-        </template>
-    </DialogModal>
-</template>
-
-<style scoped></style>

resources/js/Components/Dashboard/ProjectsChartCard.vue

@@ -76,7 +76,7 @@ const option = ref({
 
 <template>
     <v-chart
-        class="h-[420px] max-w-[300px] mx-auto bg-transparent"
+        class="h-[420px] bg-transparent"
         :autoresize="true"
         :option="option" />
 </template>

resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue

@@ -24,11 +24,12 @@ const { setActiveState } = useCurrentTimeEntryStore();
 
 async function startTaskTimer() {
     if (currentTimeEntry.value.id) {
-        await setActiveState(false);
+        await setActiveState(true);
     }
     currentTimeEntry.value.project_id = props.project_id;
     currentTimeEntry.value.task_id = props.task_id;
     currentTimeEntry.value.start = getDayJsInstance().utc().format();
+    currentTimeEntry.value.billable = project.value?.is_billable ?? false;
     await setActiveState(true);
     useCurrentTimeEntryStore().fetchCurrentTimeEntry();
 }

resources/js/Layouts/AppLayout.vue

@@ -114,10 +114,7 @@ const page = usePage<{
                             <NavigationSidebarItem
                                 title="Reporting"
                                 :icon="ChartBarIcon"
-                                :current="
-                                    route().current('reporting') ||
-                                    route().current('reporting.detailed')
-                                "
+                                :current="route().current('reporting')"
                                 :href="
                                     route('reporting')
                                 "></NavigationSidebarItem>

resources/js/Pages/Projects.vue

@@ -20,18 +20,13 @@ import type {
     Project,
 } from '@/packages/api/src';
 import { getOrganizationCurrencyString } from '@/utils/money';
-import { getCurrentRole } from '@/utils/useUser';
-import { useOrganizationStore } from '@/utils/useOrganization';
 
 onMounted(() => {
     useProjectsStore().fetchProjects();
-    useOrganizationStore().fetchOrganization();
 });
 const { clients } = storeToRefs(useClientsStore());
 const showCreateProjectModal = ref(false);
 
-const { organization } = storeToRefs(useOrganizationStore());
-
 const activeTab = ref<'active' | 'archived'>('active');
 
 function isActiveTab(tab: string) {
@@ -58,13 +53,6 @@ async function createClient(
 ): Promise<Client | undefined> {
     return await useClientsStore().createClient(client);
 }
-
-const showBillableRate = computed(() => {
-    return !!(
-        getCurrentRole() !== 'employee' ||
-        organization.value?.employees_can_see_billable_rates
-    );
-});
 </script>
 
 <template>
@@ -100,8 +88,6 @@ const showBillableRate = computed(() => {
                 @submit="createProject"
                 v-model:show="showCreateProjectModal"></ProjectCreateModal>
         </MainContainer>
-        <ProjectTable
-            :show-billable-rate="showBillableRate"
-            :projects="shownProjects"></ProjectTable>
+        <ProjectTable :projects="shownProjects"></ProjectTable>
     </AppLayout>
 </template>

resources/js/Pages/Reporting.vue

@@ -35,16 +35,13 @@ import { getCurrentMembershipId, getCurrentRole } from '@/utils/useUser';
 import ClientMultiselectDropdown from '@/Components/Common/Client/ClientMultiselectDropdown.vue';
 import { useTagsStore } from '@/utils/useTags';
 import { formatCents } from '@/packages/ui/src/utils/money';
-import { useSessionStorage, useStorage } from '@vueuse/core';
-import TabBar from '@/Components/Common/TabBar/TabBar.vue';
-import TabBarItem from '@/Components/Common/TabBar/TabBarItem.vue';
-import { router } from '@inertiajs/vue3';
+import { useStorage } from '@vueuse/core';
 
-const startDate = useSessionStorage<string>(
+const startDate = useStorage<string>(
     'reporting-start-date',
     getLocalizedDayJs(getDayJsInstance()().format()).subtract(14, 'd').format()
 );
-const endDate = useSessionStorage<string>(
+const endDate = useStorage<string>(
     'reporting-end-date',
     getLocalizedDayJs(getDayJsInstance()().format()).format()
 );
@@ -160,15 +157,6 @@ async function createTag(tag: string) {
             class="py-3 sm:py-5 border-b border-default-background-separator flex justify-between items-center">
             <div class="flex items-center space-x-3 sm:space-x-6">
                 <PageTitle :icon="ChartBarIcon" title="Reporting"></PageTitle>
-                <TabBar>
-                    <TabBarItem @click="router.visit(route('reporting'))" active
-                        >Overview</TabBarItem
-                    >
-                    <TabBarItem
-                        @click="router.visit(route('reporting.detailed'))"
-                        >Detailed</TabBarItem
-                    >
-                </TabBar>
             </div>
         </MainContainer>
         <div class="p-3 w-full border-b border-default-background-separator">

resources/js/Pages/ReportingDetailed.vue

@@ -1,452 +0,0 @@
-<script setup lang="ts">
-import MainContainer from '@/packages/ui/src/MainContainer.vue';
-import AppLayout from '@/Layouts/AppLayout.vue';
-import { FolderIcon } from '@heroicons/vue/16/solid';
-import PageTitle from '@/Components/Common/PageTitle.vue';
-import {
-    ChartBarIcon,
-    UserGroupIcon,
-    CheckCircleIcon,
-    TagIcon,
-    ChevronLeftIcon,
-    ChevronDoubleLeftIcon,
-    ChevronRightIcon,
-    ChevronDoubleRightIcon,
-    ClockIcon,
-} from '@heroicons/vue/20/solid';
-import DateRangePicker from '@/packages/ui/src/Input/DateRangePicker.vue';
-import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
-import { computed, onMounted, ref, watch } from 'vue';
-import {
-    getDayJsInstance,
-    getLocalizedDayJs,
-} from '@/packages/ui/src/utils/time';
-import { storeToRefs } from 'pinia';
-import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
-import {
-    api,
-    type Client,
-    type CreateClientBody,
-    type CreateProjectBody,
-    type Project,
-    type TimeEntriesQueryParams,
-    type TimeEntry,
-    type TimeEntryResponse,
-} from '@/packages/api/src';
-import ReportingFilterBadge from '@/Components/Common/Reporting/ReportingFilterBadge.vue';
-import ProjectMultiselectDropdown from '@/Components/Common/Project/ProjectMultiselectDropdown.vue';
-import MemberMultiselectDropdown from '@/Components/Common/Member/MemberMultiselectDropdown.vue';
-import TaskMultiselectDropdown from '@/Components/Common/Task/TaskMultiselectDropdown.vue';
-import SelectDropdown from '@/packages/ui/src/Input/SelectDropdown.vue';
-import ClientMultiselectDropdown from '@/Components/Common/Client/ClientMultiselectDropdown.vue';
-import { useTagsStore } from '@/utils/useTags';
-import { useSessionStorage } from '@vueuse/core';
-import { router } from '@inertiajs/vue3';
-import TabBar from '@/Components/Common/TabBar/TabBar.vue';
-import TabBarItem from '@/Components/Common/TabBar/TabBarItem.vue';
-import TimeEntryRow from '@/packages/ui/src/TimeEntry/TimeEntryRow.vue';
-import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
-import { useProjectsStore } from '@/utils/useProjects';
-import { useTasksStore } from '@/utils/useTasks';
-import { useClientsStore } from '@/utils/useClients';
-import { getOrganizationCurrencyString } from '@/utils/money';
-import { useMembersStore } from '@/utils/useMembers';
-import {
-    PaginationEllipsis,
-    PaginationFirst,
-    PaginationLast,
-    PaginationList,
-    PaginationListItem,
-    PaginationNext,
-    PaginationPrev,
-    PaginationRoot,
-} from 'radix-vue';
-import { useQuery, useQueryClient } from '@tanstack/vue-query';
-import { getCurrentOrganizationId } from '@/utils/useUser';
-import { useTimeEntriesStore } from '@/utils/useTimeEntries';
-import TimeEntryMassActionRow from '@/Components/Common/TimeEntry/TimeEntryMassActionRow.vue';
-
-const startDate = useSessionStorage<string>(
-    'reporting-start-date',
-    getLocalizedDayJs(getDayJsInstance()().format()).subtract(14, 'd').format()
-);
-const endDate = useSessionStorage<string>(
-    'reporting-end-date',
-    getLocalizedDayJs(getDayJsInstance()().format()).format()
-);
-const selectedTags = ref<string[]>([]);
-const selectedProjects = ref<string[]>([]);
-const selectedMembers = ref<string[]>([]);
-const selectedTasks = ref<string[]>([]);
-const selectedClients = ref<string[]>([]);
-const billable = ref<'true' | 'false' | null>(null);
-
-const { members } = storeToRefs(useMembersStore());
-const pageLimit = 15;
-const currentPage = ref(1);
-
-function getFilterAttributes() {
-    let params: TimeEntriesQueryParams = {
-        start: getLocalizedDayJs(startDate.value).startOf('day').utc().format(),
-        end: getLocalizedDayJs(endDate.value).endOf('day').utc().format(),
-        active: 'false',
-        limit: pageLimit,
-        offset: currentPage.value * pageLimit - pageLimit,
-    };
-    params = {
-        ...params,
-        member_ids:
-            selectedMembers.value.length > 0
-                ? selectedMembers.value
-                : undefined,
-        project_ids:
-            selectedProjects.value.length > 0
-                ? selectedProjects.value
-                : undefined,
-        task_ids:
-            selectedTasks.value.length > 0 ? selectedTasks.value : undefined,
-        client_ids:
-            selectedClients.value.length > 0
-                ? selectedClients.value
-                : undefined,
-        tag_ids: selectedTags.value.length > 0 ? selectedTags.value : undefined,
-        billable: billable.value !== null ? billable.value : undefined,
-    };
-    return params;
-}
-
-const currentTimeEntryStore = useCurrentTimeEntryStore();
-const { currentTimeEntry } = storeToRefs(currentTimeEntryStore);
-const { setActiveState, startLiveTimer } = currentTimeEntryStore;
-const { createTimeEntry, updateTimeEntry } = useTimeEntriesStore();
-
-const { tags } = storeToRefs(useTagsStore());
-
-const { data: timeEntryResponse } = useQuery<TimeEntryResponse>({
-    queryKey: ['timeEntry', 'detailed-report'],
-    enabled: !!getCurrentOrganizationId(),
-    queryFn: () =>
-        api.getTimeEntries({
-            params: {
-                organization: getCurrentOrganizationId() || '',
-            },
-            queries: getFilterAttributes(),
-        }),
-});
-
-const totalPages = computed(() => {
-    return timeEntryResponse?.value?.meta?.total ?? 1;
-});
-
-const timeEntriesStore = useTimeEntriesStore();
-
-async function deleteTimeEntries(timeEntries: TimeEntry[]) {
-    await timeEntriesStore.deleteTimeEntries(timeEntries);
-    selectedTimeEntries.value = [];
-    await updateFilteredTimeEntries();
-}
-
-const timeEntries = computed(() => {
-    return timeEntryResponse?.value?.data || [];
-});
-
-onMounted(async () => {
-    await updateFilteredTimeEntries();
-});
-
-const projectStore = useProjectsStore();
-const { projects } = storeToRefs(projectStore);
-const taskStore = useTasksStore();
-const { tasks } = storeToRefs(taskStore);
-const clientStore = useClientsStore();
-const { clients } = storeToRefs(clientStore);
-
-const selectedTimeEntries = ref<TimeEntry[]>([]);
-
-async function createTag(name: string) {
-    return await useTagsStore().createTag(name);
-}
-
-async function createProject(
-    project: CreateProjectBody
-): Promise<Project | undefined> {
-    return await useProjectsStore().createProject(project);
-}
-
-async function createClient(
-    body: CreateClientBody
-): Promise<Client | undefined> {
-    return await useClientsStore().createClient(body);
-}
-
-async function startTimeEntryFromExisting(entry: TimeEntry) {
-    if (currentTimeEntry.value.id) {
-        await setActiveState(false);
-    }
-    await createTimeEntry({
-        project_id: entry.project_id,
-        task_id: entry.task_id,
-        start: getDayJsInstance().utc().format(),
-        end: null,
-        billable: entry.billable,
-        description: entry.description,
-    });
-    startLiveTimer();
-    updateFilteredTimeEntries();
-    useCurrentTimeEntryStore().fetchCurrentTimeEntry();
-}
-const queryClient = useQueryClient();
-async function updateFilteredTimeEntries() {
-    await queryClient.invalidateQueries({
-        queryKey: ['timeEntry', 'detailed-report'],
-    });
-}
-watch(currentPage, () => {
-    updateFilteredTimeEntries();
-});
-function deleteSelected() {
-    deleteTimeEntries(selectedTimeEntries.value);
-}
-
-async function clearSelectionAndState() {
-    selectedTimeEntries.value = [];
-    await updateFilteredTimeEntries();
-}
-</script>
-
-<template>
-    <AppLayout
-        title="Reporting"
-        data-testid="reporting_view"
-        class="overflow-hidden">
-        <MainContainer
-            class="py-3 sm:py-5 border-b border-default-background-separator flex justify-between items-center">
-            <div class="flex items-center space-x-3 sm:space-x-6">
-                <PageTitle :icon="ChartBarIcon" title="Reporting"></PageTitle>
-                <TabBar>
-                    <TabBarItem @click="router.visit(route('reporting'))"
-                        >Overview
-                    </TabBarItem>
-                    <TabBarItem
-                        @click="router.visit(route('reporting.detailed'))"
-                        active
-                        >Detailed
-                    </TabBarItem>
-                </TabBar>
-            </div>
-        </MainContainer>
-        <div class="py-2.5 w-full border-b border-default-background-separator">
-            <MainContainer
-                class="sm:flex space-y-4 sm:space-y-0 justify-between">
-                <div
-                    class="flex flex-wrap items-center space-y-2 sm:space-y-0 space-x-4">
-                    <div class="text-sm font-medium">Filters</div>
-                    <MemberMultiselectDropdown
-                        @submit="updateFilteredTimeEntries"
-                        v-model="selectedMembers">
-                        <template v-slot:trigger>
-                            <ReportingFilterBadge
-                                :count="selectedMembers.length"
-                                :active="selectedMembers.length > 0"
-                                title="Members"
-                                :icon="UserGroupIcon"></ReportingFilterBadge>
-                        </template>
-                    </MemberMultiselectDropdown>
-                    <ProjectMultiselectDropdown
-                        @submit="updateFilteredTimeEntries"
-                        v-model="selectedProjects">
-                        <template v-slot:trigger>
-                            <ReportingFilterBadge
-                                :count="selectedProjects.length"
-                                :active="selectedProjects.length > 0"
-                                title="Projects"
-                                :icon="FolderIcon"></ReportingFilterBadge>
-                        </template>
-                    </ProjectMultiselectDropdown>
-                    <TaskMultiselectDropdown
-                        @submit="updateFilteredTimeEntries"
-                        v-model="selectedTasks">
-                        <template v-slot:trigger>
-                            <ReportingFilterBadge
-                                :count="selectedTasks.length"
-                                :active="selectedTasks.length > 0"
-                                title="Tasks"
-                                :icon="CheckCircleIcon"></ReportingFilterBadge>
-                        </template>
-                    </TaskMultiselectDropdown>
-                    <ClientMultiselectDropdown
-                        @submit="updateFilteredTimeEntries"
-                        v-model="selectedClients">
-                        <template v-slot:trigger>
-                            <ReportingFilterBadge
-                                title="Clients"
-                                :icon="FolderIcon"></ReportingFilterBadge>
-                        </template>
-                    </ClientMultiselectDropdown>
-                    <TagDropdown
-                        @submit="updateFilteredTimeEntries"
-                        :createTag
-                        v-model="selectedTags"
-                        :tags="tags">
-                        <template v-slot:trigger>
-                            <ReportingFilterBadge
-                                :count="selectedTags.length"
-                                :active="selectedTags.length > 0"
-                                title="Tags"
-                                :icon="TagIcon"></ReportingFilterBadge>
-                        </template>
-                    </TagDropdown>
-
-                    <SelectDropdown
-                        @changed="updateFilteredTimeEntries"
-                        v-model="billable"
-                        :get-key-from-item="(item) => item.value"
-                        :get-name-for-item="(item) => item.label"
-                        :items="[
-                            {
-                                label: 'Both',
-                                value: null,
-                            },
-                            {
-                                label: 'Billable',
-                                value: 'true',
-                            },
-                            {
-                                label: 'Non Billable',
-                                value: 'false',
-                            },
-                        ]">
-                        <template v-slot:trigger>
-                            <ReportingFilterBadge
-                                :active="billable !== null"
-                                :title="
-                                    billable === 'false'
-                                        ? 'Non Billable'
-                                        : 'Billable'
-                                "
-                                :icon="BillableIcon"></ReportingFilterBadge>
-                        </template>
-                    </SelectDropdown>
-                </div>
-                <div>
-                    <DateRangePicker
-                        v-model:start="startDate"
-                        v-model:end="endDate"
-                        @submit="updateFilteredTimeEntries"></DateRangePicker>
-                </div>
-            </MainContainer>
-        </div>
-        <TimeEntryMassActionRow
-            :selected-time-entries="selectedTimeEntries"
-            @submit="clearSelectionAndState"
-            :delete-selected="deleteSelected"
-            @select-all="selectedTimeEntries = [...timeEntries]"
-            @unselect-all="selectedTimeEntries = []"
-            :all-selected="
-                selectedTimeEntries.length === timeEntries.length
-            "></TimeEntryMassActionRow>
-        <div class="w-full relative">
-            <div v-for="entry in timeEntries" :key="entry.id">
-                <TimeEntryRow
-                    :selected="selectedTimeEntries.includes(entry)"
-                    @selected="selectedTimeEntries.push(entry)"
-                    @unselected="
-                        selectedTimeEntries = selectedTimeEntries.filter(
-                            (item) => item.id !== entry.id
-                        )
-                    "
-                    :createClient
-                    :createProject
-                    :projects="projects"
-                    :tasks="tasks"
-                    :tags="tags"
-                    :clients
-                    :createTag
-                    :updateTimeEntry
-                    :onStartStopClick="() => startTimeEntryFromExisting(entry)"
-                    :deleteTimeEntry="() => deleteTimeEntries([entry])"
-                    :currency="getOrganizationCurrencyString()"
-                    :members="members"
-                    showDate
-                    showMember
-                    :time-entry="entry"></TimeEntryRow>
-            </div>
-            <div v-if="timeEntries.length === 0">
-                <div class="text-center pt-12">
-                    <ClockIcon
-                        class="w-8 text-icon-default inline pb-2"></ClockIcon>
-                    <h3 class="text-white font-semibold">
-                        No time entries found
-                    </h3>
-                    <p class="pb-5">
-                        Adjust the filters to see more time entries!
-                    </p>
-                </div>
-            </div>
-        </div>
-
-        <PaginationRoot
-            :total="totalPages"
-            :items-per-page="pageLimit"
-            class="flex justify-center items-center py-8"
-            v-model:page="currentPage"
-            :sibling-count="1"
-            show-edges>
-            <PaginationList
-                v-slot="{ items }"
-                class="flex items-center space-x-1 relative">
-                <div
-                    class="pr-2 flex items-center space-x-1 border-r border-border-primary mr-1">
-                    <PaginationFirst class="navigation-item">
-                        <ChevronDoubleLeftIcon class="w-4">
-                        </ChevronDoubleLeftIcon>
-                    </PaginationFirst>
-                    <PaginationPrev class="mr-4 navigation-item">
-                        <ChevronLeftIcon
-                            class="w-4 text-text-tertiary hover:text-text-primary">
-                        </ChevronLeftIcon>
-                    </PaginationPrev>
-                </div>
-                <template v-for="(page, index) in items">
-                    <PaginationListItem
-                        v-if="page.type === 'page'"
-                        :key="index"
-                        class="pagination-item"
-                        :value="page.value">
-                        {{ page.value }}
-                    </PaginationListItem>
-                    <PaginationEllipsis
-                        v-else
-                        :key="page.type"
-                        :index="index"
-                        class="PaginationEllipsis">
-                        <div class="px-2">&#8230;</div>
-                    </PaginationEllipsis>
-                </template>
-                <div
-                    class="!ml-2 pl-2 flex items-center space-x-1 border-l border-border-primary">
-                    <PaginationNext class="navigation-item">
-                        <ChevronRightIcon
-                            class="w-4 text-text-tertiary hover:text-text-primary"></ChevronRightIcon>
-                    </PaginationNext>
-                    <PaginationLast class="navigation-item">
-                        <ChevronDoubleRightIcon
-                            class="w-4 text-text-tertiary hover:text-text-primary"></ChevronDoubleRightIcon>
-                    </PaginationLast>
-                </div>
-            </PaginationList>
-        </PaginationRoot>
-    </AppLayout>
-</template>
-<style lang="postcss">
-.navigation-item {
-    @apply bg-quaternary h-8 w-8 flex items-center justify-center rounded border border-border-primary text-text-tertiary hover:text-text-primary transition cursor-pointer hover:border-border-secondary hover:bg-secondary focus-visible:text-text-primary focus-visible:outline-0 focus-visible:ring-2 focus-visible:ring-white/80;
-}
-
-.pagination-item {
-    @apply bg-secondary h-8 w-8 flex items-center justify-center rounded border border-border-tertiary text-text-secondary hover:text-text-primary transition cursor-pointer hover:border-border-secondary hover:bg-secondary focus-visible:text-text-primary focus-visible:outline-0 focus-visible:ring-2 focus-visible:ring-white/80;
-}
-.pagination-item[data-selected] {
-    @apply text-white bg-accent-300/10 border border-accent-300/20 rounded-md font-medium hover:bg-accent-300/20 active:bg-accent-300/20 outline-0 focus-visible:ring-2 focus:ring-white/80 transition ease-in-out duration-150;
-}
-</style>

resources/js/Pages/Teams/Partials/OrganizationBillableRate.vue

@@ -9,7 +9,6 @@ import { useOrganizationStore } from '@/utils/useOrganization';
 import { storeToRefs } from 'pinia';
 import OrganizationBillableRateModal from '@/Components/Common/Organization/OrganizationBillableRateModal.vue';
 import { getOrganizationCurrencyString } from '@/utils/money';
-import { Checkbox } from '@/packages/ui/src';
 
 const store = useOrganizationStore();
 const { fetchOrganization, updateOrganization } = store;
@@ -18,7 +17,6 @@ const saving = ref(false);
 const organizationBody = ref<UpdateOrganizationBody>({
     name: '',
     billable_rate: null as number | null,
-    employees_can_see_billable_rates: false,
 });
 
 onMounted(async () => {
@@ -26,8 +24,6 @@ onMounted(async () => {
     organizationBody.value = {
         name: organization.value?.name ?? '',
         billable_rate: organization.value?.billable_rate,
-        employees_can_see_billable_rates:
-            organization.value?.employees_can_see_billable_rates ?? false,
     };
 });
 const showConfirmationModal = ref(false);
@@ -38,17 +34,6 @@ async function submit() {
     saving.value = false;
     showConfirmationModal.value = false;
 }
-
-function checkForConfirmationModal() {
-    if (
-        organizationBody.value.billable_rate ===
-        organization.value?.billable_rate
-    ) {
-        submit();
-    } else {
-        showConfirmationModal.value = true;
-    }
-}
 </script>
 
 <template>
@@ -79,25 +64,9 @@ function checkForConfirmationModal() {
                         name="organizationBillableRate"></BillableRateInput>
                 </div>
             </div>
-
-            <div class="col-span-6">
-                <div class="col-span-6 sm:col-span-4">
-                    <div class="flex items-center space-x-2">
-                        <Checkbox
-                            v-if="organization"
-                            v-model:checked="
-                                organizationBody.employees_can_see_billable_rates
-                            "
-                            id="organizationShowBillableRatesToEmployees"></Checkbox>
-                        <InputLabel
-                            for="organizationShowBillableRatesToEmployees"
-                            value="Show Billable Rates to Employees" />
-                    </div>
-                </div>
-            </div>
         </template>
         <template #actions>
-            <PrimaryButton @click="checkForConfirmationModal"
+            <PrimaryButton @click="showConfirmationModal = true"
                 >Save</PrimaryButton
             >
         </template>

resources/js/Pages/Time.vue

@@ -26,15 +26,14 @@ import { useTagsStore } from '@/utils/useTags';
 import { useClientsStore } from '@/utils/useClients';
 import TimeEntryCreateModal from '@/Components/Common/TimeEntry/TimeEntryCreateModal.vue';
 import { getOrganizationCurrencyString } from '@/utils/money';
-import TimeEntryMassActionRow from '@/Components/Common/TimeEntry/TimeEntryMassActionRow.vue';
 
 const timeEntriesStore = useTimeEntriesStore();
 const { timeEntries, allTimeEntriesLoaded } = storeToRefs(timeEntriesStore);
 const { updateTimeEntry, fetchTimeEntries, createTimeEntry } =
     useTimeEntriesStore();
 
-async function updateTimeEntries(ids: string[], changes: Partial<TimeEntry>) {
-    await useTimeEntriesStore().updateTimeEntries(ids, changes);
+function updateTimeEntries(ids: string[], changes: Partial<TimeEntry>) {
+    useTimeEntriesStore().updateTimeEntries(ids, changes);
     fetchTimeEntries();
 }
 
@@ -58,7 +57,9 @@ async function startTimeEntry(
 }
 
 function deleteTimeEntries(timeEntries: TimeEntry[]) {
-    useTimeEntriesStore().deleteTimeEntries(timeEntries);
+    timeEntries.forEach((entry) => {
+        useTimeEntriesStore().deleteTimeEntry(entry.id);
+    });
     fetchTimeEntries();
 }
 
@@ -98,18 +99,6 @@ async function createClient(
 ): Promise<Client | undefined> {
     return await useClientsStore().createClient(body);
 }
-
-const selectedTimeEntries = ref([] as TimeEntry[]);
-
-async function clearSelectionAndState() {
-    selectedTimeEntries.value = [];
-    await fetchTimeEntries();
-}
-
-function deleteSelected() {
-    deleteTimeEntries(selectedTimeEntries.value);
-    selectedTimeEntries.value = [];
-}
 </script>
 
 <template>
@@ -133,15 +122,7 @@ function deleteSelected() {
                 </div>
             </div>
         </MainContainer>
-        <TimeEntryMassActionRow
-            :selected-time-entries="selectedTimeEntries"
-            @submit="clearSelectionAndState"
-            :all-selected="selectedTimeEntries.length === timeEntries.length"
-            @select-all="selectedTimeEntries = [...timeEntries]"
-            @unselect-all="selectedTimeEntries = []"
-            :delete-selected="deleteSelected"></TimeEntryMassActionRow>
         <TimeEntryGroupedTable
-            v-model:selected="selectedTimeEntries"
             :createProject
             :clients
             :createClient

resources/js/app.ts

@@ -7,7 +7,6 @@ import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers';
 import { ZiggyVue } from '../../vendor/tightenco/ziggy';
 import { createPinia } from 'pinia';
 import type { User } from '@/types/models';
-import { VueQueryPlugin } from '@tanstack/vue-query';
 
 const appName = import.meta.env.VITE_APP_NAME || 'Laravel';
 const pinia = createPinia();
@@ -43,7 +42,7 @@ createInertiaApp({
             return page.props.auth.user.timezone;
         };
 
-        app.use(plugin).use(pinia).use(ZiggyVue).use(VueQueryPlugin).mount(el);
+        app.use(plugin).use(pinia).use(ZiggyVue).mount(el);
     },
 
     progress: {

resources/js/packages/api/src/index.ts

@@ -28,14 +28,6 @@ export type CreateTimeEntryBody = ZodiosBodyByAlias<
     'createTimeEntry'
 >;
 
-export type UpdateMultipleTimeEntriesBody = ZodiosBodyByAlias<
-    SolidTimeApi,
-    'updateMultipleTimeEntries'
->;
-
-export type UpdateMultipleTimeEntriesChangeset =
-    UpdateMultipleTimeEntriesBody['changes'];
-
 export type ProjectResponse = ZodiosResponseByAlias<
     SolidTimeApi,
     'getProjects'
@@ -115,11 +107,6 @@ export type ReportingResponse = ZodiosResponseByAlias<
 export type AggregatedTimeEntries = ReportingResponse['data'];
 export type GroupedDataEntries = ReportingResponse['data']['grouped_data'];
 
-export type TimeEntriesQueryParams = ZodiosQueryParamsByAlias<
-    SolidTimeApi,
-    'getTimeEntries'
->;
-
 export type AggregatedTimeEntriesQueryParams = ZodiosQueryParamsByAlias<
     SolidTimeApi,
     'getAggregatedTimeEntries'

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

@@ -51,14 +51,12 @@ const OrganizationResource = z
         name: z.string(),
         is_personal: z.boolean(),
         billable_rate: z.union([z.number(), z.null()]),
-        employees_can_see_billable_rates: z.boolean(),
     })
     .passthrough();
 const OrganizationUpdateRequest = z
     .object({
         name: z.string().max(255),
         billable_rate: z.union([z.number(), z.null()]).optional(),
-        employees_can_see_billable_rates: z.boolean().optional(),
     })
     .passthrough();
 const ProjectResource = z
@@ -72,6 +70,7 @@ const ProjectResource = z
         is_billable: z.boolean(),
         estimated_time: z.union([z.number(), z.null()]),
         spent_time: z.number().int(),
+        limited_visibility: z.boolean(),
     })
     .passthrough();
 const ProjectStoreRequest = z
@@ -101,16 +100,22 @@ const ProjectMemberResource = z
         billable_rate: z.union([z.number(), z.null()]),
         member_id: z.string(),
         project_id: z.string(),
+        role: z.string(),
     })
     .passthrough();
+const ProjectMemberRole = z.enum(['manager', 'normal']);
 const ProjectMemberStoreRequest = z
     .object({
         member_id: z.string().uuid(),
         billable_rate: z.union([z.number(), z.null()]).optional(),
+        role: ProjectMemberRole,
     })
     .passthrough();
 const ProjectMemberUpdateRequest = z
-    .object({ billable_rate: z.union([z.number(), z.null()]) })
+    .object({
+        billable_rate: z.union([z.number(), z.null()]),
+        role: ProjectMemberRole,
+    })
     .partial()
     .passthrough();
 const TagResource = z
@@ -170,6 +175,7 @@ const TimeEntryResource = z
         billable: z.boolean(),
     })
     .passthrough();
+const TimeEntryCollection = z.array(TimeEntryResource);
 const TimeEntryStoreRequest = z
     .object({
         member_id: z.string().uuid(),
@@ -258,6 +264,7 @@ export const schemas = {
     ProjectStoreRequest,
     ProjectUpdateRequest,
     ProjectMemberResource,
+    ProjectMemberRole,
     ProjectMemberStoreRequest,
     ProjectMemberUpdateRequest,
     TagResource,
@@ -269,6 +276,7 @@ export const schemas = {
     TaskUpdateRequest,
     start,
     TimeEntryResource,
+    TimeEntryCollection,
     TimeEntryStoreRequest,
     TimeEntryUpdateMultipleRequest,
     TimeEntryUpdateRequest,
@@ -2145,11 +2153,6 @@ Users with the permission `time-entries:view:own` can only use this en
                 type: 'Query',
                 schema: z.number().int().gte(1).lte(500).optional(),
             },
-            {
-                name: 'offset',
-                type: 'Query',
-                schema: z.number().int().gte(0).optional(),
-            },
             {
                 name: 'only_full_dates',
                 type: 'Query',
@@ -2160,11 +2163,6 @@ Users with the permission `time-entries:view:own` can only use this en
                 type: 'Query',
                 schema: z.array(z.string().uuid()).min(1).optional(),
             },
-            {
-                name: 'client_ids',
-                type: 'Query',
-                schema: z.array(z.string().uuid()).min(1).optional(),
-            },
             {
                 name: 'project_ids',
                 type: 'Query',
@@ -2180,18 +2178,18 @@ Users with the permission `time-entries:view:own` can only use this en
                 type: 'Query',
                 schema: z.array(z.string().uuid()).min(1).optional(),
             },
+            {
+                name: 'client_ids',
+                type: 'Query',
+                schema: z.string().optional(),
+            },
             {
                 name: 'user_id',
                 type: 'Query',
                 schema: z.string().optional(),
             },
         ],
-        response: z
-            .object({
-                data: z.array(TimeEntryResource),
-                meta: z.object({ total: z.number().int() }).passthrough(),
-            })
-            .passthrough(),
+        response: z.object({ data: TimeEntryCollection }).passthrough(),
         errors: [
             {
                 status: 401,
@@ -2325,54 +2323,6 @@ Users with the permission `time-entries:view:own` can only use this en
             },
         ],
     },
-    {
-        method: 'delete',
-        path: '/v1/organizations/:organization/time-entries',
-        alias: 'deleteTimeEntries',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'organization',
-                type: 'Path',
-                schema: z.string(),
-            },
-            {
-                name: 'ids',
-                type: 'Query',
-                schema: z.array(z.string().uuid()),
-            },
-        ],
-        response: z
-            .object({ success: z.string(), error: z.string() })
-            .passthrough(),
-        errors: [
-            {
-                status: 401,
-                description: `Unauthenticated`,
-                schema: z.object({ message: z.string() }).passthrough(),
-            },
-            {
-                status: 403,
-                description: `Authorization error`,
-                schema: z.object({ message: z.string() }).passthrough(),
-            },
-            {
-                status: 404,
-                description: `Not found`,
-                schema: z.object({ message: z.string() }).passthrough(),
-            },
-            {
-                status: 422,
-                description: `Validation error`,
-                schema: z
-                    .object({
-                        message: z.string(),
-                        errors: z.record(z.array(z.string())),
-                    })
-                    .passthrough(),
-            },
-        ],
-    },
     {
         method: 'put',
         path: '/v1/organizations/:organization/time-entries/:timeEntry',

resources/js/packages/ui/src/Badge.vue

@@ -39,7 +39,7 @@ const borderClasses = computed(() => {
             twMerge(
                 badgeClasses[size],
                 borderClasses,
-                'rounded inline-flex items-center font-semibold text-white disabled:text-text-quaternary outline-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-white/80',
+                'rounded inline-flex items-center font-semibold text-white',
                 props.class
             )
         ">

resources/js/packages/ui/src/DaySectionHeader.vue

@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import {
+    formatDate,
+    formatHumanReadableDuration,
+    formatWeekday,
+} from '@/packages/ui/src/utils/time';
+
+defineProps<{
+    date: string;
+    duration: number;
+}>();
+</script>
+
+<template>
+    <div class="flex justify-between items-center">
+        <div class="flex items-center space-x-2">
+            <svg
+                class="w-4 sm:w-5 text-muted"
+                viewBox="0 0 24 24"
+                xmlns="http://www.w3.org/2000/svg">
+                <g fill="none">
+                    <path
+                        d="m12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035c-.01-.004-.019-.001-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427c-.002-.01-.009-.017-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093c.012.004.023 0 .029-.008l.004-.014l-.034-.614c-.003-.012-.01-.02-.02-.022m-.715.002a.023.023 0 0 0-.027.006l-.006.014l-.034.614c0 .012.007.02.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z" />
+                    <path
+                        fill="currentColor"
+                        d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-7zm-5-9a1 1 0 0 1 1 1v1h2a2 2 0 0 1 2 2v3H3V7a2 2 0 0 1 2-2h2V4a1 1 0 0 1 2 0v1h6V4a1 1 0 0 1 1-1" />
+                </g>
+            </svg>
+            <span class="font-semibold text-white">
+                {{ formatWeekday(date) }}
+            </span>
+            <span class="font-semibold text-muted">
+                {{ formatDate(date) }}
+            </span>
+        </div>
+        <div class="text-muted pr-[90px] lg:pr-[108px]">
+            <span class="font-semibold">
+                {{ formatHumanReadableDuration(duration) }}
+            </span>
+        </div>
+    </div>
+</template>
+
+<style scoped></style>

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

@@ -12,10 +12,6 @@ const props = defineProps({
         type: String,
         default: null,
     },
-    id: {
-        type: String,
-        default: null,
-    },
 });
 
 const proxyChecked = computed({
@@ -33,7 +29,6 @@ const proxyChecked = computed({
     <input
         v-model="proxyChecked"
         type="checkbox"
-        :id="id"
         :value="value"
-        class="h-4 w-4 rounded bg-card-background border-input-border text-accent-500/80 focus:ring-accent-500/80" />
+        class="rounded bg-input-background border-input-border text-indigo-600 shadow-sm focus:ring-indigo-500" />
 </template>

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

@@ -94,7 +94,7 @@ function setLastYear() {
         @submit="emit('submit')">
         <template #trigger>
             <button
-                class="px-2 py-1 bg-input-background border border-input-border font-medium rounded-lg flex items-center space-x-2">
+                class="px-3 py-1.5 bg-input-background border border-input-border font-medium rounded-lg flex items-center space-x-2">
                 <CalendarIcon class="w-5"></CalendarIcon>
                 <div class="text-white">
                     {{ formatDate(start) }}

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

@@ -85,7 +85,7 @@ const { floatingStyles } = useFloating(reference, floating, {
         <Teleport to="body">
             <div
                 v-show="open"
-                class="fixed inset-0 z-50"
+                class="fixed inset-0 z-40"
                 @click.prevent="onBackgroundClick" />
             <transition
                 enter-active-class="transition-opacity ease-out duration-200"

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

@@ -1,15 +1,11 @@
 <script setup lang="ts">
-import { twMerge } from 'tailwind-merge';
-
-const props = defineProps<{
-    value?: string;
-    class?: string;
-}>();
+defineProps({
+    value: String,
+});
 </script>
 
 <template>
-    <label
-        :class="twMerge('block font-medium text-sm text-white', props.class)">
+    <label class="block font-medium text-sm text-white">
         <span v-if="value">{{ value }}</span>
         <span v-else><slot /></span>
     </label>

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

@@ -165,9 +165,7 @@ const highlightedItem = computed(() => {
                 ref="searchInput"
                 class="bg-card-background border-0 placeholder-muted text-sm text-white py-2.5 focus:ring-0 border-b border-card-background-separator focus:border-card-background-separator w-full"
                 :placeholder="searchPlaceholder" />
-            <div
-                ref="dropdownViewport"
-                class="min-w-60 max-w-80 max-h-60 overflow-y-scroll">
+            <div ref="dropdownViewport" class="w-60 max-h-60 overflow-y-scroll">
                 <div
                     v-for="item in filteredItems"
                     :key="props.getKeyFromItem(item)"