feat: increase gallery grid from 4 to 5 columns per row on desktopfeat: increase gallery grid from 4 to 5 columns per row on desktop

app/Http/Controllers/User/MembersController.php

@@ -44,6 +44,6 @@ class MembersController extends Controller
             });
         }
 
-        return view('web.browse', compact('page_title', 'artworks'));
+        return view('web.members.photos', compact('page_title', 'artworks'));
     }
 }

app/Http/Controllers/User/MonthlyCommentatorsController.php

@@ -14,26 +14,21 @@ class MonthlyCommentatorsController extends Controller
         $page = max(1, (int) $request->query('page', 1));
 
         $query = DB::table('artwork_comments as t1')
-            ->leftJoin('users as t2', 't1.user_id', '=', 't2.user_id')
-            ->leftJoin('country as c', 't2.country', '=', 'c.id')
+            ->leftJoin('users as t2', 't1.user_id', '=', 't2.id')
             ->where('t1.user_id', '>', 0)
-            ->whereRaw("DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= t1.date")
+            ->whereRaw('t1.created_at >= DATE_SUB(NOW(), INTERVAL 30 DAY)')
             ->select(
-                't2.user_id',
-                't2.uname',
-                't2.user_type',
-                't2.country',
-                'c.name as country_name',
-                'c.flag as country_flag',
+                't2.id as user_id',
+                DB::raw('COALESCE(t2.username, t2.name, "User") as uname'),
                 DB::raw('COUNT(*) as num_comments')
             )
-            ->groupBy('t1.user_id')
+            ->groupBy('t2.id')
             ->orderByDesc('num_comments');
 
         $rows = $query->paginate($hits)->withQueryString();
 
         $page_title = 'Monthly Top Commentators';
 
-        return view('user.monthly-commentators', compact('page_title', 'rows'));
+        return view('web.comments.monthly', compact('page_title', 'rows'));
     }
 }

app/Http/Controllers/User/ProfileController.php

@@ -5,15 +5,21 @@ namespace App\Http\Controllers\User;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ProfileUpdateRequest;
 use App\Models\Artwork;
+use App\Models\ProfileComment;
 use App\Models\User;
 use App\Services\ArtworkService;
+use App\Services\ThumbnailPresenter;
+use App\Services\ThumbnailService;
 use App\Services\UsernameApprovalService;
+use App\Support\AvatarUrl;
 use App\Support\UsernamePolicy;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Schema;
 use Illuminate\View\View;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\Rules\Password as PasswordRule;
@@ -63,6 +69,66 @@ class ProfileController extends Controller
         return redirect()->route('profile.show', ['username' => UsernamePolicy::normalize($username)], 301);
     }
 
+    /** Toggle follow/unfollow for the profile of $username (auth required). */
+    public function toggleFollow(Request $request, string $username): JsonResponse
+    {
+        $normalized = UsernamePolicy::normalize($username);
+        $target = User::query()->whereRaw('LOWER(username) = ?', [$normalized])->firstOrFail();
+
+        $viewerId = Auth::id();
+
+        if ($viewerId === $target->id) {
+            return response()->json(['error' => 'Cannot follow yourself.'], 422);
+        }
+
+        $exists = DB::table('user_followers')
+            ->where('user_id', $target->id)
+            ->where('follower_id', $viewerId)
+            ->exists();
+
+        if ($exists) {
+            DB::table('user_followers')
+                ->where('user_id', $target->id)
+                ->where('follower_id', $viewerId)
+                ->delete();
+            $following = false;
+        } else {
+            DB::table('user_followers')->insertOrIgnore([
+                'user_id'    => $target->id,
+                'follower_id'=> $viewerId,
+                'created_at' => now(),
+            ]);
+            $following = true;
+        }
+
+        $count = DB::table('user_followers')->where('user_id', $target->id)->count();
+
+        return response()->json([
+            'following'      => $following,
+            'follower_count' => $count,
+        ]);
+    }
+
+    /** Store a comment on a user profile (auth required). */
+    public function storeComment(Request $request, string $username): RedirectResponse
+    {
+        $normalized = UsernamePolicy::normalize($username);
+        $target = User::query()->whereRaw('LOWER(username) = ?', [$normalized])->firstOrFail();
+
+        $request->validate([
+            'body' => ['required', 'string', 'min:2', 'max:2000'],
+        ]);
+
+        ProfileComment::create([
+            'profile_user_id' => $target->id,
+            'author_user_id'  => Auth::id(),
+            'body'            => $request->input('body'),
+        ]);
+
+        return Redirect::route('profile.show', ['username' => strtolower((string) $target->username)])
+            ->with('status', 'Comment posted!');
+    }
+
     public function edit(Request $request): View
     {
         return view('profile.edit', [
@@ -256,38 +322,211 @@ class ProfileController extends Controller
 
     private function renderUserProfile(Request $request, User $user)
     {
-        $isOwner = Auth::check() && Auth::id() === $user->id;
-        $perPage = 24;
+        $isOwner  = Auth::check() && Auth::id() === $user->id;
+        $viewer   = Auth::user();
+        $perPage  = 24;
 
+        // ── Artworks (cursor-paginated) ──────────────────────────────────────
         $artworks = $this->artworkService->getArtworksByUser($user->id, $isOwner, $perPage)
             ->through(function (Artwork $art) {
-            $present = \App\Services\ThumbnailPresenter::present($art, 'md');
+                $present = ThumbnailPresenter::present($art, 'md');
+                return (object) [
+                    'id'           => $art->id,
+                    'name'         => $art->title,
+                    'picture'      => $art->file_name,
+                    'datum'        => $art->published_at,
+                    'published_at' => $art->published_at, // required by cursor paginator (orders by this column)
+                    'thumb'        => $present['url'],
+                    'thumb_srcset' => $present['srcset'] ?? $present['url'],
+                    'uname'        => $art->user->name ?? 'Skinbase',
+                    'username'     => $art->user->username ?? null,
+                    'user_id'      => $art->user_id,
+                    'width'        => $art->width,
+                    'height'       => $art->height,
+                ];
+            });
 
-            return (object) [
-                'id' => $art->id,
-                'name' => $art->title,
-                'picture' => $art->file_name,
-                'datum' => $art->published_at,
-                'thumb' => $present['url'],
-                'thumb_srcset' => $present['srcset'] ?? $present['url'],
-                'uname' => $art->user->name ?? 'Skinbase',
-            ];
-        });
+        // ── Featured artworks for this user ─────────────────────────────────
+        $featuredArtworks = collect();
+        if (Schema::hasTable('artwork_features')) {
+            $featuredArtworks = DB::table('artwork_features as af')
+                ->join('artworks as a', 'a.id', '=', 'af.artwork_id')
+                ->where('a.user_id', $user->id)
+                ->where('af.is_active', true)
+                ->whereNull('af.deleted_at')
+                ->whereNull('a.deleted_at')
+                ->where('a.is_public', true)
+                ->where('a.is_approved', true)
+                ->orderByDesc('af.featured_at')
+                ->limit(3)
+                ->select([
+                    'a.id', 'a.title as name', 'a.hash', 'a.thumb_ext',
+                    'a.width', 'a.height', 'af.label', 'af.featured_at',
+                ])
+                ->get()
+                ->map(function ($row) {
+                    $thumbUrl = ($row->hash && $row->thumb_ext)
+                        ? ThumbnailService::fromHash($row->hash, $row->thumb_ext, 'md')
+                        : '/images/placeholder.jpg';
+                    return (object) [
+                        'id'          => $row->id,
+                        'name'        => $row->name,
+                        'thumb'       => $thumbUrl,
+                        'label'       => $row->label,
+                        'featured_at' => $row->featured_at,
+                        'width'       => $row->width,
+                        'height'      => $row->height,
+                    ];
+                });
+        }
 
-        $legacyUser = (object) [
-            'user_id' => $user->id,
-            'uname' => $user->username ?? $user->name,
-            'name' => $user->name,
-            'real_name' => $user->name,
-            'icon' => DB::table('user_profiles')->where('user_id', $user->id)->value('avatar_hash'),
-            'about_me' => $user->bio ?? null,
-        ];
+        // ── Favourites ───────────────────────────────────────────────────────
+        $favourites = collect();
+        if (Schema::hasTable('user_favorites')) {
+            $favourites = DB::table('user_favorites as uf')
+                ->join('artworks as a', 'a.id', '=', 'uf.artwork_id')
+                ->where('uf.user_id', $user->id)
+                ->whereNull('a.deleted_at')
+                ->where('a.is_public', true)
+                ->where('a.is_approved', true)
+                ->orderByDesc('uf.created_at')
+                ->limit(12)
+                ->select(['a.id', 'a.title as name', 'a.hash', 'a.thumb_ext', 'a.width', 'a.height', 'a.user_id'])
+                ->get()
+                ->map(function ($row) {
+                    $thumbUrl = ($row->hash && $row->thumb_ext)
+                        ? ThumbnailService::fromHash($row->hash, $row->thumb_ext, 'sm')
+                        : '/images/placeholder.jpg';
+                    return (object) [
+                        'id'    => $row->id,
+                        'name'  => $row->name,
+                        'thumb' => $thumbUrl,
+                        'width' => $row->width,
+                        'height'=> $row->height,
+                    ];
+                });
+        }
+
+        // ── Statistics ───────────────────────────────────────────────────────
+        $stats = null;
+        if (Schema::hasTable('user_statistics')) {
+            $stats = DB::table('user_statistics')->where('user_id', $user->id)->first();
+        }
+
+        // ── Social links ─────────────────────────────────────────────────────
+        $socialLinks = collect();
+        if (Schema::hasTable('user_social_links')) {
+            $socialLinks = DB::table('user_social_links')
+                ->where('user_id', $user->id)
+                ->get()
+                ->keyBy('platform');
+        }
+
+        // ── Follower data ────────────────────────────────────────────────────
+        $followerCount    = 0;
+        $recentFollowers  = collect();
+        $viewerIsFollowing = false;
+
+        if (Schema::hasTable('user_followers')) {
+            $followerCount = DB::table('user_followers')->where('user_id', $user->id)->count();
+
+            $recentFollowers = DB::table('user_followers as uf')
+                ->join('users as u', 'u.id', '=', 'uf.follower_id')
+                ->leftJoin('user_profiles as up', 'up.user_id', '=', 'u.id')
+                ->where('uf.user_id', $user->id)
+                ->whereNull('u.deleted_at')
+                ->orderByDesc('uf.created_at')
+                ->limit(10)
+                ->select(['u.id', 'u.username', 'u.name', 'up.avatar_hash', 'uf.created_at as followed_at'])
+                ->get()
+                ->map(fn ($row) => (object) [
+                    'id'          => $row->id,
+                    'username'    => $row->username,
+                    'uname'       => $row->username ?? $row->name,
+                    'avatar_url'  => AvatarUrl::forUser((int) $row->id, $row->avatar_hash, 50),
+                    'profile_url' => '/@' . strtolower((string) ($row->username ?? $row->id)),
+                    'followed_at' => $row->followed_at,
+                ]);
+
+            if ($viewer && $viewer->id !== $user->id) {
+                $viewerIsFollowing = DB::table('user_followers')
+                    ->where('user_id', $user->id)
+                    ->where('follower_id', $viewer->id)
+                    ->exists();
+            }
+        }
+
+        // ── Profile comments ─────────────────────────────────────────────────
+        $profileComments = collect();
+        if (Schema::hasTable('profile_comments')) {
+            $profileComments = DB::table('profile_comments as pc')
+                ->join('users as u', 'u.id', '=', 'pc.author_user_id')
+                ->leftJoin('user_profiles as up', 'up.user_id', '=', 'u.id')
+                ->where('pc.profile_user_id', $user->id)
+                ->where('pc.is_active', true)
+                ->whereNull('u.deleted_at')
+                ->orderByDesc('pc.created_at')
+                ->limit(10)
+                ->select([
+                    'pc.id', 'pc.body', 'pc.created_at',
+                    'u.id as author_id', 'u.username as author_username', 'u.name as author_name',
+                    'up.avatar_hash as author_avatar_hash', 'up.signature as author_signature',
+                ])
+                ->get()
+                ->map(fn ($row) => (object) [
+                    'id'          => $row->id,
+                    'body'        => $row->body,
+                    'created_at'  => $row->created_at,
+                    'author_id'   => $row->author_id,
+                    'author_name' => $row->author_username ?? $row->author_name ?? 'Unknown',
+                    'author_profile_url' => '/@' . strtolower((string) ($row->author_username ?? $row->author_id)),
+                    'author_avatar' => AvatarUrl::forUser((int) $row->author_id, $row->author_avatar_hash, 50),
+                    'author_signature' => $row->author_signature,
+                ]);
+        }
+
+        // ── Profile data ─────────────────────────────────────────────────────
+        $profile = $user->profile;
+
+        // ── Country name (from old country_list table if available) ──────────
+        $countryName = null;
+        if ($profile?->country_code) {
+            if (Schema::hasTable('country_list')) {
+                $countryName = DB::table('country_list')
+                    ->where('country_code', $profile->country_code)
+                    ->value('country_name');
+            }
+            $countryName = $countryName ?? strtoupper((string) $profile->country_code);
+        }
+
+        // ── Increment profile views (async-safe, ignore errors) ──────────────
+        if (! $isOwner) {
+            try {
+                DB::table('user_statistics')
+                    ->updateOrInsert(
+                        ['user_id' => $user->id],
+                        ['profile_views' => DB::raw('COALESCE(profile_views, 0) + 1'), 'updated_at' => now()]
+                    );
+            } catch (\Throwable) {}
+        }
 
         return response()->view('legacy.profile', [
-            'user' => $legacyUser,
-            'artworks' => $artworks,
-            'page_title' => 'Profile: ' . ($legacyUser->uname ?? ''),
-            'page_canonical' => url('/@' . strtolower((string) ($user->username ?? ''))),
+            'user'              => $user,
+            'profile'           => $profile,
+            'artworks'          => $artworks,
+            'featuredArtworks'  => $featuredArtworks,
+            'favourites'        => $favourites,
+            'stats'             => $stats,
+            'socialLinks'       => $socialLinks,
+            'followerCount'     => $followerCount,
+            'recentFollowers'   => $recentFollowers,
+            'viewerIsFollowing' => $viewerIsFollowing,
+            'profileComments'   => $profileComments,
+            'countryName'       => $countryName,
+            'isOwner'           => $isOwner,
+            'page_title'        => 'Profile: ' . ($user->username ?? $user->name ?? ''),
+            'page_canonical'    => url('/@' . strtolower((string) ($user->username ?? ''))),
+            'page_meta_description' => 'View the profile of ' . ($user->username ?? $user->name) . ' on Skinbase.org — artworks, favourites and more.',
         ]);
     }
 }

app/Http/Controllers/User/TodayDownloadsController.php

@@ -59,6 +59,6 @@ class TodayDownloadsController extends Controller
 
         $page_title = 'Today Downloaded Artworks';
 
-        return view('web.browse', ['page_title' => $page_title, 'artworks' => $paginator]);
+        return view('web.downloads.today', ['page_title' => $page_title, 'artworks' => $paginator]);
     }
 }

app/Http/Controllers/User/TodayInHistoryController.php

@@ -45,7 +45,7 @@ class TodayInHistoryController extends Controller
             });
         }
 
-        return view('user.today-in-history', [
+        return view('legacy.today-in-history', [
             'artworks' => $artworks,
             'page_title' => 'Popular on this day in history',
         ]);

app/Http/Controllers/User/TopAuthorsController.php

@@ -21,7 +21,6 @@ class TopAuthorsController extends Controller
         }
 
         $sub = Artwork::query()
-            ->select('artworks.user_id')
             ->join('artwork_stats', 'artwork_stats.artwork_id', '=', 'artworks.id')
             ->where('artworks.is_public', true)
             ->where('artworks.is_approved', true)
@@ -52,6 +51,6 @@ class TopAuthorsController extends Controller
 
         $page_title = 'Top Authors';
 
-        return view('user.top-authors', compact('page_title', 'authors', 'metric'));
+        return view('web.authors.top', compact('page_title', 'authors', 'metric'));
     }
 }

app/Http/Controllers/User/TopFavouritesController.php

@@ -51,6 +51,6 @@ class TopFavouritesController extends Controller
 
         $page_title = 'Top Favourites';
 
-        return view('user.top-favourites', ['page_title' => $page_title, 'artworks' => $paginator]);
+        return view('legacy.top-favourites', ['page_title' => $page_title, 'artworks' => $paginator]);
     }
 }