fix: fix configs and add command for assets

IBEC-BOX · Sep 11, 2023 · ec2baef · ec2baef
1 parent 1c2c35f
commit ec2baef
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 22 deletions.
diff --git a/src/Commands/InstallCommand.php b/src/Commands/InstallCommand.php
@@ -75,6 +75,11 @@ public function handle()
             'FILAMENT_IMPERSONATE_REDIRECT',
         ], config('admin-kit.panel.path'));
 
+        // load asset files
+        if ($this->confirm('Load asset files?', true)) {
+            $this->call('filament:assets');
+        }
+
         // completing the installation
         $this->info('Admin Kit has been successfully installed =)');
         $this->info('To create a SuperAdmin user, run: <comment>php artisan shield:super-admin</comment>');

diff --git a/src/CoreServiceProvider.php b/src/CoreServiceProvider.php
@@ -21,7 +21,6 @@ public function configurePackage(Package $package): void
          */
         $package
             ->name('admin-kit')
-            ->hasConfigFile()
             ->hasMigration('create_admin_kit_users_table')
             ->hasTranslations()
             ->hasRoute('api')
@@ -30,10 +29,10 @@ public function configurePackage(Package $package): void
 
     public function registeringPackage()
     {
+        $this->registerConfigs();
+
         $this->app->register(AdminPanelProvider::class);
         $this->app->register(MiddlewareServiceProvider::class);
-
-        $this->registerAuthConfigs();
     }
 
     public function bootingPackage(): void
@@ -42,8 +41,9 @@ public function bootingPackage(): void
         $this->configureTimezoneForFilament();
     }
 
-    protected function registerAuthConfigs(): self
+    protected function registerConfigs(): self
     {
+        $this->mergeConfigFrom(__DIR__.'/../config/admin-kit.php', 'admin-kit');
         $this->mergeConfigFrom(__DIR__.'/../config/auth_guards.php', 'auth.guards');
         $this->mergeConfigFrom(__DIR__.'/../config/auth_providers.php', 'auth.providers');
 

diff --git a/src/Providers/FilamentServiceProvider.php b/src/Providers/FilamentServiceProvider.php
diff --git a/stubs/app/AdminKitUser.stub b/stubs/app/AdminKitUser.stub
@@ -25,6 +25,6 @@ class AdminKitUser extends Authenticatable implements FilamentUser
 
     public function canAccessPanel(Panel $panel): bool
     {
-        return str_ends_with($this->email, '@ibecsystems.com') && $this->hasVerifiedEmail();
+        return true;
     }
 }