Merge branch 'develop'

# Conflicts:
#	public/build/manifest.json
This commit is contained in:
Dennis
2023-01-25 13:22:45 +01:00
8 changed files with 1213 additions and 337 deletions

View File

@@ -4,8 +4,19 @@ namespace App\Filament\Resources\UserResource\Pages;
use App\Filament\Resources\UserResource;
use Filament\Resources\Pages\CreateRecord;
use Illuminate\Database\Eloquent\Model;
class CreateUser extends CreateRecord
{
protected static string $resource = UserResource::class;
protected function handleRecordCreation(array $data): Model
{
$model = $this->getModel();
$record = new $model;
$record->forceFill($data);
$record->save();
return $record;
}
}

View File

@@ -8,11 +8,20 @@ use App\Actions\User\DeleteUserAction;
use App\Filament\Resources\UserResource;
use Filament\Notifications\Notification;
use Filament\Resources\Pages\EditRecord;
use Illuminate\Database\Eloquent\Model;
class EditUser extends EditRecord
{
protected static string $resource = UserResource::class;
protected function handleRecordUpdate(Model $record, array $data): Model
{
$record->forceFill($data);
$record->save();
return $record;
}
protected function getActions(): array
{
return [

711
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -3567,12 +3567,12 @@ html {
.h-4{
height: 1rem;
}
.h-5{
height: 1.25rem;
}
.h-7{
height: 1.75rem;
}
.h-5{
height: 1.25rem;
}
.h-0{
height: 0px;
}
@@ -3838,12 +3838,12 @@ html {
.cursor-move{
cursor: move;
}
.cursor-default{
cursor: default;
}
.cursor-pointer{
cursor: pointer;
}
.cursor-default{
cursor: default;
}
.cursor-not-allowed{
cursor: not-allowed;
}

View File

@@ -1,6 +1,6 @@
{
"resources/css/filament.css": {
"file": "assets/filament-e043686a.css",
"file": "assets/filament-f45bb7ca.css",
"src": "resources/css/filament.css",
"isEntry": true
}

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -1,5 +1,5 @@
{
"/app.js": "/app.js?id=b22b4a426c4cca29187265b2e0e0cccb",
"/app.js": "/app.js?id=d771ecef70ba42f5cd96a3e4e342bd06",
"/app-dark.css": "/app-dark.css?id=796af76ce8c445651baf66c67de3eea4",
"/app.css": "/app.css?id=a19518e2122467d2e842f411ca5b65e4",
"/img/favicon.png": "/img/favicon.png?id=1542bfe8a0010dcbee710da13cce367f",