From cc7902c084d1c0fa73a6962c7f34d854ee7c8da0 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Fri, 5 Jun 2020 20:07:24 -0500
Subject: [PATCH] WIP

---
 .../Install/DatabaseController.php            |  1 +
 resources/lang/en/install.php                 |  1 +
 resources/views/install/database.blade.php    | 25 ++++++++++++++++---
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Install/DatabaseController.php b/app/Http/Controllers/Install/DatabaseController.php
index f2be11c08c..c90a8c90ab 100644
--- a/app/Http/Controllers/Install/DatabaseController.php
+++ b/app/Http/Controllers/Install/DatabaseController.php
@@ -37,6 +37,7 @@ class DatabaseController extends \App\Http\Controllers\Controller
     {
         $data = Arr::only(session()->get('db') ?: [], self::KEYS);
         $data['stage'] = 2;
+        $data['status'] = session('install.database');
 
         return view('install.database', $data);
     }
diff --git a/resources/lang/en/install.php b/resources/lang/en/install.php
index 76bdc91c7f..a1224878f8 100644
--- a/resources/lang/en/install.php
+++ b/resources/lang/en/install.php
@@ -11,6 +11,7 @@ return [
         'comment' => 'Comment',
     ],
     'database' => [
+        'status' => 'Status',
         'host' => 'Host',
         'port' => 'Port',
         'socket' => 'Unix-Socket',
diff --git a/resources/views/install/database.blade.php b/resources/views/install/database.blade.php
index 04c2d468a7..2deaf6da70 100644
--- a/resources/views/install/database.blade.php
+++ b/resources/views/install/database.blade.php
@@ -20,7 +20,7 @@
                 <div class="form-group">
                     <label for="unix_socket" class="col-sm-4 control-label">@lang('install.database.socket')</label>
                     <div class="col-sm-8">
-                        <input type="text" class="form-control" name="unix_socket" id="unix_socket" value="{{ $unix_socket }}" placeholder="@lang('install.database.ip_empty')">
+                        <input type="text" class="form-control" name="unix_socket" id="unix_socket" value="{{ $unix_socket ?? '' }}" placeholder="@lang('install.database.ip_empty')">
                     </div>
                 </div>
                 <div class="form-group">
@@ -32,7 +32,7 @@
                 <div class="form-group">
                     <label for="password" class="col-sm-4 control-label">@lang('install.database.password')</label>
                     <div class="col-sm-8">
-                        <input type="password" class="form-control" name="password" id="password" value="{{ $password }}">
+                        <input type="password" class="form-control" name="password" id="password" value="{{ $password ?? '' }}">
                     </div>
                 </div>
                 <div class="form-group">
@@ -41,7 +41,17 @@
                         <input type="text" class="form-control" name="database" id="database" value="{{ $database ?? 'librenms' }}">
                     </div>
                 </div>
-                <button type="submit" class="btn btn-success pull-right">Test</button>
+                <div>
+                    <span id="database-status">
+                    @lang('install.database.status'):
+                    @if($status)
+                        <i class="fa fa-2x fa-check-circle"></i>
+                    @else
+                        <i class="fa fa-2x fa-times-circle"></i>
+                    @endif
+                    </span>
+                    <button type="submit" class="btn btn-success pull-right">Test</button>
+                </div>
             </form>
         </div>
         <div class="col-md-3">
@@ -55,10 +65,17 @@
             event.preventDefault();
             $.ajax({
                 type: 'POST',
+                dataType: "json",
                 url: $('#database-form').attr('action'),
                 data: $('#database-form').serialize(),
                 success: function (response) {
-                    alert(response.message)
+                    console.log(response.ok);
+                    if (response.status === 'ok') {
+                        $('#database-status.i').removeClass('fa-check-circle').addClass('fa-times-circle')
+                    } else {
+                        $('#database-status.i').removeClass('fa-times-circle').addClass('fa-check-circle')
+                        alert(response.message)
+                    }
                 },
             });
         });