Wip

2022-08-15 09:29:47 +02:00
parent 3388b4fdec
commit aab1e86eee
22 changed files with 149 additions and 105 deletions
--- a/app/Filament/Resources/DatabaseResource.php
+++ b/app/Filament/Resources/DatabaseResource.php
@@ -32,10 +32,15 @@ class DatabaseResource extends Resource
    {
        return $table
            ->columns([
+                Tables\Columns\TextColumn::make('name')
+                    ->label(__('Name'))
+                    ->searchable(),
                Tables\Columns\TextColumn::make('server.name')
-                    ->label(__('Server')),
+                    ->label(__('Server'))
+                    ->searchable(),
                Tables\Columns\TextColumn::make('site.domain')
-                    ->label(__('Site')),
+                    ->label(__('Site'))
+                    ->searchable(),
                Tables\Columns\BadgeColumn::make('status')
                    ->enum([
                        Database::STATUS_BUSY => __('Busy'),
@@ -46,10 +51,10 @@ class DatabaseResource extends Resource
                        'success' => Database::STATUS_ACTIVE,
                    ])
                    ->label(__('Status')),
-                Tables\Columns\TextColumn::make('name')
-                    ->label(__('Name')),
+
                Tables\Columns\TextColumn::make('created_at')
                    ->label(__('Date'))
+                    ->sortable()
                    ->dateTime(),
            ])
            ->filters([
@@ -60,7 +65,8 @@ class DatabaseResource extends Resource
            ])
            ->bulkActions([
                //
-            ]);
+            ])
+            ->defaultSort('created_at', 'desc');
    }

    public static function getRelations(): array
--- a/app/Filament/Resources/DatabaseResource/Pages/EditDatabase.php
+++ b/app/Filament/Resources/DatabaseResource/Pages/EditDatabase.php
@@ -60,7 +60,7 @@ class EditDatabase extends Page
            ->success()
            ->send();

-        if ( $state['send_new_password_to_user'] ) {
+        if ($state['send_new_password_to_user']) {
            Mail::to($this->record->site->users)->send(new PasswordReset($this->record, $this->recentlyUpdatedPassword));
        }
    }
--- a/app/Filament/Resources/PackageResource.php
+++ b/app/Filament/Resources/PackageResource.php
@@ -103,6 +103,7 @@ class PackageResource extends Resource
    {
        return $table
            ->columns([
+                Tables\Columns\TextColumn::make('id')->label('ID')->searchable(),
                Tables\Columns\TextColumn::make('name')
                    ->label(__('Name'))
                    ->description(function (Package $record) {
--- a/app/Filament/Resources/PackageResource/RelationManagers/UsersRelationManager.php
+++ b/app/Filament/Resources/PackageResource/RelationManagers/UsersRelationManager.php
@@ -31,6 +31,8 @@ class UsersRelationManager extends RelationManager
                        Select::make('user_id')
                            ->label('User')
                            ->options(User::orderBy('name')->get()->mapWithKeys(fn (User $user) => [$user->id => $user->name]))
+                            ->preload()
+                            ->searchable()
                            ->required(),
                    ])
                    ->action(function (array $data, self $livewire) {
--- a/app/Filament/Resources/ProviderPlanResource.php
+++ b/app/Filament/Resources/ProviderPlanResource.php
@@ -33,8 +33,10 @@ class ProviderPlanResource extends Resource
    {
        return $table
            ->columns([
+                Tables\Columns\TextColumn::make('id')->label('ID')->searchable(),
                Tables\Columns\TextColumn::make('provider.name')
-                    ->label(__('Provider')),
+                    ->label(__('Provider'))
+                    ->searchable(),
                Tables\Columns\TextColumn::make('plan_id')
                    ->label(__('Plan ID'))
                    ->searchable(),
--- a/app/Filament/Resources/ProviderRegionResource.php
+++ b/app/Filament/Resources/ProviderRegionResource.php
@@ -33,8 +33,10 @@ class ProviderRegionResource extends Resource
    {
        return $table
            ->columns([
+                Tables\Columns\TextColumn::make('id')->label('ID')->searchable(),
                Tables\Columns\TextColumn::make('provider.name')
-                    ->label(__('Provider')),
+                    ->label(__('Provider'))
+                    ->searchable(),
                Tables\Columns\TextColumn::make('region_id')
                    ->searchable()
                    ->label(__('Region')),
--- a/app/Filament/Resources/ProviderResource.php
+++ b/app/Filament/Resources/ProviderResource.php
@@ -49,6 +49,7 @@ class ProviderResource extends Resource
    {
        return $table
            ->columns([
+                Tables\Columns\TextColumn::make('id')->label('ID')->searchable(),
                Tables\Columns\TextColumn::make('name')
                    ->description(function (Provider $record) {
                        return "{$record->plans_count} plan(s) · {$record->regions_count} region(s)";
--- a/app/Filament/Resources/RedirectResource.php
+++ b/app/Filament/Resources/RedirectResource.php
@@ -43,10 +43,18 @@ class RedirectResource extends Resource
    {
        return $table
            ->columns([
+                Tables\Columns\TextColumn::make('redirect_from')
+                    ->label(__('Redirect from'))
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('redirect_to')
+                    ->label(__('Redirect to'))
+                    ->searchable(),
                Tables\Columns\TextColumn::make('server.name')
-                    ->label(__('Server')),
+                    ->label(__('Server'))
+                    ->searchable(),
                Tables\Columns\TextColumn::make('site.domain')
-                    ->label(__('Site')),
+                    ->label(__('Site'))
+                    ->searchable(),
                Tables\Columns\TextColumn::make('type')
                    ->label(__('Type')),
                Tables\Columns\BadgeColumn::make('status')
@@ -59,10 +67,6 @@ class RedirectResource extends Resource
                        'success' => Redirect::STATUS_ACTIVE,
                    ])
                    ->label(__('Status')),
-                Tables\Columns\TextColumn::make('redirect_from')
-                    ->label(__('Redirect from')),
-                Tables\Columns\TextColumn::make('redirect_to')
-                    ->label(__('Redirect to')),
                Tables\Columns\TextColumn::make('created_at')
                    ->label(__('Date'))
                    ->dateTime(),
--- a/app/Filament/Resources/ServerResource.php
+++ b/app/Filament/Resources/ServerResource.php
@@ -23,6 +23,8 @@ class ServerResource extends Resource

    protected static ?string $navigationGroup = 'Server management';

+    protected static ?string $recordTitleAttribute = 'name';
+
    public static function form(Form $form): Form
    {
        return $form
@@ -93,7 +95,7 @@ class ServerResource extends Resource
    public static function getEloquentQuery(): Builder
    {
        return parent::getEloquentQuery()
-            ->with(['users'])
+            ->with(['users:id,name'])
            ->withCount(['sites']);
    }

@@ -113,8 +115,4 @@ class ServerResource extends Resource
        ];
    }

-    public static function canCreate(): bool
-    {
-        return false;
-    }
 }
--- a/app/Filament/Resources/ServerResource/Pages/ListServers.php
+++ b/app/Filament/Resources/ServerResource/Pages/ListServers.php
@@ -2,16 +2,13 @@

 namespace App\Filament\Resources\ServerResource\Pages;

-use App\Filament\Resources\ServerResource;
-use App\Traits\HasPloi;
 use Filament\Pages\Actions\Action;
 use Filament\Resources\Pages\ListRecords;
 use Illuminate\Database\Eloquent\Builder;
+use App\Filament\Resources\ServerResource;

 class ListServers extends ListRecords
 {
-    use HasPloi;
-
    protected static string $resource = ServerResource::class;

    protected function getActions(): array
@@ -22,12 +19,13 @@ class ListServers extends ListRecords
                ->icon('heroicon-o-refresh')
                ->color('secondary')
                ->url(route('filament.resources.servers.synchronize')),
+            ...parent::getActions(),
        ];
    }

    protected function applySearchToTableQuery(Builder $query): Builder
    {
-        if ( filled($searchTerm = $this->getTableSearchQuery()) ) {
+        if (filled($searchTerm = $this->getTableSearchQuery())) {
            $query
                ->where('domain', 'LIKE', "%{$searchTerm}%")
                ->orWhereHas('users', fn (Builder $query) => $query->where('name', 'LIKE', "%{$searchTerm}%"))
--- a/app/Filament/Resources/SiteResource.php
+++ b/app/Filament/Resources/SiteResource.php
@@ -25,6 +25,8 @@ class SiteResource extends Resource

    protected static ?int $navigationSort = 0;

+    protected static ?string $recordTitleAttribute = 'domain';
+
    public static function form(Form $form): Form
    {
        return $form
@@ -116,11 +118,6 @@ class SiteResource extends Resource
        ];
    }

-    public static function canCreate(): bool
-    {
-        return false;
-    }
-
    public static function getPages(): array
    {
        return [
--- a/app/Filament/Resources/SiteResource/Pages/ListSites.php
+++ b/app/Filament/Resources/SiteResource/Pages/ListSites.php
@@ -22,16 +22,18 @@ class ListSites extends ListRecords
                ->icon('heroicon-o-refresh')
                ->color('secondary')
                ->url(route('filament.resources.sites.synchronize')),
+
+            ...parent::getActions()
        ];
    }

    protected function applySearchToTableQuery(Builder $query): Builder
    {
-        if ( filled($searchTerm = $this->getTableSearchQuery()) ) {
+        if (filled($searchTerm = $this->getTableSearchQuery())) {
            $query
                ->where('domain', 'LIKE', "%{$searchTerm}%")
-                ->orWhereHas('users', fn (Builder $query) => $query->where('name', 'LIKE', "%{$searchTerm}%"))
-                ->orWhereHas('users', fn (Builder $query) => $query->where('email', 'LIKE', "%{$searchTerm}%"));
+                ->orWhereHas('users', fn(Builder $query) => $query->where('name', 'LIKE', "%{$searchTerm}%"))
+                ->orWhereHas('users', fn(Builder $query) => $query->where('email', 'LIKE', "%{$searchTerm}%"));
        }

        return $query;
--- a/app/Filament/Resources/UserResource.php
+++ b/app/Filament/Resources/UserResource.php
@@ -50,11 +50,12 @@ class UserResource extends Resource
                    ->label(__('Notes'))
                    ->maxLength(65535),
                Forms\Components\Textarea::make('blocked')
+                    ->helperText('Entering a reason here will block the user from accessing your panel. It will also display the typed message to the user.')
                    ->label(__('Blocked')),
                Forms\Components\Checkbox::make('requires_password_for_ftp')
                    ->default(true)
                    ->label(__('Require password to show FTP password'))
-                    ->helperText(__('Disabling this will allow this user to get the FTP password right away.')),
+                    ->helperText(__('Disabling this will allow this user to get the FTP password without entering their password.')),
            ]);
    }

@@ -87,8 +88,8 @@ class UserResource extends Resource
            ->filters([
                //
            ])
-            ->appendActions([
-                Impersonate::make('impersonate'),
+            ->actions([
+                Impersonate::make('impersonate')->tooltip('Login as this user (impersonate)'),
                Tables\Actions\EditAction::make(),
            ])
            ->bulkActions([
--- a/app/Jobs/Databases/CreateDatabase.php
+++ b/app/Jobs/Databases/CreateDatabase.php
@@ -46,7 +46,10 @@ class CreateDatabase implements ShouldQueue
        $this->database->ploi_id = $ploiDatabase->id;
        $this->database->save();

-        // Lets fetch the status after 5 seconds
+        $databaseUser->ploi_id = $ploiDatabase->users[0]->id;
+        $databaseUser->save();
+
+        // Let's fetch the status after 5 seconds
        dispatch(new FetchDatabaseStatus($this->database))->delay(now()->addSeconds(3));
    }
 }
--- a/app/Mail/Database/PasswordReset.php
+++ b/app/Mail/Database/PasswordReset.php
@@ -4,9 +4,9 @@ namespace App\Mail\Database;

 use App\Models\Database;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Contracts\Queue\ShouldQueue;

 class PasswordReset extends Mailable implements ShouldQueue
 {
@@ -15,7 +15,8 @@ class PasswordReset extends Mailable implements ShouldQueue
    public function __construct(
        public Database $database,
        public string $newPassword,
-    ) {}
+    ) {
+    }

    /**
     * Build the message.
--- a/app/Models/DatabaseUser.php
+++ b/app/Models/DatabaseUser.php
@@ -8,6 +8,7 @@ class DatabaseUser extends Model
 {
    public $fillable = [
        'name',
+
    ];

    public function database()
--- a/app/Services/Ploi/Resources/DatabaseUser.php
+++ b/app/Services/Ploi/Resources/DatabaseUser.php
@@ -30,7 +30,7 @@ class DatabaseUser extends Resource

    public function resetPassword(): Response
    {
-        return $this->getPloi()->makeAPICall($this->getEndpoint() . '/reset-password');
+        return $this->getPloi()->makeAPICall($this->getEndpoint() . '/reset-password', 'post');
    }

    public function setDatabase(Database $database): static
--- a/composer.lock
+++ b/composer.lock
@@ -126,16 +126,16 @@
        },
        {
            "name": "aws/aws-sdk-php",
-            "version": "3.232.3",
+            "version": "3.233.1",
            "source": {
                "type": "git",
                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "96fae7f4b2ab11a3eb3fceacef7cb4b12e46b27c"
+                "reference": "1eeac24f921f146b7cef5beb61375d7852df7cf8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/96fae7f4b2ab11a3eb3fceacef7cb4b12e46b27c",
-                "reference": "96fae7f4b2ab11a3eb3fceacef7cb4b12e46b27c",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1eeac24f921f146b7cef5beb61375d7852df7cf8",
+                "reference": "1eeac24f921f146b7cef5beb61375d7852df7cf8",
                "shasum": ""
            },
            "require": {
@@ -212,9 +212,9 @@
            "support": {
                "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.232.3"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.233.1"
            },
-            "time": "2022-08-08T18:19:49+00:00"
+            "time": "2022-08-12T18:18:34+00:00"
        },
        {
            "name": "bacon/bacon-qr-code",
@@ -422,16 +422,16 @@
        },
        {
            "name": "brick/math",
-            "version": "0.10.1",
+            "version": "0.10.2",
            "source": {
                "type": "git",
                "url": "https://github.com/brick/math.git",
-                "reference": "de846578401f4e58f911b3afeb62ced56365ed87"
+                "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/de846578401f4e58f911b3afeb62ced56365ed87",
-                "reference": "de846578401f4e58f911b3afeb62ced56365ed87",
+                "url": "https://api.github.com/repos/brick/math/zipball/459f2781e1a08d52ee56b0b1444086e038561e3f",
+                "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f",
                "shasum": ""
            },
            "require": {
@@ -466,7 +466,7 @@
            ],
            "support": {
                "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.10.1"
+                "source": "https://github.com/brick/math/tree/0.10.2"
            },
            "funding": [
                {
@@ -474,7 +474,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-08-01T22:54:31+00:00"
+            "time": "2022-08-10T22:54:19+00:00"
        },
        {
            "name": "calebporzio/sushi",
@@ -1591,16 +1591,16 @@
        },
        {
            "name": "filament/filament",
-            "version": "v2.15.15",
+            "version": "v2.15.18",
            "source": {
                "type": "git",
                "url": "https://github.com/filamentphp/admin.git",
-                "reference": "be8f21108bb4f7ab3e497cfbade3969681becf88"
+                "reference": "640de5e1c0565d54596cffd72aacdfc6ae362738"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/admin/zipball/be8f21108bb4f7ab3e497cfbade3969681becf88",
-                "reference": "be8f21108bb4f7ab3e497cfbade3969681becf88",
+                "url": "https://api.github.com/repos/filamentphp/admin/zipball/640de5e1c0565d54596cffd72aacdfc6ae362738",
+                "reference": "640de5e1c0565d54596cffd72aacdfc6ae362738",
                "shasum": ""
            },
            "require": {
@@ -1649,20 +1649,20 @@
                "issues": "https://github.com/filamentphp/filament/issues",
                "source": "https://github.com/filamentphp/filament"
            },
-            "time": "2022-08-08T16:13:01+00:00"
+            "time": "2022-08-11T07:50:28+00:00"
        },
        {
            "name": "filament/forms",
-            "version": "v2.15.15",
+            "version": "v2.15.18",
            "source": {
                "type": "git",
                "url": "https://github.com/filamentphp/forms.git",
-                "reference": "81df0984e3790193737d74dc8665954e856d979a"
+                "reference": "eae97260411d73f8e401d6ca386fc51e6730aa2d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/81df0984e3790193737d74dc8665954e856d979a",
-                "reference": "81df0984e3790193737d74dc8665954e856d979a",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/eae97260411d73f8e401d6ca386fc51e6730aa2d",
+                "reference": "eae97260411d73f8e401d6ca386fc51e6730aa2d",
                "shasum": ""
            },
            "require": {
@@ -1707,11 +1707,11 @@
                "issues": "https://github.com/filamentphp/filament/issues",
                "source": "https://github.com/filamentphp/filament"
            },
-            "time": "2022-08-08T16:12:55+00:00"
+            "time": "2022-08-11T07:50:19+00:00"
        },
        {
            "name": "filament/notifications",
-            "version": "v2.15.15",
+            "version": "v2.15.18",
            "source": {
                "type": "git",
                "url": "https://github.com/filamentphp/notifications.git",
@@ -1760,16 +1760,16 @@
        },
        {
            "name": "filament/support",
-            "version": "v2.15.15",
+            "version": "v2.15.18",
            "source": {
                "type": "git",
                "url": "https://github.com/filamentphp/support.git",
-                "reference": "5673da81bd52bf19bf59833d53ebf903b4cba07a"
+                "reference": "f377e88b4ea03b3234299bd98ff2c19c9ecc9aaf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/5673da81bd52bf19bf59833d53ebf903b4cba07a",
-                "reference": "5673da81bd52bf19bf59833d53ebf903b4cba07a",
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/f377e88b4ea03b3234299bd98ff2c19c9ecc9aaf",
+                "reference": "f377e88b4ea03b3234299bd98ff2c19c9ecc9aaf",
                "shasum": ""
            },
            "require": {
@@ -1806,20 +1806,20 @@
                "issues": "https://github.com/filamentphp/filament/issues",
                "source": "https://github.com/filamentphp/filament"
            },
-            "time": "2022-08-08T09:45:37+00:00"
+            "time": "2022-08-11T07:50:28+00:00"
        },
        {
            "name": "filament/tables",
-            "version": "v2.15.15",
+            "version": "v2.15.18",
            "source": {
                "type": "git",
                "url": "https://github.com/filamentphp/tables.git",
-                "reference": "8b388f255c829f772b384b91a2203743622bd16f"
+                "reference": "dee72c20a70c51a2a52100e8ad06fce487ba8cca"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/8b388f255c829f772b384b91a2203743622bd16f",
-                "reference": "8b388f255c829f772b384b91a2203743622bd16f",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/dee72c20a70c51a2a52100e8ad06fce487ba8cca",
+                "reference": "dee72c20a70c51a2a52100e8ad06fce487ba8cca",
                "shasum": ""
            },
            "require": {
@@ -1861,7 +1861,7 @@
                "issues": "https://github.com/filamentphp/filament/issues",
                "source": "https://github.com/filamentphp/filament"
            },
-            "time": "2022-08-08T16:13:01+00:00"
+            "time": "2022-08-11T07:50:27+00:00"
        },
        {
            "name": "fruitcake/php-cors",
@@ -2714,16 +2714,16 @@
        },
        {
            "name": "laravel/breeze",
-            "version": "v1.11.3",
+            "version": "v1.11.4",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/breeze.git",
-                "reference": "40e0536e92385fa9f5c165b23ef544aad11e5fc5"
+                "reference": "a6817a45c9f49e2bf342c4a38e27a610cbda787a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/breeze/zipball/40e0536e92385fa9f5c165b23ef544aad11e5fc5",
-                "reference": "40e0536e92385fa9f5c165b23ef544aad11e5fc5",
+                "url": "https://api.github.com/repos/laravel/breeze/zipball/a6817a45c9f49e2bf342c4a38e27a610cbda787a",
+                "reference": "a6817a45c9f49e2bf342c4a38e27a610cbda787a",
                "shasum": ""
            },
            "require": {
@@ -2771,7 +2771,7 @@
                "issues": "https://github.com/laravel/breeze/issues",
                "source": "https://github.com/laravel/breeze"
            },
-            "time": "2022-08-01T13:34:50+00:00"
+            "time": "2022-08-08T13:25:54+00:00"
        },
        {
            "name": "laravel/cashier",
@@ -2854,16 +2854,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v9.23.0",
+            "version": "v9.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "c4eea9060d847b5c93957b203caa8f57544a76ab"
+                "reference": "053840f579cf01d353d81333802afced79b1c0af"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/c4eea9060d847b5c93957b203caa8f57544a76ab",
-                "reference": "c4eea9060d847b5c93957b203caa8f57544a76ab",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/053840f579cf01d353d81333802afced79b1c0af",
+                "reference": "053840f579cf01d353d81333802afced79b1c0af",
                "shasum": ""
            },
            "require": {
@@ -3030,7 +3030,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2022-08-02T14:24:44+00:00"
+            "time": "2022-08-09T13:43:22+00:00"
        },
        {
            "name": "laravel/horizon",
@@ -3563,16 +3563,16 @@
        },
        {
            "name": "league/flysystem",
-            "version": "3.2.0",
+            "version": "3.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "ed0ecc7f9b5c2f4a9872185846974a808a3b052a"
+                "reference": "81aea9e5217084c7850cd36e1587ee4aad721c6b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/ed0ecc7f9b5c2f4a9872185846974a808a3b052a",
-                "reference": "ed0ecc7f9b5c2f4a9872185846974a808a3b052a",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/81aea9e5217084c7850cd36e1587ee4aad721c6b",
+                "reference": "81aea9e5217084c7850cd36e1587ee4aad721c6b",
                "shasum": ""
            },
            "require": {
@@ -3633,7 +3633,7 @@
            ],
            "support": {
                "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.2.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.2.1"
            },
            "funding": [
                {
@@ -3649,7 +3649,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-07-26T07:26:36+00:00"
+            "time": "2022-08-14T20:48:34+00:00"
        },
        {
            "name": "league/mime-type-detection",
@@ -3920,16 +3920,16 @@
        },
        {
            "name": "moneyphp/money",
-            "version": "v4.0.4",
+            "version": "v4.0.5",
            "source": {
                "type": "git",
                "url": "https://github.com/moneyphp/money.git",
-                "reference": "efe904ab6109d87046eb624d5dff7d270fd0cca5"
+                "reference": "cee58435ff82a5de252c516e6a31beb674898985"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/moneyphp/money/zipball/efe904ab6109d87046eb624d5dff7d270fd0cca5",
-                "reference": "efe904ab6109d87046eb624d5dff7d270fd0cca5",
+                "url": "https://api.github.com/repos/moneyphp/money/zipball/cee58435ff82a5de252c516e6a31beb674898985",
+                "reference": "cee58435ff82a5de252c516e6a31beb674898985",
                "shasum": ""
            },
            "require": {
@@ -4002,9 +4002,9 @@
            ],
            "support": {
                "issues": "https://github.com/moneyphp/money/issues",
-                "source": "https://github.com/moneyphp/money/tree/v4.0.4"
+                "source": "https://github.com/moneyphp/money/tree/v4.0.5"
            },
-            "time": "2022-05-18T19:32:15+00:00"
+            "time": "2022-08-11T09:12:20+00:00"
        },
        {
            "name": "monolog/monolog",
@@ -12954,16 +12954,16 @@
        },
        {
            "name": "spatie/ray",
-            "version": "1.34.5",
+            "version": "1.36.0",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/ray.git",
-                "reference": "2d64ea264eecbdc7ec01e4e8b45978cae80815d2"
+                "reference": "4a4def8cda4806218341b8204c98375aa8c34323"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/ray/zipball/2d64ea264eecbdc7ec01e4e8b45978cae80815d2",
-                "reference": "2d64ea264eecbdc7ec01e4e8b45978cae80815d2",
+                "url": "https://api.github.com/repos/spatie/ray/zipball/4a4def8cda4806218341b8204c98375aa8c34323",
+                "reference": "4a4def8cda4806218341b8204c98375aa8c34323",
                "shasum": ""
            },
            "require": {
@@ -13013,7 +13013,7 @@
            ],
            "support": {
                "issues": "https://github.com/spatie/ray/issues",
-                "source": "https://github.com/spatie/ray/tree/1.34.5"
+                "source": "https://github.com/spatie/ray/tree/1.36.0"
            },
            "funding": [
                {
@@ -13025,7 +13025,7 @@
                    "type": "other"
                }
            ],
-            "time": "2022-06-03T12:32:57+00:00"
+            "time": "2022-08-11T14:04:18+00:00"
        },
        {
            "name": "symfony/filesystem",
--- a/database/migrations/2022_08_15_070144_add_ploi_id_to_database_users_table.php
+++ b/database/migrations/2022_08_15_070144_add_ploi_id_to_database_users_table.php
@@ -0,0 +1,15 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up()
+    {
+        Schema::table('database_users', function (Blueprint $table) {
+            $table->bigInteger('ploi_id', false, true)->nullable()->after('id');
+        });
+    }
+};
--- a/resources/js/Pages/Sites/Aliases.vue
+++ b/resources/js/Pages/Sites/Aliases.vue
@@ -22,6 +22,13 @@
                                <template #form>
                                    <form class="space-y-4" @submit.prevent="submit">
                                        <FormInput :label="__('Domain')" :errors="$page.props.errors.domain" v-model="form.domain" />
+                                        <div>
+                                            <input id="request_new_certificate" class="form-checkbox" type="checkbox"
+                                                   v-model="form.request_new_certificate">
+                                            <label for="request_new_certificate" class="ml-2 text-sm">
+                                                {{ __('Request new certificate') }}
+                                            </label>
+                                        </div>
                                        <FormActions>
                                            <Button>{{ __('Save changes') }}</Button>
                                        </FormActions>
@@ -140,6 +147,7 @@ export default {

            form: {
                domain: null,
+                request_new_certificate: false,
            },

            breadcrumbs: [
--- a/resources/js/Pages/Sites/Show.vue
+++ b/resources/js/Pages/Sites/Show.vue
@@ -102,21 +102,21 @@
                                        <div class="grid grid-cols-2 gap-4">
                                            <div class="col-span-2 md:col-span-1">
                                                <FormInput label="A" :errors="$page.props.errors.domain"
-                                                           :value="mainDnsRecord" />
+                                                           :model-value="mainDnsRecord" />
                                            </div>
                                            <div class="col-span-2 md:col-span-1">
                                                <FormInput label="IP" allow-copy :errors="$page.props.errors.domain"
-                                                           :value="ip_address" />
+                                                           :model-value="ip_address" />
                                            </div>
                                        </div>
                                        <div class="grid grid-cols-2 gap-4">
                                            <div class="col-span-2 md:col-span-1">
                                                <FormInput label="A" :errors="$page.props.errors.domain"
-                                                           :value="`www`" />
+                                                           :model-value="`www`" />
                                            </div>
                                            <div class="col-span-2 md:col-span-1">
                                                <FormInput label="IP" allow-copy :errors="$page.props.errors.domain"
-                                                           :value="ip_address" />
+                                                           :model-value="ip_address" />
                                            </div>
                                        </div>
                                    </form>
--- a/resources/views/emails/database/password-reset.blade.php
+++ b/resources/views/emails/database/password-reset.blade.php
@@ -1,5 +1,7 @@
@component('mail::message')
 {{ __('Hi!') }}

-{{ __('The password for your database `:database` has been reset to **:newPassword**. You should update your applications to use the new password for your applications to keep working.', ['database' => $database->name, 'newPassword' => $newPassword]) }}
+{{ __('The password for your database **:database** has been reset to **:newPassword**.', ['database' => $database->name, 'newPassword' => $newPassword]) }}
+
+{{ __('You should update your applications to use the new password for your applications to keep working.') }}
@endcomponent