Merge remote-tracking branch 'origin/main' into backend_complete

SerpentRace_Backend/src/Api/index.ts

@@ -10,7 +10,10 @@ import chatRouter from './routers/chatRouter';
 import contactRouter from './routers/contactRouter';
 import adminRouter from './routers/adminRouter';
 import deckImportExportRouter from './routers/deckImportExportRouter';
+<<<<<<< HEAD
 import gameRouter from './routers/gameRouter';
+=======
+>>>>>>> origin/main
 import { LoggingService, logStartup, logConnection, logError, logRequest } from '../Application/Services/Logger';
 import { WebSocketService } from '../Application/Services/WebSocketService';
 import { setupSwagger } from './swagger/swaggerUiSetup';
@@ -132,7 +135,10 @@ app.use('/api/chats', chatRouter);
 app.use('/api/contacts', contactRouter);
 app.use('/api/admin', adminRouter);
 app.use('/api/deck-import-export', deckImportExportRouter);
+<<<<<<< HEAD
 app.use('/api/games', gameRouter);
+=======
+>>>>>>> origin/main
 
 // Global error handler (must be after routes)
 app.use(loggingService.errorLoggingMiddleware());