davidl/ploi-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Dennis
2022-08-27 20:02:51 +02:00
parent cbd6a227ee fd1d31d347
commit 557cff5e05
6 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Filament/Resources/CertificateResource.php
View File

@@ -10,6 +10,7 @@ use Filament\Resources\Table;
use Filament\Resources\Resource;
use Illuminate\Database\Eloquent\Builder;
use App\Filament\Resources\CertificateResource\Pages;
use Illuminate\Support\HtmlString;
class CertificateResource extends Resource
{
@@ -44,8 +45,10 @@ class CertificateResource extends Resource
return $table
->columns([
Tables\Columns\TextColumn::make('server.name')
->searchable()
->label(__('Server')),
Tables\Columns\TextColumn::make('site.domain')
->searchable()
->label(__('Main domain')),
Tables\Columns\TextColumn::make('type')
->label('Type'),
@@ -60,9 +63,17 @@ class CertificateResource extends Resource
])
->label(__('Status')),
Tables\Columns\TextColumn::make('domain')
->searchable()
->wrap()
->getStateUsing(function (Certificate $record) {
$state = str($record->domain)->explode(',')->implode(', ');
return new HtmlString($state);
})
->label('Domains & aliases'),
Tables\Columns\TextColumn::make('created_at')
->label(__('Date'))
->sortable()
->dateTime(),
])
->filters([
@@ -73,7 +84,8 @@ class CertificateResource extends Resource
])
->bulkActions([
Tables\Actions\DeleteBulkAction::make(),
]);
])
->defaultSort('created_at', 'desc');
}
public static function getEloquentQuery(): Builder

4
app/Filament/Resources/CronjobResource.php
View File

@@ -54,6 +54,7 @@ class CronjobResource extends Resource
->label(__('Frequency')),
Tables\Columns\TextColumn::make('created_at')
->label(__('Date'))
->sortable()
->dateTime(),
])
->filters([
@@ -64,7 +65,8 @@ class CronjobResource extends Resource
])
->bulkActions([
//
]);
])
->defaultSort('created_at', 'desc');
}
public static function getRelations(): array

6
app/Filament/Resources/RedirectResource.php
View File

@@ -43,9 +43,11 @@ class RedirectResource extends Resource
return $table
->columns([
Tables\Columns\TextColumn::make('redirect_from')
->wrap()
->label(__('Redirect from'))
->searchable(),
Tables\Columns\TextColumn::make('redirect_to')
->wrap()
->label(__('Redirect to'))
->searchable(),
Tables\Columns\TextColumn::make('server.name')
@@ -68,6 +70,7 @@ class RedirectResource extends Resource
->label(__('Status')),
Tables\Columns\TextColumn::make('created_at')
->label(__('Date'))
->sortable()
->dateTime(),
])
->filters([
@@ -78,7 +81,8 @@ class RedirectResource extends Resource
])
->bulkActions([
//
]);
])
->defaultSort('created_at', 'desc');
}
public static function getRelations(): array

1
app/Filament/Resources/ServerResource.php
View File

@@ -73,6 +73,7 @@ class ServerResource extends Resource
]),
Tables\Columns\TextColumn::make('users')
->label(__('Users'))
->wrap()
->getStateUsing(function (Server $record) {
$state = $record
->users

2
app/Http/Controllers/SiteDatabaseController.php
View File

@@ -25,7 +25,7 @@ class SiteDatabaseController extends Controller
$site = auth()->user()->sites()->findOrFail($id);
$database = $site->databases()->create([
'name' => Str::of($site->domain)->limit(8)->remove(['.', '-'])->lower()->append('_')->append($request->input('name')),
'name' => Str::of($site->domain)->limit(5)->remove(['.', '-'])->lower()->append('_')->append($request->input('name')),
]);
$database->users()->create([

6
app/Http/Requests/SiteDatabaseRequest.php
View File

@@ -45,8 +45,7 @@ class SiteDatabaseRequest extends FormRequest
new NotContains('-'),
],
'user_name' => [
'sometimes',
'nullable',
'required',
'string',
'alpha_dash',
'min:2',
@@ -58,8 +57,7 @@ class SiteDatabaseRequest extends FormRequest
])
],
'password' => [
'sometimes',
'nullable',
'required',
'string',
],
];