Merge branch 'ControlPanel-gg:development' into development

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>
 

resources/views/profile/index.blade.php

@@ -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>