Merge pull request #227 from Muetze42/development

chore(portal): integrate media support for user avatars in admin views

Author: Muetze42

app/Livewire/Portal/Admin/ApiUsage.php

@@ -5,6 +5,7 @@
 use App\Livewire\AbstractComponent;
 use App\Models\PersonalAccessToken;
 use App\Models\PersonalAccessTokenUsage;
+use App\Models\User;
 use Illuminate\Contracts\View\View;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -98,18 +99,19 @@ public function topEndpoints(): Collection
     /**
      * Get the most active users.
      *
-     * @return Collection<int, stdClass>
+     * @return Collection<int, User>
      */
     #[Computed]
     public function topUsers(): Collection
     {
         $startDate = $this->getStartDate();
 
-        return DB::table('personal_access_token_usages')
-            ->join('users', 'personal_access_token_usages.user_id', '=', 'users.id')
-            ->select('users.id', 'users.name', 'users.email', DB::raw('COUNT(*) as request_count'))
+        return User::with('media')
+            ->select('users.*')
+            ->selectRaw('COUNT(personal_access_token_usages.id) as request_count')
+            ->join('personal_access_token_usages', 'users.id', '=', 'personal_access_token_usages.user_id')
             ->where('personal_access_token_usages.created_at', '>=', $startDate)
-            ->groupBy('users.id', 'users.name', 'users.email')
+            ->groupBy('users.id')
             ->orderByDesc('request_count')
             ->limit(10)
             ->get();
@@ -143,7 +145,7 @@ public function usageLogs(): LengthAwarePaginator
     {
         $startDate = $this->getStartDate();
 
-        return PersonalAccessTokenUsage::with(['user', 'token'])
+        return PersonalAccessTokenUsage::with(['user.media', 'token'])
             ->where('created_at', '>=', $startDate)
             ->latest('created_at')
             ->when($this->search !== '', function (Builder $query): void {

app/Livewire/Portal/Admin/UserIndex.php

@@ -81,7 +81,8 @@ public function stats(): array
     #[Computed]
     public function users(): LengthAwarePaginator
     {
-        return User::withCount('tokens')
+        return User::with('media')
+            ->withCount('tokens')
             ->when($this->search !== '', function (Builder $query): void {
                 $query->where(function (Builder $query): void {
                     $query->whereLike('name', sprintf('%%%s%%', $this->search))

resources/views/portal/livewire/admin/api-usage.blade.php

@@ -67,7 +67,7 @@
           @foreach($this->topUsers as $topUser)
             <div wire:key="top-user-{{ $topUser->id }}" class="flex items-center justify-between">
               <div class="flex items-center gap-ui flex-1 min-w-0">
-                <flux:avatar name="{{ $topUser->name }}" size="sm" />
+                <flux:avatar :src="$topUser->getFirstMediaUrl('avatar', 'sm')" name="{{ $topUser->name }}" size="sm" />
                 <div class="min-w-0 flex-1">
                   <div class="font-medium truncate">{{ $topUser->name }}</div>
                   <flux:text variant="subtle" size="sm" class="truncate">{{ $topUser->email }}</flux:text>
@@ -157,7 +157,7 @@ class="w-full sm:w-64"
             <flux:table.cell>
               @if($log->user)
                 <div class="flex items-center gap-ui">
-                  <flux:avatar name="{{ $log->user->name }}" size="xs" />
+                  <flux:avatar :src="$log->user->getFirstMediaUrl('avatar', 'sm')" name="{{ $log->user->name }}" size="xs" />
                   <span>{{ $log->user->name }}</span>
                 </div>
               @else

resources/views/portal/livewire/admin/user-index.blade.php

@@ -72,7 +72,7 @@ class="flex-1"
             </flux:table.cell>
             <flux:table.cell>
               <div class="flex items-center gap-ui">
-                <flux:avatar name="{{ $user->name }}" size="sm" />
+                <flux:avatar :src="$user->getFirstMediaUrl('avatar', 'sm')" name="{{ $user->name }}" size="sm" />
                 <div>
                   <div class="font-medium flex items-center gap-ui">
                     {{ $user->name }}