From 00bf010d377a278289dafada517cdb1f192bc373 Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Thu, 13 Oct 2022 23:13:34 +0600 Subject: [PATCH 1/6] chore: admin package console ui improvement --- packages/admin/src/Commands/MakePageCommand.php | 4 ++-- packages/admin/src/Commands/MakeRelationManagerCommand.php | 4 ++-- packages/admin/src/Commands/MakeResourceCommand.php | 2 +- packages/admin/src/Commands/MakeUserCommand.php | 4 ++-- packages/admin/src/Commands/MakeWidgetCommand.php | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/admin/src/Commands/MakePageCommand.php b/packages/admin/src/Commands/MakePageCommand.php index 3cd6a22274..a3f5053a03 100644 --- a/packages/admin/src/Commands/MakePageCommand.php +++ b/packages/admin/src/Commands/MakePageCommand.php @@ -113,10 +113,10 @@ class MakePageCommand extends Command $this->copyStubToApp('PageView', $viewPath); } - $this->info("Successfully created {$page}!"); + $this->components->info("Successfully created {$page}!"); if ($resource !== null) { - $this->info("Make sure to register the page in `{$resourceClass}::getPages()`."); + $this->components->info("Make sure to register the page in `{$resourceClass}::getPages()`."); } return static::SUCCESS; diff --git a/packages/admin/src/Commands/MakeRelationManagerCommand.php b/packages/admin/src/Commands/MakeRelationManagerCommand.php index 32114a34c2..ba0e9d3827 100644 --- a/packages/admin/src/Commands/MakeRelationManagerCommand.php +++ b/packages/admin/src/Commands/MakeRelationManagerCommand.php @@ -136,9 +136,9 @@ class MakeRelationManagerCommand extends Command 'tableHeaderActions' => $this->indentString($tableHeaderActions, 4), ]); - $this->info("Successfully created {$managerClass}!"); + $this->components->info("Successfully created {$managerClass}!"); - $this->info("Make sure to register the relation in `{$resource}::getRelations()`."); + $this->components->info("Make sure to register the relation in `{$resource}::getRelations()`."); return static::SUCCESS; } diff --git a/packages/admin/src/Commands/MakeResourceCommand.php b/packages/admin/src/Commands/MakeResourceCommand.php index 46d580874a..3dacfaba0c 100644 --- a/packages/admin/src/Commands/MakeResourceCommand.php +++ b/packages/admin/src/Commands/MakeResourceCommand.php @@ -213,7 +213,7 @@ class MakeResourceCommand extends Command ]); } - $this->info("Successfully created {$resource}!"); + $this->components->info("Successfully created {$resource}!"); return static::SUCCESS; } diff --git a/packages/admin/src/Commands/MakeUserCommand.php b/packages/admin/src/Commands/MakeUserCommand.php index d3911f6387..bfd3c5b6d5 100644 --- a/packages/admin/src/Commands/MakeUserCommand.php +++ b/packages/admin/src/Commands/MakeUserCommand.php @@ -36,7 +36,7 @@ class MakeUserCommand extends Command protected function sendSuccessMessage(Authenticatable $user): void { $loginUrl = route('filament.auth.login'); - $this->info('Success! ' . ($user->getAttribute('email') ?? $user->getAttribute('username') ?? 'You') . " may now log in at {$loginUrl}."); + $this->components->info('Success! ' . ($user->getAttribute('email') ?? $user->getAttribute('username') ?? 'You') . " may now log in at {$loginUrl}."); if ($this->getUserModel()::count() === 1 && $this->confirm('Would you like to show some love by starring the repo?', true)) { if (PHP_OS_FAMILY === 'Darwin') { @@ -49,7 +49,7 @@ class MakeUserCommand extends Command exec('start https://github.com/filamentphp/filament'); } - $this->line('Thank you!'); + $this->components->info('Thank you!'); } } diff --git a/packages/admin/src/Commands/MakeWidgetCommand.php b/packages/admin/src/Commands/MakeWidgetCommand.php index e83895ddf0..5d3ffa6131 100644 --- a/packages/admin/src/Commands/MakeWidgetCommand.php +++ b/packages/admin/src/Commands/MakeWidgetCommand.php @@ -116,10 +116,10 @@ class MakeWidgetCommand extends Command $this->copyStubToApp('WidgetView', $viewPath); } - $this->info("Successfully created {$widget}!"); + $this->components->info("Successfully created {$widget}!"); if ($resource !== null) { - $this->info("Make sure to register the widget in `{$resourceClass}::getWidgets()`, and then again in `getHeaderWidgets()` or `getFooterWidgets()` of any `{$resourceClass}` page."); + $this->components->info("Make sure to register the widget in `{$resourceClass}::getWidgets()`, and then again in `getHeaderWidgets()` or `getFooterWidgets()` of any `{$resourceClass}` page."); } return static::SUCCESS; From 74e892a740cfa31262ee10e9a32c1b0861303727 Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Thu, 13 Oct 2022 23:14:14 +0600 Subject: [PATCH 2/6] chore: forms package console ui improvement --- packages/forms/src/Commands/InstallCommand.php | 4 ++-- packages/forms/src/Commands/MakeFieldCommand.php | 2 +- packages/forms/src/Commands/MakeLayoutComponentCommand.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/forms/src/Commands/InstallCommand.php b/packages/forms/src/Commands/InstallCommand.php index c081471e83..f0de0b209f 100644 --- a/packages/forms/src/Commands/InstallCommand.php +++ b/packages/forms/src/Commands/InstallCommand.php @@ -20,9 +20,9 @@ class InstallCommand extends Command $filesystem->delete(resource_path('js/bootstrap.js')); $filesystem->copyDirectory(__DIR__ . '/../../stubs/scaffolding', base_path()); - $this->info('Scaffolding installed successfully.'); + $this->components->info('Scaffolding installed successfully.'); - $this->comment('Please run `npm install && npm run dev` to compile your new assets.'); + $this->components->info('Please run `npm install && npm run dev` to compile your new assets.'); return static::SUCCESS; } diff --git a/packages/forms/src/Commands/MakeFieldCommand.php b/packages/forms/src/Commands/MakeFieldCommand.php index f16dc27e6a..d81506c695 100644 --- a/packages/forms/src/Commands/MakeFieldCommand.php +++ b/packages/forms/src/Commands/MakeFieldCommand.php @@ -63,7 +63,7 @@ class MakeFieldCommand extends Command $this->copyStubToApp('FieldView', $viewPath); } - $this->info("Successfully created {$field}!"); + $this->components->info("Successfully created {$field}!"); return static::SUCCESS; } diff --git a/packages/forms/src/Commands/MakeLayoutComponentCommand.php b/packages/forms/src/Commands/MakeLayoutComponentCommand.php index 339231fe09..6e87b84cd4 100644 --- a/packages/forms/src/Commands/MakeLayoutComponentCommand.php +++ b/packages/forms/src/Commands/MakeLayoutComponentCommand.php @@ -63,7 +63,7 @@ class MakeLayoutComponentCommand extends Command $this->copyStubToApp('LayoutComponentView', $viewPath); } - $this->info("Successfully created {$component}!"); + $this->components->info("Successfully created {$component}!"); return static::SUCCESS; } From a3526e597c59f92d0be9a3269e03eb9fa8a88b9b Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Thu, 13 Oct 2022 23:14:58 +0600 Subject: [PATCH 3/6] chore: notifications package console ui improvement --- packages/notifications/src/Commands/InstallCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/notifications/src/Commands/InstallCommand.php b/packages/notifications/src/Commands/InstallCommand.php index b0a1796b9a..a5223ba186 100644 --- a/packages/notifications/src/Commands/InstallCommand.php +++ b/packages/notifications/src/Commands/InstallCommand.php @@ -20,9 +20,9 @@ class InstallCommand extends Command $filesystem->delete(resource_path('js/bootstrap.js')); $filesystem->copyDirectory(__DIR__ . '/../../stubs/scaffolding', base_path()); - $this->info('Scaffolding installed successfully.'); + $this->components->info('Scaffolding installed successfully.'); - $this->comment('Please run `npm install && npm run dev` to compile your new assets.'); + $this->components->info('Please run `npm install && npm run dev` to compile your new assets.'); return static::SUCCESS; } From 14a769396fe1988831c8b296a63f238a17c04172 Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Thu, 13 Oct 2022 23:15:41 +0600 Subject: [PATCH 4/6] chore: spatie-laravel-settings-plugin package console ui improvement --- .../src/Commands/MakeSettingsPageCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/spatie-laravel-settings-plugin/src/Commands/MakeSettingsPageCommand.php b/packages/spatie-laravel-settings-plugin/src/Commands/MakeSettingsPageCommand.php index a6f7e5b249..f961768f8a 100644 --- a/packages/spatie-laravel-settings-plugin/src/Commands/MakeSettingsPageCommand.php +++ b/packages/spatie-laravel-settings-plugin/src/Commands/MakeSettingsPageCommand.php @@ -50,7 +50,7 @@ class MakeSettingsPageCommand extends Command 'settingsClass' => $settingsClass, ]); - $this->info("Successfully created {$page}!"); + $this->components->info("Successfully created {$page}!"); return static::SUCCESS; } From e41ce1b42ff974eeb6248eedb74ac76f332d8677 Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Thu, 13 Oct 2022 23:16:30 +0600 Subject: [PATCH 5/6] chore: support package console ui improvement --- packages/support/src/Commands/Concerns/CanManipulateFiles.php | 2 +- packages/support/src/Commands/Concerns/CanValidateInput.php | 2 +- packages/support/src/Commands/UpgradeCommand.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/support/src/Commands/Concerns/CanManipulateFiles.php b/packages/support/src/Commands/Concerns/CanManipulateFiles.php index 6027ae4059..da445c933c 100644 --- a/packages/support/src/Commands/Concerns/CanManipulateFiles.php +++ b/packages/support/src/Commands/Concerns/CanManipulateFiles.php @@ -12,7 +12,7 @@ trait CanManipulateFiles { foreach ($paths as $path) { if ($this->fileExists($path)) { - $this->error("{$path} already exists, aborting."); + $this->components->error("{$path} already exists, aborting."); return true; } diff --git a/packages/support/src/Commands/Concerns/CanValidateInput.php b/packages/support/src/Commands/Concerns/CanValidateInput.php index 38e93472d0..90d34dd75f 100644 --- a/packages/support/src/Commands/Concerns/CanValidateInput.php +++ b/packages/support/src/Commands/Concerns/CanValidateInput.php @@ -22,7 +22,7 @@ trait CanValidateInput ); if ($validator->fails()) { - $this->error($validator->errors()->first()); + $this->components->error($validator->errors()->first()); $input = $this->validateInput($callback, $field, $rules); } diff --git a/packages/support/src/Commands/UpgradeCommand.php b/packages/support/src/Commands/UpgradeCommand.php index 6cb0186062..31e81a8d12 100644 --- a/packages/support/src/Commands/UpgradeCommand.php +++ b/packages/support/src/Commands/UpgradeCommand.php @@ -21,7 +21,7 @@ class UpgradeCommand extends Command $this->call($command); } - $this->info('Successfully upgraded!'); + $this->components->info('Successfully upgraded!'); return static::SUCCESS; } From bbc5aaf397e804d7d66009541689991232729d8a Mon Sep 17 00:00:00 2001 From: Shuvro Roy Date: Thu, 13 Oct 2022 23:16:51 +0600 Subject: [PATCH 6/6] chore: tables package console ui improvement --- packages/tables/src/Commands/InstallCommand.php | 4 ++-- packages/tables/src/Commands/MakeColumnCommand.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/tables/src/Commands/InstallCommand.php b/packages/tables/src/Commands/InstallCommand.php index ac4e409d55..39d54380ec 100644 --- a/packages/tables/src/Commands/InstallCommand.php +++ b/packages/tables/src/Commands/InstallCommand.php @@ -20,9 +20,9 @@ class InstallCommand extends Command $filesystem->delete(resource_path('js/bootstrap.js')); $filesystem->copyDirectory(__DIR__ . '/../../stubs/scaffolding', base_path()); - $this->info('Scaffolding installed successfully.'); + $this->components->info('Scaffolding installed successfully.'); - $this->comment('Please run `npm install && npm run dev` to compile your new assets.'); + $this->components->info('Please run `npm install && npm run dev` to compile your new assets.'); return static::SUCCESS; } diff --git a/packages/tables/src/Commands/MakeColumnCommand.php b/packages/tables/src/Commands/MakeColumnCommand.php index 71bca00e7e..8f77738c06 100644 --- a/packages/tables/src/Commands/MakeColumnCommand.php +++ b/packages/tables/src/Commands/MakeColumnCommand.php @@ -63,7 +63,7 @@ class MakeColumnCommand extends Command $this->copyStubToApp('ColumnView', $viewPath); } - $this->info("Successfully created {$column}!"); + $this->components->info("Successfully created {$column}!"); return static::SUCCESS; }