From 82006f24af15cc506cbc93a8b97e84b0d2f3ffc3 Mon Sep 17 00:00:00 2001
From: Dennis <ownerdennis8@gmail.com>
Date: Mon, 27 Sep 2021 09:48:18 +0200
Subject: [PATCH 1/4] Added re-sync Discord and Discord Card to Profile

---
 resources/views/profile/index.blade.php | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.php
index 88a6c0b5..97e5a3b1 100644
--- a/resources/views/profile/index.blade.php
+++ b/resources/views/profile/index.blade.php
@@ -145,7 +145,7 @@
                                                     <div class="form-group"><label>Current Password</label> <input
                                                             class="form-control @error('current_password') is-invalid @enderror"
                                                             name="current_password" type="password"
-                                                            placeholder="••••••">
+                                                            placeholder="••••••">
 
                                                         @error('current_password')
                                                         <div class="invalid-feedback">
@@ -159,7 +159,7 @@
                                                 <div class="col">
                                                     <div class="form-group"><label>New Password</label> <input
                                                             class="form-control @error('new_password') is-invalid @enderror"
-                                                            name="new_password" type="password" placeholder="••••••">
+                                                            name="new_password" type="password" placeholder="••••••">
 
                                                         @error('new_password')
                                                         <div class="invalid-feedback">
@@ -176,7 +176,7 @@
                                                         <input
                                                             class="form-control @error('new_password_confirmation') is-invalid @enderror"
                                                             name="new_password_confirmation" type="password"
-                                                            placeholder="••••••">
+                                                            placeholder="••••••">
 
                                                         @error('new_password_confirmation')
                                                         <div class="invalid-feedback">
@@ -213,6 +213,23 @@
                                                             <p>You are verified!</p>
                                                         </div>
                                                     </div>
+                                                    <div class="row">
+                                                            <div class="small-box bg-dark">
+                                                                <div class="d-flex justify-content-between">
+                                                                    <div class="p-3">
+                                                                        <h3>{{$user->discordUser->username}} <sup>{{$user->discordUser->locale}}</sup> </h3>
+                                                                        <p>{{$user->discordUser->id}}
+                                                                        </p>
+                                                                    </div>
+                                                                    <div class="p-3"><img width="100px" height="100px" class="rounded-circle" src="{{$user->discordUser->getAvatar()}}" alt="avatar"></div>
+                                                                </div>
+								<div class="small-box-footer">
+                                                        	    <a href="{{route('auth.redirect')}}">
+                                                                        <i class="fab fa-discord mr-1"></i>Re-Sync Discord
+								    </a>
+                                                                </div>
+                                                        </div>
+                                                    </div>
                                                 @endif
 
                                             </div>

From 2ece3591405304048fb298e9ef5e95a0923df5db Mon Sep 17 00:00:00 2001
From: Dennis <ownerdennis8@gmail.com>
Date: Mon, 27 Sep 2021 10:11:13 +0200
Subject: [PATCH 2/4] fixed placeholders

---
 resources/views/profile/index.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.php
index 97e5a3b1..15b52438 100644
--- a/resources/views/profile/index.blade.php
+++ b/resources/views/profile/index.blade.php
@@ -145,7 +145,7 @@
                                                     <div class="form-group"><label>Current Password</label> <input
                                                             class="form-control @error('current_password') is-invalid @enderror"
                                                             name="current_password" type="password"
-                                                            placeholder="••••••">
+                                                            placeholder="••••••">
 
                                                         @error('current_password')
                                                         <div class="invalid-feedback">
@@ -159,7 +159,7 @@
                                                 <div class="col">
                                                     <div class="form-group"><label>New Password</label> <input
                                                             class="form-control @error('new_password') is-invalid @enderror"
-                                                            name="new_password" type="password" placeholder="••••••">
+                                                            name="new_password" type="password" placeholder="••••••">
 
                                                         @error('new_password')
                                                         <div class="invalid-feedback">
@@ -176,7 +176,7 @@
                                                         <input
                                                             class="form-control @error('new_password_confirmation') is-invalid @enderror"
                                                             name="new_password_confirmation" type="password"
-                                                            placeholder="••••••">
+                                                            placeholder="••••••">
 
                                                         @error('new_password_confirmation')
                                                         <div class="invalid-feedback">

From 20e14bb3e78918787b32a2184da6e9512f16e835 Mon Sep 17 00:00:00 2001
From: Dennis <ownerdennis8@gmail.com>
Date: Mon, 27 Sep 2021 10:12:13 +0200
Subject: [PATCH 3/4] Fixed Spacing

---
 resources/views/profile/index.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.php
index 15b52438..75f2d1a0 100644
--- a/resources/views/profile/index.blade.php
+++ b/resources/views/profile/index.blade.php
@@ -223,10 +223,10 @@
                                                                     </div>
                                                                     <div class="p-3"><img width="100px" height="100px" class="rounded-circle" src="{{$user->discordUser->getAvatar()}}" alt="avatar"></div>
                                                                 </div>
-								<div class="small-box-footer">
-                                                        	    <a href="{{route('auth.redirect')}}">
+								                                <div class="small-box-footer">
+                                                                    <a href="{{route('auth.redirect')}}">
                                                                         <i class="fab fa-discord mr-1"></i>Re-Sync Discord
-								    </a>
+                                                                    </a>
                                                                 </div>
                                                         </div>
                                                     </div>

From 2d21d2d2ca7242e2868844dd78e4f02c89523e1b Mon Sep 17 00:00:00 2001
From: Dennis <ownerdennis8@gmail.com>
Date: Mon, 27 Sep 2021 15:32:27 +0200
Subject: [PATCH 4/4] Added better Logs

---
 .../views/admin/activitylogs/index.blade.php    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/resources/views/admin/activitylogs/index.blade.php b/resources/views/admin/activitylogs/index.blade.php
index e3cc7946..978e8c9c 100644
--- a/resources/views/admin/activitylogs/index.blade.php
+++ b/resources/views/admin/activitylogs/index.blade.php
@@ -71,7 +71,10 @@
                         <tbody>
                         @foreach($logs as $log)
                             <tr>
-                                <td>{{$log->causer ? json_decode($log->causer)->name : 'system'}}</td>
+        <td> @if($log->causer) <a href='/admin/users/{{$log->causer_id}}'> {{json_decode($log->causer)->name}} 
+		@else 
+			System
+		@endif</td>
                                 <td>
                                         <span>
                                             @switch($log->description)
@@ -90,6 +93,18 @@
                                             @endswitch
                                             {{ucfirst($log->description)}}
                                             {{ explode("\\" , $log->subject_type)[2]}}
+				            @php $first=true @endphp
+					    @foreach(json_decode($log->properties, true) as $properties)
+						@if($first)
+						    @if(isset($properties['name']))
+					    	       " {{$properties['name']}} "
+						    @endif
+						    @if(isset($properties['email']))
+						       < {{$properties['email']}} >
+						    @endif
+						    @php $first=false @endphp
+						@endif
+					    @endforeach
                                         </span>
                                 </td>