Merge branch 'main' into error-page-translations

# Conflicts:
#	src/resources/views/ui/errors/layout.blade.php

Author: promatik

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

@@ -49,9 +49,9 @@ class Install extends Command
      * @var array
      */
     protected $themes = [
-        Themes\RequireThemeCoreuiv2::class,
-        Themes\RequireThemeCoreuiv4::class,
         Themes\RequireThemeTabler::class,
+        Themes\RequireThemeCoreuiv4::class,
+        Themes\RequireThemeCoreuiv2::class,
     ];
 
     /**
@@ -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 --no-interaction');
         $this->closeProgressBlock();
 
         // Optional commands
@@ -109,10 +109,12 @@ public function handle()
         } elseif (! $this->isAnyThemeInstalled()) {
             // Install default theme
             $this->progressBlock('Installing default theme');
-            $this->executeArtisanProcess('backpack:require:theme-coreuiv2');
+            $this->executeArtisanProcess('backpack:require:theme-tabler');
             $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');
@@ -309,14 +311,14 @@ private function installTheme()
             }, 0);
 
         $total = 0;
-        $input = (int) $this->listChoice('Which Backpack theme would you like to install? <fg=gray>(enter option number: 1, 2 or 3)</>', $this->themes()->toArray());
+        $input = (int) $this->listChoice('Which Backpack theme would you like to install? <fg=gray>(enter option number: 1, 2 or 3)</>', $this->themes()->toArray(), 1);
 
         if ($input < 1 || $input > $this->themes()->count()) {
             $this->deleteLines(3);
-            $this->note('Skipping installing a theme.');
+            $this->note('Unknown theme. Using default theme value.');
             $this->newLine();
 
-            return;
+            $input = 1;
         }
 
         // Clear list

src/app/Console/Commands/PublishAssets.php

@@ -29,9 +29,9 @@ class RequireThemeCoreuiv2 extends Command
      * @var array
      */
     public static $addon = [
-        'name'        => 'CoreUIv2 <fg=green>(default)</>',
+        'name'        => 'CoreUIv2',
         'description' => [
-            'UI provided by CoreUIv2, a Boostrap 4 template.',
+            'UI provided by CoreUIv2, a Boostrap 4 template. Considered legacy, but useful for IE support.',
             '<fg=blue>https://github.com/laravel-backpack/theme-coreuiv2/</>',
         ],
         'repo'    => 'backpack/theme-coreuiv2',

src/app/Console/Commands/Themes/RequireThemeCoreuiv2.php

@@ -29,7 +29,7 @@ class RequireThemeCoreuiv4 extends Command
      * @var array
      */
     public static $addon = [
-        'name'        => 'CoreUIv4 <fg=yellow>(public beta)</>',
+        'name'        => 'CoreUIv4',
         'description' => [
             'UI provided by CoreUIv4, a Boostrap 5 template.',
             '<fg=blue>https://github.com/laravel-backpack/theme-coreuiv4/</>',

src/app/Console/Commands/Themes/RequireThemeCoreuiv4.php

@@ -29,9 +29,9 @@ class RequireThemeTabler extends Command
      * @var array
      */
     public static $addon = [
-        'name'        => 'Tabler',
+        'name'        => 'Tabler <fg=green>(default)</>',
         'description' => [
-            'UI provided by Tabler, a Boostrap 5 template.',
+            'UI provided by Tabler, a Boostrap 5 template. Lots of new features, including a dark mode.',
             '<fg=blue>https://github.com/laravel-backpack/theme-tabler/</>',
         ],
         'repo'    => 'backpack/theme-tabler',

src/app/Console/Commands/Themes/RequireThemeTabler.php

@@ -14,6 +14,6 @@ class AccessDeniedException extends Exception
      */
     public function render($request)
     {
-        return response(view('errors.403', ['exception' => $this]), 403);
+        return abort(403, $this->getMessage());
     }
 }

src/app/Exceptions/AccessDeniedException.php

@@ -20,6 +20,6 @@ public function render($request)
                 break;
         }
 
-        return response(view('errors.500', ['exception' => $this]), 500);
+        return abort(500, $this->getMessage());
     }
 }

src/app/Exceptions/BackpackProRequiredException.php

@@ -38,15 +38,15 @@ class CrudColumn
 
     protected $attributes;
 
-    public function upload($upload = true)
+    public function __construct($nameOrDefinitionArray)
     {
-        $this->attributes['upload'] = $upload;
-
-        return $this->save();
-    }
+        if (is_array($nameOrDefinitionArray)) {
+            $column = $this->crud()->addAndReturnColumn($nameOrDefinitionArray);
+            $name = $column->getAttributes()['name'];
+        } else {
+            $name = $nameOrDefinitionArray;
+        }
 
-    public function __construct($name)
-    {
         $column = $this->crud()->firstColumnWhere('name', $name);
 
         // if column exists
@@ -159,6 +159,13 @@ public function before($destinationColumn)
         return $this;
     }
 
+    public function upload($upload = true)
+    {
+        $this->attributes['upload'] = $upload;
+
+        return $this->save();
+    }
+
     /**
      * Make the current column the first one in the columns list.
      *