More installer fixes, creation and seeding works

modules/Installer/Http/Controllers/InstallerController.php

@@ -117,9 +117,13 @@ class InstallerController extends AppBaseController
         );
 
         $log[] = 'Creating database';
-        $this->dbService->setupDB();
+        $console_out = $this->dbService->setupDB();
 
-        return redirect('/');
+        return view('installer::steps/step2a-completed', [
+            'console_output' => $console_out
+        ]);
+
+        //return redirect('/');
     }
 
     /**
@@ -129,4 +133,9 @@ class InstallerController extends AppBaseController
     {
 
     }
+
+    public function complete(Request $request)
+    {
+        return redirect('/');
+    }
 }

modules/Installer/Http/Routes/install.php

@@ -8,3 +8,5 @@ Route::get('/step3', 'InstallerController@step3')->name('step3');
 
 Route::post('/dbtest', 'InstallerController@dbtest')->name('dbtest');
 Route::post('/dbsetup', 'InstallerController@dbsetup')->name('dbsetup');
+
+Route::get('/complete', 'InstallerController@complete')->name('complete');

modules/Installer/Resources/views/app.blade.php

@@ -18,6 +18,7 @@
     <link href="/vendor/select2/dist/css/select2.min.css" rel="stylesheet"/>
     <link href="/assets/frontend/css/now-ui-kit.css" rel="stylesheet"/>
     <link href="/assets/frontend/css/styles.css" rel="stylesheet"/>
+    <link href="/assets/frontend/css/installer.css" rel="stylesheet"/>
     @yield('css')
 </head>
 
@@ -59,6 +60,8 @@
     <div class="clearfix" style="height: 200px;"></div>
 </div>
 
+<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>
+
 <script src="/assets/frontend/js/core/jquery.3.2.1.min.js" type="text/javascript"></script>
 <script src="/assets/frontend/js/core/tether.min.js" type="text/javascript"></script>
 <script src="/assets/frontend/js/core/bootstrap.min.js" type="text/javascript"></script>

modules/Installer/Resources/views/steps/step2a-completed.blade.php

@@ -0,0 +1,18 @@
+@extends('installer::app')
+@section('title', 'Database Setup')
+@section('content')
+<div style="align-content: center;">
+    {!! Form::open(['route' => 'installer.complete', 'method' => 'GET']) !!}
+
+    <pre class="prettyprint lang-html">
+        <code class="language-bash">
+        {!! $console_output !!}
+        </code>
+    </pre>
+
+    <p style="text-align: right">
+        {!! Form::submit('Complete Setup >>', ['class' => 'btn btn-success']) !!}
+    </p>
+    {!! Form::close() !!}
+</div>
+@endsection

modules/Installer/Services/DatabaseService.php

@@ -44,7 +44,16 @@ class DatabaseService {
      */
     public function setupDB()
     {
-        \Artisan::call('database:create');
-        \Artisan::call('migrate:refresh');
+        $output = "";
+        #\Artisan::call('database:create');
+        #$output .= \Artisan::output();
+
+        \Artisan::call('migrate');
+        $output .= \Artisan::output();
+
+        \Artisan::call('db:seed');
+        $output .= \Artisan::output();
+
+        return $output;
     }
 }