From 1b1c36edca2c8d9e4fb1393bcac868ce8f3046c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20Ioni=C8=9B=C4=83?= Date: Wed, 18 Oct 2023 11:24:46 +0100 Subject: [PATCH] feat: add organization profile resource (#112) * feat: add organization profile resource * sort navigation items * fix document list eager loading * remove relation managers from edit * update dependencies --- app/Filament/Resources/DocumentResource.php | 2 + .../DocumentResource/Pages/ListDocuments.php | 6 + .../Resources/OrganisationResource.php | 3 +- .../Pages/EditOrganisation.php | 9 +- app/Filament/Resources/ProfileResource.php | 63 +++++ .../Concerns/ResolvesRecord.php | 15 + .../ProfileResource/Pages/EditProfile.php | 50 ++++ .../ProfileResource/Pages/ViewProfile.php | 40 +++ .../DocumentsRelationManager.php | 16 ++ .../ResourcesRelationManager.php | 16 ++ .../RelationManagers/UsersRelationManager.php | 16 ++ .../VolunteersRelationManager.php | 16 ++ app/Filament/Resources/ResourceResource.php | 2 + app/Filament/Resources/UserResource.php | 2 + app/Filament/Resources/VolunteerResource.php | 2 + composer.json | 8 +- composer.lock | 263 +++++++++--------- package-lock.json | 8 +- package.json | 2 +- 19 files changed, 390 insertions(+), 149 deletions(-) create mode 100644 app/Filament/Resources/ProfileResource.php create mode 100644 app/Filament/Resources/ProfileResource/Concerns/ResolvesRecord.php create mode 100644 app/Filament/Resources/ProfileResource/Pages/EditProfile.php create mode 100644 app/Filament/Resources/ProfileResource/Pages/ViewProfile.php create mode 100644 app/Filament/Resources/ProfileResource/RelationManagers/DocumentsRelationManager.php create mode 100644 app/Filament/Resources/ProfileResource/RelationManagers/ResourcesRelationManager.php create mode 100644 app/Filament/Resources/ProfileResource/RelationManagers/UsersRelationManager.php create mode 100644 app/Filament/Resources/ProfileResource/RelationManagers/VolunteersRelationManager.php diff --git a/app/Filament/Resources/DocumentResource.php b/app/Filament/Resources/DocumentResource.php index 8eeb24a..5dcbe6c 100644 --- a/app/Filament/Resources/DocumentResource.php +++ b/app/Filament/Resources/DocumentResource.php @@ -30,6 +30,8 @@ class DocumentResource extends Resource protected static ?string $navigationIcon = 'heroicon-o-document-text'; + protected static ?int $navigationSort = 2; + public static function getModelLabel(): string { return __('document.label.singular'); diff --git a/app/Filament/Resources/DocumentResource/Pages/ListDocuments.php b/app/Filament/Resources/DocumentResource/Pages/ListDocuments.php index f21e399..8dc27d5 100644 --- a/app/Filament/Resources/DocumentResource/Pages/ListDocuments.php +++ b/app/Filament/Resources/DocumentResource/Pages/ListDocuments.php @@ -7,6 +7,7 @@ use App\Filament\Resources\DocumentResource; use Filament\Pages\Actions; use Filament\Resources\Pages\ListRecords; +use Illuminate\Database\Eloquent\Builder; class ListDocuments extends ListRecords { @@ -18,4 +19,9 @@ protected function getActions(): array Actions\CreateAction::make(), ]; } + + protected function getTableQuery(): Builder + { + return parent::getTableQuery()->with('organisation'); + } } diff --git a/app/Filament/Resources/OrganisationResource.php b/app/Filament/Resources/OrganisationResource.php index 8a16afc..04c17e1 100644 --- a/app/Filament/Resources/OrganisationResource.php +++ b/app/Filament/Resources/OrganisationResource.php @@ -39,6 +39,8 @@ class OrganisationResource extends Resource protected static ?string $navigationIcon = 'heroicon-o-office-building'; + protected static ?int $navigationSort = 1; + public static function getModelLabel(): string { return __('organisation.label.singular'); @@ -51,7 +53,6 @@ public static function getPluralModelLabel(): string public static function form(Form $form): Form { -// debug(Organisation::find(1)->expertises); return $form ->columns(3) ->schema([ diff --git a/app/Filament/Resources/OrganisationResource/Pages/EditOrganisation.php b/app/Filament/Resources/OrganisationResource/Pages/EditOrganisation.php index 6fce69c..3b74a8b 100644 --- a/app/Filament/Resources/OrganisationResource/Pages/EditOrganisation.php +++ b/app/Filament/Resources/OrganisationResource/Pages/EditOrganisation.php @@ -5,10 +5,6 @@ namespace App\Filament\Resources\OrganisationResource\Pages; use App\Filament\Resources\OrganisationResource; -use App\Filament\Resources\OrganisationResource\RelationManagers\DocumentsRelationManager; -use App\Filament\Resources\OrganisationResource\RelationManagers\ResourcesRelationManager; -use App\Filament\Resources\OrganisationResource\RelationManagers\UsersRelationManager; -use App\Filament\Resources\OrganisationResource\RelationManagers\VolunteersRelationManager; use Filament\Resources\Pages\EditRecord; class EditOrganisation extends EditRecord @@ -30,10 +26,7 @@ public function getTitle(): string protected function getRelationManagers(): array { return [ - VolunteersRelationManager::class, - ResourcesRelationManager::class, - DocumentsRelationManager::class, - UsersRelationManager::class, + // ]; } diff --git a/app/Filament/Resources/ProfileResource.php b/app/Filament/Resources/ProfileResource.php new file mode 100644 index 0000000..eef37ed --- /dev/null +++ b/app/Filament/Resources/ProfileResource.php @@ -0,0 +1,63 @@ + Pages\ViewProfile::route('/'), + 'edit' => Pages\EditProfile::route('/edit'), + ]; + } + + public static function canViewAny(): bool + { + return auth()->user()->isOrgAdmin(); + } +} diff --git a/app/Filament/Resources/ProfileResource/Concerns/ResolvesRecord.php b/app/Filament/Resources/ProfileResource/Concerns/ResolvesRecord.php new file mode 100644 index 0000000..cc02c6f --- /dev/null +++ b/app/Filament/Resources/ProfileResource/Concerns/ResolvesRecord.php @@ -0,0 +1,15 @@ +record = auth()->user()->organisation; + + $this->fillForm(); + } +} diff --git a/app/Filament/Resources/ProfileResource/Pages/EditProfile.php b/app/Filament/Resources/ProfileResource/Pages/EditProfile.php new file mode 100644 index 0000000..84049b9 --- /dev/null +++ b/app/Filament/Resources/ProfileResource/Pages/EditProfile.php @@ -0,0 +1,50 @@ +getRecord()->name; + } + + protected function getRelationManagers(): array + { + return [ + // + ]; + } + + public function hasCombinedRelationManagerTabsWithForm(): bool + { + return true; + } + + protected function getRedirectUrl(): ?string + { + return static::getResource()::getUrl('index'); + } + + public function getFormTabLabel(): ?string + { + return __('organisation.section.profile'); + } +} diff --git a/app/Filament/Resources/ProfileResource/Pages/ViewProfile.php b/app/Filament/Resources/ProfileResource/Pages/ViewProfile.php new file mode 100644 index 0000000..eddf3cf --- /dev/null +++ b/app/Filament/Resources/ProfileResource/Pages/ViewProfile.php @@ -0,0 +1,40 @@ +getRecord()->name; + } + + protected function getActions(): array + { + return [ + EditAction::make() + ->url(static::getResource()::getUrl('edit')), + ]; + } + + public function hasCombinedRelationManagerTabsWithForm(): bool + { + return true; + } + + public function getFormTabLabel(): ?string + { + return __('organisation.section.profile'); + } +} diff --git a/app/Filament/Resources/ProfileResource/RelationManagers/DocumentsRelationManager.php b/app/Filament/Resources/ProfileResource/RelationManagers/DocumentsRelationManager.php new file mode 100644 index 0000000..c278a06 --- /dev/null +++ b/app/Filament/Resources/ProfileResource/RelationManagers/DocumentsRelationManager.php @@ -0,0 +1,16 @@ +with('organisation:id,name,city_id,county_id'); + } +} diff --git a/app/Filament/Resources/ProfileResource/RelationManagers/ResourcesRelationManager.php b/app/Filament/Resources/ProfileResource/RelationManagers/ResourcesRelationManager.php new file mode 100644 index 0000000..ab7d65d --- /dev/null +++ b/app/Filament/Resources/ProfileResource/RelationManagers/ResourcesRelationManager.php @@ -0,0 +1,16 @@ +with('organisation:id,name,city_id,county_id'); + // } +} diff --git a/app/Filament/Resources/ProfileResource/RelationManagers/UsersRelationManager.php b/app/Filament/Resources/ProfileResource/RelationManagers/UsersRelationManager.php new file mode 100644 index 0000000..716d667 --- /dev/null +++ b/app/Filament/Resources/ProfileResource/RelationManagers/UsersRelationManager.php @@ -0,0 +1,16 @@ +with('organisation:id,name,city_id,county_id'); + } +} diff --git a/app/Filament/Resources/ProfileResource/RelationManagers/VolunteersRelationManager.php b/app/Filament/Resources/ProfileResource/RelationManagers/VolunteersRelationManager.php new file mode 100644 index 0000000..7454566 --- /dev/null +++ b/app/Filament/Resources/ProfileResource/RelationManagers/VolunteersRelationManager.php @@ -0,0 +1,16 @@ +with('organisation:id,name,city_id,county_id'); + } +} diff --git a/app/Filament/Resources/ResourceResource.php b/app/Filament/Resources/ResourceResource.php index c38ca5a..15622e1 100644 --- a/app/Filament/Resources/ResourceResource.php +++ b/app/Filament/Resources/ResourceResource.php @@ -29,6 +29,8 @@ class ResourceResource extends Resource protected static ?string $navigationIcon = 'heroicon-o-collection'; + protected static ?int $navigationSort = 3; + public static function getModelLabel(): string { return __('resource.label.singular'); diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php index 2753c36..c1ecdc8 100644 --- a/app/Filament/Resources/UserResource.php +++ b/app/Filament/Resources/UserResource.php @@ -25,6 +25,8 @@ class UserResource extends Resource protected static ?string $navigationIcon = 'heroicon-o-users'; + protected static ?int $navigationSort = 5; + public static function getModelLabel(): string { return __('user.label.singular'); diff --git a/app/Filament/Resources/VolunteerResource.php b/app/Filament/Resources/VolunteerResource.php index 676f44c..8a8ca8f 100644 --- a/app/Filament/Resources/VolunteerResource.php +++ b/app/Filament/Resources/VolunteerResource.php @@ -33,6 +33,8 @@ class VolunteerResource extends Resource protected static ?string $navigationIcon = 'heroicon-o-user-group'; + protected static ?int $navigationSort = 4; + public static function getModelLabel(): string { return __('volunteer.label.singular'); diff --git a/composer.json b/composer.json index ad7de99..b6113f9 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "filament/spatie-laravel-media-library-plugin": "^2.17", "guzzlehttp/guzzle": "^7.8", "jeffgreco13/filament-breezy": "^1.5", - "laravel/framework": "^10.26", + "laravel/framework": "^10.28", "laravel/sanctum": "^3.2", "laravel/tinker": "^2.8", "league/flysystem-aws-s3-v3": "^3.16", @@ -21,13 +21,13 @@ "barryvdh/laravel-debugbar": "^3.9", "barryvdh/laravel-ide-helper": "^2.13", "fakerphp/faker": "^1.23", - "friendsofphp/php-cs-fixer": "^3.34", + "friendsofphp/php-cs-fixer": "^3.35", "itsgoingd/clockwork": "^5.1", "laravel-lang/common": "^4.0", "laravel/sail": "^1.23", "mockery/mockery": "^1.6", - "nunomaduro/collision": "^7.9", - "phpunit/phpunit": "^10.3", + "nunomaduro/collision": "^7.10", + "phpunit/phpunit": "^10.4", "spatie/laravel-ignition": "^2.3" }, "autoload": { diff --git a/composer.lock b/composer.lock index 6a18aed..afc75fe 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c79861b1e5e657766187c525910282d7", + "content-hash": "1a3d9d120d9dac173a76607600f0eb85", "packages": [ { "name": "akaunting/laravel-money", @@ -251,16 +251,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.282.2", + "version": "3.283.5", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "b9b4013f68f1bd5f219f9784c1b2a47da02c1261" + "reference": "848be1aefb7ab6adfe8995de07166f38ec7c1f53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b9b4013f68f1bd5f219f9784c1b2a47da02c1261", - "reference": "b9b4013f68f1bd5f219f9784c1b2a47da02c1261", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/848be1aefb7ab6adfe8995de07166f38ec7c1f53", + "reference": "848be1aefb7ab6adfe8995de07166f38ec7c1f53", "shasum": "" }, "require": { @@ -340,9 +340,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.282.2" + "source": "https://github.com/aws/aws-sdk-php/tree/3.283.5" }, - "time": "2023-10-03T18:07:23+00:00" + "time": "2023-10-17T18:12:19+00:00" }, { "name": "bacon/bacon-qr-code", @@ -1140,16 +1140,16 @@ }, { "name": "egulias/email-validator", - "version": "4.0.1", + "version": "4.0.2", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "3a85486b709bc384dae8eb78fb2eec649bdb64ff" + "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/3a85486b709bc384dae8eb78fb2eec649bdb64ff", - "reference": "3a85486b709bc384dae8eb78fb2eec649bdb64ff", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e", + "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e", "shasum": "" }, "require": { @@ -1158,8 +1158,8 @@ "symfony/polyfill-intl-idn": "^1.26" }, "require-dev": { - "phpunit/phpunit": "^9.5.27", - "vimeo/psalm": "^4.30" + "phpunit/phpunit": "^10.2", + "vimeo/psalm": "^5.12" }, "suggest": { "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" @@ -1195,7 +1195,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/4.0.1" + "source": "https://github.com/egulias/EmailValidator/tree/4.0.2" }, "funding": [ { @@ -1203,7 +1203,7 @@ "type": "github" } ], - "time": "2023-01-14T14:17:03+00:00" + "time": "2023-10-06T06:47:41+00:00" }, { "name": "ezyang/htmlpurifier", @@ -1585,21 +1585,21 @@ }, { "name": "fruitcake/php-cors", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/fruitcake/php-cors.git", - "reference": "58571acbaa5f9f462c9c77e911700ac66f446d4e" + "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/58571acbaa5f9f462c9c77e911700ac66f446d4e", - "reference": "58571acbaa5f9f462c9c77e911700ac66f446d4e", + "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/3d158f36e7875e2f040f37bc0573956240a5a38b", + "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b", "shasum": "" }, "require": { "php": "^7.4|^8.0", - "symfony/http-foundation": "^4.4|^5.4|^6" + "symfony/http-foundation": "^4.4|^5.4|^6|^7" }, "require-dev": { "phpstan/phpstan": "^1.4", @@ -1609,7 +1609,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -1640,7 +1640,7 @@ ], "support": { "issues": "https://github.com/fruitcake/php-cors/issues", - "source": "https://github.com/fruitcake/php-cors/tree/v1.2.0" + "source": "https://github.com/fruitcake/php-cors/tree/v1.3.0" }, "funding": [ { @@ -1652,7 +1652,7 @@ "type": "github" } ], - "time": "2022-02-20T15:07:15+00:00" + "time": "2023-10-12T05:21:21+00:00" }, { "name": "graham-campbell/result-type", @@ -2287,16 +2287,16 @@ }, { "name": "laravel/framework", - "version": "v10.26.2", + "version": "v10.28.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "6e5440f7c518f26b4495e5d7e4796ec239e26df9" + "reference": "09137f50f715c1efc649788a26092dcb1ec4ab6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/6e5440f7c518f26b4495e5d7e4796ec239e26df9", - "reference": "6e5440f7c518f26b4495e5d7e4796ec239e26df9", + "url": "https://api.github.com/repos/laravel/framework/zipball/09137f50f715c1efc649788a26092dcb1ec4ab6e", + "reference": "09137f50f715c1efc649788a26092dcb1ec4ab6e", "shasum": "" }, "require": { @@ -2483,7 +2483,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-10-03T14:24:20+00:00" + "time": "2023-10-10T13:01:37+00:00" }, { "name": "laravel/prompts", @@ -2927,16 +2927,16 @@ }, { "name": "league/flysystem", - "version": "3.16.0", + "version": "3.17.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "4fdf372ca6b63c6e281b1c01a624349ccb757729" + "reference": "bd4c9b26849d82364119c68429541f1631fba94b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4fdf372ca6b63c6e281b1c01a624349ccb757729", - "reference": "4fdf372ca6b63c6e281b1c01a624349ccb757729", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/bd4c9b26849d82364119c68429541f1631fba94b", + "reference": "bd4c9b26849d82364119c68429541f1631fba94b", "shasum": "" }, "require": { @@ -2954,8 +2954,8 @@ "symfony/http-client": "<5.2" }, "require-dev": { - "async-aws/s3": "^1.5", - "async-aws/simple-s3": "^1.1", + "async-aws/s3": "^1.5 || ^2.0", + "async-aws/simple-s3": "^1.1 || ^2.0", "aws/aws-sdk-php": "^3.220.0", "composer/semver": "^3.0", "ext-fileinfo": "*", @@ -3001,7 +3001,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.16.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.17.0" }, "funding": [ { @@ -3013,7 +3013,7 @@ "type": "github" } ], - "time": "2023-09-07T19:22:17+00:00" + "time": "2023-10-05T20:15:05+00:00" }, { "name": "league/flysystem-aws-s3-v3", @@ -3208,16 +3208,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.13.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96" + "reference": "b6a5854368533df0295c5761a0253656a2e52d9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/a6dfb1194a2946fcdc1f38219445234f65b35c96", - "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e", + "reference": "b6a5854368533df0295c5761a0253656a2e52d9e", "shasum": "" }, "require": { @@ -3248,7 +3248,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.13.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0" }, "funding": [ { @@ -3260,7 +3260,7 @@ "type": "tidelift" } ], - "time": "2023-08-05T12:09:49+00:00" + "time": "2023-10-17T14:13:20+00:00" }, { "name": "league/uri-parser", @@ -4015,16 +4015,16 @@ }, { "name": "nette/schema", - "version": "v1.2.4", + "version": "v1.2.5", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "c9ff517a53903b3d4e29ec547fb20feecb05b8ab" + "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/c9ff517a53903b3d4e29ec547fb20feecb05b8ab", - "reference": "c9ff517a53903b3d4e29ec547fb20feecb05b8ab", + "url": "https://api.github.com/repos/nette/schema/zipball/0462f0166e823aad657c9224d0f849ecac1ba10a", + "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a", "shasum": "" }, "require": { @@ -4071,9 +4071,9 @@ ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.2.4" + "source": "https://github.com/nette/schema/tree/v1.2.5" }, - "time": "2023-08-05T18:56:25+00:00" + "time": "2023-10-05T20:37:59+00:00" }, { "name": "nette/utils", @@ -5016,16 +5016,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.21", + "version": "v0.11.22", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "bcb22101107f3bf770523b65630c9d547f60c540" + "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/bcb22101107f3bf770523b65630c9d547f60c540", - "reference": "bcb22101107f3bf770523b65630c9d547f60c540", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b", + "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b", "shasum": "" }, "require": { @@ -5054,7 +5054,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "0.11.x-dev" + "dev-0.11": "0.11.x-dev" }, "bamarni-bin": { "bin-links": false, @@ -5090,9 +5090,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.21" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.22" }, - "time": "2023-09-17T21:15:54+00:00" + "time": "2023-10-14T21:56:36+00:00" }, { "name": "pxlrbt/filament-excel", @@ -5656,16 +5656,16 @@ }, { "name": "spatie/laravel-medialibrary", - "version": "10.13.0", + "version": "10.13.2", "source": { "type": "git", "url": "https://github.com/spatie/laravel-medialibrary.git", - "reference": "87fb7707bc38f0c7ff002e4618a501b5ab1827da" + "reference": "6b4b7dab4e6a089c0c2292cd3ce7ce89106586ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/87fb7707bc38f0c7ff002e4618a501b5ab1827da", - "reference": "87fb7707bc38f0c7ff002e4618a501b5ab1827da", + "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/6b4b7dab4e6a089c0c2292cd3ce7ce89106586ae", + "reference": "6b4b7dab4e6a089c0c2292cd3ce7ce89106586ae", "shasum": "" }, "require": { @@ -5748,7 +5748,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-medialibrary/issues", - "source": "https://github.com/spatie/laravel-medialibrary/tree/10.13.0" + "source": "https://github.com/spatie/laravel-medialibrary/tree/10.13.2" }, "funding": [ { @@ -5760,7 +5760,7 @@ "type": "github" } ], - "time": "2023-09-26T12:30:51+00:00" + "time": "2023-10-09T12:51:50+00:00" }, { "name": "spatie/laravel-package-tools", @@ -8805,16 +8805,16 @@ }, { "name": "composer/pcre", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", "shasum": "" }, "require": { @@ -8856,7 +8856,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.0" + "source": "https://github.com/composer/pcre/tree/3.1.1" }, "funding": [ { @@ -8872,7 +8872,7 @@ "type": "tidelift" } ], - "time": "2022-11-17T09:50:14+00:00" + "time": "2023-10-11T07:11:09+00:00" }, { "name": "composer/xdebug-handler", @@ -9035,16 +9035,16 @@ }, { "name": "doctrine/dbal", - "version": "3.7.0", + "version": "3.7.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "00d03067f07482f025d41ab55e4ba0db5eca2cdf" + "reference": "5b7bd66c9ff58c04c5474ab85edce442f8081cb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/00d03067f07482f025d41ab55e4ba0db5eca2cdf", - "reference": "00d03067f07482f025d41ab55e4ba0db5eca2cdf", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/5b7bd66c9ff58c04c5474ab85edce442f8081cb2", + "reference": "5b7bd66c9ff58c04c5474ab85edce442f8081cb2", "shasum": "" }, "require": { @@ -9128,7 +9128,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.7.0" + "source": "https://github.com/doctrine/dbal/tree/3.7.1" }, "funding": [ { @@ -9144,7 +9144,7 @@ "type": "tidelift" } ], - "time": "2023-09-26T20:56:55+00:00" + "time": "2023-10-06T05:06:20+00:00" }, { "name": "doctrine/deprecations", @@ -9681,16 +9681,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.34.1", + "version": "v3.35.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "98bf1b1068b4ceddbbc2a2b70b67a5e380add9e3" + "reference": "ec1ccc264994b6764882669973ca435cf05bab08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/98bf1b1068b4ceddbbc2a2b70b67a5e380add9e3", - "reference": "98bf1b1068b4ceddbbc2a2b70b67a5e380add9e3", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/ec1ccc264994b6764882669973ca435cf05bab08", + "reference": "ec1ccc264994b6764882669973ca435cf05bab08", "shasum": "" }, "require": { @@ -9723,8 +9723,6 @@ "phpspec/prophecy": "^1.16", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "phpunitgoodpractices/polyfill": "^1.6", - "phpunitgoodpractices/traits": "^1.9.2", "symfony/phpunit-bridge": "^6.2.3", "symfony/yaml": "^5.4 || ^6.0" }, @@ -9764,7 +9762,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.34.1" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.35.1" }, "funding": [ { @@ -9772,7 +9770,7 @@ "type": "github" } ], - "time": "2023-10-03T23:51:05+00:00" + "time": "2023-10-12T13:47:26+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -10365,16 +10363,16 @@ }, { "name": "maximebf/debugbar", - "version": "v1.19.0", + "version": "v1.19.1", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "30f65f18f7ac086255a77a079f8e0dcdd35e828e" + "reference": "03dd40a1826f4d585ef93ef83afa2a9874a00523" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30f65f18f7ac086255a77a079f8e0dcdd35e828e", - "reference": "30f65f18f7ac086255a77a079f8e0dcdd35e828e", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/03dd40a1826f4d585ef93ef83afa2a9874a00523", + "reference": "03dd40a1826f4d585ef93ef83afa2a9874a00523", "shasum": "" }, "require": { @@ -10425,9 +10423,9 @@ ], "support": { "issues": "https://github.com/maximebf/php-debugbar/issues", - "source": "https://github.com/maximebf/php-debugbar/tree/v1.19.0" + "source": "https://github.com/maximebf/php-debugbar/tree/v1.19.1" }, - "time": "2023-09-19T19:53:10+00:00" + "time": "2023-10-12T08:10:52+00:00" }, { "name": "mockery/mockery", @@ -10575,16 +10573,16 @@ }, { "name": "nunomaduro/collision", - "version": "v7.9.0", + "version": "v7.10.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "296d0cf9fe462837ac0da8a568b56fc026b132da" + "reference": "49ec67fa7b002712da8526678abd651c09f375b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/296d0cf9fe462837ac0da8a568b56fc026b132da", - "reference": "296d0cf9fe462837ac0da8a568b56fc026b132da", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/49ec67fa7b002712da8526678abd651c09f375b2", + "reference": "49ec67fa7b002712da8526678abd651c09f375b2", "shasum": "" }, "require": { @@ -10593,19 +10591,22 @@ "php": "^8.1.0", "symfony/console": "^6.3.4" }, + "conflict": { + "laravel/framework": ">=11.0.0" + }, "require-dev": { - "brianium/paratest": "^7.2.7", - "laravel/framework": "^10.23.1", - "laravel/pint": "^1.13.1", + "brianium/paratest": "^7.3.0", + "laravel/framework": "^10.28.0", + "laravel/pint": "^1.13.3", "laravel/sail": "^1.25.0", "laravel/sanctum": "^3.3.1", "laravel/tinker": "^2.8.2", "nunomaduro/larastan": "^2.6.4", - "orchestra/testbench-core": "^8.11.0", - "pestphp/pest": "^2.19.1", - "phpunit/phpunit": "^10.3.5", + "orchestra/testbench-core": "^8.13.0", + "pestphp/pest": "^2.23.2", + "phpunit/phpunit": "^10.4.1", "sebastian/environment": "^6.0.1", - "spatie/laravel-ignition": "^2.3.0" + "spatie/laravel-ignition": "^2.3.1" }, "type": "library", "extra": { @@ -10664,7 +10665,7 @@ "type": "patreon" } ], - "time": "2023-09-19T10:45:09+00:00" + "time": "2023-10-11T15:45:01+00:00" }, { "name": "phar-io/manifest", @@ -10937,16 +10938,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.6", + "version": "10.1.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "56f33548fe522c8d82da7ff3824b42829d324364" + "reference": "355324ca4980b8916c18b9db29f3ef484078f26e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/56f33548fe522c8d82da7ff3824b42829d324364", - "reference": "56f33548fe522c8d82da7ff3824b42829d324364", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/355324ca4980b8916c18b9db29f3ef484078f26e", + "reference": "355324ca4980b8916c18b9db29f3ef484078f26e", "shasum": "" }, "require": { @@ -11003,7 +11004,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.6" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.7" }, "funding": [ { @@ -11011,7 +11012,7 @@ "type": "github" } ], - "time": "2023-09-19T04:59:03+00:00" + "time": "2023-10-04T15:34:17+00:00" }, { "name": "phpunit/php-file-iterator", @@ -11258,16 +11259,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.3.5", + "version": "10.4.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "747c3b2038f1139e3dcd9886a3f5a948648b7503" + "reference": "62bd7af13d282deeb95650077d28ba3600ca321c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/747c3b2038f1139e3dcd9886a3f5a948648b7503", - "reference": "747c3b2038f1139e3dcd9886a3f5a948648b7503", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/62bd7af13d282deeb95650077d28ba3600ca321c", + "reference": "62bd7af13d282deeb95650077d28ba3600ca321c", "shasum": "" }, "require": { @@ -11307,7 +11308,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "10.3-dev" + "dev-main": "10.4-dev" } }, "autoload": { @@ -11339,7 +11340,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.3.5" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.4.1" }, "funding": [ { @@ -11355,7 +11356,7 @@ "type": "tidelift" } ], - "time": "2023-09-19T05:42:37+00:00" + "time": "2023-10-08T05:01:11+00:00" }, { "name": "psr/cache", @@ -12385,35 +12386,35 @@ }, { "name": "spatie/flare-client-php", - "version": "1.4.2", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/spatie/flare-client-php.git", - "reference": "5f2c6a7a0d2c1d90c12559dc7828fd942911a544" + "reference": "5db2fdd743c3ede33f2a5367d89ec1a7c9c1d1ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/5f2c6a7a0d2c1d90c12559dc7828fd942911a544", - "reference": "5f2c6a7a0d2c1d90c12559dc7828fd942911a544", + "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/5db2fdd743c3ede33f2a5367d89ec1a7c9c1d1ec", + "reference": "5db2fdd743c3ede33f2a5367d89ec1a7c9c1d1ec", "shasum": "" }, "require": { - "illuminate/pipeline": "^8.0|^9.0|^10.0", + "illuminate/pipeline": "^8.0|^9.0|^10.0|^11.0", "nesbot/carbon": "^2.62.1", "php": "^8.0", "spatie/backtrace": "^1.5.2", - "symfony/http-foundation": "^5.0|^6.0", - "symfony/mime": "^5.2|^6.0", - "symfony/process": "^5.2|^6.0", - "symfony/var-dumper": "^5.2|^6.0" + "symfony/http-foundation": "^5.2|^6.0|^7.0", + "symfony/mime": "^5.2|^6.0|^7.0", + "symfony/process": "^5.2|^6.0|^7.0", + "symfony/var-dumper": "^5.2|^6.0|^7.0" }, "require-dev": { - "dms/phpunit-arraysubset-asserts": "^0.3.0", - "pestphp/pest": "^1.20", + "dms/phpunit-arraysubset-asserts": "^0.5.0", + "pestphp/pest": "^1.20|^2.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", - "spatie/phpunit-snapshot-assertions": "^4.0" + "spatie/phpunit-snapshot-assertions": "^4.0|^5.0" }, "type": "library", "extra": { @@ -12443,7 +12444,7 @@ ], "support": { "issues": "https://github.com/spatie/flare-client-php/issues", - "source": "https://github.com/spatie/flare-client-php/tree/1.4.2" + "source": "https://github.com/spatie/flare-client-php/tree/1.4.3" }, "funding": [ { @@ -12451,7 +12452,7 @@ "type": "github" } ], - "time": "2023-07-28T08:07:24+00:00" + "time": "2023-10-17T15:54:07+00:00" }, { "name": "spatie/ignition", @@ -12538,16 +12539,16 @@ }, { "name": "spatie/laravel-ignition", - "version": "2.3.0", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "4ed813d16edb5a1ab0d7f4b1d116c37ee8cdf3c0" + "reference": "bf21cd15aa47fa4ec5d73bbc932005c70261efc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/4ed813d16edb5a1ab0d7f4b1d116c37ee8cdf3c0", - "reference": "4ed813d16edb5a1ab0d7f4b1d116c37ee8cdf3c0", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/bf21cd15aa47fa4ec5d73bbc932005c70261efc8", + "reference": "bf21cd15aa47fa4ec5d73bbc932005c70261efc8", "shasum": "" }, "require": { @@ -12626,7 +12627,7 @@ "type": "github" } ], - "time": "2023-08-23T06:24:34+00:00" + "time": "2023-10-09T12:55:26+00:00" }, { "name": "symfony/filesystem", diff --git a/package-lock.json b/package-lock.json index fa33fa2..79dc8ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "postcss": "^8.4.31", "tailwindcss": "^3.3.3", "tippy.js": "^6.3.7", - "vite": "^4.4.10" + "vite": "^4.5.0" } }, "node_modules/@alloc/quick-lru": { @@ -1759,9 +1759,9 @@ "dev": true }, "node_modules/vite": { - "version": "4.4.10", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.10.tgz", - "integrity": "sha512-TzIjiqx9BEXF8yzYdF2NTf1kFFbjMjUSV0LFZ3HyHoI3SGSPLnnFUKiIQtL3gl2AjHvMrprOvQ3amzaHgQlAxw==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", + "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==", "dev": true, "dependencies": { "esbuild": "^0.18.10", diff --git a/package.json b/package.json index 3f324b8..1eb153d 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,6 @@ "postcss": "^8.4.31", "tailwindcss": "^3.3.3", "tippy.js": "^6.3.7", - "vite": "^4.4.10" + "vite": "^4.5.0" } }