Added last seen section to users page
This commit is contained in:
parent
beac50ffc0
commit
2ebfe4db94
|
@ -50,16 +50,16 @@ public function users(Request $request)
|
||||||
|
|
||||||
switch ($usersType) {
|
switch ($usersType) {
|
||||||
case 'all':
|
case 'all':
|
||||||
$users = User::select('id', 'name', 'email', 'littlelink_name', 'role', 'block', 'email_verified_at', 'created_at')->get();
|
$users = User::select('id', 'name', 'email', 'littlelink_name', 'role', 'block', 'email_verified_at', 'created_at', 'updated_at')->get();
|
||||||
break;
|
break;
|
||||||
case 'user':
|
case 'user':
|
||||||
$users = User::where('role', 'user')->select('id', 'email', 'name', 'littlelink_name', 'role', 'block', 'email_verified_at', 'created_at')->get();
|
$users = User::where('role', 'user')->select('id', 'email', 'name', 'littlelink_name', 'role', 'block', 'email_verified_at', 'created_at', 'updated_at')->get();
|
||||||
break;
|
break;
|
||||||
case 'vip':
|
case 'vip':
|
||||||
$users = User::where('role', 'vip')->select('id', 'email', 'name', 'littlelink_name', 'role', 'block', 'email_verified_at', 'created_at')->get();
|
$users = User::where('role', 'vip')->select('id', 'email', 'name', 'littlelink_name', 'role', 'block', 'email_verified_at', 'created_at', 'updated_at')->get();
|
||||||
break;
|
break;
|
||||||
case 'admin':
|
case 'admin':
|
||||||
$users = User::where('role', 'admin')->select('id', 'email', 'name', 'littlelink_name', 'role', 'block', 'email_verified_at', 'created_at')->get();
|
$users = User::where('role', 'admin')->select('id', 'email', 'name', 'littlelink_name', 'role', 'block', 'email_verified_at', 'created_at', 'updated_at')->get();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,14 @@
|
||||||
<title>Studio ⚙️ {{ config('app.name') }}</title>
|
<title>Studio ⚙️ {{ config('app.name') }}</title>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
|
|
||||||
|
@php
|
||||||
|
// Update the 'updated_at' timestamp for the currently authenticated user
|
||||||
|
if (auth()->check()) {
|
||||||
|
$user = auth()->user();
|
||||||
|
$user->touch();
|
||||||
|
}
|
||||||
|
@endphp
|
||||||
|
|
||||||
@include('layouts.analytics')
|
@include('layouts.analytics')
|
||||||
|
|
||||||
<base href="{{url()->current()}}" />
|
<base href="{{url()->current()}}" />
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
<th id="cs" scope="col" data-sort="links" data-order="asc">Total links</th>
|
<th id="cs" scope="col" data-sort="links" data-order="asc">Total links</th>
|
||||||
<th id="cs" scope="col" data-sort="clicks" data-order="asc">Total clicks</th>
|
<th id="cs" scope="col" data-sort="clicks" data-order="asc">Total clicks</th>
|
||||||
<th id="cs" scope="col" data-sort="created" data-order="asc">Created at</th>
|
<th id="cs" scope="col" data-sort="created" data-order="asc">Created at</th>
|
||||||
|
<th id="cs" scope="col" data-sort="last" data-order="asc">Last seen</th>
|
||||||
<th data-sortable="false">Edit</th>
|
<th data-sortable="false">Edit</th>
|
||||||
<th data-sortable="false">Links</th>
|
<th data-sortable="false">Links</th>
|
||||||
@if(env('REGISTER_AUTH') !== 'auth')<th id="cs" style="width:15%" scope="col">E-Mail Verified</th>@endif
|
@if(env('REGISTER_AUTH') !== 'auth')<th id="cs" style="width:15%" scope="col">E-Mail Verified</th>@endif
|
||||||
|
@ -48,10 +49,29 @@
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@foreach($users as $user)
|
@foreach($users as $user)
|
||||||
<?php
|
@php
|
||||||
$date = date('d.m.Y', strtotime($user->created_at));
|
$dateFormat = 'd/m/Y';
|
||||||
|
|
||||||
|
$date = date($dateFormat, strtotime($user->created_at));
|
||||||
if(!isset($user->created_at)){$date = "NULL";}
|
if(!isset($user->created_at)){$date = "NULL";}
|
||||||
?>
|
|
||||||
|
$lastSeen = $user->updated_at;
|
||||||
|
$lastSeenDate = date($dateFormat, strtotime($lastSeen));
|
||||||
|
$timezone = new DateTimeZone(date_default_timezone_get());
|
||||||
|
$datetime = new DateTime($lastSeen, $timezone);
|
||||||
|
$now = new DateTime(null, $timezone);
|
||||||
|
$interval = $now->diff($datetime);
|
||||||
|
$daysAgo = $interval->days." days ago";
|
||||||
|
if($interval->days == 1) $daysAgo = "1 day ago";
|
||||||
|
if($interval->days == 0) $daysAgo = "Today";
|
||||||
|
if ($interval->days >= 365) {
|
||||||
|
$yearsAgo = floor($interval->days / 365);
|
||||||
|
if ($yearsAgo == 1) {
|
||||||
|
$daysAgo = "1 year ago";
|
||||||
|
} else {
|
||||||
|
$daysAgo = "$yearsAgo years ago";
|
||||||
|
}}
|
||||||
|
@endphp
|
||||||
<tr>
|
<tr>
|
||||||
<td data-id>{{ $user->id }}</td>
|
<td data-id>{{ $user->id }}</td>
|
||||||
<td class="shorten" title="{{ $user->name }}" data-name> {{ $user->name }} </td>
|
<td class="shorten" title="{{ $user->name }}" data-name> {{ $user->name }} </td>
|
||||||
|
@ -61,6 +81,7 @@
|
||||||
<td data-links>{{$user->links}}</td>
|
<td data-links>{{$user->links}}</td>
|
||||||
<td data-clicks>{{$user->clicks}}</td>
|
<td data-clicks>{{$user->clicks}}</td>
|
||||||
<td data-created>{{$date}}</td>
|
<td data-created>{{$date}}</td>
|
||||||
|
<td class="shorten" data-last title="{{ $lastSeenDate }}">{{$daysAgo}}</td>
|
||||||
<td><a href="{{ route('editUser', $user->id ) }}">Edit</a></td>
|
<td><a href="{{ route('editUser', $user->id ) }}">Edit</a></td>
|
||||||
<td><a href="{{ route('showLinksUser', $user->id ) }}" class="text-primary">View</a></td>
|
<td><a href="{{ route('showLinksUser', $user->id ) }}" class="text-primary">View</a></td>
|
||||||
@if(env('REGISTER_AUTH') !== 'auth')
|
@if(env('REGISTER_AUTH') !== 'auth')
|
||||||
|
|
Loading…
Reference in New Issue