From a5499f3494bb6bb4f8c643255e3d7e0133603e86 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 27 Nov 2025 21:42:55 +0100 Subject: [PATCH] Update user list and edit page --- .../Controllers/Admin/AdminUserController.php | 23 ++++++- resources/views/admin/users/edit.blade.php | 61 ++++++++++++++++++- resources/views/admin/users/index.blade.php | 18 ++++++ 3 files changed, 100 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/AdminUserController.php b/app/Http/Controllers/Admin/AdminUserController.php index 123ce006b..4643ef594 100644 --- a/app/Http/Controllers/Admin/AdminUserController.php +++ b/app/Http/Controllers/Admin/AdminUserController.php @@ -65,6 +65,15 @@ class AdminUserController extends BasePageController } $user->country_name = $position ? $position->countryName : null; $user->country_code = $position ? $position->countryCode : null; + + // Add daily API and download counts + try { + $user->daily_api_count = \App\Models\UserRequest::getApiRequests($user->id); + $user->daily_download_count = \App\Models\UserDownload::getDownloadRequests($user->id); + } catch (\Exception $e) { + $user->daily_api_count = 0; + $user->daily_download_count = 0; + } } // Build order by URLs @@ -154,7 +163,8 @@ class AdminUserController extends BasePageController $ret = User::signUp($request->input('username'), $request->input('password'), $request->input('email'), '', $request->input('notes'), $invites, '', true, $request->input('role'), false); } else { $editedUser = User::find($request->input('id')); - $ret = User::updateUser($editedUser->id, $request->input('username'), $request->input('email'), $request->input('grabs'), $request->input('role'), $request->input('notes'), $request->input('invites'), ($request->has('movieview') ? 1 : 0), ($request->has('musicview') ? 1 : 0), ($request->has('gameview') ? 1 : 0), ($request->has('xxxview') ? 1 : 0), ($request->has('consoleview') ? 1 : 0), ($request->has('bookview') ? 1 : 0)); + // Use the current grabs value since it's read-only + $ret = User::updateUser($editedUser->id, $request->input('username'), $request->input('email'), $editedUser->grabs, $request->input('role'), $request->input('notes'), $request->input('invites'), ($request->has('movieview') ? 1 : 0), ($request->has('musicview') ? 1 : 0), ($request->has('gameview') ? 1 : 0), ($request->has('xxxview') ? 1 : 0), ($request->has('consoleview') ? 1 : 0), ($request->has('bookview') ? 1 : 0)); if ($request->input('password') !== null) { User::updatePassword($editedUser->id, $request->input('password')); } @@ -211,6 +221,17 @@ class AdminUserController extends BasePageController $title = 'User Edit'; $id = $request->input('id'); $user = User::find($id); + + // Add daily API and download counts + if ($user) { + try { + $user->daily_api_count = \App\Models\UserRequest::getApiRequests($user->id); + $user->daily_download_count = \App\Models\UserDownload::getDownloadRequests($user->id); + } catch (\Exception $e) { + $user->daily_api_count = 0; + $user->daily_download_count = 0; + } + } } break; diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php index 16518260b..5ba25e488 100644 --- a/resources/views/admin/users/edit.blade.php +++ b/resources/views/admin/users/edit.blade.php @@ -301,7 +301,66 @@ id="grabs" name="grabs" value="{{ is_array($user) ? ($user['grabs'] ?? 0) : ($user->grabs ?? 0) }}" - class="w-full px-3 py-2 bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 border border-gray-300 dark:border-gray-600 rounded-md focus:ring-blue-500 focus:border-blue-500"> + disabled + class="w-full px-3 py-2 bg-gray-100 dark:bg-gray-800 text-gray-600 dark:text-gray-400 border border-gray-300 dark:border-gray-600 rounded-md cursor-not-allowed opacity-75"> +

+ Total grabs is read-only and automatically tracked +

+ + + +
+
+ + +
+
+ +
+
+
+

+ API Requests +

+

+ {{ is_array($user) ? ($user['daily_api_count'] ?? 0) : ($user->daily_api_count ?? 0) }} +

+
+
+ +
+
+

+ In the last 24 hours +

+
+ + +
+
+
+

+ Downloads +

+

+ {{ is_array($user) ? ($user['daily_download_count'] ?? 0) : ($user->daily_download_count ?? 0) }} +

+
+
+ +
+
+

+ In the last 24 hours +

+
+
+

+ + These counters show activity from the past 24 hours and are automatically updated. +

@endif diff --git a/resources/views/admin/users/index.blade.php b/resources/views/admin/users/index.blade.php index d1a900d6a..a8cbb899f 100644 --- a/resources/views/admin/users/index.blade.php +++ b/resources/views/admin/users/index.blade.php @@ -173,6 +173,12 @@ @endif + + Daily API + + + Daily DLs + Actions @@ -253,6 +259,18 @@ {{ $user->created_at ? $user->created_at->format('Y-m-d') : 'N/A' }} + + + {{ $user->daily_api_count ?? 0 }} + + + + + {{ $user->daily_download_count ?? 0 }} + +
@if($user->deleted_at)