From c2549b96adf981b5b999acc6e4bb74d6adb0e938 Mon Sep 17 00:00:00 2001
From: Yasir Turk <yasirmturk@gmail.com>
Date: Mon, 8 Aug 2022 19:06:23 +0200
Subject: [PATCH 1/2] Uses database config from env while install

---
 app/Http/Controllers/Install/Database.php         |  4 +++-
 resources/views/install/database/create.blade.php | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Install/Database.php b/app/Http/Controllers/Install/Database.php
index aa5ecff3a..ead3adebf 100644
--- a/app/Http/Controllers/Install/Database.php
+++ b/app/Http/Controllers/Install/Database.php
@@ -15,7 +15,9 @@ class Database extends Controller
      */
     public function create()
     {
-        return view('install.database.create');
+        $connection = config('database.default','mysql');
+
+        return view('install.database.create')->with(config("database.connections.$connection"));
     }
 
     /**
diff --git a/resources/views/install/database/create.blade.php b/resources/views/install/database/create.blade.php
index 096535a15..76a7678f7 100644
--- a/resources/views/install/database/create.blade.php
+++ b/resources/views/install/database/create.blade.php
@@ -5,13 +5,13 @@
 
     <x-slot name="content">
         <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
-            <x-form.group.text name="hostname" label="{{ trans('install.database.hostname') }}" value="{{ old('hostname', 'localhost') }}" form-group-class="sm:col-span-6" />
-    
-            <x-form.group.text name="username" label="{{ trans('install.database.username') }}" value="{{ old('username') }}" form-group-class="sm:col-span-6" />
-    
-            <x-form.group.password name="password" label="{{ trans('install.database.password') }}" not-required form-group-class="sm:col-span-6" />
-    
-            <x-form.group.text name="database" label="{{ trans('install.database.name') }}" value="{{ old('database') }}" form-group-class="sm:col-span-6" />
+            <x-form.group.text name="hostname" label="{{ trans('install.database.hostname') }}" value="{{ old('hostname', $host ?? 'localhost') }}" form-group-class="sm:col-span-6" />
+
+            <x-form.group.text name="username" label="{{ trans('install.database.username') }}" value="{{ old('username', $username) }}" form-group-class="sm:col-span-6" />
+
+            <x-form.group.password name="password" label="{{ trans('install.database.password') }}" value="{{ $password }}" not-required form-group-class="sm:col-span-6" />
+
+            <x-form.group.text name="database" label="{{ trans('install.database.name') }}" value="{{ old('database', $database) }}" form-group-class="sm:col-span-6" />
         </div>
     </x-slot>
 </x-layouts.install>

From 3553561240aa47cea92abc6727cfce30fbe14f67 Mon Sep 17 00:00:00 2001
From: EnesSacid-Buker <73346401+EnesSacid-Buker@users.noreply.github.com>
Date: Wed, 15 Feb 2023 17:04:59 +0300
Subject: [PATCH 2/2] Code refactoring

---
 app/Http/Controllers/Install/Database.php         | 9 ++++++---
 resources/views/install/database/create.blade.php | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Install/Database.php b/app/Http/Controllers/Install/Database.php
index ead3adebf..e2261e5b7 100644
--- a/app/Http/Controllers/Install/Database.php
+++ b/app/Http/Controllers/Install/Database.php
@@ -15,9 +15,12 @@ class Database extends Controller
      */
     public function create()
     {
-        $connection = config('database.default','mysql');
-
-        return view('install.database.create')->with(config("database.connections.$connection"));
+        return view('install.database.create', [
+            'host'      => env('DB_HOST'    , 'localhost'),
+            'username'  => env('DB_USERNAME', 'root'),
+            'password'  => env('DB_PASSWORD', ''),
+            'database'  => env('DB_DATABASE', 'akaunting'),
+        ]);
     }
 
     /**
diff --git a/resources/views/install/database/create.blade.php b/resources/views/install/database/create.blade.php
index 76a7678f7..2f80c6f6f 100644
--- a/resources/views/install/database/create.blade.php
+++ b/resources/views/install/database/create.blade.php
@@ -5,7 +5,7 @@
 
     <x-slot name="content">
         <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
-            <x-form.group.text name="hostname" label="{{ trans('install.database.hostname') }}" value="{{ old('hostname', $host ?? 'localhost') }}" form-group-class="sm:col-span-6" />
+            <x-form.group.text name="hostname" label="{{ trans('install.database.hostname') }}" value="{{ old('hostname', $host) }}" form-group-class="sm:col-span-6" />
 
             <x-form.group.text name="username" label="{{ trans('install.database.username') }}" value="{{ old('username', $username) }}" form-group-class="sm:col-span-6" />