Merge branch 'main' into summernote-field-fix

Author: pxpm

composer.json

@@ -37,7 +37,7 @@
     "require": {
         "laravel/framework": "^10.0",
         "prologue/alerts": "^1.0",
-        "backpack/basset": "^1.0.0",
+        "backpack/basset": "^1.1.1",
         "creativeorange/gravatar": "~1.0",
         "doctrine/dbal": "^3.0",
         "guzzlehttp/guzzle": "^7.0"

src/BackpackServiceProvider.php

@@ -13,6 +13,7 @@
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
+use Illuminate\View\Compilers\BladeCompiler;
 
 class BackpackServiceProvider extends ServiceProvider
 {
@@ -22,7 +23,6 @@ class BackpackServiceProvider extends ServiceProvider
         \Backpack\CRUD\app\Console\Commands\Install::class,
         \Backpack\CRUD\app\Console\Commands\AddMenuContent::class,
         \Backpack\CRUD\app\Console\Commands\AddCustomRouteContent::class,
-        \Backpack\CRUD\app\Console\Commands\PublishAssets::class,
         \Backpack\CRUD\app\Console\Commands\Version::class,
         \Backpack\CRUD\app\Console\Commands\CreateUser::class,
         \Backpack\CRUD\app\Console\Commands\PublishBackpackMiddleware::class,
@@ -275,10 +275,13 @@ public function loadConfigs()
 
         // add the backpack_users password broker to the configuration
         $laravelAuthPasswordBrokers = app()->config['auth.passwords'];
+        $laravelFirstPasswordBroker = is_array($laravelAuthPasswordBrokers) && current($laravelAuthPasswordBrokers) ?
+                                        current($laravelAuthPasswordBrokers)['table'] :
+                                        '';
 
         $backpackPasswordBrokerTable = config('backpack.base.password_resets_table') ??
                                         config('auth.passwords.users.table') ??
-                                        current($laravelAuthPasswordBrokers)['table'];
+                                        $laravelFirstPasswordBroker;
 
         app()->config['auth.passwords'] = $laravelAuthPasswordBrokers +
         [
@@ -302,7 +305,9 @@ public function loadConfigs()
 
     public function loadViewComponents()
     {
-        Blade::componentNamespace('Backpack\\CRUD\\app\\View\\Components', 'backpack');
+        $this->app->afterResolving(BladeCompiler::class, function () {
+            Blade::componentNamespace('Backpack\\CRUD\\app\\View\\Components', 'backpack');
+        });
     }
 
     /**

src/app/Console/Commands/Install.php

@@ -93,7 +93,7 @@ public function handle()
 
         // Install Backpack Basset
         $this->progressBlock('Installing Basset');
-        $this->executeArtisanProcess('basset:install --no-interaction');
+        $this->executeArtisanProcess('basset:install --no-check');
         $this->closeProgressBlock();
 
         // Optional commands
@@ -113,6 +113,8 @@ public function handle()
             $this->closeProgressBlock();
         }
 
+        //execute basset checks
+        $this->call('basset:check');
         // Done
         $url = Str::of(config('app.url'))->finish('/')->append('admin/');
         $this->infoBlock('Backpack installation complete.', 'done');

src/app/Console/Commands/PublishAssets.php

@@ -131,4 +131,17 @@
         // 'resources/js/app.js',
     ],
 
+    'classes' => [
+        /**
+         * Use this as fallback config for themes to pass classes to the table displayed in List Operation
+         * It defaults to: "table table-striped table-hover nowrap rounded card-table table-vcenter card-table shadow-xs border-xs".
+         */
+        'table' => null,
+
+        /**
+         * Use this as fallback config for themes to pass classes to the table wrapper component displayed in List Operation.
+         */
+        'tableWrapper' => null,
+    ],
+
 ];

src/config/backpack/ui.php

@@ -38,13 +38,13 @@
 @push('crud_fields_styles')
     @bassetBlock('backpack/crud/fields/color.css')
     <style>
-        [bp-field-name="color"] input[type="color"] {
+        [bp-field-type="color"] input[type="color"] {
             background-color: unset;
             border: 0;
             width: 1.8rem;
             height: 1.8rem;
         }
-        [bp-field-name="color"] .input-group-text {
+        [bp-field-type="color"] .input-group-text {
             padding: 0 0.4rem;
         }
     </style>

src/resources/views/crud/fields/color.blade.php

@@ -348,16 +348,6 @@ functionsToRunOnDataTablesDrawEvent: [],
             localStorage.setItem('DataTables_crudTable_/{{$crud->getRoute()}}_pageLength', len);
         });
 
-        // make sure AJAX requests include XSRF token
-        $.ajaxPrefilter(function(options, originalOptions, xhr) {
-            var token = $('meta[name="csrf_token"]').attr('content');
-
-            if (token) {
-                return xhr.setRequestHeader('X-XSRF-TOKEN', token);
-            }
-        });
-
-
         $('#crudTable').on( 'page.dt', function () {
             localStorage.setItem('page_changed', true);
         });