From c8606aab6bf408f3eb430236710e5950725973c4 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Sat, 9 Apr 2022 15:05:09 -0500
Subject: [PATCH] Fix install icons (#13904)

---
 .../Controllers/Install/ChecksController.php  |  2 +-
 .../Install/DatabaseController.php            |  2 +-
 .../Install/FinalizeController.php            |  2 +-
 .../Install/MakeUserController.php            |  2 +-
 resources/views/install/checks.blade.php      |  8 +++---
 resources/views/install/database.blade.php    | 28 +++++++++----------
 resources/views/install/finish.blade.php      | 14 +++++-----
 .../views/install/user-created.blade.php      |  2 +-
 resources/views/layouts/install.blade.php     |  4 +--
 9 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/app/Http/Controllers/Install/ChecksController.php b/app/Http/Controllers/Install/ChecksController.php
index 3cec32a4b0..d67b6894ef 100644
--- a/app/Http/Controllers/Install/ChecksController.php
+++ b/app/Http/Controllers/Install/ChecksController.php
@@ -98,6 +98,6 @@ class ChecksController extends InstallationController implements InstallerStep
 
     public function icon(): string
     {
-        return 'fa-list-ul fa-flip-horizontal';
+        return 'fa-solid fa-list-ul fa-flip-horizontal';
     }
 }
diff --git a/app/Http/Controllers/Install/DatabaseController.php b/app/Http/Controllers/Install/DatabaseController.php
index 8c39818202..710e528c29 100644
--- a/app/Http/Controllers/Install/DatabaseController.php
+++ b/app/Http/Controllers/Install/DatabaseController.php
@@ -143,6 +143,6 @@ class DatabaseController extends InstallationController implements InstallerStep
 
     public function icon(): string
     {
-        return 'fa-database';
+        return 'fa-solid fa-database';
     }
 }
diff --git a/app/Http/Controllers/Install/FinalizeController.php b/app/Http/Controllers/Install/FinalizeController.php
index 5a87ff0ba6..7a48d8a5bd 100644
--- a/app/Http/Controllers/Install/FinalizeController.php
+++ b/app/Http/Controllers/Install/FinalizeController.php
@@ -149,6 +149,6 @@ class FinalizeController extends InstallationController implements InstallerStep
 
     public function icon(): string
     {
-        return 'fa-check';
+        return 'fa-solid fa-check';
     }
 }
diff --git a/app/Http/Controllers/Install/MakeUserController.php b/app/Http/Controllers/Install/MakeUserController.php
index c76e4543b4..c7b40fe8e8 100644
--- a/app/Http/Controllers/Install/MakeUserController.php
+++ b/app/Http/Controllers/Install/MakeUserController.php
@@ -117,6 +117,6 @@ class MakeUserController extends InstallationController implements InstallerStep
 
     public function icon(): string
     {
-        return 'fa-key';
+        return 'fa-solid fa-key';
     }
 }
diff --git a/resources/views/install/checks.blade.php b/resources/views/install/checks.blade.php
index 13df71b3f7..bbe700b811 100644
--- a/resources/views/install/checks.blade.php
+++ b/resources/views/install/checks.blade.php
@@ -12,9 +12,9 @@
                         <div class="col-5 text-right text-nowrap @if($php_ok) text-success @else text-danger @endif">
                             {{ $php_version }}
                             @if($php_ok)
-                                <i class="fa fa-lg fa-check-square-o text-success align-middle"></i>
+                                <i class="fa-solid fa-lg fa-square-check text-success align-middle"></i>
                             @else
-                                <i class="fa fa-lg fa-times-rectangle-o text-danger align-middle"></i>
+                                <i class="fa-solid fa-lg fa-rectangle-xmark text-danger align-middle"></i>
                             @endif
 
                         </div>
@@ -27,9 +27,9 @@
                         </div>
                         <div class="col-5 text-right">
                             @if($module['status'])
-                                <i class="fa fa-lg fa-check-square-o text-success align-middle"></i>
+                                <i class="fa-solid fa-lg fa-square-check text-success align-middle"></i>
                             @else
-                                <i class="fa fa-lg fa-times-rectangle-o text-danger align-middle"></i>
+                                <i class="fa-solid fa-lg fa-rectangle-xmark text-danger align-middle"></i>
                             @endif
                         </div>
                     </div>
diff --git a/resources/views/install/database.blade.php b/resources/views/install/database.blade.php
index 49e1a06dcd..98a980bbd9 100644
--- a/resources/views/install/database.blade.php
+++ b/resources/views/install/database.blade.php
@@ -12,15 +12,15 @@
                 >
                     <span id="credential-status">
                        @if($valid_credentials === null)
-                            <i class="fa fa-lg fa-question-circle-o text-muted"></i>
+                            <i class="fa-solid fa-lg fa-square-question text-muted"></i>
                         @elseif($valid_credentials)
-                            <i class="fa fa-lg fa-check-square-o text-success"></i>
+                            <i class="fa-solid fa-lg fa-square-check  text-success"></i>
                         @else
-                            <i class="fa fa-lg fa-times-rectangle-o text-danger"></i>
+                            <i class="fa-solid fa-lg fa-rectangle-xmark text-danger"></i>
                         @endif
                     </span>
                     {{ __('install.database.credentials') }}
-                    <i class="fa fa-lg fa-chevron-down rotate-if-collapsed fa-pull-right"></i>
+                    <span class="fa-pull-right"><i class="fa-solid fa-lg fa-chevron-down rotate-if-collapsed"></i></span>
                 </div>
                 <div id="db-form-container" class="card-body collapse @if(!$valid_credentials) show @endif">
                     <form id="database-form" class="form-horizontal" role="form" method="post" action="{{ route('install.acton.test-database') }}">
@@ -82,15 +82,15 @@
                 >
                     <span id="migrate-status">
                         @if($migrated === null)
-                            <i class="fa fa-lg fa-question-circle-o text-muted"></i>
+                            <i class="fa-solid fa-lg fa-square-question text-muted"></i>
                         @elseif($migrated)
-                            <i class="fa fa-lg fa-check-square-o text-success"></i>
+                            <i class="fa-solid fa-lg fa-square-check  text-success"></i>
                         @else
-                            <i class="fa fa-lg fa-times-rectangle-o text-danger"></i>
+                            <i class="fa-solid fa-lg fa-rectangle-xmark text-danger"></i>
                         @endif
                     </span>
                     {{ __('install.migrate.migrate') }}
-                    <i class="fa fa-lg fa-chevron-down rotate-if-collapsed fa-pull-right"></i>
+                    <span class="fa-pull-right"><i class="fa-solid fa-lg fa-chevron-down rotate-if-collapsed"></i></span>
                 </div>
                 <div id="migrate-container" class="card-body collapse @if(!$migrated) show @endif">
                     <div class="row">
@@ -114,7 +114,7 @@
     <script>
         $('#database-form').on("submit", function (event) {
             event.preventDefault();
-            $('#credential-status>i').attr('class', 'fa fa-lg fa-spinner fa-spin');
+            $('#credential-status>i').attr('class', 'fa-solid fa-lg fa-spinner fa-spin');
             $('#error-box').empty();
 
             $.ajax({
@@ -124,11 +124,11 @@
                 data: $('#database-form').serialize(),
                 success: function (response) {
                     if (response.result === 'ok') {
-                        $('#credential-status>i').attr('class', 'fa fa-lg fa-check-square-o text-success');
+                        $('#credential-status>i').attr('class', 'fa-solid fa-lg fa-square-check text-success');
                         $('#migrate-step').show();
                         $('#db-form-container').collapse('hide')
                     } else {
-                        $('#credential-status>i').attr('class', 'fa fa-lg fa-times-rectangle-o text-danger')
+                        $('#credential-status>i').attr('class', 'fa-solid fa-lg fa-rectangle-xmark text-danger')
                         if (response.message) {
                             $('#error-box').append($('<div class="alert alert-danger">' + response.message + '</div>'))
                         }
@@ -140,7 +140,7 @@
 
         $('#migrate-btn').on("click", function () {
             $('#migrate-warning').show()
-            $('#migrate-status>i').attr('class', 'fa fa-lg fa-spinner fa-spin');
+            $('#migrate-status>i').attr('class', 'fa-solid fa-lg fa-spinner fa-spin');
             $('#error-box').empty();
             $('#migrate-btn').prop('disabled', true).addClass('disabled')
 
@@ -155,7 +155,7 @@
                 if (output.innerHTML.indexOf('Error!') !== -1) {
                     // if error word in output, show the retry button
                     $('#migrate-warning').hide();
-                    $('#migrate-status>i').attr('class', 'fa fa-lg fa-times-rectangle-o text-danger')
+                    $('#migrate-status>i').attr('class', 'fa-solid fa-lg fa-rectangle-xmark text-danger')
                     $('#migrate-btn').prop('disabled', false).removeClass('disabled').text('{{ __('install.migrate.retry') }}')
                     $('#error-box').append($('<div class="alert alert-danger">{{ __('install.migrate.error') }}</div>'));
                 }
@@ -170,7 +170,7 @@
                     $('#migrate-warning').hide();
                     checkStepStatus(function (status) {
                         if (status.database.complete) {
-                            $('#migrate-status>i').attr('class', 'fa fa-lg fa-check-square-o text-success');
+                            $('#migrate-status>i').attr('class', 'fa-solid fa-lg fa-square-check  text-success');
                             $('#migrate-container').collapse('hide');
                         }
                     });
diff --git a/resources/views/install/finish.blade.php b/resources/views/install/finish.blade.php
index f14cfab2eb..0f21669e3f 100644
--- a/resources/views/install/finish.blade.php
+++ b/resources/views/install/finish.blade.php
@@ -4,12 +4,12 @@
 <div class="card mb-2">
   <div class="card-header h6" data-toggle="collapse" data-target="#env-file-text" aria-expanded="{{ $success ? 'false' : 'true' }}">
     @if($success)
-      <i class="fa fa-lg fa-check-square-o text-success"></i>
+      <i class="fa-solid fa-lg fa-square-check  text-success"></i>
     @else
-      <i class="fa fa-lg fa-times-rectangle-o text-danger"></i>
+      <i class="fa-solid fa-lg fa-rectangle-xmark text-danger"></i>
     @endif
     {{ $env_message }}
-    @if($env)<i class="fa fa-lg fa-chevron-down rotate-if-collapsed pull-right"></i>@endif($env)
+    @if($env)<i class="fa-solid fa-lg fa-chevron-down rotate-if-collapsed pull-right"></i>@endif($env)
   </div>
     @if($env)
     <div id="env-file-text" class="card-body collapse @if(!$success) show @endif">
@@ -26,7 +26,7 @@
                 data-trigger="manual"
                 data-title="{{ __('install.finish.copied') }}"
             >
-                <i class="fa fa-clipboard"></i>
+                <i class="fa-solid fa-clipboard"></i>
             </button>
         </div>
         <pre id="env-content" class="card bg-light p-3">{{ $env }}</pre>
@@ -35,9 +35,9 @@
 </div>
 <div class="card mb-2">
     <div class="card-header h6" data-toggle="collapse" data-target="#config-file-text" aria-expanded="false">
-        <i class="fa fa-lg fa-check-square-o text-success"></i>
+        <i class="fa-solid fa-lg fa-square-check  text-success"></i>
         {{ $config_message }}
-        @if($config)<i class="fa fa-lg fa-chevron-down rotate-if-collapsed pull-right"></i>@endif
+        @if($config)<i class="fa-solid fa-lg fa-chevron-down rotate-if-collapsed pull-right"></i>@endif
     </div>
     @if($config)
     <div id="config-file-text" class="card-body collapse">
@@ -53,7 +53,7 @@
                 data-trigger="manual"
                 data-title="{{ __('install.finish.copied') }}"
             >
-                <i class="fa fa-clipboard"></i>
+                <i class="fa-solid fa-clipboard"></i>
             </button>
         </div>
         <pre id="config-content" class="card bg-light p-3">{{ $config }}</pre>
diff --git a/resources/views/install/user-created.blade.php b/resources/views/install/user-created.blade.php
index 66a1c7a6a1..931cf57dc0 100644
--- a/resources/views/install/user-created.blade.php
+++ b/resources/views/install/user-created.blade.php
@@ -4,7 +4,7 @@
     <div class="row">
         <div class="col-12 text-center p-5">
             <h4>
-                <i class="fa fa-2x fa-user-circle align-middle"></i>
+                <i class="fa-solid fa-2x fa-circle-user align-middle"></i>
                 <strong>{{ $user->username }}</strong>
             </h4>
         </div>
diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php
index 801dc5bdb4..ad83c0aa60 100644
--- a/resources/views/layouts/install.blade.php
+++ b/resources/views/layouts/install.blade.php
@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="{{ asset('css/bootstrap4.min.css') }}" rel="stylesheet" type="text/css"/>
-    <link href="{{ asset('css/font-awesome.min.css') }}" rel="stylesheet" type="text/css"/>
+    <link href="{{ asset('css/fontawesome.min.css') }}" rel="stylesheet">
     <script src="{{ asset('js/jquery.min.js') }}"></script>
     <script src="{{ asset('js/popper.min.js') }}"></script>
     <script src="{{ asset('js/bootstrap4.min.js') }}"></script>
@@ -107,7 +107,7 @@
                            @if(!$controller->enabled()) disabled @endif"
                            title="{{ __("install.$name.title") }}"
                         >
-                            <i class="fa fa-lg {{ $controller->icon() }}"></i>
+                            <i class="{{ $controller->icon() }}"></i>
                         </a>
                     </div>
                     <div id="progress-{{ $name }}-bar" class="install-progress loop @if($controller->complete() || $step == 'finish') complete @endif"></div>