diff --git a/app/Http/Controllers/Admin/AdminUserController.php b/app/Http/Controllers/Admin/AdminUserController.php index 7b84856a3..a8baad2e3 100644 --- a/app/Http/Controllers/Admin/AdminUserController.php +++ b/app/Http/Controllers/Admin/AdminUserController.php @@ -50,7 +50,7 @@ trait AdminUserController 'query' => $queryString, ]; - $users = User::select('id', 'username', 'status', 'profile_id', 'is_admin') + $users = User::select('id', 'username', 'status', 'profile_id', 'is_admin', 'email', 'app_register_ip') ->orderBy($col, $dir) ->when($search, function ($q, $search) { return $q->where('username', 'like', "%{$search}%"); diff --git a/resources/views/admin/users/home.blade.php b/resources/views/admin/users/home.blade.php index 354611340..3cc475410 100644 --- a/resources/views/admin/users/home.blade.php +++ b/resources/views/admin/users/home.blade.php @@ -60,6 +60,22 @@ Show deleted accounts + +
+ + +
+ +
+ + +
@@ -166,37 +182,58 @@ {{$user->id}} - -
- -
- @if($user->account) - -
- @else - -
- @endif -
- -
-
- -
- {{$user->username}} - @if($user->is_admin) - - Admin - + +
+
+ +
+ @if($user->account) + +
+ @else + +
@endif
+ +
+
+
+ {{$user->username}} + @if($user->is_admin) + + Admin + + @endif +
+
+ + + + {{ str_limit(strip_tags($user->profile->bio))}} + + + {{ parse_url($user->profile->website, PHP_URL_HOST) }} +
- {{ str_limit(strip_tags($user->profile->bio))}} - {{ parse_url($user->profile->website, PHP_URL_HOST) }}
+
+ @if($user->email) + + {{$user->email}} + + @endif + + @if($user->app_register_ip) + + {{$user->app_register_ip}} + + @endif +
+ {{$user->account['statuses_count'] ?? 0}} @@ -574,6 +611,28 @@ window.location.href = url.toString(); } + function toggleEmail(checked) { + const emails = document.querySelectorAll('.user-email'); + emails.forEach(el => { + if (checked) { + el.classList.remove('d-none'); + } else { + el.classList.add('d-none'); + } + }); + } + + function toggleIp(checked) { + const ips = document.querySelectorAll('.user-ip'); + ips.forEach(el => { + if (checked) { + el.classList.remove('d-none'); + } else { + el.classList.add('d-none'); + } + }); + } + async function deleteSelected() { const selectedData = userSelectionManager.getSelectedUserData();