From e6f02ce07f158615be6f194bf2f26bab8d18acc7 Mon Sep 17 00:00:00 2001
From: miguel456 <me@nogueira.codes>
Date: Fri, 19 Aug 2022 00:52:02 +0100
Subject: [PATCH] refactor: expanded AccountStatus data

---
 app/View/Components/AccountStatus.php         | 15 ++++++++---
 .../views/components/account-status.blade.php | 26 +++++++++++--------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/View/Components/AccountStatus.php b/app/View/Components/AccountStatus.php
index 0c6bf6f..75f2f5e 100755
--- a/app/View/Components/AccountStatus.php
+++ b/app/View/Components/AccountStatus.php
@@ -7,16 +7,25 @@ use Illuminate\View\Component;
 
 class AccountStatus extends Component
 {
-    public $user;
+    public bool $isVerified;
+
+    public bool $isSuspended;
+
+    public bool $isLocked;
+
+    public bool $has2FA;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct($userId)
+    public function __construct($isVerified, $isSuspended, $isLocked, $has2FA)
     {
-        $this->user = User::findOrFail($userId);
+        $this->isVerified = $isVerified;
+        $this->isSuspended = $isSuspended;
+        $this->isLocked = $isLocked;
+        $this->has2FA = $has2FA;
     }
 
     /**
diff --git a/resources/views/components/account-status.blade.php b/resources/views/components/account-status.blade.php
index 5618a0e..9920719 100755
--- a/resources/views/components/account-status.blade.php
+++ b/resources/views/components/account-status.blade.php
@@ -1,23 +1,27 @@
 <span>
 
-    @if ($user->isBanned())
+    @if ($isSuspended)
         <span class="badge badge-danger ml-2"><i class="fa fa-ban"></i> {{__('Suspended')}}</span>
     @else
         <span class="badge badge-success ml-2"><i class="fas fa-check"></i>{{__('Active')}}</span>
     @endif
 
     @if (Auth::user()->hasRole('admin'))
-       @if ($user->has2FA())
-            <span class="badge badge-success ml-2"><i class="fas fa-lock"> </i> {{ __('MFA Active') }}</span>
-       @else
-           <span class="badge badge-danger ml-2"><i class="fas fa-lock-open"> </i> {{ __('MFA Inactive') }}</span>
-       @endif
+            @if ($isLocked)
+                <span class="badge badge-warning ml-2"><i class="fas fa-lock"></i> {{ __('Admin locked') }}</span>
+            @endif
 
-           @if(!is_null($user->email_verified_at))
-               <span class="badge badge-success ml-2"><i class="fas fa-check-square"> </i> {{ __('Verified Email') }}</span>
-           @else
-               <span class="badge badge-danger ml-2"><i class="fas fa-exclamation-circle"></i>  {{ __('Unverified Email') }}</span>
-           @endif
+            @if($isVerified)
+                <span class="badge badge-success ml-2"><i class="fas fa-check-square"> </i> {{ __('Verified Email') }}</span>
+            @else
+                <span class="badge badge-danger ml-2"><i class="fas fa-exclamation-circle"></i>  {{ __('Unverified Email') }}</span>
+            @endif
+
+            @if ($has2FA)
+                <span class="badge badge-success ml-2"><i class="fas fa-lock"> </i> {{ __('MFA Active') }}</span>
+            @else
+                <span class="badge badge-danger ml-2"><i class="fas fa-lock-open"> </i> {{ __('MFA Inactive') }}</span>
+            @endif
     @endif
 
 </span>