Merge remote-tracking branch 'origin/dev' into dev

server/src/services/cookie.ts

@@ -7,7 +7,7 @@ export function cookieOptions(clear = false) {
   return {
     httpOnly: true,
     secure,
-    sameSite: 'strict' as const,
+    sameSite: 'lax' as const,
     path: '/',
     ...(clear ? {} : { maxAge: 24 * 60 * 60 * 1000 }), // 24h — matches JWT expiry
   };

server/src/services/tripService.ts

@@ -6,7 +6,7 @@ import { Trip, User } from '../types';
 export const MS_PER_DAY = 86400000;
 export const MAX_TRIP_DAYS = 365;
 
-const TRIP_SELECT = `
+export const TRIP_SELECT = `
   SELECT t.*,
     (SELECT COUNT(*) FROM days d WHERE d.trip_id = t.id) as day_count,
     (SELECT COUNT(*) FROM places p WHERE p.trip_id = t.id) as place_count,