@@ -79,29 +79,40 @@ public function index(Request $request): \Inertia\Response|\Illuminate\Http\Redi
7979 switch ($ sortBy ) {
8080 case 'catches_asc ' :
8181 if ($ isHistoricalEvent ) {
82- $ query ->orderBy ('name ' , 'asc ' ); // Fallback to name for historical events
82+ $ query ->orderBy ('name ' )
83+ ->orderByDesc ('event_id ' ); // Fallback to name for historical events
8384 } else {
84- $ query ->orderBy ('catched_by_users_count ' , 'asc ' )->orderBy ('name ' , 'asc ' );
85+ $ query ->orderBy ('catched_by_users_count ' )
86+ ->orderBy ('name ' )
87+ ->orderByDesc ('event_id ' ); // Show newest event first on same name + count
8588 }
8689 break ;
8790 case 'name_asc ' :
88- $ query ->orderBy ('name ' , 'asc ' );
91+ $ query ->orderBy ('name ' )
92+ ->orderByDesc ('event_id ' );
8993 break ;
9094 case 'name_desc ' :
91- $ query ->orderBy ('name ' , 'desc ' );
95+ $ query ->orderByDesc ('name ' )
96+ ->orderByDesc ('event_id ' );
9297 break ;
9398 case 'catches_desc ' :
9499 if ($ isHistoricalEvent ) {
95- $ query ->orderBy ('name ' , 'asc ' ); // Fallback to name for historical events
100+ $ query ->orderBy ('name ' )
101+ ->orderByDesc ('event_id ' ); // Fallback to name for historical events
96102 } else {
97- $ query ->orderBy ('catched_by_users_count ' , 'desc ' )->orderBy ('name ' , 'asc ' );
103+ $ query ->orderByDesc ('catched_by_users_count ' )
104+ ->orderBy ('name ' )
105+ ->orderByDesc ('event_id ' );
98106 }
99107 break ;
100108 default :
101109 if ($ isHistoricalEvent ) {
102- $ query ->orderBy ('name ' , 'asc ' ); // Default to name for historical events
110+ $ query ->orderBy ('name ' )
111+ ->orderByDesc ('event_id ' ); // Default to name for historical events
103112 } else {
104- $ query ->orderBy ('catched_by_users_count ' , 'desc ' )->orderBy ('name ' , 'asc ' );
113+ $ query ->orderByDesc ('catched_by_users_count ' )
114+ ->orderBy ('name ' )
115+ ->orderByDesc ('event_id ' );
105116 }
106117 break ;
107118 }
0 commit comments