Enhanced description for Clockify imports

.env.ci

@@ -1,11 +1,10 @@
-# Application
 APP_NAME=solidtime
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
 APP_FORCE_HTTPS=false
-APP_ENABLE_REGISTRATION=true
+SESSION_SECURE_COOKIE=false
 
 # Logging
 LOG_CHANNEL=stack
@@ -20,39 +19,35 @@ DB_TEST_DATABASE=laravel
 DB_TEST_USERNAME=root
 DB_TEST_PASSWORD=root
 
-# Broadcasting
-BROADCAST_DRIVER=null
-
-# Cache
+BROADCAST_DRIVER=log
 CACHE_DRIVER=file
-
-# Queue
 QUEUE_CONNECTION=sync
-
-# Session
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
 
 # Mail
 MAIL_MAILER=log
-MAIL_FROM_ADDRESS="no-reply@solidtime.test"
-MAIL_FROM_NAME="solidtime"
-MAIL_REPLY_TO_ADDRESS="hello@solidtime.test"
-MAIL_REPLY_TO_NAME="solidtime"
+MAIL_FROM_ADDRESS="hello@example.com"
+MAIL_FROM_NAME="${APP_NAME}"
 
 # Filesystems
 FILESYSTEM_DISK=local
 PUBLIC_FILESYSTEM_DISK=public
 
-# Passport
-PASSPORT_PERSONAL_ACCESS_CLIENT_ID="9e27f54d-5dfb-4dde-99d7-834518236c92"
-PASSPORT_PERSONAL_ACCESS_CLIENT_SECRET="EL5mXp3aF8ITjcwoOXRpbSK7zGrWhW4zTDpQXTkf"
-
-# Auditing
-AUDITING_ENABLED=true
-
-# Telescope
-TELESCOPE_ENABLED=false
-
 # Services
 GOTENBERG_URL=http://0.0.0.0:3000
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_HOST=
+PUSHER_PORT=443
+PUSHER_SCHEME=https
+PUSHER_APP_CLUSTER=mt1
+
+VITE_APP_NAME="${APP_NAME}"
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_HOST="${PUSHER_HOST}"
+VITE_PUSHER_PORT="${PUSHER_PORT}"
+VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.env.example

@@ -1,13 +1,10 @@
-# Application
 APP_NAME=solidtime
 APP_ENV=local
 APP_KEY=base64:UNQNf1SXeASNkWux01Rj8EnHYx8FO0kAxWNDwktclkk=
 APP_DEBUG=true
 APP_URL=https://solidtime.test
-APP_FORCE_HTTPS=false
-APP_ENABLE_REGISTRATION=true
+AUDITING_ENABLED=true
 SUPER_ADMINS=admin@example.com
-PAGINATION_PER_PAGE_DEFAULT=500
 
 # Logging
 LOG_CHANNEL=single
@@ -28,16 +25,9 @@ DB_TEST_DATABASE=laravel
 DB_TEST_USERNAME=root
 DB_TEST_PASSWORD=root
 
-# Broadcasting
-BROADCAST_DRIVER=null
-
-# Cache
+BROADCAST_DRIVER=log
 CACHE_DRIVER=file
-
-# Queue
 QUEUE_CONNECTION=sync
-
-# Session
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
 
@@ -49,9 +39,15 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS="no-reply@solidtime.test"
-MAIL_FROM_NAME="solidtime"
-MAIL_REPLY_TO_ADDRESS="hello@solidtime.test"
-MAIL_REPLY_TO_NAME="solidtime"
+MAIL_FROM_NAME="${APP_NAME}"
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_HOST=
+PUSHER_PORT=443
+PUSHER_SCHEME=https
+PUSHER_APP_CLUSTER=mt1
 
 # Filesystems
 FILESYSTEM_DISK=s3
@@ -64,24 +60,21 @@ S3_URL=http://storage.solidtime.test/local
 S3_ENDPOINT=http://storage.solidtime.test
 S3_USE_PATH_STYLE_ENDPOINT=true
 
-# Passport
-PASSPORT_PERSONAL_ACCESS_CLIENT_ID="9e27f54d-5dfb-4dde-99d7-834518236c92"
-PASSPORT_PERSONAL_ACCESS_CLIENT_SECRET="EL5mXp3aF8ITjcwoOXRpbSK7zGrWhW4zTDpQXTkf"
-
-# Auditing
-AUDITING_ENABLED=true
-
-# Telescope
-TELESCOPE_ENABLED=false
-
 # Services
 GOTENBERG_URL=http://gotenberg:3000
 
-# Local setup
-NGINX_HOST_NAME=solidtime.test
-NETWORK_NAME=reverse-proxy-docker-traefik_routing
-FORWARD_DB_PORT=5432
-FORWARD_WEB_PORT=8083
 VITE_HOST_NAME=vite.solidtime.test
 VITE_APP_NAME="${APP_NAME}"
-#SAIL_XDEBUG_MODE=develop,debug,coverage
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_HOST="${PUSHER_HOST}"
+VITE_PUSHER_PORT="${PUSHER_PORT}"
+VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+NGINX_HOST_NAME=solidtime.test
+NETWORK_NAME=reverse-proxy-docker-traefik_routing
+
+FORWARD_DB_PORT=5432
+FORWARD_WEB_PORT=8083
+
+PAGINATION_PER_PAGE_DEFAULT=500

.env.production

@@ -5,6 +5,7 @@ VITE_APP_NAME=solidtime
 APP_ENV=production
 APP_DEBUG=false
 APP_FORCE_HTTPS=true
+SESSION_SECURE_COOKIE=true
 OCTANE_SERVER=frankenphp
 PAGINATION_PER_PAGE_DEFAULT=500
 

.eslintrc.cjs

@@ -0,0 +1,13 @@
+/* eslint-env node */
+require("@rushstack/eslint-patch/modern-module-resolution")
+
+module.exports = {
+    extends: ['plugin:vue/vue3-essential', '@vue/eslint-config-typescript/recommended', '@vue/eslint-config-prettier'],
+    rules: {
+        'vue/multi-word-component-names': 'off',
+        "@typescript-eslint/no-unused-vars": "off",
+        "unused-imports/no-unused-imports": "error",
+        "unused-imports/no-unused-vars": "error",
+    },
+    plugins: ['unused-imports'],
+}

.github/workflows/build-public.yml

@@ -14,7 +14,7 @@ on:
 name: Build - Public
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       packages: write
       contents: read

.github/workflows/npm-publish-api.yml

@@ -8,8 +8,7 @@ jobs:
       contents: read
       id-token: write
     steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       # Setup .npmrc file to publish to npm
       - name: Install root project dependencies
         run: npm ci

.github/workflows/npm-publish-ui.yml

@@ -8,8 +8,7 @@ jobs:
       contents: read
       id-token: write
     steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v4
         with:

.github/workflows/phpunit.yml

@@ -63,7 +63,7 @@ jobs:
         run: php artisan test --stop-on-failure --coverage-text --coverage-clover=coverage.xml
 
       - name: "Upload coverage reports to Codecov"
-        uses: codecov/codecov-action@v5.3.1
+        uses: codecov/codecov-action@v4.5.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: solidtime-io/solidtime

.github/workflows/pint.yml

@@ -10,6 +10,6 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "Check code style"
-        uses: aglipanci/laravel-pint-action@2.5
+        uses: aglipanci/laravel-pint-action@2.4
         with:
           configPath: "pint.json"

.github/workflows/playwright.yml

@@ -27,47 +27,45 @@ jobs:
       - name: "Checkout code"
         uses: actions/checkout@v4
 
-      - name: "Setup node"
-        uses: actions/setup-node@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 
-      - name: "Setup PHP"
+      - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.3'
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
           coverage: none
 
-      - name: "Run composer install"
+      - name: Run composer install
         run: composer install -n --prefer-dist
 
-      - name: "Prepare Laravel Application"
+      - name: Prepare Laravel Application
         run: |
           cp .env.ci .env
           php artisan key:generate
-          php artisan passport:keys
           php artisan migrate --seed
+          php artisan passport:keys
 
-      - name: "Install dependencies"
+      - name: Install dependencies
         run: npm ci
 
-      - name: "Build Frontend"
+      - name: Build Frontend
         run: npm run build
 
-      - name: "Run Laravel Server"
+      - name: Run Laravel Server
         run: php artisan serve > /dev/null 2>&1 &
 
-      - name: "Install Playwright Browsers"
+      - name: Install Playwright Browsers
         run: npx playwright install --with-deps
 
-      - name: "Run Playwright tests"
+      - name: Run Playwright tests
         run: npx playwright test
         env:
           PLAYWRIGHT_BASE_URL: 'http://127.0.0.1:8000'
 
-      - name: "Upload test results"
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: test-results

app/Actions/Fortify/CreateNewUser.php

@@ -4,14 +4,16 @@ declare(strict_types=1);
 
 namespace App\Actions\Fortify;
 
+use App\Enums\Role;
 use App\Enums\Weekday;
 use App\Events\NewsletterRegistered;
+use App\Models\Organization;
 use App\Models\User;
 use App\Service\IpLookup\IpLookupServiceContract;
 use App\Service\TimezoneService;
-use App\Service\UserService;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
@@ -32,12 +34,6 @@ class CreateNewUser implements CreatesNewUsers
      */
     public function create(array $input): User
     {
-        if (! config('app.enable_registration')) {
-            throw ValidationException::withMessages([
-                'email' => [__('Registration is disabled.')],
-            ]);
-        }
-
         Validator::make($input, [
             'name' => [
                 'required',
@@ -85,16 +81,30 @@ class CreateNewUser implements CreatesNewUsers
             $currency = $ipLookupResponse->currency;
         }
         $user = null;
-        DB::transaction(function () use (&$user, $input, $timezone, $startOfWeek, $currency): void {
-            $userService = app(UserService::class);
-            $user = $userService->createUser(
-                $input['name'],
-                $input['email'],
-                $input['password'],
-                $timezone ?? 'UTC',
-                $startOfWeek,
-                $currency ?? 'EUR',
+        $organization = null;
+        DB::transaction(function () use (&$user, &$organization, $input, $timezone, $startOfWeek, $currency): void {
+            $user = User::create([
+                'name' => $input['name'],
+                'email' => $input['email'],
+                'password' => Hash::make($input['password']),
+                'timezone' => $timezone ?? 'UTC',
+                'week_start' => $startOfWeek,
+            ]);
+
+            $organization = new Organization;
+            $organization->name = explode(' ', $user->name, 2)[0]."'s Organization";
+            $organization->personal_team = true;
+            $organization->currency = $currency ?? 'EUR';
+            $organization->owner()->associate($user);
+            $organization->save();
+
+            $organization->users()->attach(
+                $user, [
+                    'role' => Role::Owner->value,
+                ]
             );
+
+            $user->ownedTeams()->save($organization);
         });
 
         $newsletterConsent = isset($input['newsletter_consent']) && (bool) $input['newsletter_consent'];

app/Actions/Jetstream/AddOrganizationMember.php

@@ -7,16 +7,18 @@ namespace App\Actions\Jetstream;
 use App\Enums\Role;
 use App\Models\Organization;
 use App\Models\User;
-use App\Service\MemberService;
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Rules\In;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 use Laravel\Jetstream\Contracts\AddsTeamMembers;
+use Laravel\Jetstream\Events\AddingTeamMember;
+use Laravel\Jetstream\Events\TeamMemberAdded;
 
 class AddOrganizationMember implements AddsTeamMembers
 {
@@ -34,7 +36,15 @@ class AddOrganizationMember implements AddsTeamMembers
             ->where('is_placeholder', '=', false)
             ->firstOrFail();
 
-        app(MemberService::class)->addMember($newOrganizationMember, $organization, Role::from($role));
+        AddingTeamMember::dispatch($organization, $newOrganizationMember);
+
+        DB::transaction(function () use ($organization, $newOrganizationMember, $role): void {
+            $organization->users()->attach(
+                $newOrganizationMember, ['role' => $role]
+            );
+        });
+
+        TeamMemberAdded::dispatch($organization, $newOrganizationMember);
     }
 
     /**

app/Console/Commands/Admin/UserCreateCommand.php

@@ -1,92 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Console\Commands\Admin;
-
-use App\Enums\Weekday;
-use App\Models\Organization;
-use App\Models\User;
-use App\Service\UserService;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-use LogicException;
-
-class UserCreateCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'admin:user:create
-                { name : The name of the user }
-                { email : The email of the user }
-                { --ask-for-password : Ask for the password, otherwise the command will generate a random one }
-                { --verify-email : Verify the email address of the user }';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Create a new user';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
-    {
-        $name = $this->argument('name');
-        $email = $this->argument('email');
-        $askForPassword = (bool) $this->option('ask-for-password');
-        $verifyEmail = (bool) $this->option('verify-email');
-
-        if (User::query()->where('email', $email)->where('is_placeholder', '=', false)->exists()) {
-            $this->error('User with email "'.$email.'" already exists.');
-
-            return self::FAILURE;
-        }
-
-        if ($askForPassword) {
-            $outputPassword = false;
-            $password = $this->secret('Enter the password');
-        } else {
-            $outputPassword = true;
-            $password = bin2hex(random_bytes(16));
-        }
-
-        $user = null;
-        DB::transaction(function () use (&$user, $name, $email, $password, $verifyEmail): void {
-            $user = app(UserService::class)->createUser(
-                $name,
-                $email,
-                $password,
-                'UTC',
-                Weekday::Monday,
-                'EUR',
-                $verifyEmail
-            );
-        });
-        /** @var Organization|null $organization */
-        $organization = $user->ownedTeams->first();
-        if ($organization === null) {
-            throw new LogicException('User does not have an organization');
-        }
-
-        $this->info('Created user "'.$name.'" ("'.$email.'")');
-        $this->line('ID: '.$user->getKey());
-        $this->line('Name: '.$name);
-        $this->line('Email: '.$email);
-        if ($outputPassword) {
-            $this->line('Password: '.$password);
-        }
-        $this->line('Timezone: '.$user->timezone);
-        $this->line('Week start: '.$user->week_start->value);
-
-        // Organization
-        $this->line('Currency: '.$organization->currency);
-
-        return self::SUCCESS;
-    }
-}

app/Console/Commands/Admin/UserVerifyCommand.php

@@ -35,9 +35,7 @@ class UserVerifyCommand extends Command
         $this->info('Start verifying user with email "'.$email.'"');
 
         /** @var User|null $user */
-        $user = User::query()->where('email', $email)
-            ->where('is_placeholder', '=', false)
-            ->first();
+        $user = User::where('email', $email)->first();
 
         if ($user === null) {
             $this->error('User with email "'.$email.'" not found.');

app/Exceptions/Api/PersonalAccessClientIsNotConfiguredException.php

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

app/Filament/Resources/ClientResource.php

@@ -60,13 +60,8 @@ class ClientResource extends Resource
             ->defaultSort('created_at', 'desc')
             ->filters([
                 SelectFilter::make('organization')
-                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
-                SelectFilter::make('organization_id')
-                    ->label('Organization ID')
-                    ->relationship('organization', 'id')
-                    ->searchable(),
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),

app/Filament/Resources/ClientResource/Pages/EditClient.php

@@ -15,8 +15,7 @@ class EditClient extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
+            Actions\DeleteAction::make(),
         ];
     }
 }

app/Filament/Resources/ClientResource/Pages/ListClients.php

@@ -15,8 +15,7 @@ class ListClients extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/OrganizationInvitationResource.php

@@ -1,114 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources;
-
-use App\Enums\Role;
-use App\Filament\Resources\OrganizationInvitationResource\Pages;
-use App\Models\OrganizationInvitation;
-use App\Service\OrganizationInvitationService;
-use Filament\Forms;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Table;
-use Illuminate\Support\Collection;
-
-class OrganizationInvitationResource extends Resource
-{
-    protected static ?string $model = OrganizationInvitation::class;
-
-    protected static ?string $label = 'Invitations';
-
-    protected static ?string $navigationIcon = 'heroicon-o-user-plus';
-
-    protected static ?string $navigationGroup = 'Users';
-
-    protected static ?int $navigationSort = 9;
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->columns(1)
-            ->schema([
-                Forms\Components\TextInput::make('email')
-                    ->label('Email')
-                    ->disabledOn(['edit'])
-                    ->required(),
-                Select::make('role')
-                    ->options(Role::class),
-                Forms\Components\Select::make('organization_id')
-                    ->label('Organization')
-                    ->relationship(name: 'organization', titleAttribute: 'name')
-                    ->searchable(['name'])
-                    ->disabledOn(['edit'])
-                    ->required(),
-                Forms\Components\DateTimePicker::make('created_at')
-                    ->label('Created At')
-                    ->hiddenOn(['create'])
-                    ->disabled(),
-                Forms\Components\DateTimePicker::make('updated_at')
-                    ->label('Updated At')
-                    ->hiddenOn(['create'])
-                    ->disabled(),
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('organization.name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('email')
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('role'),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->label('Created At')
-                    ->dateTime()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->label('Updated At')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->defaultSort('created_at', 'desc')
-            ->filters([
-                //
-            ])
-            ->actions([
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\BulkAction::make('resend')
-                        ->label('Resend')
-                        ->action(function (Collection $records): void {
-                            foreach ($records as $organizationInvite) {
-                                app(OrganizationInvitationService::class)->resend($organizationInvite);
-                            }
-                        }),
-                ]),
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListOrganizationInvitations::route('/'),
-            'edit' => Pages\EditOrganizationInvitation::route('/{record}/edit'),
-            'view' => Pages\ViewOrganizationInvitation::route('/{record}'),
-        ];
-    }
-}

app/Filament/Resources/OrganizationInvitationResource/Pages/EditOrganizationInvitation.php

@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\OrganizationInvitationResource\Pages;
-
-use App\Filament\Resources\OrganizationInvitationResource;
-use Filament\Actions;
-use Filament\Resources\Pages\EditRecord;
-
-class EditOrganizationInvitation extends EditRecord
-{
-    protected static string $resource = OrganizationInvitationResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
-        ];
-    }
-}

app/Filament/Resources/OrganizationInvitationResource/Pages/ListOrganizationInvitations.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\OrganizationInvitationResource\Pages;
-
-use App\Filament\Resources\OrganizationInvitationResource;
-use Filament\Resources\Pages\ListRecords;
-
-class ListOrganizationInvitations extends ListRecords
-{
-    protected static string $resource = OrganizationInvitationResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-        ];
-    }
-}

app/Filament/Resources/OrganizationInvitationResource/Pages/ViewOrganizationInvitation.php

@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\OrganizationInvitationResource\Pages;
-
-use App\Filament\Resources\OrganizationInvitationResource;
-use Filament\Actions\EditAction;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewOrganizationInvitation extends ViewRecord
-{
-    protected static string $resource = OrganizationInvitationResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            EditAction::make('edit')
-                ->icon('heroicon-s-pencil'),
-        ];
-    }
-}

app/Filament/Resources/OrganizationResource.php

@@ -5,10 +5,8 @@ declare(strict_types=1);
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\OrganizationResource\Pages;
-use App\Filament\Resources\OrganizationResource\RelationManagers\InvitationsRelationManager;
 use App\Filament\Resources\OrganizationResource\RelationManagers\UsersRelationManager;
 use App\Models\Organization;
-use App\Service\DeletionService;
 use App\Service\Export\ExportService;
 use App\Service\Import\Importers\ImporterProvider;
 use App\Service\Import\Importers\ImportException;
@@ -48,13 +46,10 @@ class OrganizationResource extends Resource
                     ->maxLength(255),
                 Forms\Components\Toggle::make('personal_team')
                     ->label('Is personal?')
-                    ->hiddenOn(['create'])
                     ->required(),
                 Forms\Components\Select::make('user_id')
-                    ->label('Owner')
                     ->relationship(name: 'owner', titleAttribute: 'email')
                     ->searchable(['name', 'email'])
-                    ->disabledOn(['edit'])
                     ->required(),
                 Forms\Components\Select::make('currency')
                     ->label('Currency')
@@ -67,7 +62,6 @@ class OrganizationResource extends Resource
 
                         return $select;
                     })
-                    ->required()
                     ->searchable(),
                 Forms\Components\TextInput::make('billable_rate')
                     ->label('Billable rate (in Cents)')
@@ -81,11 +75,9 @@ class OrganizationResource extends Resource
                     ->numeric(),
                 Forms\Components\DateTimePicker::make('created_at')
                     ->label('Created At')
-                    ->hiddenOn(['create'])
                     ->disabled(),
                 Forms\Components\DateTimePicker::make('updated_at')
                     ->label('Updated At')
-                    ->hiddenOn(['create'])
                     ->disabled(),
             ]);
     }
@@ -105,7 +97,7 @@ class OrganizationResource extends Resource
                     ->sortable(),
                 Tables\Columns\TextColumn::make('currency'),
                 TextColumn::make('billable_rate')
-                    ->money(fn (Organization $resource) => $resource->currency, divideBy: 100),
+                    ->money(fn (Organization $resource) => $resource->currency ?? 'EUR', divideBy: 100),
                 Tables\Columns\TextColumn::make('created_at')
                     ->dateTime()
                     ->sortable(),
@@ -120,10 +112,6 @@ class OrganizationResource extends Resource
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make()
-                    ->using(function (Organization $record): void {
-                        app(DeletionService::class)->deleteOrganization($record);
-                    }),
                 Action::make('Export')
                     ->icon('heroicon-o-arrow-down-tray')
                     ->action(function (Organization $record) {
@@ -211,6 +199,8 @@ class OrganizationResource extends Resource
                     ]),
             ])
             ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                ]),
             ]);
     }
 
@@ -218,7 +208,6 @@ class OrganizationResource extends Resource
     {
         return [
             UsersRelationManager::class,
-            InvitationsRelationManager::class,
         ];
     }
 

app/Filament/Resources/OrganizationResource/Actions/DeleteOrganization.php

@@ -15,6 +15,7 @@ class DeleteOrganization extends DeleteAction
     protected function setUp(): void
     {
         parent::setUp();
+        // TODO: check why setting the icon is necessary
         $this->icon('heroicon-m-trash');
         $this->action(function (): void {
             $result = $this->process(function (Organization $record): bool {

app/Filament/Resources/OrganizationResource/Pages/CreateOrganization.php

@@ -4,33 +4,10 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources\OrganizationResource\Pages;
 
-use App\Enums\Role;
 use App\Filament\Resources\OrganizationResource;
-use App\Models\Organization;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateOrganization extends CreateRecord
 {
     protected static string $resource = OrganizationResource::class;
-
-    protected function mutateFormDataBeforeCreate(array $data): array
-    {
-        $data['personal_team'] = false;
-
-        return $data;
-    }
-
-    protected function afterCreate(): void
-    {
-        /** @var Organization $organization */
-        $organization = $this->record;
-
-        $user = $organization->owner;
-
-        $organization->users()->attach(
-            $user, [
-                'role' => Role::Owner->value,
-            ]
-        );
-    }
 }

app/Filament/Resources/OrganizationResource/Pages/ListOrganizations.php

@@ -15,8 +15,7 @@ class ListOrganizations extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

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

@@ -1,86 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\OrganizationResource\RelationManagers;
-
-use App\Enums\Role;
-use App\Filament\Resources\OrganizationInvitationResource;
-use App\Models\Organization;
-use App\Models\OrganizationInvitation;
-use App\Service\InvitationService;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
-use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Tables;
-use Filament\Tables\Actions\Action;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Validation\Rule;
-
-class InvitationsRelationManager extends RelationManager
-{
-    protected static string $relationship = 'teamInvitations';
-
-    protected static ?string $title = 'Invitations';
-
-    public function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                TextInput::make('email')
-                    ->label('Email')
-                    ->disabledOn(['edit'])
-                    ->required(),
-                Select::make('role')
-                    ->options(Role::class)
-                    ->label('Role')
-                    ->rules([
-                        'required',
-                        'string',
-                        Rule::enum(Role::class)
-                            ->except([Role::Owner, Role::Placeholder]),
-                    ])
-                    ->required(),
-            ]);
-    }
-
-    public function table(Table $table): Table
-    {
-        return $table
-            ->recordTitleAttribute('email')
-            ->modelLabel('Invitation')
-            ->pluralModelLabel('Invitations')
-            ->columns([
-                Tables\Columns\TextColumn::make('email'),
-                Tables\Columns\TextColumn::make('role'),
-            ])
-            ->headerActions([
-                Tables\Actions\CreateAction::make()
-                    ->icon('heroicon-s-plus')
-                    ->using(function (array $data, string $model): Model {
-                        /** @var Organization $ownerRecord */
-                        $ownerRecord = $this->getOwnerRecord();
-
-                        return app(InvitationService::class)
-                            ->inviteUser($ownerRecord, $data['email'], Role::from($data['role']));
-                    }),
-            ])
-            ->actions([
-                Action::make('view')
-                    ->icon('heroicon-o-eye')
-                    ->color('gray')
-                    ->url(fn (OrganizationInvitation $record): string => OrganizationInvitationResource::getUrl('view', [
-                        'record' => $record->getKey(),
-                    ])),
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DetachBulkAction::make(),
-                ]),
-            ]);
-    }
-}

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

@@ -5,24 +5,17 @@ declare(strict_types=1);
 namespace App\Filament\Resources\OrganizationResource\RelationManagers;
 
 use App\Enums\Role;
-use App\Exceptions\Api\ApiException;
 use App\Filament\Resources\UserResource;
-use App\Models\Member;
-use App\Models\Organization;
 use App\Models\User;
-use App\Service\BillableRateService;
-use App\Service\MemberService;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
-use Filament\Notifications\Notification;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Actions\Action;
 use Filament\Tables\Actions\AttachAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Validation\Rule;
 
 class UsersRelationManager extends RelationManager
 {
@@ -43,40 +36,20 @@ class UsersRelationManager extends RelationManager
 
     public function table(Table $table): Table
     {
-        /** @var Organization $organization */
-        $organization = $this->getOwnerRecord();
-
         return $table
             ->recordTitleAttribute('name')
             ->columns([
                 Tables\Columns\TextColumn::make('name'),
                 Tables\Columns\TextColumn::make('role'),
                 TextColumn::make('billable_rate')
-                    ->money($organization->currency, divideBy: 100),
+                    ->money($this->getOwnerRecord()->currency ?? 'EUR', divideBy: 100),
             ])
             ->headerActions([
-                Tables\Actions\AttachAction::make()
-                    ->recordTitle(fn (User $record): string => "{$record->name} ({$record->email})")
-                    ->form(fn (AttachAction $action): array => [
-                        $action->getRecordSelect(),
-                        Select::make('role')
-                            ->required()
-                            ->options(Role::class)
-                            ->rule([
-                                'required',
-                                'string',
-                                Rule::enum(Role::class)
-                                    ->except([Role::Owner, Role::Placeholder]),
-                            ]),
-                    ])
-                    ->label('Add user')
-                    ->modalHeading('Add user')
-                    ->icon('heroicon-s-plus')
-                    ->using(function (User $record, array $data): void {
-                        /** @var Organization $organization */
-                        $organization = $this->getOwnerRecord();
-                        app(MemberService::class)->addMember($record, $organization, Role::from($data['role']), true);
-                    }),
+                Tables\Actions\AttachAction::make()->form(fn (AttachAction $action): array => [
+                    $action->getRecordSelect(),
+                    Select::make('role')
+                        ->options(Role::class),
+                ]),
             ])
             ->actions([
                 Action::make('view')
@@ -85,55 +58,13 @@ class UsersRelationManager extends RelationManager
                     ->url(fn (User $record): string => UserResource::getUrl('view', [
                         'record' => $record->getKey(),
                     ])),
-                Tables\Actions\EditAction::make()
-                    ->using(function (User $record, array $data): User {
-                        /** @var Organization $organization */
-                        $organization = $this->getOwnerRecord();
-                        /** @var Member $member */
-                        $member = $record->getRelation('membership');
-
-                        if ($data['billable_rate'] !== $member->billable_rate) {
-                            $member->billable_rate = $data['billable_rate'];
-                            app(BillableRateService::class)->updateTimeEntriesBillableRateForMember($member);
-                        }
-
-                        if ($data['role'] !== $member->role) {
-                            try {
-                                app(MemberService::class)->changeRole($member, $organization, Role::from($data['role']), true);
-                            } catch (ApiException $exception) {
-                                Notification::make()
-                                    ->danger()
-                                    ->title('Update failed')
-                                    ->body($exception->getTranslatedMessage())
-                                    ->persistent()
-                                    ->send();
-                            }
-                        }
-                        $member->save();
-
-                        return $record;
-                    }),
-                Tables\Actions\DetachAction::make()
-                    ->using(function (User $record): void {
-                        /** @var Organization $organization */
-                        $organization = $this->getOwnerRecord();
-                        $member = Member::query()
-                            ->whereBelongsTo($record, 'user')
-                            ->whereBelongsTo($organization, 'organization')
-                            ->firstOrFail();
-                        try {
-                            app(MemberService::class)->removeMember($member, $organization);
-                        } catch (ApiException $exception) {
-                            Notification::make()
-                                ->danger()
-                                ->title('Delete failed')
-                                ->body($exception->getTranslatedMessage())
-                                ->persistent()
-                                ->send();
-                        }
-                    }),
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DetachAction::make(),
             ])
             ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DetachBulkAction::make(),
+                ]),
             ]);
     }
 }

app/Filament/Resources/ProjectMemberResource/Pages/EditProjectMember.php

@@ -15,8 +15,7 @@ class EditProjectMember extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
+            Actions\DeleteAction::make(),
         ];
     }
 }

app/Filament/Resources/ProjectMemberResource/Pages/ListProjectMembers.php

@@ -15,8 +15,7 @@ class ListProjectMembers extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/ProjectResource.php

@@ -72,13 +72,8 @@ class ProjectResource extends Resource
             ])
             ->filters([
                 SelectFilter::make('organization')
-                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
-                SelectFilter::make('organization_id')
-                    ->label('Organization ID')
-                    ->relationship('organization', 'id')
-                    ->searchable(),
             ])
             ->defaultSort('created_at', 'desc')
             ->actions([

app/Filament/Resources/ProjectResource/Pages/EditProject.php

@@ -15,8 +15,7 @@ class EditProject extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
+            Actions\DeleteAction::make(),
         ];
     }
 }

app/Filament/Resources/ProjectResource/Pages/ListProjects.php

@@ -15,8 +15,7 @@ class ListProjects extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/ReportResource.php

@@ -1,141 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources;
-
-use App\Filament\Resources\ReportResource\Pages;
-use App\Models\Report;
-use App\Service\Dto\ReportPropertiesDto;
-use Filament\Forms;
-use Filament\Forms\Components\DateTimePicker;
-use Filament\Forms\Components\Toggle;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Actions\Action;
-use Filament\Tables\Columns\TextColumn;
-use Filament\Tables\Columns\ToggleColumn;
-use Filament\Tables\Filters\SelectFilter;
-use Filament\Tables\Table;
-use Novadaemon\FilamentPrettyJson\PrettyJson;
-
-class ReportResource extends Resource
-{
-    protected static ?string $model = Report::class;
-
-    protected static ?string $navigationIcon = 'heroicon-o-document-chart-bar';
-
-    protected static ?string $navigationGroup = 'Timetracking';
-
-    protected static ?int $navigationSort = 7;
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->columns(1)
-            ->schema([
-                Forms\Components\TextInput::make('name')
-                    ->label('Name')
-                    ->required()
-                    ->maxLength(255),
-                Forms\Components\TextInput::make('description')
-                    ->label('Description')
-                    ->nullable()
-                    ->maxLength(255),
-                Toggle::make('is_public')
-                    ->label('Is public?')
-                    ->required(),
-                DateTimePicker::make('public_until')
-                    ->label('Public until')
-                    ->nullable(),
-                Forms\Components\Select::make('organization_id')
-                    ->label('Organization')
-                    ->relationship(name: 'organization', titleAttribute: 'name')
-                    ->searchable(['name'])
-                    ->disabled()
-                    ->required(),
-                Forms\Components\TextInput::make('share_secret')
-                    ->label('Share Secret')
-                    ->nullable(),
-                PrettyJson::make('properties')
-                    ->formatStateUsing(function (ReportPropertiesDto $state, Report $record): string {
-                        return $record->getRawOriginal('properties');
-                    })
-                    ->disabled(),
-                Forms\Components\DateTimePicker::make('created_at')
-                    ->label('Created At')
-                    ->hiddenOn(['create'])
-                    ->disabled(),
-                Forms\Components\DateTimePicker::make('updated_at')
-                    ->label('Updated At')
-                    ->hiddenOn(['create'])
-                    ->disabled(),
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('description')
-                    ->searchable()
-                    ->sortable(),
-                ToggleColumn::make('is_public')
-                    ->label('Is public?')
-                    ->sortable(),
-                TextColumn::make('organization.name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->dateTime()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->defaultSort('created_at', 'desc')
-            ->filters([
-                SelectFilter::make('organization')
-                    ->label('Organization')
-                    ->relationship('organization', 'name')
-                    ->searchable(),
-                SelectFilter::make('organization_id')
-                    ->label('Organization ID')
-                    ->relationship('organization', 'id')
-                    ->searchable(),
-            ])
-            ->actions([
-                Action::make('public-view')
-                    ->label('Public')
-                    ->icon('heroicon-o-eye')
-                    ->color('gray')
-                    ->hidden(fn (Report $record): bool => $record->getShareableLink() === null)
-                    ->url(fn (Report $record): string => $record->getShareableLink(), true),
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
-            ])
-            ->bulkActions([
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListReports::route('/'),
-            'edit' => Pages\EditReport::route('/{record}/edit'),
-            'view' => Pages\ViewReport::route('/{record}'),
-        ];
-    }
-}

app/Filament/Resources/ReportResource/Pages/EditReport.php

@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\ReportResource\Pages;
-
-use App\Filament\Resources\ReportResource;
-use Filament\Actions;
-use Filament\Resources\Pages\EditRecord;
-
-class EditReport extends EditRecord
-{
-    protected static string $resource = ReportResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
-        ];
-    }
-}

app/Filament/Resources/ReportResource/Pages/ListReports.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\ReportResource\Pages;
-
-use App\Filament\Resources\ReportResource;
-use Filament\Resources\Pages\ListRecords;
-
-class ListReports extends ListRecords
-{
-    protected static string $resource = ReportResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-        ];
-    }
-}

app/Filament/Resources/ReportResource/Pages/ViewReport.php

@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\ReportResource\Pages;
-
-use App\Filament\Resources\ReportResource;
-use Filament\Actions\EditAction;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewReport extends ViewRecord
-{
-    protected static string $resource = ReportResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            EditAction::make('edit')
-                ->icon('heroicon-s-pencil'),
-        ];
-    }
-}

app/Filament/Resources/TagResource.php

@@ -60,13 +60,8 @@ class TagResource extends Resource
             ->defaultSort('created_at', 'desc')
             ->filters([
                 SelectFilter::make('organization')
-                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
-                SelectFilter::make('organization_id')
-                    ->label('Organization ID')
-                    ->relationship('organization', 'id')
-                    ->searchable(),
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),

app/Filament/Resources/TagResource/Pages/EditTag.php

@@ -15,8 +15,7 @@ class EditTag extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
+            Actions\DeleteAction::make(),
         ];
     }
 }

app/Filament/Resources/TagResource/Pages/ListTags.php

@@ -15,8 +15,7 @@ class ListTags extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/TaskResource.php

@@ -61,13 +61,8 @@ class TaskResource extends Resource
             ])
             ->filters([
                 SelectFilter::make('organization')
-                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
-                SelectFilter::make('organization_id')
-                    ->label('Organization ID')
-                    ->relationship('organization', 'id')
-                    ->searchable(),
             ])
             ->defaultSort('created_at', 'desc')
             ->actions([

app/Filament/Resources/TaskResource/Pages/EditTask.php

@@ -15,8 +15,7 @@ class EditTask extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
+            Actions\DeleteAction::make(),
         ];
     }
 }

app/Filament/Resources/TaskResource/Pages/ListTasks.php

@@ -15,8 +15,7 @@ class ListTasks extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/TimeEntryResource.php

@@ -92,13 +92,8 @@ class TimeEntryResource extends Resource
             ])
             ->filters([
                 SelectFilter::make('organization')
-                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
-                SelectFilter::make('organization_id')
-                    ->label('Organization ID')
-                    ->relationship('organization', 'id')
-                    ->searchable(),
             ])
             ->defaultSort('created_at', 'desc')
             ->actions([

app/Filament/Resources/TimeEntryResource/Pages/EditTimeEntry.php

@@ -15,8 +15,7 @@ class EditTimeEntry extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
+            Actions\DeleteAction::make(),
         ];
     }
 }

app/Filament/Resources/TimeEntryResource/Pages/ListTimeEntries.php

@@ -15,8 +15,7 @@ class ListTimeEntries extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/TokenResource.php

@@ -1,148 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources;
-
-use App\Filament\Resources\TokenResource\Pages;
-use App\Models\Passport\Client;
-use App\Models\Passport\Token;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Filters\TernaryFilter;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-
-class TokenResource extends Resource
-{
-    protected static ?string $model = Token::class;
-
-    protected static ?string $navigationIcon = 'heroicon-o-key';
-
-    protected static ?string $navigationGroup = 'Auth';
-
-    protected static ?int $navigationSort = 6;
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->columns(1)
-            ->schema([
-                Forms\Components\TextInput::make('id')
-                    ->label('ID')
-                    ->disabled()
-                    ->visibleOn(['update', 'show'])
-                    ->readOnly()
-                    ->maxLength(255),
-                Forms\Components\TextInput::make('name')
-                    ->label('Name')
-                    ->required()
-                    ->maxLength(255),
-                Forms\Components\Select::make('user_id')
-                    ->label('User')
-                    ->relationship(name: 'user', titleAttribute: 'name')
-                    ->searchable(['name'])
-                    ->disabled()
-                    ->required(),
-                Forms\Components\Select::make('client_id')
-                    ->label('Client')
-                    ->relationship(name: 'client', titleAttribute: 'name')
-                    ->searchable(['name'])
-                    ->required(),
-                Forms\Components\Toggle::make('revoked')
-                    ->label('Revoked')
-                    ->required(),
-                Forms\Components\DateTimePicker::make('expires_at')
-                    ->label('Expires At')
-                    ->disabled(),
-                Forms\Components\DateTimePicker::make('created_at')
-                    ->label('Created At')
-                    ->disabled(),
-                Forms\Components\DateTimePicker::make('updated_at')
-                    ->label('Updated At')
-                    ->disabled(),
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('user.name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('client.name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\IconColumn::make('client.personal_access_client')
-                    ->boolean()
-                    ->label('API token?')
-                    ->sortable(),
-                Tables\Columns\IconColumn::make('revoked')
-                    ->boolean()
-                    ->label('Revoked?')
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('expires_at')
-                    ->dateTime()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->dateTime()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->defaultSort('created_at', 'desc')
-            ->filters([
-                TernaryFilter::make('is_personal_access_client')
-                    ->queries(
-                        true: function (Builder $query) {
-                            /** @var Builder<Token> $query */
-                            return $query->whereHas('client', function (Builder $query) {
-                                /** @var Builder<Client> $query */
-                                return $query->where('personal_access_client', true);
-                            });
-                        },
-                        false: function (Builder $query) {
-                            /** @var Builder<Token> $query */
-                            return $query->whereHas('client', function (Builder $query) {
-                                /** @var Builder<Client> $query */
-                                return $query->where('personal_access_client', false);
-                            });
-                        },
-                        blank: function (Builder $query) {
-                            /** @var Builder<Token> $query */
-                            return $query;
-                        },
-                    )
-                    ->label('API token?'),
-                TernaryFilter::make('revoked')
-                    ->label('Revoked?'),
-            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-            ])
-            ->bulkActions([
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListTokens::route('/'),
-            'view' => Pages\ViewToken::route('/{record}'),
-        ];
-    }
-}

app/Filament/Resources/TokenResource/Pages/ListTokens.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\TokenResource\Pages;
-
-use App\Filament\Resources\TokenResource;
-use Filament\Resources\Pages\ListRecords;
-
-class ListTokens extends ListRecords
-{
-    protected static string $resource = TokenResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-        ];
-    }
-}

app/Filament/Resources/TokenResource/Pages/ViewToken.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\TokenResource\Pages;
-
-use App\Filament\Resources\TokenResource;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewToken extends ViewRecord
-{
-    protected static string $resource = TokenResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-        ];
-    }
-}

app/Filament/Resources/UserResource.php

@@ -5,27 +5,21 @@ declare(strict_types=1);
 namespace App\Filament\Resources;
 
 use App\Enums\Weekday;
-use App\Exceptions\Api\ApiException;
 use App\Filament\Resources\UserResource\Pages;
 use App\Filament\Resources\UserResource\RelationManagers\OrganizationsRelationManager;
 use App\Filament\Resources\UserResource\RelationManagers\OwnedOrganizationsRelationManager;
 use App\Models\User;
-use App\Service\DeletionService;
 use App\Service\TimezoneService;
-use Brick\Money\ISOCurrencyProvider;
 use Exception;
 use Filament\Forms;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
-use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Filters\TernaryFilter;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
-use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 use STS\FilamentImpersonate\Tables\Actions\Impersonate;
 
 class UserResource extends Resource
@@ -40,9 +34,6 @@ class UserResource extends Resource
 
     public static function form(Form $form): Form
     {
-        /** @var User|null $record */
-        $record = $form->getRecord();
-
         return $form
             ->columns(1)
             ->schema([
@@ -59,25 +50,12 @@ class UserResource extends Resource
                 Forms\Components\TextInput::make('email')
                     ->label('Email')
                     ->required()
-                    ->rules($record?->is_placeholder ? [] : [
-                        UniqueEloquent::make(User::class, 'email')
-                            ->ignore($record?->getKey()),
-                    ])
-                    ->rule([
-                        'email',
-                    ])
                     ->maxLength(255),
                 Forms\Components\Toggle::make('is_placeholder')
-                    ->label('Is Placeholder?')
-                    ->hiddenOn(['create'])
-                    ->disabledOn(['edit']),
+                    ->label('Is Placeholder'),
                 Forms\Components\DateTimePicker::make('email_verified_at')
                     ->label('Email Verified At')
-                    ->hiddenOn(['create'])
                     ->nullable(),
-                Forms\Components\Toggle::make('is_email_verified')
-                    ->label('Email Verified?')
-                    ->visibleOn(['create']),
                 Forms\Components\Select::make('timezone')
                     ->label('Timezone')
                     ->options(fn (): array => app(TimezoneService::class)->getSelectOptions())
@@ -89,39 +67,15 @@ class UserResource extends Resource
                     ->required(),
                 TextInput::make('password')
                     ->password()
-                    ->label('Password')
                     ->dehydrateStateUsing(fn ($state) => Hash::make($state))
                     ->dehydrated(fn ($state) => filled($state))
-                    ->hiddenOn(['create'])
                     ->required(fn (string $context): bool => $context === 'create')
                     ->maxLength(255),
-                TextInput::make('password_create')
-                    ->password()
-                    ->label('Password')
-                    ->visibleOn(['create'])
-                    ->required(fn (string $context): bool => $context === 'create')
-                    ->maxLength(255),
-                Forms\Components\Select::make('currency')
-                    ->label('Currency (Personal Organization)')
-                    ->options(function (): array {
-                        $currencies = ISOCurrencyProvider::getInstance()->getAvailableCurrencies();
-                        $select = [];
-                        foreach ($currencies as $currency) {
-                            $select[$currency->getCurrencyCode()] = $currency->getName().' ('.$currency->getCurrencyCode().')';
-                        }
-
-                        return $select;
-                    })
-                    ->required()
-                    ->visibleOn(['create'])
-                    ->searchable(),
                 Forms\Components\DateTimePicker::make('created_at')
                     ->label('Created At')
-                    ->hiddenOn(['create'])
                     ->disabled(),
                 Forms\Components\DateTimePicker::make('updated_at')
                     ->label('Updated At')
-                    ->hiddenOn(['create'])
                     ->disabled(),
             ]);
     }
@@ -191,22 +145,11 @@ class UserResource extends Resource
                     }
                 }),
                 Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make()
-                    ->hidden(fn (User $record) => $record->is(Auth::user()))
-                    ->using(function (User $record): void {
-                        try {
-                            app(DeletionService::class)->deleteUser($record);
-                        } catch (ApiException $exception) {
-                            Notification::make()
-                                ->danger()
-                                ->title('Delete failed')
-                                ->body($exception->getTranslatedMessage())
-                                ->persistent()
-                                ->send();
-                        }
-                    }),
             ])
             ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
             ]);
     }
 

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

@@ -4,29 +4,24 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources\UserResource\Pages;
 
-use App\Enums\Weekday;
 use App\Filament\Resources\UserResource;
+use App\Models\Organization;
 use App\Models\User;
-use App\Service\UserService;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateUser extends CreateRecord
 {
     protected static string $resource = UserResource::class;
 
-    protected function handleRecordCreation(array $data): User
+    protected function afterCreate(): void
     {
-        $userService = app(UserService::class);
-        $user = $userService->createUser(
-            $data['name'],
-            $data['email'],
-            $data['password_create'],
-            $data['timezone'],
-            Weekday::from($data['week_start']),
-            $data['currency'],
-            (bool) $data['is_email_verified']
-        );
+        /** @var User $user */
+        $user = $this->record;
 
-        return $user;
+        $user->ownedTeams()->save(Organization::forceCreate([
+            'user_id' => $user->id,
+            'name' => explode(' ', $user->name, 2)[0]."'s Organization",
+            'personal_team' => true,
+        ]));
     }
 }

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

@@ -15,8 +15,7 @@ class ListUsers extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

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

@@ -7,7 +7,6 @@ namespace App\Filament\Resources\UserResource\Pages;
 use App\Filament\Resources\UserResource;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ViewRecord;
-use STS\FilamentImpersonate\Pages\Actions\Impersonate;
 
 class ViewUser extends ViewRecord
 {
@@ -16,7 +15,6 @@ class ViewUser extends ViewRecord
     protected function getHeaderActions(): array
     {
         return [
-            Impersonate::make()->record($this->getRecord()),
             EditAction::make('edit')
                 ->icon('heroicon-s-pencil'),
         ];

app/Filament/Resources/UserResource/RelationManagers/OrganizationsRelationManager.php

@@ -5,18 +5,15 @@ declare(strict_types=1);
 namespace App\Filament\Resources\UserResource\RelationManagers;
 
 use App\Enums\Role;
-use App\Exceptions\Api\ApiException;
 use App\Filament\Resources\OrganizationResource;
-use App\Models\Member;
 use App\Models\Organization;
-use App\Models\User;
-use App\Service\MemberService;
 use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
-use Filament\Notifications\Notification;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Actions\Action;
+use Filament\Tables\Actions\AttachAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 
@@ -30,6 +27,10 @@ class OrganizationsRelationManager extends RelationManager
             ->schema([
                 Select::make('role')
                     ->options(Role::class),
+                TextInput::make('billable_rate')
+                    ->label('Billable rate (in Cents)')
+                    ->nullable()
+                    ->numeric(),
             ]);
     }
 
@@ -40,11 +41,15 @@ class OrganizationsRelationManager extends RelationManager
             ->columns([
                 TextColumn::make('name'),
                 TextColumn::make('role'),
-                TextColumn::make('membership.billable_rate')
-                    ->label('Billable rate')
-                    ->money(fn (Organization $resource) => $resource->currency, divideBy: 100),
+                TextColumn::make('billable_rate')
+                    ->money(fn (Organization $resource) => $resource->currency ?? 'EUR', divideBy: 100),
             ])
             ->headerActions([
+                Tables\Actions\AttachAction::make()->form(fn (AttachAction $action): array => [
+                    $action->getRecordSelect(),
+                    Select::make('role')
+                        ->options(Role::class),
+                ]),
             ])
             ->actions([
                 Action::make('view')
@@ -53,48 +58,13 @@ class OrganizationsRelationManager extends RelationManager
                     ->url(fn (Organization $record): string => OrganizationResource::getUrl('view', [
                         'record' => $record->getKey(),
                     ])),
-                Tables\Actions\EditAction::make()
-                    ->using(function (Organization $record, array $data): Organization {
-                        /** @var Member $member */
-                        $member = $record->getRelation('membership');
-
-                        if ($data['role'] !== $member->role) {
-                            try {
-                                app(MemberService::class)->changeRole($member, $record, Role::from($data['role']), true);
-                            } catch (ApiException $exception) {
-                                Notification::make()
-                                    ->danger()
-                                    ->title('Update failed')
-                                    ->body($exception->getTranslatedMessage())
-                                    ->persistent()
-                                    ->send();
-                            }
-                        }
-                        $member->save();
-
-                        return $record;
-                    }),
-                Tables\Actions\DetachAction::make()
-                    ->using(function (Organization $record): void {
-                        /** @var User $user */
-                        $user = $this->getOwnerRecord();
-                        $member = Member::query()
-                            ->whereBelongsTo($user, 'user')
-                            ->whereBelongsTo($record, 'organization')
-                            ->firstOrFail();
-                        try {
-                            app(MemberService::class)->removeMember($member, $record);
-                        } catch (ApiException $exception) {
-                            Notification::make()
-                                ->danger()
-                                ->title('Delete failed')
-                                ->body($exception->getTranslatedMessage())
-                                ->persistent()
-                                ->send();
-                        }
-                    }),
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DetachAction::make(),
             ])
             ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DetachBulkAction::make(),
+                ]),
             ]);
     }
 }

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

@@ -1,114 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Api\V1;
-
-use App\Exceptions\Api\PersonalAccessClientIsNotConfiguredException;
-use App\Http\Requests\V1\ApiToken\ApiTokenStoreRequest;
-use App\Http\Resources\V1\ApiToken\ApiTokenCollection;
-use App\Http\Resources\V1\ApiToken\ApiTokenWithAccessTokenResource;
-use App\Models\Passport\Token;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Http\JsonResponse;
-
-class ApiTokenController extends Controller
-{
-    /**
-     * List all api token of the currently authenticated user
-     *
-     * This endpoint is independent of organization.
-     *
-     * @operationId getApiTokens
-     *
-     * @throws AuthorizationException
-     */
-    public function index(): ApiTokenCollection
-    {
-        $user = $this->user();
-
-        $tokens = $user->tokens()
-            ->where('client_id', '=', config('passport.personal_access_client.id'))
-            ->get();
-
-        return new ApiTokenCollection($tokens);
-    }
-
-    /**
-     * Create a new api token for the currently authenticated user
-     *
-     * The response will contain the access token that can be used to send authenticated API requests.
-     * Please note that the access token is only shown in this response and cannot be retrieved later.
-     *
-     * @operationId createApiToken
-     *
-     * @throws AuthorizationException|PersonalAccessClientIsNotConfiguredException
-     */
-    public function store(ApiTokenStoreRequest $request): ApiTokenWithAccessTokenResource
-    {
-        $user = $this->user();
-
-        if (config('passport.personal_access_client.id') === null || config('passport.personal_access_client.secret') === null) {
-            throw new PersonalAccessClientIsNotConfiguredException;
-        }
-
-        $token = $user->createToken($request->getName(), ['*']);
-        /** @var Token $tokenModel */
-        $tokenModel = $token->token;
-
-        return new ApiTokenWithAccessTokenResource($tokenModel, $token->accessToken);
-    }
-
-    /**
-     * Revoke an api token
-     *
-     * @operationId revokeApiToken
-     *
-     * @throws AuthorizationException
-     * @throws PersonalAccessClientIsNotConfiguredException
-     */
-    public function revoke(Token $apiToken): JsonResponse
-    {
-        $user = $this->user();
-
-        if (config('passport.personal_access_client.id') === null || config('passport.personal_access_client.secret') === null) {
-            throw new PersonalAccessClientIsNotConfiguredException;
-        }
-        if ($apiToken->user_id !== $user->getKey()) {
-            throw new AuthorizationException('API token does not belong to user');
-        }
-        if ($apiToken->client_id !== config('passport.personal_access_client.id')) {
-            throw new AuthorizationException('API token is not a personal access token');
-        }
-
-        $apiToken->revoke();
-
-        return response()->json(null, 204);
-    }
-
-    /**
-     * Delete an api token
-     *
-     * @operationId deleteApiToken
-     *
-     * @throws AuthorizationException|PersonalAccessClientIsNotConfiguredException
-     */
-    public function destroy(Token $apiToken): JsonResponse
-    {
-        $user = $this->user();
-
-        if (config('passport.personal_access_client.id') === null || config('passport.personal_access_client.secret') === null) {
-            throw new PersonalAccessClientIsNotConfiguredException;
-        }
-        if ($apiToken->user_id !== $user->getKey()) {
-            throw new AuthorizationException('API token does not belong to user');
-        }
-        if ($apiToken->client_id !== config('passport.personal_access_client.id')) {
-            throw new AuthorizationException('API token is not a personal access token');
-        }
-
-        $apiToken->delete();
-
-        return response()->json(null, 204);
-    }
-}

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

@@ -9,12 +9,13 @@ use App\Http\Requests\V1\Invitation\InvitationIndexRequest;
 use App\Http\Requests\V1\Invitation\InvitationStoreRequest;
 use App\Http\Resources\V1\Invitation\InvitationCollection;
 use App\Http\Resources\V1\Invitation\InvitationResource;
+use App\Mail\OrganizationInvitationMail;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
 use App\Service\InvitationService;
-use App\Service\OrganizationInvitationService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Mail;
 
 class InvitationController extends Controller
 {
@@ -72,11 +73,12 @@ class InvitationController extends Controller
      *
      * @operationId resendInvitationEmail
      */
-    public function resend(Organization $organization, OrganizationInvitation $invitation, OrganizationInvitationService $organizationInvitationService): JsonResponse
+    public function resend(Organization $organization, OrganizationInvitation $invitation): JsonResponse
     {
         $this->checkPermission($organization, 'invitations:resend', $invitation);
 
-        $organizationInvitationService->resend($invitation);
+        Mail::to($invitation->email)
+            ->queue(new OrganizationInvitationMail($invitation));
 
         return response()->json(null, 204);
     }

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

@@ -6,6 +6,7 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Enums\Role;
 use App\Events\MemberMadeToPlaceholder;
+use App\Events\MemberRemoved;
 use App\Exceptions\Api\CanNotRemoveOwnerFromOrganization;
 use App\Exceptions\Api\ChangingRoleToPlaceholderIsNotAllowed;
 use App\Exceptions\Api\EntityStillInUseApiException;
@@ -18,6 +19,8 @@ use App\Http\Resources\V1\Member\MemberCollection;
 use App\Http\Resources\V1\Member\MemberResource;
 use App\Models\Member;
 use App\Models\Organization;
+use App\Models\ProjectMember;
+use App\Models\TimeEntry;
 use App\Service\BillableRateService;
 use App\Service\InvitationService;
 use App\Service\MemberService;
@@ -77,8 +80,22 @@ class MemberController extends Controller
         }
         if ($request->has('role') && $member->role !== $request->getRole()->value) {
             $newRole = $request->getRole();
-            $allowOwnerChange = $this->hasPermission($organization, 'members:change-ownership');
-            $memberService->changeRole($member, $organization, $newRole, $allowOwnerChange);
+            $oldRole = Role::from($member->role);
+            if ($oldRole === Role::Owner) {
+                throw new OrganizationNeedsAtLeastOneOwner;
+            }
+            if ($newRole === Role::Placeholder) {
+                throw new ChangingRoleToPlaceholderIsNotAllowed;
+            }
+            if ($newRole === Role::Owner) {
+                if ($this->hasPermission($organization, 'members:change-ownership')) {
+                    $memberService->changeOwnership($organization, $member);
+                } else {
+                    throw new OnlyOwnerCanChangeOwnership;
+                }
+            } else {
+                $member->role = $request->getRole()->value;
+            }
         }
         $member->save();
 
@@ -92,11 +109,22 @@ class MemberController extends Controller
      *
      * @operationId removeMember
      */
-    public function destroy(Organization $organization, Member $member, MemberService $memberService): JsonResponse
+    public function destroy(Organization $organization, Member $member): JsonResponse
     {
         $this->checkPermission($organization, 'members:delete', $member);
 
-        $memberService->removeMember($member, $organization);
+        if (TimeEntry::query()->where('user_id', $member->user_id)->whereBelongsTo($organization, 'organization')->exists()) {
+            throw new EntityStillInUseApiException('member', 'time_entry');
+        }
+        if (ProjectMember::query()->whereBelongsToOrganization($organization)->where('user_id', $member->user_id)->exists()) {
+            throw new EntityStillInUseApiException('member', 'project_member');
+        }
+        if ($member->role === Role::Owner->value) {
+            throw new CanNotRemoveOwnerFromOrganization;
+        }
+
+        $member->delete();
+        MemberRemoved::dispatch($member, $organization);
 
         return response()
             ->json(null, 204);

app/Http/Controllers/Web/HealthCheckController.php

@@ -64,7 +64,6 @@ class HealthCheckController extends Controller
             $response['app_env'] = app()->environment();
             $response['app_timezone'] = config('app.timezone');
             $response['app_force_https'] = config('app.force_https');
-            $response['session_secure'] = config('session.secure');
             $response['trusted_proxies'] = config('trustedproxy.proxies');
             $headers = $request->headers->all();
             if (isset($headers['cookie'])) {

app/Http/Kernel.php

@@ -18,7 +18,7 @@ class Kernel extends HttpKernel
      * @var array<int, class-string|string>
      */
     protected $middleware = [
-        \App\Http\Middleware\ForceHttps::class,
+        // \App\Http\Middleware\TrustHosts::class,
         \App\Http\Middleware\TrustProxies::class,
         \Illuminate\Http\Middleware\HandleCors::class,
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,

app/Http/Middleware/ForceHttps.php

@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\URL;
-use Symfony\Component\HttpFoundation\Response;
-
-class ForceHttps
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
-     */
-    public function handle(Request $request, Closure $next, string ...$guards): Response
-    {
-        if (config('app.force_https', false)) {
-            URL::forceScheme('https');
-            $request->server->set('HTTPS', 'on');
-            $request->headers->set('X-Forwarded-Proto', 'https');
-        }
-
-        return $next($request);
-    }
-}

app/Http/Middleware/TrustHosts.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Middleware;
+
+use Illuminate\Http\Middleware\TrustHosts as Middleware;
+
+class TrustHosts extends Middleware
+{
+    /**
+     * Get the host patterns that should be trusted.
+     *
+     * @return array<int, string|null>
+     */
+    public function hosts(): array
+    {
+        return [
+            $this->allSubdomainsOfApplicationUrl(),
+        ];
+    }
+}

app/Http/Requests/V1/ApiToken/ApiTokenStoreRequest.php

@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Requests\V1\ApiToken;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class ApiTokenStoreRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, array<string>>
-     */
-    public function rules(): array
-    {
-        return [
-            'name' => [
-                'required',
-                'string',
-                'min:1',
-                'max:255',
-            ],
-        ];
-    }
-
-    public function getName(): string
-    {
-        return $this->input('name');
-    }
-}

app/Http/Resources/V1/ApiToken/ApiTokenCollection.php

@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Resources\V1\ApiToken;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ApiTokenCollection extends ResourceCollection
-{
-    /**
-     * The resource that this resource collects.
-     *
-     * @var string
-     */
-    public $collects = ApiTokenResource::class;
-}

app/Http/Resources/V1/ApiToken/ApiTokenResource.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Resources\V1\ApiToken;
-
-use App\Http\Resources\V1\BaseResource;
-use App\Models\Passport\Token;
-use Illuminate\Http\Request;
-
-/**
- * @property-read Token $resource
- */
-class ApiTokenResource extends BaseResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, string|bool|int|null|array<string>>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            /** @var string $id ID of the API token, this ID is NOT a UUID */
-            'id' => $this->resource->id,
-            /** @var string $name Name of the API token */
-            'name' => $this->resource->name,
-            /** @var bool $revoked Whether the API token is revoked */
-            'revoked' => $this->resource->revoked,
-            /** @var array<string> $scopes List of scopes that the API token has */
-            'scopes' => $this->resource->scopes,
-            /** @var string $created_at When the API token was created (ISO 8601 format, UTC timezone, example: 2024-02-26T17:17:17Z) */
-            'created_at' => $this->formatDateTime($this->resource->created_at),
-            /** @var string|null $expires_at At what time the API token expires (ISO 8601 format, UTC timezone, example: 2024-02-26T17:17:17Z) */
-            'expires_at' => $this->formatDateTime($this->resource->expires_at),
-        ];
-    }
-}

app/Http/Resources/V1/ApiToken/ApiTokenWithAccessTokenResource.php

@@ -1,49 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Resources\V1\ApiToken;
-
-use App\Http\Resources\V1\BaseResource;
-use App\Models\Passport\Token;
-use Illuminate\Http\Request;
-
-/**
- * @property-read Token $resource
- */
-class ApiTokenWithAccessTokenResource extends BaseResource
-{
-    private string $accessToken;
-
-    public function __construct(Token $resource, string $accessToken)
-    {
-        $this->accessToken = $accessToken;
-        parent::__construct($resource);
-    }
-
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, string|bool|int|null|array<string>>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            /** @var string $id ID of the API token, this ID is NOT a UUID */
-            'id' => $this->resource->id,
-            /** @var string $name Name of the API token */
-            'name' => $this->resource->name,
-            /** @var bool $revoked Whether the API token is revoked */
-            'revoked' => $this->resource->revoked,
-            /** @var array<string> $scopes List of scopes that the API token has */
-            'scopes' => $this->resource->scopes,
-            /** @var string $created_at When the API token was created (ISO 8601 format, UTC timezone, example: 2024-02-26T17:17:17Z) */
-            'created_at' => $this->formatDateTime($this->resource->created_at),
-            /** @var string|null $expires_at At what time the API token expires (ISO 8601 format, UTC timezone, example: 2024-02-26T17:17:17Z) */
-            'expires_at' => $this->formatDateTime($this->resource->expires_at),
-            // Additional fields
-            /** @var string $access_token Access token that can be used to authenticate requests */
-            'access_token' => $this->accessToken,
-        ];
-    }
-}

app/Jobs/RecalculateSpentTimeForProject.php

@@ -7,13 +7,12 @@ namespace App\Jobs;
 use App\Models\Project;
 use Exception;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Events\ShouldDispatchAfterCommit;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class RecalculateSpentTimeForProject implements ShouldDispatchAfterCommit, ShouldQueue
+class RecalculateSpentTimeForProject implements ShouldQueue
 {
     use Dispatchable;
     use InteractsWithQueue;

app/Jobs/RecalculateSpentTimeForTask.php

@@ -7,13 +7,12 @@ namespace App\Jobs;
 use App\Models\Task;
 use Exception;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Events\ShouldDispatchAfterCommit;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class RecalculateSpentTimeForTask implements ShouldDispatchAfterCommit, ShouldQueue
+class RecalculateSpentTimeForTask implements ShouldQueue
 {
     use Dispatchable;
     use InteractsWithQueue;

app/Models/Passport/AuthCode.php

@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Models\Passport;
-
-use Laravel\Passport\AuthCode as PassportAuthCode;
-
-class AuthCode extends PassportAuthCode {}

app/Models/Passport/Client.php

@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Models\Passport;
-
-use Database\Factories\Passport\ClientFactory;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Laravel\Passport\Client as PassportClient;
-
-/**
- * @property string $id
- * @property string|null $user_id
- * @property string $name
- * @property string|null $secret
- * @property string|null $provider
- * @property string $redirect
- * @property bool $personal_access_client
- * @property bool $password_client
- * @property bool $revoked
- */
-class Client extends PassportClient
-{
-    /** @use HasFactory<ClientFactory> */
-    use HasFactory;
-}

app/Models/Passport/PersonalAccessClient.php

@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Models\Passport;
-
-use Laravel\Passport\PersonalAccessClient as PassportPersonalAccessClient;
-
-class PersonalAccessClient extends PassportPersonalAccessClient {}

app/Models/Passport/RefreshToken.php

@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Models\Passport;
-
-use Laravel\Passport\RefreshToken as PassportRefreshToken;
-
-class RefreshToken extends PassportRefreshToken {}

app/Models/Passport/Token.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Models\Passport;
-
-use Database\Factories\Passport\TokenFactory;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Support\Carbon;
-use Laravel\Passport\Token as PassportToken;
-
-/**
- * @property string $id
- * @property null|string $user_id
- * @property string $client_id
- * @property null|string $name
- * @property array<string> $scopes
- * @property bool $revoked
- * @property Carbon|null $created_at
- * @property Carbon|null $updated_at
- * @property Carbon|null $expires_at
- */
-class Token extends PassportToken
-{
-    /** @use HasFactory<TokenFactory> */
-    use HasFactory;
-
-    /**
-     * Get the client that the token belongs to.
-     *
-     * @return BelongsTo<Client, Token>
-     */
-    public function client(): BelongsTo
-    {
-        return $this->belongsTo(Client::class, 'client_id', 'id');
-    }
-}

app/Models/User.php

@@ -7,7 +7,6 @@ namespace App\Models;
 use App\Enums\Weekday;
 use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
-use App\Models\Passport\Token;
 use Database\Factories\UserFactory;
 use Filament\Models\Contracts\FilamentUser;
 use Filament\Panel;
@@ -28,13 +27,14 @@ use Laravel\Jetstream\HasProfilePhoto;
 use Laravel\Jetstream\HasTeams;
 use Laravel\Passport\AuthCode;
 use Laravel\Passport\HasApiTokens;
+use Laravel\Passport\Token;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
  * @property string $id
  * @property string $name
  * @property string $email
- * @property Carbon|null $email_verified_at
+ * @property string|null $email_verified_at
  * @property string|null $password
  * @property string|null $two_factor_secret
  * @property string $timezone
@@ -44,7 +44,6 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property-read Organization|null $currentOrganization
  * @property-read Organization|null $currentTeam
  * @property-read string $profile_photo_url
- * @property-read Collection<int, Token> $tokens
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property string|null $current_team_id
@@ -197,17 +196,6 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
         return $this->hasMany(AuthCode::class);
     }
 
-    /**
-     * Get the access tokens for the user.
-     *
-     * @return HasMany<Token>
-     */
-    public function tokens(): HasMany
-    {
-        return $this->hasMany(Token::class, 'user_id')
-            ->orderBy('created_at', 'desc');
-    }
-
     /**
      * @param  Builder<User>  $builder
      */

app/Providers/AppServiceProvider.php

@@ -9,7 +9,6 @@ use App\Models\FailedJob;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
-use App\Models\Passport\Token;
 use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\Tag;
@@ -30,6 +29,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\URL;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -90,6 +90,12 @@ class AppServiceProvider extends ServiceProvider
             );
         });
 
+        if (config('app.force_https', false)) {
+            URL::forceScheme('https');
+            request()->server->set('HTTPS', 'on');
+            request()->headers->set('X-Forwarded-Proto', 'https');
+        }
+
         $this->app->scoped(PermissionStore::class, function (Application $app): PermissionStore {
             return new PermissionStore;
         });
@@ -101,6 +107,5 @@ class AppServiceProvider extends ServiceProvider
         // Routing
         Route::model('member', Member::class);
         Route::model('invitation', OrganizationInvitation::class);
-        Route::model('apiToken', Token::class);
     }
 }

app/Providers/AuthServiceProvider.php

@@ -5,11 +5,6 @@ declare(strict_types=1);
 namespace App\Providers;
 
 use App\Models\Organization;
-use App\Models\Passport\AuthCode;
-use App\Models\Passport\Client;
-use App\Models\Passport\PersonalAccessClient;
-use App\Models\Passport\RefreshToken;
-use App\Models\Passport\Token;
 use App\Policies\OrganizationPolicy;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Laravel\Jetstream\Jetstream;
@@ -47,16 +42,6 @@ class AuthServiceProvider extends ServiceProvider
             // 'delete',
         ]);
 
-        Passport::useTokenModel(Token::class);
-        Passport::useRefreshTokenModel(RefreshToken::class);
-        Passport::useAuthCodeModel(AuthCode::class);
-        Passport::useClientModel(Client::class);
-        Passport::usePersonalAccessClientModel(PersonalAccessClient::class);
-
-        // Passport::tokensExpireIn(now()->addDays(15));
-        // Passport::refreshTokensExpireIn(now()->addDays(30));
-        Passport::personalAccessTokensExpireIn(now()->addMonths(12));
-
         // same as passport default above
         Jetstream::defaultApiTokenPermissions(['read']);
 

app/Providers/Filament/AdminPanelProvider.php

@@ -69,9 +69,6 @@ class AdminPanelProvider extends PanelProvider
                 NavigationGroup::make()
                     ->label('System')
                     ->collapsed(),
-                NavigationGroup::make()
-                    ->label('Auth')
-                    ->collapsed(),
             ])
             ->middleware([
                 EncryptCookies::class,

app/Service/DeletionService.php

@@ -13,7 +13,6 @@ use App\Models\Organization;
 use App\Models\OrganizationInvitation;
 use App\Models\Project;
 use App\Models\ProjectMember;
-use App\Models\Report;
 use App\Models\Tag;
 use App\Models\Task;
 use App\Models\TimeEntry;
@@ -72,9 +71,6 @@ class DeletionService
         // Delete all clients
         Client::query()->whereBelongsTo($organization, 'organization')->delete();
 
-        // Delete all reports
-        Report::query()->whereBelongsTo($organization, 'organization')->delete();
-
         // Reset the current organization
         $organization->owner()
             ->where('current_team_id', $organization->getKey())

app/Service/Import/ImportDatabaseHelper.php

@@ -188,18 +188,6 @@ class ImportDatabaseHelper
         return $model;
     }
 
-    /**
-     * @return array<TModel>
-     */
-    public function getCachedModels(): array
-    {
-        if ($this->mapKeyToModel === null) {
-            return [];
-        }
-
-        return array_values($this->mapKeyToModel);
-    }
-
     /**
      * @param  array<string, mixed>  $identifierData
      * @return TModel|null

app/Service/Import/Importers/ClockifyProjectsImporter.php

@@ -43,7 +43,6 @@ class ClockifyProjectsImporter extends DefaultImporter
                         'color' => $this->colorService->getRandomColor(),
                         'is_billable' => $record['Billability'] === 'Yes',
                         'billable_rate' => $billableRateKey !== null && $record[$billableRateKey] !== '' ? (int) (((float) $record[$billableRateKey]) * 100) : null,
-                        'estimated_time' => $record['Estimated (h)'] !== '' && is_numeric($record['Estimated (h)']) ? (int) ($record['Estimated (h)'] * 3600) : null,
                     ]);
                 }
 

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -5,8 +5,6 @@ declare(strict_types=1);
 namespace App\Service\Import\Importers;
 
 use App\Enums\Role;
-use App\Jobs\RecalculateSpentTimeForProject;
-use App\Jobs\RecalculateSpentTimeForTask;
 use App\Models\TimeEntry;
 use Carbon\Exceptions\InvalidFormatException;
 use Exception;
@@ -101,7 +99,6 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                         'project_id' => $projectId,
                         'organization_id' => $this->organization->id,
                     ]);
-                    $this->taskImportHelper->getModelById($taskId);
                 }
                 $timeEntry = new TimeEntry;
                 $timeEntry->disableAuditing();
@@ -161,12 +158,6 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                 $timeEntry->save();
                 $this->timeEntriesCreated++;
             }
-            foreach ($this->projectImportHelper->getCachedModels() as $usedProject) {
-                RecalculateSpentTimeForProject::dispatch($usedProject);
-            }
-            foreach ($this->taskImportHelper->getCachedModels() as $usedTask) {
-                RecalculateSpentTimeForTask::dispatch($usedTask);
-            }
         } catch (ImportException $exception) {
             throw $exception;
         } catch (CsvException $exception) {

app/Service/Import/Importers/SolidtimeImporter.php

@@ -5,8 +5,6 @@ declare(strict_types=1);
 namespace App\Service\Import\Importers;
 
 use App\Enums\Role;
-use App\Jobs\RecalculateSpentTimeForProject;
-use App\Jobs\RecalculateSpentTimeForTask;
 use App\Models\TimeEntry;
 use Carbon\Exceptions\InvalidFormatException;
 use Exception;
@@ -237,7 +235,6 @@ class SolidtimeImporter extends DefaultImporter
                 $taskId = null;
                 if ($timeEntryRow['task_id'] !== '') {
                     $taskId = $this->taskImportHelper->getKeyByExternalIdentifier($timeEntryRow['task_id']);
-                    $this->taskImportHelper->getModelById($taskId);
                 }
                 $timeEntry = new TimeEntry;
                 $timeEntry->disableAuditing();
@@ -306,12 +303,6 @@ class SolidtimeImporter extends DefaultImporter
                 $timeEntry->save();
                 $this->timeEntriesCreated++;
             }
-            foreach ($this->projectImportHelper->getCachedModels() as $usedProject) {
-                RecalculateSpentTimeForProject::dispatch($usedProject);
-            }
-            foreach ($this->taskImportHelper->getCachedModels() as $usedTask) {
-                RecalculateSpentTimeForTask::dispatch($usedTask);
-            }
         } catch (ImportException $exception) {
             throw $exception;
         } catch (Exception $exception) {

app/Service/Import/Importers/TogglTimeEntriesImporter.php

@@ -5,8 +5,6 @@ declare(strict_types=1);
 namespace App\Service\Import\Importers;
 
 use App\Enums\Role;
-use App\Jobs\RecalculateSpentTimeForProject;
-use App\Jobs\RecalculateSpentTimeForTask;
 use App\Models\TimeEntry;
 use Carbon\Exceptions\InvalidFormatException;
 use Exception;
@@ -101,7 +99,6 @@ class TogglTimeEntriesImporter extends DefaultImporter
                         'project_id' => $projectId,
                         'organization_id' => $this->organization->id,
                     ]);
-                    $this->taskImportHelper->getModelById($taskId);
                 }
                 $timeEntry = new TimeEntry;
                 $timeEntry->disableAuditing();
@@ -147,12 +144,6 @@ class TogglTimeEntriesImporter extends DefaultImporter
                 $timeEntry->save();
                 $this->timeEntriesCreated++;
             }
-            foreach ($this->projectImportHelper->getCachedModels() as $usedProject) {
-                RecalculateSpentTimeForProject::dispatch($usedProject);
-            }
-            foreach ($this->taskImportHelper->getCachedModels() as $usedTask) {
-                RecalculateSpentTimeForTask::dispatch($usedTask);
-            }
         } catch (ImportException $exception) {
             throw $exception;
         } catch (CsvException $exception) {

app/Service/MemberService.php

@@ -5,21 +5,10 @@ declare(strict_types=1);
 namespace App\Service;
 
 use App\Enums\Role;
-use App\Events\MemberRemoved;
-use App\Exceptions\Api\CanNotRemoveOwnerFromOrganization;
-use App\Exceptions\Api\ChangingRoleToPlaceholderIsNotAllowed;
-use App\Exceptions\Api\EntityStillInUseApiException;
-use App\Exceptions\Api\OnlyOwnerCanChangeOwnership;
-use App\Exceptions\Api\OrganizationNeedsAtLeastOneOwner;
 use App\Models\Member;
 use App\Models\Organization;
-use App\Models\ProjectMember;
-use App\Models\TimeEntry;
 use App\Models\User;
-use Illuminate\Support\Facades\DB;
 use InvalidArgumentException;
-use Laravel\Jetstream\Events\AddingTeamMember;
-use Laravel\Jetstream\Events\TeamMemberAdded;
 
 class MemberService
 {
@@ -30,72 +19,6 @@ class MemberService
         $this->userService = $userService;
     }
 
-    public function addMember(User $user, Organization $organization, Role $role, bool $asSuperAdmin = false): Member
-    {
-        if (! $asSuperAdmin) {
-            AddingTeamMember::dispatch($organization, $user);
-        }
-
-        $member = new Member;
-        DB::transaction(function () use ($organization, $user, $role, &$member): void {
-            $member->user()->associate($user);
-            $member->organization()->associate($organization);
-            $member->role = $role->value;
-            $member->save();
-        });
-
-        if (! $asSuperAdmin) {
-            TeamMemberAdded::dispatch($organization, $user);
-        }
-
-        return $member;
-    }
-
-    /**
-     * @throws CanNotRemoveOwnerFromOrganization
-     * @throws EntityStillInUseApiException
-     */
-    public function removeMember(Member $member, Organization $organization): void
-    {
-        if (TimeEntry::query()->where('user_id', $member->user_id)->whereBelongsTo($organization, 'organization')->exists()) {
-            throw new EntityStillInUseApiException('member', 'time_entry');
-        }
-        if (ProjectMember::query()->whereBelongsToOrganization($organization)->where('user_id', $member->user_id)->exists()) {
-            throw new EntityStillInUseApiException('member', 'project_member');
-        }
-        if ($member->role === Role::Owner->value) {
-            throw new CanNotRemoveOwnerFromOrganization;
-        }
-
-        $member->delete();
-        MemberRemoved::dispatch($member, $organization);
-    }
-
-    /**
-     * @throws ChangingRoleToPlaceholderIsNotAllowed
-     * @throws OnlyOwnerCanChangeOwnership
-     * @throws OrganizationNeedsAtLeastOneOwner
-     */
-    public function changeRole(Member $member, Organization $organization, Role $newRole, bool $allowOwnerChange): void
-    {
-        $oldRole = Role::from($member->role);
-        if ($oldRole === Role::Owner) {
-            throw new OrganizationNeedsAtLeastOneOwner;
-        }
-        if ($newRole === Role::Placeholder) {
-            throw new ChangingRoleToPlaceholderIsNotAllowed;
-        }
-        if ($newRole === Role::Owner) {
-            if ($allowOwnerChange) {
-                $this->changeOwnership($organization, $member);
-            } else {
-                throw new OnlyOwnerCanChangeOwnership;
-            }
-        } else {
-            $member->role = $newRole->value;
-        }
-    }
-
     /**
      * Change the ownership of an organization to a new user.
      * The previous owner will be demoted to an admin.

app/Service/OrganizationInvitationService.php

@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service;
-
-use App\Mail\OrganizationInvitationMail;
-use App\Models\OrganizationInvitation;
-use Illuminate\Support\Facades\Mail;
-
-class OrganizationInvitationService
-{
-    public function resend(OrganizationInvitation $invitation): void
-    {
-        Mail::to($invitation->email)
-            ->queue(new OrganizationInvitationMail($invitation));
-    }
-}

app/Service/UserService.php

@@ -5,49 +5,15 @@ declare(strict_types=1);
 namespace App\Service;
 
 use App\Enums\Role;
-use App\Enums\Weekday;
 use App\Events\AfterCreateOrganization;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\ProjectMember;
 use App\Models\TimeEntry;
 use App\Models\User;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Hash;
 
 class UserService
 {
-    public function createUser(string $name, string $email, string $password, string $timezone, Weekday $weekStart, string $currency, bool $verifyEmail = false): User
-    {
-        $user = new User;
-        $user->name = $name;
-        $user->email = $email;
-        $user->password = Hash::make($password);
-        $user->timezone = $timezone;
-        $user->week_start = $weekStart;
-        if ($verifyEmail) {
-            $user->email_verified_at = Carbon::now();
-        }
-        $user->save();
-
-        $organization = new Organization;
-        $organization->name = explode(' ', $user->name, 2)[0]."'s Organization";
-        $organization->personal_team = true;
-        $organization->currency = $currency;
-        $organization->owner()->associate($user);
-        $organization->save();
-
-        $organization->users()->attach(
-            $user, [
-                'role' => Role::Owner->value,
-            ]
-        );
-
-        $user->ownedTeams()->save($organization);
-
-        return $user;
-    }
-
     /**
      * Assign all organization entities (time entries, project members) from one user to another.
      * This is useful when a placeholder user is replaced with a real user.

composer.json

@@ -9,7 +9,7 @@
         "ext-zip": "*",
         "brick/money": "^0.10.0",
         "datomatic/laravel-enum-helper": "^2.0.0",
-        "dedoc/scramble": "^0.12.2",
+        "dedoc/scramble": "^0.11.28",
         "filament/filament": "^3.2",
         "flowframe/laravel-trend": "^0.3.0",
         "gotenberg/gotenberg-php": "^2.8",
@@ -40,7 +40,7 @@
         "barryvdh/laravel-ide-helper": "^3.0",
         "brianium/paratest": "^7.3",
         "fakerphp/faker": "^1.9.1",
-        "fumeapp/modeltyper": "^3.0",
+        "fumeapp/modeltyper": "^2.2",
         "phpstan/phpstan": "1.12.0",
         "larastan/larastan": "^2.0",
         "laravel/pint": "^1.0",

config/app.php

@@ -67,8 +67,6 @@ return [
 
     'force_https' => (bool) env('APP_FORCE_HTTPS', false),
 
-    'enable_registration' => (bool) env('APP_ENABLE_REGISTRATION', false),
-
     /*
     |--------------------------------------------------------------------------
     | Application Timezone

config/excel.php

@@ -163,8 +163,8 @@ return [
        */
         'cells' => [
             'middleware' => [
-                // \Maatwebsite\Excel\Middleware\TrimCellValue::class,
-                // \Maatwebsite\Excel\Middleware\ConvertEmptyCellValuesToNull::class,
+                //\Maatwebsite\Excel\Middleware\TrimCellValue::class,
+                //\Maatwebsite\Excel\Middleware\ConvertEmptyCellValuesToNull::class,
             ],
         ],
 

config/filesystems.php

@@ -39,7 +39,6 @@ return [
         'local' => [
             'driver' => 'local',
             'root' => storage_path('app'),
-            'serve' => true,
             'throw' => true,
         ],
 

config/passport.php

@@ -15,7 +15,7 @@ return [
     |
     */
 
-    'guard' => 'api',
+    'guard' => 'web',
 
     /*
     |--------------------------------------------------------------------------

config/session.php

@@ -168,7 +168,7 @@ return [
     |
     */
 
-    'secure' => env('SESSION_SECURE_COOKIE', env('APP_FORCE_HTTPS')),
+    'secure' => env('SESSION_SECURE_COOKIE'),
 
     /*
     |--------------------------------------------------------------------------

database/factories/Passport/ClientFactory.php

@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Database\Factories\Passport;
-
-use App\Models\Passport\Client;
-use App\Models\User;
-use Illuminate\Database\Eloquent\Factories\Factory;
-
-/**
- * @extends Factory<Client>
- */
-class ClientFactory extends Factory
-{
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id' => $this->faker->uuid,
-            'user_id' => null,
-            'name' => $this->faker->company(),
-            'secret' => $this->faker->regexify('[A-Za-z]{40}'),
-            'provider' => 'users',
-            'redirect' => $this->faker->url(),
-            'personal_access_client' => false,
-            'password_client' => false,
-            'revoked' => false,
-            'created_at' => $this->faker->dateTime(),
-            'updated_at' => $this->faker->dateTime(),
-        ];
-    }
-
-    public function personalAccessClient(): self
-    {
-        return $this->state(function (array $attributes) {
-            return [
-                'personal_access_client' => true,
-            ];
-        });
-    }
-
-    public function forUser(User $user): self
-    {
-        return $this->state(function (array $attributes) use ($user): array {
-            return [
-                'user_id' => $user->getKey(),
-            ];
-        });
-    }
-}

database/factories/Passport/TokenFactory.php

@@ -1,54 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Database\Factories\Passport;
-
-use App\Models\Passport\Client;
-use App\Models\Passport\Token;
-use App\Models\User;
-use Illuminate\Database\Eloquent\Factories\Factory;
-
-/**
- * @extends Factory<Token>
- */
-class TokenFactory extends Factory
-{
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id' => $this->faker->uuid,
-            'user_id' => null,
-            'client_id' => $this->faker->uuid,
-            'name' => null,
-            'scopes' => [],
-            'revoked' => false,
-            'created_at' => $this->faker->dateTime,
-            'updated_at' => $this->faker->dateTime,
-            'expires_at' => $this->faker->dateTime,
-        ];
-    }
-
-    public function forUser(User $user): self
-    {
-        return $this->state(function (array $attributes) use ($user): array {
-            return [
-                'user_id' => $user->getKey(),
-            ];
-        });
-    }
-
-    public function forClient(Client $client): self
-    {
-        return $this->state(function (array $attributes) use ($client): array {
-            return [
-                'client_id' => $client->getKey(),
-            ];
-        });
-    }
-}

database/seeders/DatabaseSeeder.php

@@ -12,7 +12,6 @@ use App\Models\Organization;
 use App\Models\OrganizationInvitation;
 use App\Models\Project;
 use App\Models\ProjectMember;
-use App\Models\Report;
 use App\Models\Tag;
 use App\Models\Task;
 use App\Models\TimeEntry;
@@ -34,29 +33,6 @@ class DatabaseSeeder extends Seeder
     public function run(): void
     {
         $this->deleteAll();
-
-        app(ClientRepository::class)->create(
-            null,
-            'desktop',
-            'solidtime://oauth/callback',
-            null,
-            false,
-            false,
-            false
-        );
-
-        $personalAccessClient = new PassportClient;
-        $personalAccessClient->id = config('passport.personal_access_client.id');
-        $personalAccessClient->secret = config('passport.personal_access_client.secret');
-        $personalAccessClient->name = 'API';
-        $personalAccessClient->redirect = 'http://localhost';
-        $personalAccessClient->user_id = null;
-        $personalAccessClient->revoked = false;
-        $personalAccessClient->provider = null;
-        $personalAccessClient->personal_access_client = true;
-        $personalAccessClient->password_client = false;
-        $personalAccessClient->save();
-
         $userWithMultipleOrganizations = User::factory()->withPersonalOrganization()->create([
             'name' => 'Mister Overemployed',
             'email' => 'overemployed@acme.test',
@@ -78,8 +54,6 @@ class DatabaseSeeder extends Seeder
             'name' => 'Acme Manager',
             'email' => 'test@example.com',
         ]);
-        $userAcmeManager->createToken('Testing Token 1')->accessToken;
-        $userAcmeManager->createToken('Testing Token 2')->accessToken;
         $userAcmeAdmin = User::factory()->withPersonalOrganization()->create([
             'name' => 'Acme Admin',
             'email' => 'admin@acme.test',
@@ -160,7 +134,6 @@ class DatabaseSeeder extends Seeder
             'personal_team' => true,
             'currency' => 'USD',
         ]);
-        Member::factory()->forUser($rivalOwner)->forOrganization($organizationRival)->role(Role::Owner)->create();
         $userRivalManager = User::factory()->withPersonalOrganization()->create([
             'name' => 'Other User',
             'email' => 'test@rival-company.test',
@@ -184,6 +157,15 @@ class DatabaseSeeder extends Seeder
             'email' => 'admin@example.com',
         ]);
 
+        app(ClientRepository::class)->create(
+            null,
+            'desktop',
+            'solidtime://oauth/callback',
+            null,
+            false,
+            false,
+            false
+        );
     }
 
     private function deleteAll(): void
@@ -204,7 +186,6 @@ class DatabaseSeeder extends Seeder
 
         // Application tables
         DB::table((new Audit)->getTable())->delete();
-        DB::table((new Report)->getTable())->delete();
         DB::table((new TimeEntry)->getTable())->delete();
         DB::table((new Task)->getTable())->delete();
         DB::table((new Tag)->getTable())->delete();

docker-compose.yml

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

e2e/profile.spec.ts

@@ -1,69 +1,25 @@
-import {test, expect} from '../playwright/fixtures';
-import {PLAYWRIGHT_BASE_URL} from '../playwright/config';
+import { test, expect } from '../playwright/fixtures';
+import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 
-test('test that user name can be updated', async ({page}) => {
+test('test that user name can be updated', async ({ page }) => {
     await page.goto(PLAYWRIGHT_BASE_URL + '/user/profile');
-    await page.getByLabel('Name', {exact: true} ).fill('NEW NAME');
+    await page.getByLabel('Name').fill('NEW NAME');
     await Promise.all([
-        page.getByRole('button', {name: 'Save'}).first().click(),
+        page.getByRole('button', { name: 'Save' }).first().click(),
         page.waitForResponse('**/user/profile-information'),
     ]);
     await page.reload();
-    await expect(page.getByLabel('Name', {exact: true})).toHaveValue('NEW NAME');
+    await expect(page.getByLabel('Name')).toHaveValue('NEW NAME');
 });
 
-test.skip('test that user email can be updated', async ({page}) => {
+test.skip('test that user email can be updated', async ({ page }) => {
     // this does not work because of email verification currently
     await page.goto(PLAYWRIGHT_BASE_URL + '/user/profile');
     const emailId = Math.round(Math.random() * 10000);
     await page.getByLabel('Email').fill(`newemail+${emailId}@test.com`);
-    await page.getByRole('button', {name: 'Save'}).first().click();
+    await page.getByRole('button', { name: 'Save' }).first().click();
     await page.reload();
     await expect(page.getByLabel('Email')).toHaveValue(
         `newemail+${emailId}@test.com`
     );
 });
-
-async function createNewApiToken(page) {
-    await page.getByLabel('API Key Name').fill('NEW API KEY');
-    await Promise.all([
-        page.getByRole('button', {name: 'Create API Key'}).click(),
-        page.waitForResponse('**/users/me/api-tokens')
-    ]);
-
-    await expect(page.locator('body')).toContainText('API Token created successfully');
-    await page.getByRole('dialog').getByText('Close').click();
-    await expect(page.locator('body')).toContainText('NEW API KEY');
-}
-
-test('test that user can create an API key', async ({page}) => {
-    await page.goto(PLAYWRIGHT_BASE_URL + '/user/profile');
-    await createNewApiToken(page);
-});
-
-test('test that user can delete an API key', async ({page}) => {
-    await page.goto(PLAYWRIGHT_BASE_URL + '/user/profile');
-    await createNewApiToken(page);
-    page.getByLabel('Delete API Token NEW API KEY').click();
-    await expect(page.getByRole('dialog')).toContainText('Are you sure you would like to delete this API token?');
-    await Promise.all([
-        page.getByRole('dialog').getByRole('button', {name: 'Delete'}).click(),
-        page.waitForResponse('**/users/me/api-tokens')
-    ]);
-    await expect(page.locator('body')).not.toContainText('NEW API KEY');
-});
-
-
-test('test that user can revoke an API key', async ({page}) => {
-    await page.goto(PLAYWRIGHT_BASE_URL + '/user/profile');
-    await createNewApiToken(page);
-    page.getByLabel('Revoke API Token NEW API KEY').click();
-    await expect(page.getByRole('dialog')).toContainText('Are you sure you would like to revoke this API token?');
-    await Promise.all([
-        page.getByRole('dialog').getByRole('button', {name: 'Revoke'}).click(),
-        page.waitForResponse('**/users/me/api-tokens')
-    ]);
-    await expect(page.getByRole('button', {name: 'Revoke'})).toBeHidden();
-    await expect(page.locator('body')).toContainText('NEW API KEY');
-    await expect(page.locator('body')).toContainText('Revoked');
-});

e2e/time.spec.ts

@@ -191,7 +191,7 @@ test('test that updating a the start of an existing time entry in the overview w
         'time_entry_range_selector'
     );
     await timeEntryRangeElement.click();
-    await page.getByTestId('time_entry_range_start').first().fill('1');
+    await page.getByTestId('time_picker_input').first().fill('1');
     await Promise.all([
         page.waitForResponse(async (response) => {
             return (
@@ -204,7 +204,10 @@ test('test that updating a the start of an existing time entry in the overview w
                 (await response.json()).data.end !== null
             );
         }),
-        page.getByTestId('time_entry_range_end').press('Enter'),
+        page
+            .getByTestId('time_entry_range_end')
+            .getByTestId('time_picker_input')
+            .press('Enter'),
     ]);
 });
 

e2e/timetracker.spec.ts

@@ -152,7 +152,7 @@ test('test that starting and updating the time while running works', async ({
                     JSON.stringify([])
             );
         }),
-        page.getByTestId('time_entry_time').press('Enter'),
+        page.getByTestId('time_entry_time').press('Tab'),
     ]);
 
     await expect(page.getByTestId('time_entry_time')).toHaveValue(/00:20/);

eslint.config.mjs

@@ -1,36 +0,0 @@
-import eslint from '@eslint/js';
-import eslintConfigPrettier from 'eslint-config-prettier';
-import eslintPluginVue from 'eslint-plugin-vue';
-import globals from 'globals';
-import typescriptEslint from 'typescript-eslint';
-import unusedImports from "eslint-plugin-unused-imports";
-
-export default typescriptEslint.config(
-    { ignores: ['*.d.ts', '**/coverage', '**/dist'] },
-    {
-        extends: [
-            eslint.configs.recommended,
-            ...typescriptEslint.configs.recommended,
-            ...eslintPluginVue.configs['flat/recommended'],
-        ],
-        files: ['**/*.{ts,vue,js}'],
-        languageOptions: {
-            ecmaVersion: 'latest',
-            sourceType: 'module',
-            globals: globals.browser,
-            parserOptions: {
-                parser: typescriptEslint.parser,
-            },
-        },
-        plugins: {
-            "unused-imports": unusedImports,
-        },
-        rules: {
-            "vue/multi-word-component-names": "off",
-            "@typescript-eslint/no-unused-vars": "off",
-            "unused-imports/no-unused-imports": "error",
-            "unused-imports/no-unused-vars": "error",
-        },
-    },
-    eslintConfigPrettier
-);