wip #3490 @2

diff --git a/src/app/Console/Commands/InstallCommand.php b/src/app/Console/Commands/InstallCommand.php
index 0aafc97a1ec52270ee7c85a3aa1fbdfb01f786f9..ad224ce91a9575d5da51799224d482c877f9345c 100644 (file)
--- a/src/app/Console/Commands/InstallCommand.php
+++ b/src/app/Console/Commands/InstallCommand.php
@@ -19,7 +19,7 @@ class InstallCommand extends CubistCommand
 
         $commands = [
             'Update Cubist' => ['php artisan cubist:update'],
-            'Install backpack' => ['php artisan backpack:install'],
+            'Install backpack' => ['php artisan backpack:install --elfinder=no'],
             'Publish backpack assets' => ['php artisan vendor:publish --provider="Backpack\CRUD\BackpackServiceProvider" --tag="minimum"'],
             'Install backpack addons' => [
                 // BackupManager

diff --git a/src/app/Magic/Models/CubistMagicAuthenticatable.php b/src/app/Magic/Models/CubistMagicAuthenticatable.php
index db1cfc6287c7d119cd970c7a2676e2430149cbd4..55debd952d9cd9a49bb3e9a6f241e31bf0dd7c62 100644 (file)
--- a/src/app/Magic/Models/CubistMagicAuthenticatable.php
+++ b/src/app/Magic/Models/CubistMagicAuthenticatable.php
@@ -53,5 +53,16 @@ class CubistMagicAuthenticatable extends CubistMagicAbstractModel
         $this->addField(['name' => 'remember_token',
             'type' => 'Text',
             'hidden' => true]);
+
+
+        $this->addField(['name' => 'email',
+            'label' => 'E-mail',
+            'type' => 'Email',
+            'column' => true]);
+
+        $this->addField(['name' => 'password',
+            'label' => 'Password',
+            'type' => 'Password',
+        ]);
     }
 }

diff --git a/src/resources/install/app/Http/Kernel.php b/src/resources/install/app/Http/Kernel.php
index 3ff225f43099a0039b355eff3e3e102c7ff34601..8fbb5432674aab77b0f5b16772d2777bf4fada20 100644 (file)
--- a/src/resources/install/app/Http/Kernel.php
+++ b/src/resources/install/app/Http/Kernel.php
@@ -20,7 +20,6 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \Cubist\Backpack\app\Middleware\VariantSelector::class,
-        \Spatie\MissingPageRedirector\RedirectsMissingPages::class,
         \Spatie\Honeypot\ProtectAgainstSpam::class,
     ];