From 7d252ea91c7fddfec9f5afc3f93d11bbe995634d Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Thu, 11 Apr 2019 13:58:56 -0600
Subject: [PATCH] Update security settings

---
 app/Http/Controllers/Settings/SecuritySettings.php    | 11 +++--------
 resources/views/settings/security.blade.php           |  2 +-
 .../security/{2fa/partial => }/log-panel.blade.php    |  4 ++--
 3 files changed, 6 insertions(+), 11 deletions(-)
 rename resources/views/settings/security/{2fa/partial => }/log-panel.blade.php (91%)

diff --git a/app/Http/Controllers/Settings/SecuritySettings.php b/app/Http/Controllers/Settings/SecuritySettings.php
index 5d1c49ad3..01dc35384 100644
--- a/app/Http/Controllers/Settings/SecuritySettings.php
+++ b/app/Http/Controllers/Settings/SecuritySettings.php
@@ -20,19 +20,14 @@ trait SecuritySettings
 
 	public function security()
 	{
-		$sessions = DB::table('sessions')
-			->whereUserId(Auth::id())
-			->limit(20)
-			->get();
+		$user = Auth::user();
 
-		$activity = AccountLog::whereUserId(Auth::id())
+		$activity = AccountLog::whereUserId($user->id)
 			->orderBy('created_at', 'desc')
 			->limit(20)
 			->get();
 
-		$user = Auth::user();
-
-		return view('settings.security', compact('sessions', 'activity', 'user'));
+		return view('settings.security', compact('activity', 'user'));
 	}
 
 	public function securityTwoFactorSetup(Request $request)
diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php
index 2002b3a61..67dfaadd3 100644
--- a/resources/views/settings/security.blade.php
+++ b/resources/views/settings/security.blade.php
@@ -23,7 +23,7 @@
       @endif
     </div>
 
-    @include('settings.security.2fa.partial.log-panel')
+    @include('settings.security.log-panel')
   </section>
 
 @endsection
\ No newline at end of file
diff --git a/resources/views/settings/security/2fa/partial/log-panel.blade.php b/resources/views/settings/security/log-panel.blade.php
similarity index 91%
rename from resources/views/settings/security/2fa/partial/log-panel.blade.php
rename to resources/views/settings/security/log-panel.blade.php
index 7eb8aaf4e..e2f183b34 100644
--- a/resources/views/settings/security/2fa/partial/log-panel.blade.php
+++ b/resources/views/settings/security/log-panel.blade.php
@@ -1,12 +1,12 @@
     <div class="mb-4 pb-4">
       <h4 class="font-weight-bold">Account Log</h4>
       <hr>
-      <ul class="list-group" style="max-height: 400px;overflow-y: scroll;">
+      <ul class="list-group border" style="max-height: 400px;overflow-y: auto;">
         @if($activity->count() == 0) 
         <p class="alert alert-info font-weight-bold">No activity logs found!</p>
         @endif
         @foreach($activity as $log)
-        <li class="list-group-item">
+        <li class="list-group-item rounded-0 border-0">
           <div class="media">
             <div class="media-body">
               <span class="my-0 font-weight-bold text-muted">