diff --git a/app/Http/Controllers/Admin/ImageController.php b/app/Http/Controllers/Admin/ImageController.php index 54b9d7cb..d56910dc 100644 --- a/app/Http/Controllers/Admin/ImageController.php +++ b/app/Http/Controllers/Admin/ImageController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Models\Image; use App\Services\UserService; +use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\View\View; @@ -14,9 +15,12 @@ class ImageController extends Controller public function index(Request $request): View { $statuses = []; - $images = Image::query()->with('user', 'album', 'group', 'strategy')->latest()->paginate(40); + $images = Image::query()->with(['user' => function (BelongsTo $belongsTo) { + $belongsTo->withSum('images', 'size'); + }, 'album', 'group', 'strategy'])->latest()->paginate(40); $images->getCollection()->each(function (Image $image) { $image->append('url', 'pathname'); + $image->user->append('avatar'); $image->album?->setVisible(['name']); $image->group?->setVisible(['name']); $image->strategy?->setVisible(['name']); diff --git a/app/Models/User.php b/app/Models/User.php index c24fad30..97599679 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -66,9 +66,7 @@ class User extends Authenticatable implements MustVerifyEmail protected $hidden = [ 'password', 'remember_token', - 'registered_ip', 'configs', - 'status', 'group_id', 'is_adminer', ]; diff --git a/public/css/app.css b/public/css/app.css index f354467f..6f8b80e2 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -706,6 +706,9 @@ select { .right-4 { right: 1rem; } +.left-1 { + left: 0.25rem; +} .z-0 { z-index: 0; } @@ -970,6 +973,9 @@ select { .w-4 { width: 1rem; } +.w-24 { + width: 6rem; +} .min-w-full { min-width: 100%; } diff --git a/resources/views/admin/image/index.blade.php b/resources/views/admin/image/index.blade.php index 32ddce38..ffa6363e 100644 --- a/resources/views/admin/image/index.blade.php +++ b/resources/views/admin/image/index.blade.php @@ -6,6 +6,9 @@
@foreach($images as $image)
+ @if($image->extension === 'gif') + Gif + @endif