fix

Reviewed-on: #86
HALLOD UGYES VAGY :)

SerpentRace_Backend/src/Api/routers/adminRouter.ts

@@ -141,32 +141,32 @@ router.get('/users/:userId',
 });
 
 // Search users including soft-deleted ones
-// router.get('/users/search/:searchTerm',
+router.get('/users/search/:searchTerm',
-//     adminRequired,
+    adminRequired,
-//     ValidationMiddleware.validateStringLength({ searchTerm: { min: 2, max: 100 } }),
+    ValidationMiddleware.validateStringLength({ searchTerm: { min: 2, max: 100 } }),
-//     async (req: Request, res: Response) => {
+    async (req: Request, res: Response) => {
-//     try {
+    try {
-//         const { searchTerm } = req.params;
+        const { searchTerm } = req.params;
-//         const includeDeleted = req.query.includeDeleted === 'true';
+        const includeDeleted = req.query.includeDeleted === 'true';
         
-//         logRequest('Admin search users endpoint accessed', req, res, { searchTerm, includeDeleted });
+        logRequest('Admin search users endpoint accessed', req, res, { searchTerm, includeDeleted });
         
-//         const users = includeDeleted
+        const users = includeDeleted
-//             ? await container.userRepository.searchIncludingDeleted(searchTerm)
+            ? await container.userRepository.searchIncludingDeleted(searchTerm)
-//             : await container.userRepository.search(searchTerm);
+            : await container.userRepository.search(searchTerm);
 
-//         logRequest('Admin user search completed', req, res, { 
+        logRequest('Admin user search completed', req, res, { 
-//             searchTerm,
+            searchTerm,
-//             resultCount: Array.isArray(users) ? users.length : (users.totalCount || 0),
+            resultCount: Array.isArray(users) ? users.length : (users.totalCount || 0),
-//             includeDeleted
+            includeDeleted
-//         });
+        });
 
-//         res.json(users);
+        res.json(users);
-//     } catch (error) {
+    } catch (error) {
-//         logError('Admin search users endpoint error', error as Error, req, res);
+        logError('Admin search users endpoint error', error as Error, req, res);
-//         res.status(500).json({ error: 'Internal server error' });
+        res.status(500).json({ error: 'Internal server error' });
-//     }
+    }
-// });
+});
 
 // Update any user (admin only)
 router.patch('/users/:userId',
@@ -213,6 +213,32 @@ router.patch('/users/:userId',
     }
 });
 
+// Activate user (admin only)
+router.post('/users/:userId/activate',
+    adminRequired,
+    ValidationMiddleware.validateUUIDFormat(['userId']),
+    async (req: Request, res: Response) => {
+    try {
+        const targetUserId = req.params.userId;
+        const adminUserId = (req as any).user.userId;
+
+        logRequest('Admin activate user endpoint accessed', req, res, { adminUserId, targetUserId });
+
+        const result = await container.activateUserCommandHandler.execute({ id: targetUserId });
+
+        if (!result) {
+            return res.status(404).json({ error: 'User not found' });
+        }
+
+        logAuth('User activated by admin', targetUserId, { adminUserId }, req, res);
+        res.json({ message: 'User activated successfully', user: result });
+
+    } catch (error) {
+        logError('Admin activate user endpoint error', error as Error, req, res);
+        res.status(500).json({ error: 'Internal server error' });
+    }
+});
+
 // Deactivate user (admin only)
 router.post('/users/:userId/deactivate',
     adminRequired,

SerpentRace_Backend/src/Application/DTOs/Mappers/DeckMapper.ts

@@ -1,7 +1,6 @@
 import { DeckAggregate } from '../../../Domain/Deck/DeckAggregate';
 import { UserAggregate } from '../../../Domain/User/UserAggregate';
 import { CreateDeckDto, UpdateDeckDto, ShortDeckDto, DetailDeckDto } from '../DeckDto';
-import e from 'express';
 
 export class DeckMapper {
   static toShortDto(deck: DeckAggregate, userId?: string): ShortDeckDto {
@@ -14,7 +13,7 @@ export class DeckMapper {
       cardCount: deck.cards.length,
       creator: deck.user?.username || 'Unknown',
       creationdate: deck.creationdate,
-      editable: deck.isEditable() ? deck.isEditable()(userId!) : undefined
+      editable: deck.isEditable(userId!) ? deck.isEditable(userId!) : undefined
     };
   }
 
@@ -41,7 +40,7 @@ export class DeckMapper {
       cardCount: deck.cards.length,
       creator: deck.user?.username || 'Unknown',
       creationdate: deck.creationdate,
-      editable: deck.isEditable() ? deck.isEditable()(userId!) : undefined
+      editable: deck.isEditable(userId!) ? deck.isEditable(userId!) : undefined
     }));
   }
 }

SerpentRace_Backend/src/Application/DTOs/Mappers/OrganizationMapper.ts

@@ -22,7 +22,7 @@ export class OrganizationMapper {
       contactemail: org.contactemail,
       state: org.state,
       regdate: org.regdate,
-      updatedate: org.updatedate,
+      updateDate: org.updateDate,
       url: org.url,
       userinorg: org.userinorg,
       maxOrganizationalDecks: org.maxOrganizationalDecks,

SerpentRace_Backend/src/Application/DTOs/OrganizationDto.ts

@@ -27,7 +27,7 @@ export interface DetailOrganizationDto {
   contactemail: string;
   state: number;
   regdate: Date;
-  updatedate: Date;
+  updateDate: Date;
   url: string | null;
   userinorg: number;
   maxOrganizationalDecks: number | null;

SerpentRace_Backend/src/Application/Deck/commands/UpdateDeckCommandHandler.ts

@@ -9,12 +9,12 @@ export class UpdateDeckCommandHandler {
   constructor(private readonly deckRepo: IDeckRepository) {}
 
   async execute(cmd: UpdateDeckCommand): Promise<ShortDeckDto | null> {
-    if(cmd.state !== undefined && cmd.userstate!==1) {
+    if(cmd.state !== undefined && cmd.authLevel !== 1) {
         throw new Error('Only admin users can change deck state');
     }
     try {
       let existingDeck: DeckAggregate | null = null;
-        if (cmd.userstate === 1) {
+        if (cmd.authLevel === 1) {
             existingDeck = await this.deckRepo.findByIdIncludingDeleted(cmd.id);
         } else {
             existingDeck = await this.deckRepo.findById(cmd.id);

SerpentRace_Backend/src/Application/Services/CardProcessingService.ts

@@ -13,13 +13,33 @@ export interface CloserAnswer {
     percent: number;
 }
 
+/**
+ * Sentence pair for matching left to right
+ */
+export interface SentencePair {
+    id: string;           // Unique identifier for this pair
+    left: string;         // Left part to match
+    right: string;        // Right part (scrambled position)
+}
+
+/**
+ * Player's answer for sentence pairing (array of matches)
+ */
+export interface SentencePairingAnswer {
+    pairId: string;       // ID of the pair
+    leftText: string;     // Left part
+    rightText: string;    // Player's chosen right part
+}
+
 export interface CardClientData {
     cardid: string;
     question: string;
     type: CardType;
+    timeLimit: number;
     // Type-specific client data
-    options?: QuizOption[]; // For QUIZ
+    answerOptions?: QuizOption[]; // For QUIZ
-    words?: string[]; // For SENTENCE_PAIRING (scrambled)
+    words?: string[]; // For SENTENCE_PAIRING (legacy scrambled words)
+    sentencePairs?: SentencePair[]; // For SENTENCE_PAIRING (left-right matching)
     acceptableAnswers?: string[]; // For OWN_ANSWER (not sent to client)
     // CLOSER and TRUE_FALSE send only question
 }
@@ -50,7 +70,8 @@ export class CardProcessingService {
         const baseData: CardClientData = {
             cardid: card.cardid,
             question: card.question,
-            type: card.type
+            type: card.type,
+            timeLimit: 60 // Default 60 seconds for question cards
         };
 
         switch (card.type) {
@@ -116,18 +137,50 @@ export class CardProcessingService {
 
         return {
             ...baseData,
-            options: card.answer as QuizOption[]
+            answerOptions: card.answer as QuizOption[]
         };
     }
 
     /**
-     * Prepare SENTENCE_PAIRING card with scrambled words
+     * Prepare SENTENCE_PAIRING card with scrambled left/right pairs
+     * 
+     * Expected card.answer format:
+     * [
+     *   { left: "Apple", right: "Red" },
+     *   { left: "Banana", right: "Yellow" },
+     *   { left: "Orange", right: "Orange color" }
+     * ]
+     * 
+     * OR legacy string format: "word1 word2 word3" (will be split and scrambled)
      */
     private prepareSentencePairingCard(card: GameCard, baseData: CardClientData): CardClientData {
-        if (typeof card.answer !== 'string') {
+        // NEW FORMAT: Array of pairs (left-right matching)
-            throw new Error('Sentence pairing card answer must be a string');
+        if (Array.isArray(card.answer)) {
+            // Validate structure
+            const pairs = card.answer as Array<{ left: string; right: string }>;
+            if (!pairs.every(p => p.left && p.right)) {
+                throw new Error('Sentence pairing card answer must be array of {left, right} objects');
             }
 
+            // Create pairs with IDs and scramble the right parts
+            const leftParts = pairs.map((p, idx) => ({ id: `pair_${idx}`, left: p.left, right: p.right }));
+            const rightParts = this.scrambleArray([...pairs.map(p => p.right)]);
+
+            // Send left parts in order, right parts scrambled
+            const sentencePairs: SentencePair[] = leftParts.map((lp, idx) => ({
+                id: lp.id,
+                left: lp.left,
+                right: rightParts[idx]  // Scrambled position
+            }));
+
+            return {
+                ...baseData,
+                sentencePairs
+            };
+        }
+
+        // LEGACY FORMAT: Single sentence to reconstruct (backward compatibility)
+        if (typeof card.answer === 'string') {
             const words = card.answer.split(' ').filter(word => word.trim() !== '');
             const scrambledWords = this.scrambleArray([...words]);
 
@@ -137,6 +190,9 @@ export class CardProcessingService {
             };
         }
 
+        throw new Error('Sentence pairing card answer must be array of pairs or string');
+    }
+
     /**
      * Prepare OWN_ANSWER card (only question, acceptable answers hidden)
      */
@@ -187,17 +243,65 @@ export class CardProcessingService {
     }
 
     /**
-     * Validate SENTENCE_PAIRING answer (reconstructed sentence)
+     * Validate SENTENCE_PAIRING answer
+     * 
+     * Supports two formats:
+     * 1. NEW: Array of { pairId, leftText, rightText } matches
+     * 2. LEGACY: Reconstructed sentence string or array of words
      */
-    private validateSentencePairingAnswer(card: GameCard, playerAnswer: string[] | string): CardValidationResult {
+    private validateSentencePairingAnswer(card: GameCard, playerAnswer: any): CardValidationResult {
-        if (typeof card.answer !== 'string') {
+        // NEW FORMAT: Array of pairs (left-right matching)
-            throw new Error('Sentence pairing card answer must be a string');
+        if (Array.isArray(card.answer) && card.answer.every((p: any) => p.left && p.right)) {
+            const correctPairs = card.answer as Array<{ left: string; right: string }>;
+            
+            // Player answer should be array of SentencePairingAnswer objects
+            if (!Array.isArray(playerAnswer)) {
+                throw new Error('Player answer must be array of pair matches');
             }
 
+            const playerMatches = playerAnswer as SentencePairingAnswer[];
+            
+            // Check if all pairs match correctly
+            let correctCount = 0;
+            const results: string[] = [];
+
+            for (const correctPair of correctPairs) {
+                const playerMatch = playerMatches.find(pm => 
+                    pm.leftText.toLowerCase().trim() === correctPair.left.toLowerCase().trim()
+                );
+
+                if (playerMatch) {
+                    const isMatch = playerMatch.rightText.toLowerCase().trim() === 
+                                   correctPair.right.toLowerCase().trim();
+                    if (isMatch) {
+                        correctCount++;
+                        results.push(`✓ "${correctPair.left}" → "${correctPair.right}"`);
+                    } else {
+                        results.push(`✗ "${correctPair.left}" → "${playerMatch.rightText}" (should be "${correctPair.right}")`);
+                    }
+                } else {
+                    results.push(`✗ "${correctPair.left}" → (not matched)`);
+                }
+            }
+
+            const isCorrect = correctCount === correctPairs.length;
+
+            return {
+                isCorrect,
+                submittedAnswer: playerMatches,
+                correctAnswer: correctPairs,
+                explanation: isCorrect
+                    ? `✅ Perfect! All ${correctCount} pairs matched correctly!\n${results.join('\n')}`
+                    : `❌ Only ${correctCount}/${correctPairs.length} pairs correct:\n${results.join('\n')}`
+            };
+        }
+
+        // LEGACY FORMAT: Single sentence to reconstruct (backward compatibility)
+        if (typeof card.answer === 'string') {
             // Handle both array of words and joined string
             const reconstructed = Array.isArray(playerAnswer) 
                 ? playerAnswer.join(' ').toLowerCase().trim()
-            : playerAnswer.toLowerCase().trim();
+                : (typeof playerAnswer === 'string' ? playerAnswer.toLowerCase().trim() : '');
 
             const correctSentence = card.answer.toLowerCase().trim();
             const isCorrect = reconstructed === correctSentence;
@@ -212,6 +316,9 @@ export class CardProcessingService {
             };
         }
 
+        throw new Error('Sentence pairing card answer must be array of pairs or string');
+    }
+
     /**
      * Validate OWN_ANSWER (check against acceptable answers array)
      */

SerpentRace_Backend/src/Application/Services/DIContainer.ts

@@ -39,6 +39,7 @@ import { ProcessOrgAuthCallbackCommandHandler } from '../Organization/commands/P
 import { CreateContactCommandHandler } from '../Contact/commands/CreateContactCommandHandler';
 import { UpdateContactCommandHandler } from '../Contact/commands/UpdateContactCommandHandler';
 import { DeleteContactCommandHandler } from '../Contact/commands/DeleteContactCommandHandler';
+import { ActivateUserCommandHandler } from '../User/commands/ActivateUserCommandHandler';
 
 // Query Handlers
 import { GetUserByIdQueryHandler } from '../User/queries/GetUserByIdQueryHandler';
@@ -121,6 +122,7 @@ export class DIContainer {
     private _updateContactCommandHandler: UpdateContactCommandHandler | null = null;
     private _deleteContactCommandHandler: DeleteContactCommandHandler | null = null;
     private _generateBoardCommandHandler: GenerateBoardCommandHandler | null = null;
+    private _activateUserCommandHandler: ActivateUserCommandHandler | null = null;
     
     // Query Handlers
     private _getUserByIdQueryHandler: GetUserByIdQueryHandler | null = null;
@@ -306,6 +308,13 @@ export class DIContainer {
         return this._deactivateUserCommandHandler;
     }
 
+    public get activateUserCommandHandler(): ActivateUserCommandHandler {
+        if (!this._activateUserCommandHandler) {
+            this._activateUserCommandHandler = new ActivateUserCommandHandler(this.userRepository);
+        }
+        return this._activateUserCommandHandler;
+    }
+
     public get deleteUserCommandHandler(): DeleteUserCommandHandler {
         if (!this._deleteUserCommandHandler) {
             this._deleteUserCommandHandler = new DeleteUserCommandHandler(this.userRepository);

SerpentRace_Backend/src/Application/User/commands/ActivateUserCommand.ts

@@ -0,0 +1,3 @@
+export interface ActivateUserCommand {
+  id: string;
+}

SerpentRace_Backend/src/Application/User/commands/ActivateUserCommandHandler.ts

@@ -0,0 +1,12 @@
+import { IUserRepository } from '../../../Domain/IRepository/IUserRepository';
+import { ActivateUserCommand } from './ActivateUserCommand';
+
+
+export class ActivateUserCommandHandler  {
+  constructor(private readonly userRepo: IUserRepository) {}
+
+  async execute(cmd: ActivateUserCommand): Promise<boolean> {
+    await this.userRepo.activate(cmd.id);
+    return true;
+  }
+}

SerpentRace_Backend/src/Application/User/commands/LogoutCommandHandler.ts

@@ -86,7 +86,7 @@ export class LogoutCommandHandler {
 
       // 5. Update user's last logout timestamp in database
       try {
-        const updateResult = await this.userRepo.update(userId, { updatedate: new Date() });
+        const updateResult = await this.userRepo.update(userId, { updateDate: new Date() });
         if (updateResult) {
           logAuth('User last logout timestamp updated', userId);
         }
@@ -151,7 +151,7 @@ export class LogoutCommandHandler {
       }
 
       // Update user logout timestamp
-      await this.userRepo.update(userId, { updatedate: new Date() });
+      await this.userRepo.update(userId, { updateDate: new Date() });
 
       logAuth('User logged out from all devices', userId);
       return true;

SerpentRace_Backend/src/Domain/Deck/DeckAggregate.ts

@@ -74,8 +74,8 @@ export class DeckAggregate {
     @Column({ type: 'int', default: CType.PUBLIC })
     ctype!: CType;
 
-    @UpdateDateColumn({ name: 'update_date' })
+    @UpdateDateColumn()
-    updatedate!: Date;
+    updateDate!: Date;
 
     @Column({ type: 'int', default: State.ACTIVE })
         state!: State;
@@ -88,10 +88,16 @@ export class DeckAggregate {
     @JoinColumn({ name: 'user_id' })
     user!: UserAggregate | null;
 
-    isEditable() {
+    isEditable(userId:string): boolean{
         // A deck is editable if the user is the creator
-        return (userId: string) => {
+        if (!this.user) {
-            return this.user?.id.toString() === userId;
+            logError(`DeckAggregate.isEditable: User is null for deck id ${this.id}`);
-        };
+            return false;
+        }
+        //if admin, always editable
+        if (this.user?.isAdmin) {
+            return true;
+        }
+        return this.user?.id.toString() === userId;;
     }
 }

SerpentRace_Backend/src/Domain/Game/GameAggregate.ts

@@ -86,8 +86,8 @@ export class GameAggregate {
     @Column({ type: 'timestamp', nullable: true, name: 'finishDate' })
     enddate!: Date | null;
 
-    @UpdateDateColumn({ name: 'updateDate' })
+    @UpdateDateColumn()
-    updatedate!: Date;
+    updateDate!: Date;
 }
 
 // Board Generation Types

SerpentRace_Backend/src/Domain/IRepository/IUserRepository.ts

@@ -7,4 +7,5 @@ export interface IUserRepository extends IPaginatedRepository<UserAggregate, { u
     findByEmail(email: string): Promise<UserAggregate | null>;
     findByToken(token: string): Promise<UserAggregate | null>;
     deactivate(id: string): Promise<UserAggregate | null>;
+    activate(id: string): Promise<UserAggregate | null>;
 }

SerpentRace_Backend/src/Domain/Organization/OrganizationAggregate.ts

@@ -35,8 +35,8 @@ export class OrganizationAggregate {
     @CreateDateColumn()
     regdate!: Date;
 
-    @UpdateDateColumn()
+    @UpdateDateColumn({ name: 'updateDate' })
-    updatedate!: Date;
+    updateDate!: Date;
 
     @Column({ type: 'varchar', length: 500, nullable: true })
     url!: string | null;

SerpentRace_Backend/src/Domain/User/UserAggregate.ts

@@ -51,8 +51,12 @@ export class UserAggregate {
     regdate!: Date;
 
     @UpdateDateColumn()
-    updatedate!: Date;
+    updateDate!: Date;
 
     @Column({ type: 'timestamp', nullable: true })
     Orglogindate!: Date | null;
+
+    get isAdmin(): boolean {
+        return this.state === UserState.ADMIN;
+    }
 }

SerpentRace_Backend/src/Infrastructure/Migrationsettings/1757939815062-full.ts

@@ -1,10 +1,7 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
 
-<<<<<<<< HEAD:SerpentRace_Backend/src/Infrastructure/Migrationsettings/1758463928499-full.ts
 export class Full1758463928499 implements MigrationInterface {
-========
+
-export class Full1757939815062 implements MigrationInterface {
->>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2:SerpentRace_Backend/src/Infrastructure/Migrationsettings/1757939815062-full.ts
 
     public async up(queryRunner: QueryRunner): Promise<void> {
     }

SerpentRace_Backend/src/Infrastructure/Migrationsettings/1758463928499-full.ts

@@ -1,10 +1,5 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
-
-<<<<<<<< HEAD:SerpentRace_Backend/src/Infrastructure/Migrationsettings/1758463928499-full.ts
 export class Full1758463928499 implements MigrationInterface {
-========
-export class Full1757939815062 implements MigrationInterface {
->>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2:SerpentRace_Backend/src/Infrastructure/Migrationsettings/1757939815062-full.ts
 
     public async up(queryRunner: QueryRunner): Promise<void> {
     }

SerpentRace_Backend/src/Infrastructure/Repository/DeckRepository.ts

@@ -29,7 +29,7 @@ export class DeckRepository implements IDeckRepository {
             // Get paginated results
             const decks = await this.repo.find({
                 where: { state: Not(State.SOFT_DELETE) },
-                order: { updatedate: 'DESC' },
+                order: { updateDate: 'DESC' },
                 take: limit,
                 skip: offset
             });
@@ -57,7 +57,7 @@ export class DeckRepository implements IDeckRepository {
             
             // Get paginated results
             const decks = await this.repo.find({
-                order: { updatedate: 'DESC' },
+                order: { updateDate: 'DESC' },
                 take: limit,
                 skip: offset
             });

SerpentRace_Backend/src/Infrastructure/Repository/GameRepository.ts

@@ -39,7 +39,7 @@ export class GameRepository implements IGameRepository {
             // Get paginated results
             const games = await this.repo.find({
                 where: { state: Not(GameState.CANCELLED) },
-                order: { updatedate: 'DESC' },
+                order: { updateDate: 'DESC' },
                 take: limit,
                 skip: offset
             });
@@ -67,7 +67,7 @@ export class GameRepository implements IGameRepository {
             
             // Get paginated results (including deleted)
             const games = await this.repo.find({
-                order: { updatedate: 'DESC' },
+                order: { updateDate: 'DESC' },
                 take: limit,
                 skip: offset
             });
@@ -153,7 +153,7 @@ export class GameRepository implements IGameRepository {
                 queryBuilder.skip(offset);
             }
 
-            const games = await queryBuilder.orderBy('game.updatedate', 'DESC').getMany();
+            const games = await queryBuilder.orderBy('game.updateDate', 'DESC').getMany();
 
             const endTime = performance.now();
             logDatabase('Game search completed', `executionTime: ${Math.round(endTime - startTime)}ms, query: ${query}, found: ${games.length}, total: ${totalCount}`);
@@ -184,7 +184,7 @@ export class GameRepository implements IGameRepository {
                 queryBuilder.skip(offset);
             }
 
-            const games = await queryBuilder.orderBy('game.updatedate', 'DESC').getMany();
+            const games = await queryBuilder.orderBy('game.updateDate', 'DESC').getMany();
 
             const endTime = performance.now();
             logDatabase('Game search (including deleted) completed', `executionTime: ${Math.round(endTime - startTime)}ms, query: ${query}, found: ${games.length}, total: ${totalCount}`);
@@ -251,7 +251,7 @@ export class GameRepository implements IGameRepository {
         try {
             const games = await this.repo.find({
                 where: { state: GameState.ACTIVE },
-                order: { updatedate: 'DESC' }
+                order: { updateDate: 'DESC' }
             });
             const endTime = performance.now();
             logDatabase('Active games query completed', `executionTime: ${Math.round(endTime - startTime)}ms, found: ${games.length}`);
@@ -270,7 +270,7 @@ export class GameRepository implements IGameRepository {
             const queryBuilder = this.repo.createQueryBuilder('game')
                 .where('game.state != :cancelledState', { cancelledState: GameState.CANCELLED })
                 .andWhere('JSON_CONTAINS(game.players, :playerId)', { playerId: `"${playerId}"` })
-                .orderBy('game.updatedate', 'DESC');
+                .orderBy('game.updateDate', 'DESC');
 
             const games = await queryBuilder.getMany();
             const endTime = performance.now();

SerpentRace_Backend/src/Infrastructure/Repository/UserRepository.ts

@@ -345,5 +345,25 @@ export class UserRepository implements IUserRepository {
         }
     }
 
+    async activate(id: string) {
+        const startTime = Date.now();
+        try {
+            await this.repo.update(id, { state: UserState.VERIFIED_REGULAR });
+            const result = await this.findById(id);
+            logDatabase('User activated successfully', `update(${id}, { state: VERIFIED_REGULAR })`, Date.now() - startTime, {
+                userId: id,
+                success: !!result
+            });
+            return result;
+        }
+        catch (error) {
+            logError('UserRepository.activate error', error as Error);
+            // Handle invalid UUID format
+            if (error instanceof Error && error.message.includes('invalid input syntax for type uuid')) {
+                throw new Error('Invalid user ID format');
+            }
+            throw new Error('Failed to activate user in database');
+        }
+    }
 
 }

SerpentRace_Docker/sql_schema_only.sql

@@ -19,7 +19,7 @@ CREATE TABLE "Users" (
     "phone" VARCHAR(20) NULL,
     "state" INTEGER NOT NULL DEFAULT 0,
     "regdate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updateDate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "Orglogindate" TIMESTAMP NULL
 );
 
@@ -33,7 +33,7 @@ CREATE TABLE "Organizations" (
     "contactemail" VARCHAR(255) NOT NULL,
     "state" INTEGER NOT NULL DEFAULT 0,
     "regdate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updateDate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "url" VARCHAR(500) NULL,
     "userinorg" INTEGER NOT NULL DEFAULT 0,
     "maxOrganizationalDecks" INTEGER NULL
@@ -49,7 +49,7 @@ CREATE TABLE "Decks" (
     "cards" JSONB NOT NULL DEFAULT '[]',
     "played_number" INTEGER NOT NULL DEFAULT 0,
     "ctype" INTEGER NOT NULL DEFAULT 0,
-    "update_date" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updateDate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "state" INTEGER NOT NULL DEFAULT 0,
     "organization_id" UUID NULL
 );
@@ -174,40 +174,6 @@ CREATE INDEX "IDX_Games_State" ON "Games" ("state");
 CREATE INDEX "IDX_Games_CreatedBy" ON "Games" ("createdBy");
 CREATE INDEX "IDX_Games_OrganizationId" ON "Games" ("organizationid");
 
--- Create update trigger for updatedate columns
-CREATE OR REPLACE FUNCTION update_updatedate_column()
-RETURNS TRIGGER AS $$
-BEGIN
-    NEW.updatedate = CURRENT_TIMESTAMP;
-    RETURN NEW;
-END;
-$$ language 'plpgsql';
-
--- Apply update triggers
-CREATE TRIGGER update_users_updatedate 
-    BEFORE UPDATE ON "Users" 
-    FOR EACH ROW EXECUTE FUNCTION update_updatedate_column();
-
-CREATE TRIGGER update_organizations_updatedate 
-    BEFORE UPDATE ON "Organizations" 
-    FOR EACH ROW EXECUTE FUNCTION update_updatedate_column();
-
-CREATE TRIGGER update_decks_updatedate 
-    BEFORE UPDATE ON "Decks" 
-    FOR EACH ROW EXECUTE FUNCTION update_updatedate_column();
-
-CREATE TRIGGER update_chats_updatedate 
-    BEFORE UPDATE ON "Chats" 
-    FOR EACH ROW EXECUTE FUNCTION update_updatedate_column();
-
-CREATE TRIGGER update_contacts_updatedate 
-    BEFORE UPDATE ON "Contacts" 
-    FOR EACH ROW EXECUTE FUNCTION update_updatedate_column();
-
-CREATE TRIGGER update_games_updatedate 
-    BEFORE UPDATE ON "Games" 
-    FOR EACH ROW EXECUTE FUNCTION update_updatedate_column();
-
 -- Comments for documentation
 COMMENT ON TABLE "Users" IS 'User accounts with authentication and profile information';
 COMMENT ON TABLE "Organizations" IS 'Organizations that can have multiple users and premium features';

SerpentRace_Frontend/src/App.jsx

@@ -8,18 +8,19 @@ import ResetPassword from "./pages/Auth/ResetPassword"
 import Landingpage from "./pages/Landing/Landingpage"
 import Home from "./pages/Landing/Home"
 import DeckManagerPage from "./pages/Decks/DeckManagerPage"
+import Card_display from "./pages/Decks/Card_display"
 import DeckCreator from "./pages/DeckCreator/DeckCreator"
 import CompanyHub from "./pages/Contacts/Contacts"
 import About from "./pages/About/About"
 import ScrollToTop from "./components/ScrollToTop"
 import GameScreen from "./pages/Game/GameScreen"
 import Reports from "./pages/Report/Reports"
-import Lobby from "./pages/Lobby/Lobby"
+import Lobby from "./pages/Game/Lobby"
 import ProfileCard from "./components/Userdetails/Userdetails"
 import { ToastConfig } from "./components/Toastify/toastifyServices" // ✅ fontos: named import, nem default!
 import VerifyEmailPage from "./pages/Auth/VerifyEmailPage"
-
+import ChooseDeck from "./pages/Game/ChooseDeck"
-
+import PlayerSetup from "./pages/Game/PlayerSetup"
 
 function App() {
   const [isMobile, setIsMobile] = useState(false)
@@ -63,11 +64,14 @@ function App() {
           <Route path="/" element={<Landingpage />} />
           <Route path="/home" element={<Home />} />
           <Route path="/decks" element={<DeckManagerPage />} />
+          <Route path="/deck/:deckId" element={<Card_display />} />
           <Route path="/deck-creator" element={<DeckCreator />} />
           <Route path="/deck-creator/:deckId" element={<DeckCreator />} />
           <Route path="/game" element={<GameScreen />} />
-          <Route path="/contacts" element={<CompanyHub />} />
+          {/* <Route path="/contacts" element={<CompanyHub />} /> */}
           <Route path="/report" element={<Reports />} />
+          <Route path="/choosedeck" element={<ChooseDeck />} />
+          <Route path="/playersetup" element={<PlayerSetup />} />
         </Routes>
       </Router>
 

SerpentRace_Frontend/src/api/deckApi.js

@@ -40,8 +40,19 @@ export const updateDeck = async (deckId, deck) => {
   }
 }
 
+// Delete a deck (soft delete) (authenticated)
+export const deleteDeck = async (deckId) => {
+  try {
+    const response = await apiClient.delete(`/decks/${deckId}`)
+    return response.data
+  } catch (err) {
+    throw err
+  }
+}
+
 export default {
   createDeck,
   getDeckById,
-  updateDeck
+  updateDeck,
+  deleteDeck
 }

SerpentRace_Frontend/src/components/DeckCreator/DeckHeader.jsx

@@ -2,7 +2,7 @@
 // Deck alapadatok szerkesztése és mentés
 
 import React, { useState, useRef, useEffect } from "react"
-import { FaSave, FaArrowLeft, FaGlobe, FaLock, FaQuestionCircle, FaDice, FaLaughBeam } from "react-icons/fa"
+import { FaSave, FaArrowLeft, FaGlobe, FaLock, FaQuestionCircle, FaDice, FaLaughBeam, FaTrash } from "react-icons/fa"
 
 const deckTypes = [
   { value: "QUESTION", label: "Kérdés", icon: FaQuestionCircle, color: "var(--color-question)" },
@@ -15,7 +15,7 @@ const privacyOptions = [
   { value: "public", label: "Publikus", icon: FaGlobe }
 ]
 
-export default function DeckHeader({ deck, onUpdate, onSave, onBack }) {
+export default function DeckHeader({ deck, onUpdate, onSave, onBack, onDelete }) {
   const [isTypeDropdownOpen, setIsTypeDropdownOpen] = useState(false);
   const [isPrivacyDropdownOpen, setIsPrivacyDropdownOpen] = useState(false);
   const typeDropdownRef = useRef(null);
@@ -64,6 +64,17 @@ export default function DeckHeader({ deck, onUpdate, onSave, onBack }) {
           </h1>
         </div>
 
+        <div className="flex items-center gap-3">
+          {deck.id && (
+            <button
+              onClick={onDelete}
+              className="flex items-center gap-2 px-6 py-2 rounded-xl bg-red-600 hover:bg-red-700 text-white font-semibold transition-all duration-200 hover:scale-105 shadow-lg"
+            >
+              <FaTrash />
+              Törlés
+            </button>
+          )}
+          
           <button
             onClick={onSave}
             className="flex items-center gap-2 px-6 py-2 rounded-xl bg-[color:var(--color-success)] hover:bg-[color:var(--color-success)]/80 text-[color:var(--color-text-inverse)] font-semibold transition-all duration-200 hover:scale-105 shadow-lg"
@@ -72,6 +83,7 @@ export default function DeckHeader({ deck, onUpdate, onSave, onBack }) {
             Mentés
           </button>
         </div>
+      </div>
 
       {/* Main Content Row */}
       <div className="space-y-4">

SerpentRace_Frontend/src/components/DeckCreator/JokerCardEditor.jsx

@@ -4,29 +4,17 @@
 import React, { useState, useEffect } from 'react'
 import { FaTheaterMasks, FaInfoCircle, FaUsers } from 'react-icons/fa'
 
-const consequenceTypes = [
-  { value: 0, label: '⬆️ Előre lépés', description: 'A játékos előre lép X mezőt' },
-  { value: 1, label: '⬇️ Hátra lépés', description: 'A játékos hátra lép X mezőt' },
-  { value: 2, label: '⏸️ Kör kihagyás', description: 'A játékos kihagy egy kört' },
-  { value: 3, label: '⏩ Extra kör', description: 'A játékos kap egy extra kört' },
-  { value: 5, label: '🏁 Vissza a starthoz', description: 'A játékos visszakerül a starthoz' }
-]
-
 export default function JokerCardEditor({ card, onChange }) {
   const [cardData, setCardData] = useState({
     type: 'JOKER',
-    text: '',
+    text: ''
-    consequence: { type: 0, value: 1 },
-    wrongConsequence: { type: 1, value: 1 }
   })
 
   useEffect(() => {
     if (card) {
       setCardData({
         type: 'JOKER',
-        text: card.text || '',
+        text: card.text || ''
-        consequence: card.consequence || { type: 0, value: 1 },
-        wrongConsequence: card.wrongConsequence || { type: 1, value: 1 }
       })
     }
   }, [card])
@@ -43,36 +31,6 @@ export default function JokerCardEditor({ card, onChange }) {
     }
   }
 
-  const updateConsequence = (field, value) => {
-    const newCardData = {
-      ...cardData,
-      consequence: {
-        ...cardData.consequence,
-        [field]: value
-      }
-    }
-    setCardData(newCardData)
-    
-    if (onChange) {
-      onChange(newCardData)
-    }
-  }
-
-  const updateWrongConsequence = (field, value) => {
-    const newCardData = {
-      ...cardData,
-      wrongConsequence: {
-        ...cardData.wrongConsequence,
-        [field]: value
-      }
-    }
-    setCardData(newCardData)
-    
-    if (onChange) {
-      onChange(newCardData)
-    }
-  }
-
   // Példa joker kártyák
   const exampleCards = [
     "Felelsz vagy mersz? (Az előző játékos kérdez)",
@@ -186,100 +144,6 @@ export default function JokerCardEditor({ card, onChange }) {
           </div>
         )}
       </div>
-
-      {/* Következmények (teljesítés esetén) */}
-      <div className="bg-[color:var(--color-surface)] rounded-xl p-6">
-        <h3 className="text-lg font-semibold text-[color:var(--color-text)] mb-4">
-          🎯 Következmények (teljesítés esetén)
-        </h3>
-        
-        <div className="space-y-4">
-          {/* Consequence Type */}
-          <div>
-            <label className="block text-[color:var(--color-text-muted)] text-sm font-medium mb-2">
-              Hatás típusa
-            </label>
-            <select
-              value={cardData.consequence?.type ?? 0}
-              onChange={(e) => updateConsequence('type', parseInt(e.target.value))}
-              className="w-full px-4 py-2 rounded-xl bg-[color:var(--color-background)] border border-[color:var(--color-surface-selected)] text-[color:var(--color-text)] focus:ring-2 focus:ring-[color:var(--color-success)] focus:border-transparent outline-none transition-all duration-200"
-            >
-              {consequenceTypes.map(type => (
-                <option key={type.value} value={type.value}>
-                  {type.label}
-                </option>
-              ))}
-            </select>
-            <div className="text-xs text-[color:var(--color-text-muted)] mt-1">
-              {consequenceTypes.find(t => t.value === (cardData.consequence?.type ?? 0))?.description}
-            </div>
-          </div>
-
-          {/* Consequence Value - csak ha előre/hátra lépés */}
-          {(cardData.consequence?.type === 0 || cardData.consequence?.type === 1) && (
-            <div>
-              <label className="block text-[color:var(--color-text-muted)] text-sm font-medium mb-2">
-                Mezők száma
-              </label>
-              <input
-                type="number"
-                value={cardData.consequence?.value ?? 1}
-                onChange={(e) => updateConsequence('value', parseInt(e.target.value) || 1)}
-                className="w-full px-4 py-2 rounded-xl bg-[color:var(--color-background)] border border-[color:var(--color-surface-selected)] text-[color:var(--color-text)] focus:ring-2 focus:ring-[color:var(--color-success)] focus:border-transparent outline-none transition-all duration-200"
-                min="1"
-                max="10"
-              />
-            </div>
-          )}
-        </div>
-      </div>
-
-      {/* Következmények (nem teljesítés esetén) */}
-      <div className="bg-[color:var(--color-surface)] rounded-xl p-6">
-        <h3 className="text-lg font-semibold text-[color:var(--color-text)] mb-4">
-          ❌ Következmények (nem teljesítés esetén)
-        </h3>
-        
-        <div className="space-y-4">
-          {/* Wrong Consequence Type */}
-          <div>
-            <label className="block text-[color:var(--color-text-muted)] text-sm font-medium mb-2">
-              Hatás típusa
-            </label>
-            <select
-              value={cardData.wrongConsequence?.type ?? 1}
-              onChange={(e) => updateWrongConsequence('type', parseInt(e.target.value))}
-              className="w-full px-4 py-2 rounded-xl bg-[color:var(--color-background)] border border-[color:var(--color-surface-selected)] text-[color:var(--color-text)] focus:ring-2 focus:ring-[color:var(--color-danger)] focus:border-transparent outline-none transition-all duration-200"
-            >
-              {consequenceTypes.map(type => (
-                <option key={type.value} value={type.value}>
-                  {type.label}
-                </option>
-              ))}
-            </select>
-            <div className="text-xs text-[color:var(--color-text-muted)] mt-1">
-              {consequenceTypes.find(t => t.value === (cardData.wrongConsequence?.type ?? 1))?.description}
-            </div>
-          </div>
-
-          {/* Wrong Consequence Value - csak ha előre/hátra lépés */}
-          {(cardData.wrongConsequence?.type === 0 || cardData.wrongConsequence?.type === 1) && (
-            <div>
-              <label className="block text-[color:var(--color-text-muted)] text-sm font-medium mb-2">
-                Mezők száma
-              </label>
-              <input
-                type="number"
-                value={cardData.wrongConsequence?.value ?? 1}
-                onChange={(e) => updateWrongConsequence('value', parseInt(e.target.value) || 1)}
-                className="w-full px-4 py-2 rounded-xl bg-[color:var(--color-background)] border border-[color:var(--color-surface-selected)] text-[color:var(--color-text)] focus:ring-2 focus:ring-[color:var(--color-danger)] focus:border-transparent outline-none transition-all duration-200"
-                min="1"
-                max="10"
-              />
-            </div>
-          )}
-        </div>
-      </div>
     </div>
   )
 }

SerpentRace_Frontend/src/components/DeckCreator/LuckCardEditor.jsx

@@ -150,20 +150,23 @@ export default function LuckCardEditor({ card, onChange }) {
             </div>
           </div>
           
-          {/* Consequence Value - csak ha előre/hátra lépés */}
+          {/* Consequence Value - csak kör kihagyás és extra kör */}
-          {(cardData.consequence?.type === 0 || cardData.consequence?.type === 1) && (
+          {(cardData.consequence?.type === 2 || cardData.consequence?.type === 3) && (
             <div>
               <label className="block text-[color:var(--color-text-muted)] text-sm font-medium mb-2">
-                Mezők száma
+                {cardData.consequence?.type === 2 ? 'Körök kihagyása' : 'Extra körök száma'}
               </label>
               <input
                 type="number"
                 min="1"
-                max="10"
+                max="5"
                 value={cardData.consequence?.value ?? 1}
                 onChange={(e) => updateConsequence('value', parseInt(e.target.value) || 1)}
                 className="w-full px-4 py-2 rounded-xl bg-[color:var(--color-background)] border border-[color:var(--color-surface-selected)] text-[color:var(--color-text)] focus:ring-2 focus:ring-[color:var(--color-luck)] focus:border-transparent outline-none transition-all duration-200"
               />
+              <div className="text-xs text-[color:var(--color-text-muted)] mt-1">
+                Érték: 1-5 között
+              </div>
             </div>
           )}
         </div>

SerpentRace_Frontend/src/components/DeckCreator/TaskCardEditor.jsx

@@ -20,14 +20,6 @@ const timeLimits = [
   { value: 120, label: '2 perc' }
 ]
 
-const consequenceTypes = [
-  { value: 0, label: '⬆️ Előre lépés', description: 'A játékos előre lép X mezőt' },
-  { value: 1, label: '⬇️ Hátra lépés', description: 'A játékos hátra lép X mezőt' },
-  { value: 2, label: '⏸️ Kör kihagyás', description: 'A játékos kihagy egy kört' },
-  { value: 3, label: '⏩ Extra kör', description: 'A játékos kap egy extra kört' },
-  { value: 5, label: '🏁 Vissza a starthoz', description: 'A játékos visszakerül a starthoz' }
-]
-
 export default function TaskCardEditor({ card, onChange }) {
   
   const updateField = (field, value) => {
@@ -92,26 +84,6 @@ export default function TaskCardEditor({ card, onChange }) {
     onChange({ acceptedAnswers: newAnswers })
   }
 
-  const updateConsequence = (field, value) => {
-    const currentConsequence = card.consequence || { type: 0, value: 1 }
-    onChange({ 
-      consequence: {
-        ...currentConsequence,
-        [field]: value
-      }
-    })
-  }
-
-  const updateWrongConsequence = (field, value) => {
-    const currentWrongConsequence = card.wrongConsequence || { type: 1, value: 1 }
-    onChange({ 
-      wrongConsequence: {
-        ...currentWrongConsequence,
-        [field]: value
-      }
-    })
-  }
-
   return (
     <div className="max-w-4xl mx-auto space-y-6">
       {/* Feladat típus választó */}
@@ -544,100 +516,6 @@ export default function TaskCardEditor({ card, onChange }) {
           </div>
         </div>
       </div>
-
-      {/* Következmények (helyes válasz esetén) */}
-      <div className="bg-[color:var(--color-surface)] rounded-xl p-6">
-        <h3 className="text-lg font-semibold text-[color:var(--color-text)] mb-4">
-          🎯 Következmények (helyes válasz esetén)
-        </h3>
-        
-        <div className="space-y-4">
-          {/* Consequence Type */}
-          <div>
-            <label className="block text-[color:var(--color-text-muted)] text-sm font-medium mb-2">
-              Hatás típusa
-            </label>
-            <select
-              value={card.consequence?.type ?? 0}
-              onChange={(e) => updateConsequence('type', parseInt(e.target.value))}
-              className="w-full px-4 py-2 rounded-xl bg-[color:var(--color-background)] border border-[color:var(--color-surface-selected)] text-[color:var(--color-text)] focus:ring-2 focus:ring-[color:var(--color-success)] focus:border-transparent outline-none transition-all duration-200"
-            >
-              {consequenceTypes.map(type => (
-                <option key={type.value} value={type.value}>
-                  {type.label}
-                </option>
-              ))}
-            </select>
-            <div className="text-xs text-[color:var(--color-text-muted)] mt-1">
-              {consequenceTypes.find(t => t.value === (card.consequence?.type ?? 0))?.description}
-            </div>
-          </div>
-
-          {/* Consequence Value - csak ha előre/hátra lépés */}
-          {(card.consequence?.type === 0 || card.consequence?.type === 1) && (
-            <div>
-              <label className="block text-[color:var(--color-text-muted)] text-sm font-medium mb-2">
-                Mezők száma
-              </label>
-              <input
-                type="number"
-                value={card.consequence?.value ?? 1}
-                onChange={(e) => updateConsequence('value', parseInt(e.target.value) || 1)}
-                className="w-full px-4 py-2 rounded-xl bg-[color:var(--color-background)] border border-[color:var(--color-surface-selected)] text-[color:var(--color-text)] focus:ring-2 focus:ring-[color:var(--color-success)] focus:border-transparent outline-none transition-all duration-200"
-                min="1"
-                max="10"
-              />
-            </div>
-          )}
-        </div>
-      </div>
-
-      {/* Következmények (rossz válasz esetén) */}
-      <div className="bg-[color:var(--color-surface)] rounded-xl p-6">
-        <h3 className="text-lg font-semibold text-[color:var(--color-text)] mb-4">
-          ❌ Következmények (rossz válasz esetén)
-        </h3>
-        
-        <div className="space-y-4">
-          {/* Wrong Consequence Type */}
-          <div>
-            <label className="block text-[color:var(--color-text-muted)] text-sm font-medium mb-2">
-              Hatás típusa
-            </label>
-            <select
-              value={card.wrongConsequence?.type ?? 1}
-              onChange={(e) => updateWrongConsequence('type', parseInt(e.target.value))}
-              className="w-full px-4 py-2 rounded-xl bg-[color:var(--color-background)] border border-[color:var(--color-surface-selected)] text-[color:var(--color-text)] focus:ring-2 focus:ring-[color:var(--color-danger)] focus:border-transparent outline-none transition-all duration-200"
-            >
-              {consequenceTypes.map(type => (
-                <option key={type.value} value={type.value}>
-                  {type.label}
-                </option>
-              ))}
-            </select>
-            <div className="text-xs text-[color:var(--color-text-muted)] mt-1">
-              {consequenceTypes.find(t => t.value === (card.wrongConsequence?.type ?? 1))?.description}
-            </div>
-          </div>
-
-          {/* Wrong Consequence Value - csak ha előre/hátra lépés */}
-          {(card.wrongConsequence?.type === 0 || card.wrongConsequence?.type === 1) && (
-            <div>
-              <label className="block text-[color:var(--color-text-muted)] text-sm font-medium mb-2">
-                Mezők száma
-              </label>
-              <input
-                type="number"
-                value={card.wrongConsequence?.value ?? 1}
-                onChange={(e) => updateWrongConsequence('value', parseInt(e.target.value) || 1)}
-                className="w-full px-4 py-2 rounded-xl bg-[color:var(--color-background)] border border-[color:var(--color-surface-selected)] text-[color:var(--color-text)] focus:ring-2 focus:ring-[color:var(--color-danger)] focus:border-transparent outline-none transition-all duration-200"
-                min="1"
-                max="10"
-              />
-            </div>
-          )}
-        </div>
-      </div>
     </div>
   )
 }

SerpentRace_Frontend/src/components/Footer/Footer.jsx

@@ -70,12 +70,6 @@ const Footer = () => {
           >
             Rólunk
           </button>
-          <button
-            onClick={goContacts}
-            className="text-left hover:underline hover:text-green-500 transition-colors"
-          >
-            Kapcsolat
-          </button>
         </div>
 
         {/* Közösség */}

SerpentRace_Frontend/src/components/Landingpage/LandingPage.jsx

@@ -7,10 +7,12 @@ import { FaUsers, FaPaintBrush, FaHeadset } from "react-icons/fa"
 import { motion } from "framer-motion"
 import { isAuthenticated } from "../../hooks/useRequireAuth" // <-- added import
 import { useNavigate } from "react-router-dom" // <-- NEW
+import HandleNavigate from "../../utils/HandleNavigate/HandleNavigate" // <-- NEW
 
-const LandingPage = ({ onNavigateToPlay, onNavigateToAuth, onNavigateToGame, onNavigateToContacts }) => {
+// 🔧 HIBA JAVÍTVA: függvénydefiníció hozzáadva
-  const auth = isAuthenticated() // <-- check without redirect
+const LandingPage = () => {
-  const navigate = useNavigate() // <-- NEW
+  const { goLanding, goAbout, goHome, goLogin, goAuth } = HandleNavigate()
+  const auth = isAuthenticated() // a hitelesítési állapot meghatározásához
 
   return (
     <div className="w-full">
@@ -45,6 +47,7 @@ const LandingPage = ({ onNavigateToPlay, onNavigateToAuth, onNavigateToGame, onN
             A SerpentRace egy társasjáték, ahol új barátokra lelhetsz, közösséget építhetsz és tanulhatsz –
             mindezt szórakozva!
           </motion.p>
+
           <motion.div
             className="text-xl md:text-2xl font-bold text-emerald-400 mb-10"
             initial={{ opacity: 0, y: 20 }}
@@ -63,12 +66,12 @@ const LandingPage = ({ onNavigateToPlay, onNavigateToAuth, onNavigateToGame, onN
             {/* If not authenticated show Login/Register; if authenticated show Home button */}
             {!auth ? (
               <>
-                <ButtonGreen text="Bejelentkezés" onClick={onNavigateToPlay} width="w-60" />
+                <ButtonGreen text="Bejelentkezés" onClick={goLogin} width="w-60" />
-                <ButtonGreen text="Regisztráció" onClick={onNavigateToAuth} width="w-60" />
+                <ButtonGreen text="Regisztráció" onClick={goAuth} width="w-60" />
-                <ButtonGreen text="Játék" onClick={onNavigateToGame} width="w-60" /> 
+                <ButtonGreen text="Játék" onClick={goHome} width="w-60" />
               </>
             ) : (
-              <ButtonGreen text="Játék" onClick={onNavigateToGame} width="w-60" />
+              <ButtonGreen text="Játék" onClick={goHome} width="w-60" />
             )}
           </motion.div>
         </div>
@@ -178,7 +181,7 @@ const LandingPage = ({ onNavigateToPlay, onNavigateToAuth, onNavigateToGame, onN
 
             <ButtonGreen
               text="Kapcsolatfelvétel"
-              onClick={onNavigateToContacts}
+              onClick={goAbout}
               className="px-12 py-4 text-xl font-bold"
             />
           </motion.div>

SerpentRace_Frontend/src/components/Landingpage/PlayMenu.jsx

@@ -1,4 +1,5 @@
 import React, { useState } from "react"
+import { useNavigate } from "react-router-dom"
 import LogoCard from "../../assets/pictures/LogoCard.jsx"
 import logoImg from "../../assets/pictures/Logo.png" // <-- EZT ADD HOZZÁ
 import ButtonDark from "../Buttons/ButtonDark.jsx"
@@ -12,6 +13,7 @@ const PlayMenu = ({ onJoinGame, onCreateGame, user, setUser }) => {
 
   // gyors username kiolvasás (ha a parent objektum user={ { name: ... } } küldi)
   const username = user?.name ?? null
+  const navigate = useNavigate()
 
   const handleJoin = () => {
     if (!joinCode.trim()) {
@@ -23,7 +25,22 @@ const PlayMenu = ({ onJoinGame, onCreateGame, user, setUser }) => {
   }
 
   const handleCreate = () => {
-    onCreateGame()
+    // determine the name we will pass: logged in username or guestName
+    const nameToSend = username ?? guestName?.trim()
+
+    if (!nameToSend) {
+      setGuestError("Adj meg egy nevet, vagy jelentkezz be!")
+      return
+    }
+
+    // if parent provided a setter, set guest as current user (optional)
+    if (!username && setUser) {
+      setUser({ name: nameToSend })
+    }
+
+    // Do NOT call onCreateGame here to avoid any alert side-effects from parent.
+    // Just navigate to choose deck and pass username via location.state
+    navigate("/choosedeck", { state: { username: nameToSend } })
   }
 
   // egyszerű segéd a kezdobetűk kinyerésére

SerpentRace_Frontend/src/components/Navbar/Navbar.jsx

@@ -2,17 +2,16 @@ import React, { useState } from "react"
 import Logo from "../../assets/pictures/Logo"
 import { Link } from "react-router-dom"
 import HandleNavigate from "../../utils/HandleNavigate/HandleNavigate" // ✅ importáld a navigációs hookot
+import { FaSignOutAlt, FaChartBar, FaUser, FaBars } from "react-icons/fa"
 
-const navLinkClass =
+const navLinkClass = "px-3 py-2 rounded-lg text-white transition-all duration-200 hover:bg-white/10"
-  "px-3 py-2 rounded-lg text-white transition-all duration-200 hover:bg-white/10"
 const navLinkClassPlay =
   "px-4 py-2 rounded-lg text-white bg-white/12 hover:bg-white/20 transition-all duration-200"
 
 const Navbar = () => {
   const [menuOpen, setMenuOpen] = useState(false)
-  const isLoggedIn = Boolean(
+  const [userMenuOpen, setUserMenuOpen] = useState(false)
-    localStorage.getItem("authLevel") && localStorage.getItem("username")
+  const isLoggedIn = Boolean(localStorage.getItem("authLevel") && localStorage.getItem("username"))
-  )
 
   // ✅ Használjuk a HandleNavigate hookot
   const { goLanding, goAbout, goHome, goLogin, goContacts } = HandleNavigate()
@@ -25,16 +24,23 @@ const Navbar = () => {
 
   return (
     <nav className="bg-gradient-to-r from-green-700 to-emerald-500 shadow-lg">
-      <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-0">
+      {/* removed mx-auto and px-* classes; use full width + responsive padding-inline using clamp */}
+      <div
+        className="w-full"
+        style={{
+          /* minimális padding 12px, növel a képernyővel, max 30px */
+          paddingInline: "clamp(12px, calc((100vw - 1024px) / 2), 80px)",
+        }}
+      >
         <div className="flex justify-between h-16 items-center">
           {/* Logo + Brand */}
           <div className="flex-shrink-0 flex items-center gap-2">
-            <button onClick={goLanding} className="flex items-center mt-1 h-9">
+            <button onClick={goLanding} className=" cursor-pointer flex items-center mt-1 h-9">
               <Logo size={36} />
             </button>
             <button
               onClick={goLanding}
-              className="flex items-center h-9 text-white font-bold text-2xl tracking-tight"
+              className="cursor-pointer flex items-center h-9 text-white font-bold text-2xl tracking-tight"
             >
               SerpentRace
             </button>
@@ -43,22 +49,16 @@ const Navbar = () => {
           {/* Desktop Menu */}
           <div className="hidden md:flex items-center space-x-6">
             {/* Bal oldali linkek */}
-            <button onClick={goLanding} className={navLinkClass}>
-              Főoldal
-            </button>
             <button onClick={goAbout} className={navLinkClass}>
               Rólunk
             </button>
-            <button onClick={goContacts} className={navLinkClass}>
-              Kapcsolat
-            </button>
 
             {/* Csak bejelentkezve */}
             {isLoggedIn && (
               <>
-                <Link to="/decks" className={navLinkClass}>Paklik</Link>
+                <Link to="/decks" className={navLinkClass}>
-                <Link to="/report" className={navLinkClass}>Statisztikák</Link>
+                  Paklik
-                <Link to="/profile" className={navLinkClass}>Profil</Link>
+                </Link>
               </>
             )}
 
@@ -88,26 +88,54 @@ const Navbar = () => {
                 </Link>
               </div>
             ) : (
+              // Ha be van jelentkezve: mutatunk egy kis lenyíló gombot (ikon), ami tartalmazza a Profil, Statisztikák és Kijelentkezés linkeket
+              <div className="relative">
                 <button
-                onClick={handleLogout}
+                  onClick={() => setUserMenuOpen((s) => !s)}
-                className="ml-2 p-2 rounded-full bg-[#166534] hover:bg-[#1f7a45] text-white shadow-lg hover:shadow-green-400/40 transition-all transform hover:scale-105 cursor-pointer"
+                  className="ml-2 p-2 rounded-full bg-[#166534] hover:bg-[#1f7a45] text-white shadow-lg hover:shadow-green-400/40 transition-all transform hover:scale-105 cursor-pointer flex items-center gap-2"
-                title="Kijelentkezés"
+                  title="Felhasználói menü"
                 >
-                <svg
+                  <FaBars className="h-5 w-5" />
-                  xmlns="http://www.w3.org/2000/svg"
-                  className="h-6 w-6"
-                  fill="none"
-                  viewBox="0 0 24 24"
-                  stroke="currentColor"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth={2}
-                    d="M10 16l4-4m0 0l-4-4m4 4H3m13 4v1a2 2 0 002 2h2a2 2 0 002-2V7a2 2 0 00-2-2h-2a2 2 0 00-2 2v1"
-                  />
-                </svg>
                 </button>
+
+                {userMenuOpen && (
+                  <div className="absolute right-0 mt-2 w-44 bg-white/5 backdrop-blur-sm border border-gray-700 rounded-lg shadow-lg overflow-hidden z-40">
+                    <button
+                      onClick={() => {
+                        setUserMenuOpen(false)
+                        // navigálás statisztikák
+                        goLanding // fallback, majd ha kell: goReport
+                      }}
+                      className="w-full flex items-center gap-3 px-4 py-2 hover:bg-white/10 text-white"
+                    >
+                      <FaChartBar className="w-4 h-4" />
+                      <span className="text-sm">Statisztikák</span>
+                    </button>
+                    <button
+                      onClick={() => {
+                        setUserMenuOpen(false)
+                        // profil
+                        window.location.href = "/profile"
+                      }}
+                      className="w-full flex items-center gap-3 px-4 py-2 hover:bg-white/10 text-white"
+                    >
+                      <FaUser className="w-4 h-4" />
+                      <span className="text-sm">Profil</span>
+                    </button>
+                    <div className="h-px bg-white/5" />
+                    <button
+                      onClick={() => {
+                        setUserMenuOpen(false)
+                        handleLogout()
+                      }}
+                      className="w-full flex items-center gap-3 px-4 py-2 hover:bg-white/10 text-white"
+                    >
+                      <FaSignOutAlt className="w-4 h-4" />
+                      <span className="text-sm">Kijelentkezés</span>
+                    </button>
+                  </div>
+                )}
+              </div>
             )}
           </div>
 
@@ -133,12 +161,7 @@ const Navbar = () => {
                     d="M6 18L18 6M6 6l12 12"
                   />
                 ) : (
-                  <path
+                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4 8h16M4 16h16" />
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth={2}
-                    d="M4 8h16M4 16h16"
-                  />
                 )}
               </svg>
             </button>
@@ -149,24 +172,50 @@ const Navbar = () => {
       {/* Mobile Menu */}
       {menuOpen && (
         <div className="md:hidden bg-emerald-600 px-2 pt-2 pb-3 space-y-1">
-          <button onClick={() => { goLanding(); setMenuOpen(false) }} className={navLinkClass}>Főoldal</button>
+          <button
-          <button onClick={() => { goAbout(); setMenuOpen(false) }} className={navLinkClass}>Rólunk</button>
+            onClick={() => {
-          <button onClick={() => { goContacts(); setMenuOpen(false) }} className={navLinkClass}>Kapcsolat</button>
+              goAbout()
+              setMenuOpen(false)
+            }}
+            className={navLinkClass}
+          >
+            Rólunk
+          </button>
+          <button
+            onClick={() => {
+              goContacts()
+              setMenuOpen(false)
+            }}
+            className={navLinkClass}
+          >
+            Kapcsolat
+          </button>
 
           {isLoggedIn && (
             <>
-              <Link to="/decks" onClick={() => setMenuOpen(false)} className={navLinkClass}>Paklik</Link>
+              <Link to="/decks" onClick={() => setMenuOpen(false)} className={navLinkClass}>
-              <Link to="/report" onClick={() => setMenuOpen(false)} className={navLinkClass}>Statisztikák</Link>
+                Paklik
-              <Link to="/profile" onClick={() => setMenuOpen(false)} className={navLinkClass}>Profil</Link>
+              </Link>
             </>
           )}
 
-          <button onClick={() => { goHome(); setMenuOpen(false) }} className={navLinkClassPlay}>Játék</button>
+          <button
+            onClick={() => {
+              goHome()
+              setMenuOpen(false)
+            }}
+            className={navLinkClassPlay}
+          >
+            Játék
+          </button>
 
           {!isLoggedIn ? (
             <div className="flex flex-col space-y-2">
               <button
-                onClick={() => { goLogin(); setMenuOpen(false) }}
+                onClick={() => {
+                  goLogin()
+                  setMenuOpen(false)
+                }}
                 className="block px-3 py-2 rounded-lg hover:bg-white/20 text-white font-semibold transition-all"
               >
                 Bejelentkezés
@@ -190,23 +239,10 @@ const Navbar = () => {
                   handleLogout()
                   setMenuOpen(false)
                 }}
-                className="p-2 rounded-full bg-[#166534] hover:bg-[#1f7a45] text-white shadow-lg hover:shadow-green-400/40 transition-all transform hover:scale-105 cursor-pointer"
+                className="p-2 rounded-full bg-[#166534] hover:bg-[#1f7a45] text-white shadow-lg hover:shadow-green-400/40 transition-all transform hover:scale-105 cursor-pointer flex items-center gap-2"
                 title="Kijelentkezés"
               >
-                <svg
+                <FaSignOutAlt className="h-6 w-6" />
-                  xmlns="http://www.w3.org/2000/svg"
-                  className="h-6 w-6"
-                  fill="none"
-                  viewBox="0 0 24 24"
-                  stroke="currentColor"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth={2}
-                    d="M10 16l4-4m0 0l-4-4m4 4H3m13 4v1a2 2 0 002 2h2a2 2 0 002-2V7a2 2 0 00-2-2h-2a2 2 0 00-2 2v1"
-                  />
-                </svg>
               </button>
             </div>
           )}

SerpentRace_Frontend/src/components/PopUp/DeckInfoPopUp.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from "react"
+import React, { useEffect, useState } from "react"
 import { useNavigate } from "react-router-dom"
 import { 
   FaUser, 
@@ -11,9 +11,11 @@ import {
   FaTimes,
   FaEdit 
 } from "react-icons/fa"
+import { getUserProfile } from "../../api/userApi"
 
 export default function DeckInfoPopUp({ deck, onClose }) {
   const navigate = useNavigate()
+  const [currentUser, setCurrentUser] = useState(null)
   
   if (!deck) return null
 
@@ -32,6 +34,25 @@ export default function DeckInfoPopUp({ deck, onClose }) {
     }
   }, [])
 
+  // Load current user to decide if Edit button should be shown
+  useEffect(() => {
+    let mounted = true
+    const loadUser = async () => {
+      try {
+        const data = await getUserProfile()
+        console.log('👤 Loaded current user:', data)
+        if (mounted) setCurrentUser(data)
+      } catch (e) {
+        // silently ignore - edit button will be hidden for anonymous
+        console.warn('Could not fetch current user profile for DeckInfoPopUp:', e)
+      }
+    }
+
+    loadUser()
+
+    return () => { mounted = false }
+  }, [])
+
   // Backend enum mapping
   const deckTypeMapping = {
     0: { label: "Szerencse", color: "var(--color-luck)" },      // LUCK
@@ -106,8 +127,19 @@ export default function DeckInfoPopUp({ deck, onClose }) {
   }
 
   const handleOpenDeck = () => {
-    // TODO: Megnyitás funkció - később implementálható
+    // Get the deck ID from raw data
-    alert("⚠️ A pakli megnyitás funkció még fejlesztés alatt áll!")
+    const deckId = rawData.id || deck.id
+    
+    if (!deckId) {
+      alert("⚠️ Hiba: A pakli azonosítója nem található!")
+      return
+    }
+    
+    // Navigate to card display page
+    navigate(`/deck/${deckId}`)
+    
+    // Close the popup
+    onClose()
   }
 
   const handleEditDeck = () => {
@@ -126,6 +158,50 @@ export default function DeckInfoPopUp({ deck, onClose }) {
     onClose()
   }
 
+  // Determine whether the current user can edit this deck
+  // Option 1: Use backend's 'editable' flag if available (ShortDeckDto)
+  // Option 2: Check userid field (DetailDeckDto) or compare user names
+  
+  // Check if user is admin (state === 5)
+  const isAdmin = currentUser ? Number(currentUser.state) === 5 : false
+  
+  // Check if deck is editable (backend provides this in ShortDeckDto)
+  const backendEditableFlag = rawData.editable === true
+  
+  // Fallback: Check if user is the owner by userid (DetailDeckDto) or username
+  const deckOwnerId = rawData.userid // Only available in DetailDeckDto
+  const deckCreatorName = rawData.creator // Available in ShortDeckDto (username)
+  
+  const isOwnerById = currentUser && deckOwnerId
+    ? (String(currentUser.id) === String(deckOwnerId))
+    : false
+  
+  const isOwnerByName = currentUser && deckCreatorName
+    ? (currentUser.username === deckCreatorName)
+    : false
+  
+  // User can edit if:
+  // 1. Backend says it's editable (ShortDeckDto has editable flag)
+  // 2. User is the owner (by ID or username)
+  // 3. User is an admin (state === 5)
+  const canEdit = backendEditableFlag || isOwnerById || isOwnerByName || isAdmin
+
+  // Debug: Check permission logic
+  console.log('🔍 Permission Check:', {
+    'Has currentUser?': !!currentUser,
+    'currentUser.id': currentUser?.id,
+    'currentUser.username': currentUser?.username,
+    'currentUser.state': currentUser?.state,
+    'deckOwnerId (userid)': deckOwnerId,
+    'deckCreatorName': deckCreatorName,
+    'backendEditableFlag': backendEditableFlag,
+    'isOwnerById': isOwnerById,
+    'isOwnerByName': isOwnerByName,
+    'isAdmin': isAdmin,
+    'canEdit': canEdit,
+    'rawData': rawData
+  })
+
   return (
     <div className="fixed inset-0 bg-black/60 flex items-center justify-center z-50 backdrop-blur-sm">
       <div 
@@ -254,7 +330,7 @@ export default function DeckInfoPopUp({ deck, onClose }) {
 
           {/* Action buttons */}
           <div className="mt-5 pt-4 border-t border-[color:var(--color-surface-selected)]">
-            <div className="grid grid-cols-2 gap-3">
+            <div className={`grid gap-3 ${canEdit ? 'grid-cols-2' : 'grid-cols-1'}`}>
               {/* Open button */}
               <button
                 className="px-4 py-2.5 rounded-xl font-semibold text-[color:var(--color-text-inverse)] transition-all duration-200 hover:scale-105 shadow-lg bg-[color:var(--color-success)] hover:bg-[color:var(--color-success)]/80"
@@ -263,7 +339,8 @@ export default function DeckInfoPopUp({ deck, onClose }) {
                 Megnyitás
               </button>
               
-              {/* Edit button */}
+              {/* Edit button - only visible to owner or admin (state === 5) */}
+              {canEdit && (
                 <button
                   className="px-4 py-2.5 rounded-xl font-semibold text-[color:var(--color-text)] border border-[color:var(--color-surface-selected)] transition-all duration-200 hover:scale-105 hover:bg-[color:var(--color-surface-selected)] flex items-center justify-center gap-2"
                   onClick={handleEditDeck}
@@ -271,6 +348,7 @@ export default function DeckInfoPopUp({ deck, onClose }) {
                   <FaEdit className="text-sm" />
                   Szerkesztés
                 </button>
+              )}
             </div>
           </div>
         </div>

SerpentRace_Frontend/src/pages/About/About.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from "react"
+import React, { useState } from "react"
 import Navbar from "../../components/Navbar/Navbar"
 import Footer from "../../components/Footer/Footer"
 import Background from "../../assets/backgrounds/Background.jsx"
@@ -9,10 +9,53 @@ import Zsola from "../../assets/pictures/zsola.JPG"
 import Donat from "../../assets/pictures/donat.JPG"
 import Turo from "../../assets/pictures/turo.JPG"
 import Piskor from "../../assets/pictures/piskor.JPG"
+// ÚJ: kész ikonok használata
+import { FaLightbulb, FaUsers, FaShieldAlt } from "react-icons/fa"
+// ÚJ: framer-motion használata a Landing-hez hasonló megjelenésért
+import { motion } from "framer-motion"
+
+///// ÚJ: központosított motion beállítások /////
+const baseMotion = {
+  initial: { opacity: 0, y: 20 },
+  whileInView: { opacity: 1, y: 0 },
+  viewport: { once: true, amount: 0.2 },
+  transition: { duration: 0.8 },
+}
+
+const getMotionProps = (overrides = {}) => {
+  const { transition = {}, viewport = {}, ...rest } = overrides
+  return {
+    ...baseMotion,
+    ...rest,
+    transition: { ...baseMotion.transition, ...transition },
+    viewport: { ...baseMotion.viewport, ...viewport },
+  }
+}
+
+///// ÚJ: variánsok a szülő-gyermek animációhoz (stagger) /////
+// container: használható olyan szekciókra, ahol a children együttesen animálódjanak
+const containerVariant = {
+  hidden: {},
+  visible: {
+    transition: {
+      staggerChildren: 0.06,
+      // delayChildren beállítható egyedi késleltetéshez
+    },
+  },
+}
+// item: alap animáció minden gyermek elemhez
+const itemVariant = {
+  hidden: { opacity: 0, y: 20 },
+  visible: { opacity: 1, y: 0, transition: { duration: 0.6 } },
+}
 
 const About = () => {
-  const [visible, setVisible] = useState(false)
+  // Új: kontakt űrlap state + státusz
-  const sectionRef = useRef(null)
+  const [contactName, setContactName] = useState("")
+  const [contactEmail, setContactEmail] = useState("")
+  const [contactMessage, setContactMessage] = useState("")
+  const [submitting, setSubmitting] = useState(false)
+  const [success, setSuccess] = useState("")
 
   const teamMembers = [
     {
@@ -52,20 +95,35 @@ const About = () => {
     },
   ]
 
-  useEffect(() => {
+  // Új: egyszerű onSubmit kezelő (nem változott logika)
-    const observer = new IntersectionObserver(
+  const handleContactSubmit = (e) => {
-      ([entry]) => {
+    e.preventDefault()
-        if (entry.isIntersecting) setVisible(true)
+    if (!contactName.trim() || !contactEmail.trim() || !contactMessage.trim()) {
-      },
+      setSuccess("Kérlek tölts ki minden mezőt.")
-      { threshold: 0.3 }
+      return
-    )
+    }
-    if (sectionRef.current) observer.observe(sectionRef.current)
+    // nagyon egyszerű email ellenőrzés
-    return () => observer.disconnect()
+    const emailRe = /\S+@\S+\.\S+/
-  }, [])
+    if (!emailRe.test(contactEmail)) {
+      setSuccess("Kérlek adj meg érvényes email címet.")
+      return
+    }
+
+    setSubmitting(true)
+    setSuccess("")
+    // Itt lehetne API hívás; most csak szimuláljuk
+    setTimeout(() => {
+      setSubmitting(false)
+      setContactName("")
+      setContactEmail("")
+      setContactMessage("")
+      setSuccess("Köszönjük, üzenetedet megkaptuk!")
+      setTimeout(() => setSuccess(""), 5000)
+    }, 900)
+  }
 
   return (
     <div className="flex flex-col min-h-screen overflow-y-auto relative">
-
       {/* Háttér – fix pozíció, a teljes képernyőre */}
       <div className="fixed top-0 left-0 w-full h-full z-[-10]">
         <Background />
@@ -78,7 +136,6 @@ const About = () => {
 
       {/* Tartalom */}
       <main className="flex-grow text-white px-6 pt-16 mt-0 mb-20">
-
         {/* Vissza gomb */}
         <div className="fixed top-4 left-4 z-50 group">
           <div className="absolute top-full mt-1 left-1/2 -translate-x-1/2 scale-0 group-hover:scale-100 transition transform bg-zinc-800 text-sm text-white px-3 py-1 rounded shadow-lg">
@@ -86,56 +143,109 @@ const About = () => {
           </div>
         </div>
 
-        <section
+        {/* Általános konténer — framer-motion mint a Landingnél */}
-          ref={sectionRef}
+        <motion.section className="max-w-5xl mx-auto" {...getMotionProps({ transition: { duration: 0.7 } })}>
-          className={`max-w-5xl mx-auto transition-all duration-1000 ease-out ${
-            visible ? "opacity-100 translate-y-0" : "opacity-0 translate-y-10"
-          }`}
-        >
           {/* Rólunk cím */}
-          <h1 className="mt-24 text-5xl font-extrabold text-green-300 mb-10 text-center tracking-wide drop-shadow-lg">
+          <motion.h1
+            className="mt-24 text-5xl font-extrabold text-green-300 mb-10 text-center tracking-wide drop-shadow-lg"
+            {...getMotionProps({ transition: { duration: 0.8, delay: 0.1 } })}
+          >
             <span className="inline-block animate-pulse mr-2"></span> Rólunk
-          </h1>
+          </motion.h1>
 
           {/* Leírás */}
-          <p className="text-lg leading-relaxed text-zinc-200 mb-10 text-center max-w-3xl mx-auto">
+          <motion.p
-            Célunk, hogy egy innovatív, közösségorientált platformot építsünk, ahol a versenyzés, játék és technológia találkozik. Elhivatott csapatunk minden nap azon dolgozik, hogy élményt és értéket nyújtson a felhasználóinknak.
+            className="text-lg leading-relaxed text-zinc-200 mb-10 text-center max-w-3xl mx-auto"
-          </p>
+            {...getMotionProps({ transition: { duration: 0.8, delay: 0.2 } })}
+          >
+            Célunk, hogy egy innovatív, közösségorientált platformot építsünk, ahol a versenyzés, játék és
+            technológia találkozik. Elhivatott csapatunk minden nap azon dolgozik, hogy élményt és értéket
+            nyújtson a felhasználóinknak.
+          </motion.p>
 
-          {/* Küldetésünk */}
+          {/* Küldetésünk — most szülő variánssal, hogy a kártyák ne triggereljenek külön és ne ugorjanak */}
-          <div className="mt-12">
+          <motion.div
+            className="mt-12"
+            initial="hidden"
+            whileInView="visible"
+            viewport={{ once: true, amount: 0.2 }}
+            variants={{
+              hidden: {},
+              visible: { transition: { staggerChildren: 0.08, delayChildren: 0.12 } },
+            }}
+          >
             <h2 className="text-2xl font-bold text-green-300 mb-4">Küldetésünk</h2>
-            <div className="grid md:grid-cols-3 gap-6">
-              <div className="bg-zinc-800 rounded-xl p-6 shadow-lg hover:scale-105 transition">
-                <h3 className="text-xl font-semibold mb-2">Innováció</h3>
-                <p className="text-zinc-300">Folyamatosan fejlesztjük rendszereinket a legmodernebb technológiákkal.</p>
-              </div>
-              <div className="bg-zinc-800 rounded-xl p-6 shadow-lg hover:scale-105 transition">
-                <h3 className="text-xl font-semibold mb-2">Közösség</h3>
-                <p className="text-zinc-300">Fontos számunkra, hogy egy összetartó, aktív közösséget építsünk ki.</p>
-              </div>
-              <div className="bg-zinc-800 rounded-xl p-6 shadow-lg hover:scale-105 transition">
-                <h3 className="text-xl font-semibold mb-2">Minőség</h3>
-                <p className="text-zinc-300">Minden részletre figyelünk a felhasználói élmény és biztonság érdekében.</p>
-              </div>
-            </div>
-          </div>
 
-          {/* Csapat */}
+            {/* Új: stilizált kártyák (egyenként animálva a szülőből) */}
-          <div className="mt-16">
+            <div className="grid gap-6 md:grid-cols-3">
+              <motion.div
+                className="group bg-zinc-900/40 border border-gray-700 rounded-2xl p-6 shadow-lg transform transition hover:-translate-y-2"
+                variants={itemVariant}
+              >
+                <div className="w-16 h-16 mx-auto rounded-full bg-gradient-to-br from-emerald-400 to-green-600 flex items-center justify-center mb-4">
+                  {/* ICON: Lightbulb */}
+                  <FaLightbulb className="w-8 h-8 text-black" />
+                </div>
+                <h3 className="text-lg font-semibold text-center mb-2">Innováció</h3>
+                <p className="text-zinc-300 text-center">
+                  Modern megoldásokkal gyorsítjuk a fejlődést — moduláris, skálázható rendszereket építünk.
+                </p>
+              </motion.div>
+
+              <motion.div
+                className="group bg-zinc-900/40 border border-gray-700 rounded-2xl p-6 shadow-lg transform transition hover:-translate-y-2"
+                variants={itemVariant}
+              >
+                <div className="w-16 h-16 mx-auto rounded-full bg-gradient-to-br from-sky-400 to-blue-600 flex items-center justify-center mb-4">
+                  {/* ICON: Users */}
+                  <FaUsers className="w-8 h-8 text-black" />
+                </div>
+                <h3 className="text-lg font-semibold text-center mb-2">Közösség</h3>
+                <p className="text-zinc-300 text-center">
+                  Közösségépítés és együttműködés—eszközök, amik bevonják és motiválják a felhasználókat.
+                </p>
+              </motion.div>
+
+              <motion.div
+                className="group bg-zinc-900/40 border border-gray-700 rounded-2xl p-6 shadow-lg transform transition hover:-translate-y-2"
+                variants={itemVariant}
+              >
+                <div className="w-16 h-16 mx-auto rounded-full bg-gradient-to-br from-yellow-400 to-orange-500 flex items-center justify-center mb-4">
+                  {/* ICON: Shield/Quality */}
+                  <FaShieldAlt className="w-8 h-8 text-black" />
+                </div>
+                <h3 className="text-lg font-semibold text-center mb-2">Minőség</h3>
+                <p className="text-zinc-300 text-center">
+                  Biztonság, megbízhatóság és gondosan tervezett UX — minden részlet számít.
+                </p>
+              </motion.div>
+            </div>
+          </motion.div>
+
+          {/* Csapat — a szülő kezeli a gyermekek animációját (stagger), így nincs külön "belülről" trigger */}
+          <motion.div
+            className="mt-16"
+            initial="hidden"
+            whileInView="visible"
+            viewport={{ once: true, amount: 0.2 }}
+            variants={{
+              hidden: {},
+              visible: { transition: { staggerChildren: 0.06, delayChildren: 0.25 } },
+            }}
+          >
             <h2 className="text-2xl font-bold text-green-300 mb-6">Csapatunk</h2>
             <div className="grid md:grid-cols-3 gap-8">
               {teamMembers.map((member, i) => {
                 const isLast = i === teamMembers.length - 1
                 const itemsInLastRow = teamMembers.length % 3
                 const shouldCenter = itemsInLastRow === 1 && isLast
-
                 return (
-                  <div
+                  <motion.div
                     key={i}
                     className={`flex flex-col items-center text-center bg-zinc-800 p-6 rounded-xl shadow-lg hover:shadow-green-400/20 hover:scale-105 transition ${
                       shouldCenter ? "md:col-start-2" : ""
                     }`}
+                    variants={itemVariant}
                   >
                     <img
                       src={member.photo}
@@ -144,12 +254,94 @@ const About = () => {
                     />
                     <h4 className="text-lg font-bold">{member.name}</h4>
                     <p className="text-zinc-400">{member.role}</p>
-                  </div>
+                  </motion.div>
                 )
               })}
             </div>
+          </motion.div>
+
+          {/* Új: Kapcsolat szekció — egységes megjelenés (animálva) */}
+          <motion.section
+            id="contact"
+            className="mt-16 bg-transparent"
+            {...getMotionProps({ transition: { duration: 0.8, delay: 0.25 } })}
+          >
+            <div className="max-w-5xl mx-auto bg-white/5 rounded-2xl border border-gray-700 p-8 shadow-lg">
+              <h2 className="text-3xl font-bold mb-6 text-center border-b-4 border-emerald-400 pb-2 text-white">
+                Kapcsolat
+              </h2>
+
+              <div className="grid md:grid-cols-2 gap-8">
+                {/* Bal: elérhetőségek */}
+                <div className="flex flex-col justify-center gap-6">
+                  <div className="bg-zinc-800 rounded-xl p-5 shadow-md flex items-start gap-4">
+                    <div className="bg-emerald-500 text-black rounded-lg p-3 text-xl flex-shrink-0">✉️</div>
+                    <div>
+                      <div className="font-semibold">Email</div>
+                      <div className="text-zinc-300">hello@serpentrace.hu</div>
                     </div>
-        </section>
+                  </div>
+
+                  <div className="bg-zinc-800 rounded-xl p-5 shadow-md flex items-start gap-4">
+                    <div className="bg-emerald-500 text-black rounded-lg p-3 text-xl flex-shrink-0">📞</div>
+                    <div>
+                      <div className="font-semibold">Telefon</div>
+                      <div className="text-zinc-300">+36 20 123 4567</div>
+                    </div>
+                  </div>
+
+                  <div className="bg-zinc-800 rounded-xl p-5 shadow-md flex items-start gap-4">
+                    <div className="bg-emerald-500 text-black rounded-lg p-3 text-xl flex-shrink-0">📍</div>
+                    <div>
+                      <div className="font-semibold">Iroda</div>
+                      <div className="text-zinc-300">Budapest, Magyarország</div>
+                    </div>
+                  </div>
+
+                  <p className="text-zinc-400 mt-2 text-sm">
+                    Általános megkeresésekre 48 órán belül válaszolunk. Ha céges együttműködésről van szó,
+                    kérjük, írj részletesen a projektedről.
+                  </p>
+                </div>
+
+                {/* Jobb: űrlap */}
+                <form onSubmit={handleContactSubmit} className="space-y-4">
+                  <input
+                    value={contactName}
+                    onChange={(e) => setContactName(e.target.value)}
+                    type="text"
+                    placeholder="Név"
+                    className="w-full bg-white/10 text-white placeholder-white px-4 py-3 rounded-lg focus:outline-none focus:ring-2 focus:ring-emerald-400"
+                  />
+                  <input
+                    value={contactEmail}
+                    onChange={(e) => setContactEmail(e.target.value)}
+                    type="email"
+                    placeholder="Email"
+                    className="w-full bg-white/10 text-white placeholder-white px-4 py-3 rounded-lg focus:outline-none focus:ring-2 focus:ring-emerald-400"
+                  />
+                  <textarea
+                    value={contactMessage}
+                    onChange={(e) => setContactMessage(e.target.value)}
+                    placeholder="Üzenet"
+                    rows="5"
+                    className="w-full bg-white/10 text-white placeholder-white px-4 py-3 rounded-lg focus:outline-none focus:ring-2 focus:ring-emerald-400"
+                  />
+                  <div className="flex items-center gap-4">
+                    <button
+                      type="submit"
+                      disabled={submitting}
+                      className="bg-emerald-500 hover:bg-emerald-400 text-black px-6 py-3 rounded-lg font-bold transition disabled:opacity-60"
+                    >
+                      {submitting ? "Küldés..." : "Küldés"}
+                    </button>
+                    {success && <div className="text-sm text-zinc-300">{success}</div>}
+                  </div>
+                </form>
+              </div>
+            </div>
+          </motion.section>
+        </motion.section>
       </main>
 
       {/* Footer (nem scrollozható alá) */}

SerpentRace_Frontend/src/pages/DeckCreator/DeckCreator.jsx

@@ -7,7 +7,7 @@ import Navbar from "../../components/Navbar/Navbar.jsx"
 import DeckHeader from "../../components/DeckCreator/DeckHeader.jsx"
 import CardsList from "../../components/DeckCreator/CardsList.jsx"
 import CardEditor from "../../components/DeckCreator/CardEditor.jsx"
-import { createDeck, getDeckById, updateDeck } from '../../api/deckApi'
+import { createDeck, getDeckById, updateDeck, deleteDeck } from '../../api/deckApi'
 import { notifySuccess, notifyError, notifyWarning } from "../../components/Toastify/toastifyServices"
 
 export default function DeckCreator() {
@@ -29,6 +29,7 @@ export default function DeckCreator() {
   const [isCreatingCard, setIsCreatingCard] = useState(false)
   const [newCardType, setNewCardType] = useState(null)
   const [isLoading, setIsLoading] = useState(false)
+  const [showDeleteModal, setShowDeleteModal] = useState(false)
 
   // Betöltés API-ból
   useEffect(() => {
@@ -66,13 +67,23 @@ export default function DeckCreator() {
         2: 'organization'
       }
       
+      // Process cards: convert type field from number to string
+      const processedCards = (deckData.cards || []).map(card => {
+        // A kártya type mezője a deck type-ját tükrözi (backend így küldi)
+        // Ezért a deck type alapján állítjuk be
+        return {
+          ...card,
+          type: typeMapping[deckData.type] || 'QUESTION'
+        }
+      })
+      
       setDeck({
         id: deckData.id,
         name: deckData.name || "Névtelen pakli",
         type: typeMapping[deckData.type] || 'QUESTION',
         privacy: ctypeMapping[deckData.ctype] || 'private',
         description: deckData.description || "",
-        cards: deckData.cards || [],
+        cards: processedCards,
         creationdate: deckData.creationdate,
         updatedate: deckData.updatedate
       })
@@ -93,6 +104,71 @@ export default function DeckCreator() {
 
   const handleSaveDeck = async () => {
     try {
+      // Szűrjük ki a nem megfelelő típusú kártyákat
+      const validCards = deck.cards.filter(card => card.type === deck.type)
+      const invalidCardsCount = deck.cards.length - validCards.length
+      
+      // Ha voltak érvénytelen kártyák, frissítsük a state-et
+      if (invalidCardsCount > 0) {
+        setDeck(prev => ({
+          ...prev,
+          cards: validCards
+        }))
+        
+        // Értesítés a törölt kártyákról
+        notifyWarning(`${invalidCardsCount} db nem megfelelő típusú kártya törölve a mentés előtt.`)
+      }
+      
+      // Tisztítsuk meg a kártyákat - konvertáljuk a backend által várt formátumra
+      const cleanedCards = validCards.map(card => {
+        // Card subType mapping to backend CardType enum
+        const cardTypeMapping = {
+          'quiz': 0,           // QUIZ
+          'pairing': 1,        // SENTENCE_PAIRING
+          'text': 2,           // OWN_ANSWER
+          'truefalse': 3,      // TRUE_FALSE
+          'closer': 4          // CLOSER
+        }
+        
+        // Kezdjük az ID-val (ha van)
+        const cleanedCard = {}
+        
+        if (card.id) {
+          cleanedCard.id = card.id
+        }
+        
+        // Ha van subType (QUESTION típusú kártyáknál), akkor add hozzá a type mezőt
+        if (card.subType && cardTypeMapping[card.subType] !== undefined) {
+          cleanedCard.type = cardTypeMapping[card.subType]
+        }
+        
+        // Text mező - kötelező, különböző forrásokból jöhet
+        cleanedCard.text = card.text || card.question || card.statement || ""
+        
+        // Egyéb frontend mezők, amiket a backend is elfogad
+        if (card.question !== undefined) cleanedCard.question = card.question
+        if (card.statement !== undefined) cleanedCard.statement = card.statement
+        if (card.options !== undefined) cleanedCard.options = card.options
+        if (card.correctAnswer !== undefined) cleanedCard.correctAnswer = card.correctAnswer
+        if (card.leftItems !== undefined) cleanedCard.leftItems = card.leftItems
+        if (card.rightItems !== undefined) cleanedCard.rightItems = card.rightItems
+        if (card.correctPairs !== undefined) cleanedCard.correctPairs = card.correctPairs
+        if (card.acceptedAnswers !== undefined) cleanedCard.acceptedAnswers = card.acceptedAnswers
+        if (card.hint !== undefined) cleanedCard.hint = card.hint
+        
+        // Answer mező (ha van)
+        if (card.answer !== undefined && card.answer !== null) {
+          cleanedCard.answer = card.answer
+        }
+        
+        // Csak LUCK típusú kártyáknál add hozzá a consequence-t
+        if (deck.type === 'LUCK' && card.consequence) {
+          cleanedCard.consequence = card.consequence
+        }
+        
+        return cleanedCard
+      })
+      
       // Típus konverzió backendhez
       const typeMapping = {
         'LUCK': 0,
@@ -110,7 +186,7 @@ export default function DeckCreator() {
         name: deck.name?.trim() || "Névtelen pakli",
         type: typeMapping[deck.type] ?? 2,
         ctype: ctypeMapping[deck.privacy] ?? 1,
-        cards: deck.cards || []
+        cards: cleanedCards
       }
       
       // Note: description field is not sent to backend as it's not supported yet
@@ -164,6 +240,36 @@ export default function DeckCreator() {
     navigate("/decks")
   }
 
+  const handleDeleteDeck = () => {
+    if (!deck.id) {
+      notifyWarning('Nincs mit törölni - a pakli még nincs elmentve!')
+      return
+    }
+    
+    setShowDeleteModal(true)
+  }
+
+  const handleConfirmDelete = async () => {
+    try {
+      await deleteDeck(deck.id)
+      setShowDeleteModal(false)
+      notifySuccess('Pakli sikeresen törölve!')
+      navigate('/decks')
+    } catch (error) {
+      console.error('Pakli törlési hiba:', error)
+      const errorMessage = error?.response?.data?.error 
+        || error?.response?.data?.message 
+        || error?.message 
+        || 'Ismeretlen hiba történt'
+      notifyError('Hiba történt a törlés során: ' + errorMessage)
+      setShowDeleteModal(false)
+    }
+  }
+
+  const handleCancelDelete = () => {
+    setShowDeleteModal(false)
+  }
+
   const handleCreateCard = (cardType) => {
     setNewCardType(cardType)
     setIsCreatingCard(true)
@@ -184,17 +290,15 @@ export default function DeckCreator() {
         return
       }
 
-      const defaultConsequence = { type: 0, value: 1 }
+      // Alapértelmezett consequence csak LUCK típusú kártyákhoz
-      const defaultWrongConsequence = { type: 1, value: 1 }
-
       const updatedCard = {
         ...cardData,
-        id: isCreatingCard ? Date.now() : cardData.id,
+        id: isCreatingCard ? Date.now() : cardData.id
-        consequence: cardData.consequence || defaultConsequence,
+      }
-        ...(cardData.type === 'QUESTION' || cardData.type === 'JOKER' || cardData.type === 'PAIRING'
+      
-          ? { wrongConsequence: cardData.wrongConsequence || defaultWrongConsequence }
+      // Csak LUCK típusú kártyákhoz add hozzá a consequence-t
-          : {}
+      if (cardData.type === 'LUCK') {
-        )
+        updatedCard.consequence = cardData.consequence || { type: 0, value: 1 }
       }
 
       let wasInvalidCardDeleted = false
@@ -278,6 +382,7 @@ export default function DeckCreator() {
             onUpdate={handleDeckUpdate}
             onSave={handleSaveDeck}
             onBack={handleBack}
+            onDelete={handleDeleteDeck}
           />
 
           {/* Main Content */}
@@ -313,6 +418,35 @@ export default function DeckCreator() {
         </div>
         </main>
       )}
+
+      {/* Delete Confirmation Modal */}
+      {showDeleteModal && (
+        <div className="fixed inset-0 bg-black/40 flex items-center justify-center z-50">
+          <div className="bg-[color:var(--color-surface)] rounded-xl shadow-xl p-6 w-96 text-center animate-fadeIn">
+            <div className="text-4xl mb-4">🗑️</div>
+            <h3 className="text-lg font-semibold mb-4 text-[color:var(--color-text)]">
+              Biztosan törölni szeretnéd a(z) "{deck.name}" paklit?
+            </h3>
+            <p className="text-sm text-[color:var(--color-text-muted)] mb-6">
+              Ez a művelet nem visszavonható!
+            </p>
+            <div className="flex justify-center gap-4">
+              <button
+                onClick={handleConfirmDelete}
+                className="bg-red-600 text-white px-6 py-2 rounded-lg hover:bg-red-700 transition font-semibold"
+              >
+                Igen, törlöm
+              </button>
+              <button
+                onClick={handleCancelDelete}
+                className="bg-[color:var(--color-background)] text-[color:var(--color-text)] px-6 py-2 rounded-lg hover:bg-[color:var(--color-surface-selected)] transition"
+              >
+                Mégse
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
     </div>
   )
 }

SerpentRace_Frontend/src/pages/Decks/Card_display.jsx

@@ -0,0 +1,643 @@
+import React, { useState, useEffect } from "react"
+import { useParams, useNavigate } from "react-router-dom"
+import {
+  FaArrowLeft,
+  FaFilter,
+  FaArrowUp,
+  FaArrowDown,
+  FaSortAlphaDown,
+  FaSortAlphaUp,
+  FaQuestionCircle,
+  FaChevronLeft,
+  FaChevronRight,
+} from "react-icons/fa"
+import Navbar from "../../components/Navbar/Navbar"
+import SearchBox from "../../components/Search/SearchBox"
+import PopUp from "../../components/PopUp/PopUp"
+import { getDeckById } from "../../api/deckApi"
+
+const Card_display = () => {
+  const { deckId } = useParams()
+  const navigate = useNavigate()
+
+  const [deck, setDeck] = useState(null)
+  const [cards, setCards] = useState([])
+  const [loading, setLoading] = useState(true)
+  const [error, setError] = useState(null)
+
+  const [search, setSearch] = useState("")
+  const [sortBy, setSortBy] = useState("index")
+  const [showSortHelp, setShowSortHelp] = useState(false)
+  const [itemsPerPage, setItemsPerPage] = useState(20)
+  const [currentPage, setCurrentPage] = useState(1)
+  const [flippedCards, setFlippedCards] = useState(new Set()) // Track which cards are flipped
+
+  // Load deck and parse cards
+  useEffect(() => {
+    let mounted = true
+    const load = async () => {
+      setLoading(true)
+      setError(null)
+      try {
+        const result = await getDeckById(deckId)
+        if (!mounted) return
+
+        console.log('Loaded deck:', result)
+        setDeck(result)
+
+        // Parse cards from JSON if it's a string
+        let parsedCards = []
+        if (result.cards) {
+          if (typeof result.cards === 'string') {
+            try {
+              parsedCards = JSON.parse(result.cards)
+            } catch (e) {
+              console.error('Failed to parse cards JSON:', e)
+            }
+          } else if (Array.isArray(result.cards)) {
+            parsedCards = result.cards
+          }
+        }
+
+        console.log('Parsed cards:', parsedCards)
+        console.log('First card structure:', parsedCards[0])
+        setCards(parsedCards)
+      } catch (err) {
+        console.error('Failed to load deck', err)
+        if (!mounted) return
+        setError(err.message || 'Hiba történt a pakli betöltése közben.')
+      } finally {
+        if (mounted) setLoading(false)
+      }
+    }
+    load()
+    return () => { mounted = false }
+  }, [deckId])
+
+  // Filter logic
+  let filteredCards = cards.filter((card) => {
+    if (!search) return true
+    const searchLower = search.toLowerCase()
+    // Check question, statement, and options
+    const questionText = card.question || card.statement || ''
+    const questionMatch = questionText.toLowerCase().includes(searchLower)
+    const answersMatch = Array.isArray(card.options) 
+      ? card.options.some(opt => opt && opt.toLowerCase().includes(searchLower))
+      : Array.isArray(card.answers)
+      ? card.answers.some(a => a && a.toLowerCase().includes(searchLower))
+      : false
+    return questionMatch || answersMatch
+  })
+
+  // Sort logic
+  filteredCards = [...filteredCards].sort((a, b) => {
+    if (sortBy === "index") {
+      // Keep original order
+      return 0
+    } else if (sortBy === "question-asc") {
+      const aText = a.question || a.statement || ''
+      const bText = b.question || b.statement || ''
+      return aText.localeCompare(bText)
+    } else if (sortBy === "question-desc") {
+      const aText = a.question || a.statement || ''
+      const bText = b.question || b.statement || ''
+      return bText.localeCompare(aText)
+    } else if (sortBy === "answers-asc") {
+      const aCount = Array.isArray(a.options) ? a.options.length : Array.isArray(a.answers) ? a.answers.length : 0
+      const bCount = Array.isArray(b.options) ? b.options.length : Array.isArray(b.answers) ? b.answers.length : 0
+      return aCount - bCount
+    } else if (sortBy === "answers-desc") {
+      const aCount = Array.isArray(a.options) ? a.options.length : Array.isArray(a.answers) ? a.answers.length : 0
+      const bCount = Array.isArray(b.options) ? b.options.length : Array.isArray(b.answers) ? b.answers.length : 0
+      return bCount - aCount
+    }
+    return 0
+  })
+
+  // Pagination logic
+  const totalCards = filteredCards.length
+  const totalPages = Math.ceil(totalCards / itemsPerPage)
+  const startIndex = (currentPage - 1) * itemsPerPage
+  const endIndex = startIndex + itemsPerPage
+  const paginatedCards = filteredCards.slice(startIndex, endIndex)
+
+  // Reset to page 1 when filters or items per page change
+  useEffect(() => {
+    setCurrentPage(1)
+  }, [search, sortBy, itemsPerPage])
+
+  const deckTypes = {
+    0: { label: "Szerencse", color: "var(--color-luck)" },
+    1: { label: "Joker", color: "var(--color-fun)" },
+    2: { label: "Kérdés", color: "var(--color-question)" },
+  }
+
+  // Card subtype Hungarian labels - UPDATED based on actual data
+  const cardSubTypeLabels = {
+    // String types (from DeckCreator)
+    "truefalse": "Igaz/Hamis",
+    "multiplechoice": "Feleletválasztós", 
+    "text": "Szöveges válasz",
+    "number": "Számos válasz",
+    "order": "Sorbarendezés",
+    "matching": "Párosítás",
+    "fill": "Kiegészítés",
+    "QUESTION": "Kérdés",
+    "LUCK": "Szerencse",
+    "JOKER": "Joker",
+    // If backend converts to different numbers, map them:
+    "0": "Igaz/Hamis",       // truefalse = 0
+    "1": "Feleletválasztós", // multiplechoice = 1  
+    "2": "Szöveges válasz",  // text = 2
+    "3": "Igaz/Hamis",       // type 3 = truefalse (alternate encoding)
+    "4": "Sorbarendezés",    // order = 4
+    "5": "Párosítás",        // matching = 5
+    "6": "Kiegészítés",      // fill = 6
+    0: "Igaz/Hamis",
+    1: "Feleletválasztós",
+    2: "Szöveges válasz",
+    3: "Igaz/Hamis",        // type 3 detected
+    4: "Sorbarendezés",
+    5: "Párosítás",
+    6: "Kiegészítés"
+  }
+
+  const currentDeckType = deck ? (deckTypes[deck.type] || { label: "Ismeretlen", color: "var(--color-success)" }) : null
+
+  const toggleCardFlip = (cardId) => {
+    setFlippedCards(prev => {
+      const newSet = new Set(prev)
+      if (newSet.has(cardId)) {
+        newSet.delete(cardId)
+      } else {
+        newSet.add(cardId)
+      }
+      return newSet
+    })
+  }
+
+  return (
+    <div className="w-full min-h-screen bg-[color:var(--color-background)] flex flex-col">
+      <Navbar />
+      
+      <main className="flex-1 w-full max-w-[1200px] mx-auto px-4 py-10">
+        {/* Header with back button */}
+        <div className="flex items-center gap-4 mb-6">
+          <button
+            onClick={() => navigate('/decks')}
+            className="flex items-center gap-2 px-4 py-2 rounded-xl bg-[color:var(--color-surface)] text-[color:var(--color-text)] hover:bg-[color:var(--color-surface-selected)] transition-all duration-200 shadow"
+          >
+            <FaArrowLeft />
+            Vissza a paklikhoz
+          </button>
+          {deck && (
+            <div className="flex items-center gap-3">
+              <h1 className="text-2xl font-bold text-[color:var(--color-text)]">{deck.name}</h1>
+              {currentDeckType && (
+                <span
+                  className="inline-block px-3 py-1 rounded-full text-sm font-bold"
+                  style={{
+                    background: currentDeckType.color,
+                    color: "var(--color-text-inverse)",
+                  }}
+                >
+                  {currentDeckType.label}
+                </span>
+              )}
+            </div>
+          )}
+        </div>
+
+        {/* Loading / Error states */}
+        {loading && (
+          <div className="text-center text-[color:var(--color-text-muted)] py-10">
+            Betöltés...
+          </div>
+        )}
+        {error && (
+          <div className="text-center text-[color:var(--color-error)] py-10">
+            {error}
+          </div>
+        )}
+
+        {/* Filters and controls */}
+        {!loading && !error && (
+          <>
+            <div className="flex flex-col md:flex-row gap-3 justify-between items-center mb-6 bg-[color:var(--color-surface)]/80 backdrop-blur-lg rounded-2xl px-6 py-4 shadow-lg">
+              <div className="flex gap-2 items-center w-full md:w-auto">
+                <SearchBox
+                  value={search}
+                  onChange={(e) => setSearch(e.target.value)}
+                  width={300}
+                  placeholder="Keresés kérdésben vagy válaszokban..."
+                  className="mr-4"
+                />
+                <span className="text-[color:var(--color-text)] font-semibold mr-2 ml-2 flex items-center gap-1">
+                  Rendezés:
+                  <button
+                    type="button"
+                    className="ml-1 text-[color:var(--color-success)] hover:text-[color:var(--color-text)] focus:outline-none"
+                    onClick={() => setShowSortHelp(true)}
+                    aria-label="Rendezési magyarázat megnyitása"
+                    style={{ fontSize: 18, lineHeight: 1 }}
+                  >
+                    <FaQuestionCircle />
+                  </button>
+                </span>
+                <select
+                  className="px-3 py-1 rounded-lg bg-[color:var(--color-success)]/10 hover:bg-[color:var(--color-success)]/30 text-[color:var(--color-text)] border-none focus:ring-2 focus:ring-[color:var(--color-success)] outline-none"
+                  style={{ backgroundColor: "rgba(0, 255, 0, 0.10)" }}
+                  value={sortBy}
+                  onChange={(e) => setSortBy(e.target.value)}
+                  aria-label="Rendezés"
+                >
+                  <option
+                    value="index"
+                    style={{ backgroundColor: "var(--color-surface)", color: "var(--color-text)" }}
+                  >
+                    Eredeti sorrend
+                  </option>
+                  <option
+                    value="question-asc"
+                    style={{ backgroundColor: "var(--color-surface)", color: "var(--color-text)" }}
+                  >
+                    Kérdés A→Z
+                  </option>
+                  <option
+                    value="question-desc"
+                    style={{ backgroundColor: "var(--color-surface)", color: "var(--color-text)" }}
+                  >
+                    Kérdés Z→A
+                  </option>
+                  <option
+                    value="answers-asc"
+                    style={{ backgroundColor: "var(--color-surface)", color: "var(--color-text)" }}
+                  >
+                    Válaszok száma ↑
+                  </option>
+                  <option
+                    value="answers-desc"
+                    style={{ backgroundColor: "var(--color-surface)", color: "var(--color-text)" }}
+                  >
+                    Válaszok száma ↓
+                  </option>
+                </select>
+              </div>
+            </div>
+
+            {showSortHelp && (
+              <PopUp onClose={() => setShowSortHelp(false)}>
+                <h2 className="text-lg font-bold mb-4">Rendezési lehetőségek magyarázata</h2>
+                <ul className="space-y-2 text-[color:var(--color-night)]">
+                  <li>
+                    <span className="font-bold">Eredeti sorrend</span> – A kártyák eredeti sorrendben jelennek meg
+                  </li>
+                  <li>
+                    <span className="font-bold">Kérdés A→Z</span> – Kérdések ABC sorrendben (A-tól Z-ig)
+                  </li>
+                  <li>
+                    <span className="font-bold">Kérdés Z→A</span> – Kérdések fordított ABC sorrendben (Z-től A-ig)
+                  </li>
+                  <li>
+                    <span className="font-bold">Válaszok száma ↑</span> – Kevesebb választól a több válasz felé
+                  </li>
+                  <li>
+                    <span className="font-bold">Válaszok száma ↓</span> – Több választól a kevesebb válasz felé
+                  </li>
+                </ul>
+                <button
+                  className="mt-6 px-4 py-2 rounded-lg bg-[color:var(--color-success)] text-[color:var(--color-text-inverse)] font-semibold hover:bg-[color:var(--color-success)]/80 transition"
+                  onClick={() => setShowSortHelp(false)}
+                >
+                  Bezárás
+                </button>
+              </PopUp>
+            )}
+
+            {/* Items per page selector and pagination info */}
+            <div className="flex flex-col md:flex-row gap-4 justify-between items-center mb-6 bg-[color:var(--color-surface)]/60 backdrop-blur-lg rounded-xl px-6 py-3 shadow">
+              <div className="flex items-center gap-3">
+                <span className="text-[color:var(--color-text-muted)] text-sm font-medium">
+                  Elemek oldalanként:
+                </span>
+                <select
+                  value={itemsPerPage}
+                  onChange={(e) => setItemsPerPage(Number(e.target.value))}
+                  className="px-3 py-1.5 rounded-lg bg-[color:var(--color-background)] text-[color:var(--color-text)] border border-[color:var(--color-surface-selected)] focus:ring-2 focus:ring-[color:var(--color-success)] outline-none transition-all duration-200"
+                >
+                  <option value={10}>10</option>
+                  <option value={20}>20</option>
+                  <option value={30}>30</option>
+                  <option value={50}>50</option>
+                </select>
+              </div>
+
+              <div className="text-[color:var(--color-text-muted)] text-sm">
+                {totalCards > 0 ? (
+                  <>
+                    {startIndex + 1}-{Math.min(endIndex, totalCards)} / {totalCards} kártya
+                  </>
+                ) : (
+                  <>0 kártya</>
+                )}
+              </div>
+            </div>
+
+            {/* Cards Grid */}
+            <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+              {totalCards === 0 && (
+                <div className="col-span-full text-center text-[color:var(--color-text-muted)] py-10">
+                  Nincsenek kártyák ebben a pakliban.
+                </div>
+              )}
+              {paginatedCards.map((card, idx) => {
+                const cardIndex = startIndex + idx + 1
+                const questionText = card.question || card.statement || 'Kérdés hiányzik'
+                
+                // Get answers based on card type
+                let answerOptions = []
+                let correctAnswerIndex = card.correctAnswer
+                
+                // Normalize subType (can be string or number or undefined)
+                const subType = card.subType ? String(card.subType).toLowerCase() : 'undefined'
+                
+                // Detect card type by fields if subType is missing
+                let detectedType = subType
+                if (subType === 'undefined' || subType === 'null') {
+                  // Check by numeric type field first
+                  if (card.type === 3) {
+                    // type 3 = True/False
+                    detectedType = 'truefalse'
+                  } else if (card.type === 2) {
+                    // type 2 = Text answer
+                    detectedType = 'text'
+                  } else if (card.leftItems && card.rightItems && card.correctPairs) {
+                    // Has leftItems, rightItems AND correctPairs = matching
+                    detectedType = 'matching'
+                  } else if (card.acceptedAnswers && card.acceptedAnswers.length > 0 && card.acceptedAnswers[0] && card.acceptedAnswers[0].trim()) {
+                    // Only detect as text if acceptedAnswers has non-empty values
+                    detectedType = 'text'
+                  } else if (card.isTrue !== undefined) {
+                    detectedType = 'truefalse'
+                  } else if (card.options && Array.isArray(card.options) && card.options.some(opt => opt && opt.trim())) {
+                    // Has non-empty options - must be multiple choice
+                    detectedType = 'multiplechoice'
+                  }
+                }
+                
+                if (detectedType === 'truefalse' || detectedType === '0') {
+                  // True/False cards
+                  answerOptions = ['Igaz', 'Hamis']
+                  // correctAnswer: 0 = Igaz, 1 = Hamis (based on user feedback)
+                  correctAnswerIndex = card.correctAnswer !== undefined ? card.correctAnswer : (card.isTrue ? 0 : 1)
+                } else if ((detectedType === 'text' || detectedType === '2') && card.acceptedAnswers && Array.isArray(card.acceptedAnswers)) {
+                  // Text-based cards with accepted answers
+                  answerOptions = card.acceptedAnswers
+                  correctAnswerIndex = -1 // All accepted answers are correct
+                } else if (detectedType === 'matching' || detectedType === '5') {
+                  // Matching cards - pairs
+                  if (card.leftItems && card.rightItems && card.correctPairs) {
+                    // Build pairs from correctPairs object
+                    const pairs = []
+                    for (const [leftIdx, rightIdx] of Object.entries(card.correctPairs)) {
+                      const left = card.leftItems[parseInt(leftIdx)]
+                      const right = card.rightItems[parseInt(rightIdx)]
+                      if (left && right) {
+                        pairs.push(`${left} → ${right}`)
+                      }
+                    }
+                    answerOptions = pairs
+                    correctAnswerIndex = -1 // All pairs are correct
+                  }
+                } else if ((detectedType === 'multiplechoice' || detectedType === '1') && card.options && Array.isArray(card.options)) {
+                  // Multiple choice - filter out empty options
+                  answerOptions = card.options.filter(opt => opt && opt.trim())
+                  correctAnswerIndex = card.correctAnswer
+                } else if (card.options && Array.isArray(card.options)) {
+                  // Other types with options
+                  answerOptions = card.options.filter(opt => opt && opt.trim())
+                } else if (card.answers && Array.isArray(card.answers)) {
+                  // Other card types with answers array
+                  answerOptions = card.answers.filter(opt => opt && opt.trim())
+                } else if (card.acceptedAnswers && Array.isArray(card.acceptedAnswers)) {
+                  // Fallback for accepted answers
+                  answerOptions = card.acceptedAnswers
+                  correctAnswerIndex = -1
+                }
+                
+                const answerCount = answerOptions.length
+                const cardId = card.id || idx
+                const isFlipped = flippedCards.has(cardId)
+                
+                return (
+                  <div
+                    key={cardId}
+                    className="relative h-80 cursor-pointer"
+                    style={{ perspective: "1000px" }}
+                    onClick={() => toggleCardFlip(cardId)}
+                  >
+                    <div
+                      className={`relative w-full h-full transition-transform duration-500`}
+                      style={{
+                        transformStyle: "preserve-3d",
+                        transform: isFlipped ? "rotateY(180deg)" : "rotateY(0deg)"
+                      }}
+                    >
+                      {/* Front side - Question */}
+                      <div
+                        className="absolute w-full h-full bg-[color:var(--color-card)] rounded-2xl p-6 shadow-lg border-l-4"
+                        style={{
+                          borderLeftColor: currentDeckType?.color || "var(--color-success)",
+                          backfaceVisibility: "hidden"
+                        }}
+                      >
+                        <div className="flex items-center justify-between mb-3">
+                          <span className="text-[color:var(--color-text-muted)] text-sm font-medium">
+                            Kártya #{cardIndex}
+                          </span>
+                          <span
+                            className="inline-block px-2 py-1 rounded-full text-xs font-bold"
+                            style={{
+                              background: currentDeckType?.color || "var(--color-success)",
+                              color: "var(--color-text-inverse)",
+                            }}
+                          >
+                            {answerCount} válasz
+                          </span>
+                        </div>
+                        
+                        <h3 className="text-lg font-bold text-[color:var(--color-text)] mb-3">
+                          {questionText}
+                        </h3>
+                        
+                        {/* Type info only */}
+                        <div className="absolute bottom-6 left-6 right-6 pt-3 border-t border-[color:var(--color-surface-selected)] text-xs text-[color:var(--color-text-muted)]">
+                          <div>Típus: <span className="font-semibold">
+                            {cardSubTypeLabels[detectedType] || cardSubTypeLabels[card.subType] || cardSubTypeLabels[card.type] || detectedType || 'Ismeretlen'}
+                          </span></div>
+                          <div className="text-center mt-3 text-[color:var(--color-text-muted)] italic">
+                            Kattints a megoldáshoz →
+                          </div>
+                        </div>
+                      </div>
+
+                      {/* Back side - Answer */}
+                      <div
+                        className="absolute w-full h-full bg-[color:var(--color-card)] rounded-2xl p-6 shadow-lg border-l-4 overflow-y-auto"
+                        style={{
+                          borderLeftColor: currentDeckType?.color || "var(--color-success)",
+                          backfaceVisibility: "hidden",
+                          transform: "rotateY(180deg)"
+                        }}
+                      >
+                        <div className="flex items-center justify-between mb-3">
+                          <span className="text-[color:var(--color-text-muted)] text-sm font-medium">
+                            Megoldás
+                          </span>
+                          <span
+                            className="inline-block px-2 py-1 rounded-full text-xs font-bold"
+                            style={{
+                              background: currentDeckType?.color || "var(--color-success)",
+                              color: "var(--color-text-inverse)",
+                            }}
+                          >
+                            {answerCount} válasz
+                          </span>
+                        </div>
+                        
+                        {answerCount > 0 ? (
+                          <div className="space-y-2">
+                            <div className="text-[color:var(--color-text-muted)] text-sm font-medium mb-2">
+                              Helyes válasz:
+                            </div>
+                            {detectedType === 'truefalse' || detectedType === '0' ? (
+                              // True/False - show only the correct answer
+                              <div className="text-[color:var(--color-text)] text-lg font-bold bg-[color:var(--color-success)]/20 rounded-lg px-4 py-3 border-l-4 border-[color:var(--color-success)]">
+                                ✓ {card.isTrue ? 'Igaz' : 'Hamis'}
+                              </div>
+                            ) : detectedType === 'matching' || detectedType === '5' ? (
+                              // Matching - show all correct pairs
+                              <ul className="space-y-2">
+                                {answerOptions.map((pair, idx) => (
+                                  <li
+                                    key={idx}
+                                    className="text-[color:var(--color-text)] text-sm bg-[color:var(--color-success)]/20 rounded-lg px-3 py-2 border-l-2 border-[color:var(--color-success)] font-semibold"
+                                  >
+                                    ✓ {pair}
+                                  </li>
+                                ))}
+                              </ul>
+                            ) : (detectedType === 'text' || detectedType === '2') && card.acceptedAnswers && Array.isArray(card.acceptedAnswers) ? (
+                              // Text answers - show all accepted answers
+                              <ul className="space-y-1">
+                                {answerOptions.map((answer, ansIdx) => (
+                                  <li
+                                    key={ansIdx}
+                                    className="text-[color:var(--color-text)] text-sm bg-[color:var(--color-success)]/20 rounded-lg px-3 py-2 border-l-2 border-[color:var(--color-success)] font-semibold"
+                                  >
+                                    ✓ {answer}
+                                  </li>
+                                ))}
+                              </ul>
+                            ) : (
+                              // Multiple choice - show only the correct answer
+                              correctAnswerIndex !== undefined && correctAnswerIndex !== -1 && answerOptions[correctAnswerIndex] ? (
+                                <div className="text-[color:var(--color-text)] text-lg font-bold bg-[color:var(--color-success)]/20 rounded-lg px-4 py-3 border-l-4 border-[color:var(--color-success)]">
+                                  ✓ {answerOptions[correctAnswerIndex]}
+                                </div>
+                              ) : (
+                                <div className="text-center text-[color:var(--color-text-muted)] py-4">
+                                  Nincs megadva helyes válasz
+                                </div>
+                              )
+                            )}
+                          </div>
+                        ) : (
+                          <div className="text-center text-[color:var(--color-text-muted)] py-10">
+                            Nincs elérhető válasz
+                          </div>
+                        )}
+                        
+                        <div className="absolute bottom-6 left-6 right-6 text-center text-xs text-[color:var(--color-text-muted)] italic">
+                          Kattints a kérdéshez ←
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                )
+              })}
+            </div>
+
+            {/* Pagination Controls */}
+            {totalPages > 1 && (
+              <div className="flex justify-center items-center gap-2 mt-8">
+                <button
+                  onClick={() => setCurrentPage(prev => Math.max(1, prev - 1))}
+                  disabled={currentPage === 1}
+                  className={`px-4 py-2 rounded-lg font-medium transition-all duration-200 flex items-center gap-2 ${
+                    currentPage === 1
+                      ? 'bg-[color:var(--color-surface)] text-[color:var(--color-text-muted)] cursor-not-allowed'
+                      : 'bg-[color:var(--color-success)] text-[color:var(--color-text-inverse)] hover:bg-[color:var(--color-success)]/80 hover:scale-105'
+                  }`}
+                >
+                  <FaChevronLeft />
+                  Előző
+                </button>
+
+                <div className="flex items-center gap-2">
+                  {[...Array(totalPages)].map((_, index) => {
+                    const pageNum = index + 1
+                    if (
+                      pageNum === 1 ||
+                      pageNum === totalPages ||
+                      (pageNum >= currentPage - 1 && pageNum <= currentPage + 1)
+                    ) {
+                      return (
+                        <button
+                          key={pageNum}
+                          onClick={() => setCurrentPage(pageNum)}
+                          className={`w-10 h-10 rounded-lg font-medium transition-all duration-200 ${
+                            currentPage === pageNum
+                              ? 'bg-[color:var(--color-success)] text-[color:var(--color-text-inverse)] scale-110 shadow-lg'
+                              : 'bg-[color:var(--color-surface)] text-[color:var(--color-text)] hover:bg-[color:var(--color-surface-selected)]'
+                          }`}
+                        >
+                          {pageNum}
+                        </button>
+                      )
+                    } else if (
+                      pageNum === currentPage - 2 ||
+                      pageNum === currentPage + 2
+                    ) {
+                      return (
+                        <span key={pageNum} className="text-[color:var(--color-text-muted)]">
+                          ...
+                        </span>
+                      )
+                    }
+                    return null
+                  })}
+                </div>
+
+                <button
+                  onClick={() => setCurrentPage(prev => Math.min(totalPages, prev + 1))}
+                  disabled={currentPage === totalPages}
+                  className={`px-4 py-2 rounded-lg font-medium transition-all duration-200 flex items-center gap-2 ${
+                    currentPage === totalPages
+                      ? 'bg-[color:var(--color-surface)] text-[color:var(--color-text-muted)] cursor-not-allowed'
+                      : 'bg-[color:var(--color-success)] text-[color:var(--color-text-inverse)] hover:bg-[color:var(--color-success)]/80 hover:scale-105'
+                  }`}
+                >
+                  Következő
+                  <FaChevronRight />
+                </button>
+              </div>
+            )}
+          </>
+        )}
+      </main>
+    </div>
+  )
+}
+
+export default Card_display

SerpentRace_Frontend/src/pages/Game/ChooseDeck.jsx

@@ -0,0 +1,362 @@
+import React, { useEffect, useState } from "react"
+import { useNavigate, useLocation } from "react-router-dom"
+import Navbar from "../../components/Navbar/Navbar.jsx"
+import Background from "../../assets/backgrounds/Background.jsx"
+import Footer from "../../components/Footer/Footer.jsx"
+import useRequireAuth from "../../hooks/useRequireAuth.jsx"
+import ButtonGreen from "../../components/Buttons/ButtonGreen.jsx"
+import {
+  FaFilter,
+  FaCalendarAlt,
+  FaArrowUp,
+  FaArrowDown,
+  FaSortAlphaDown,
+  FaSortAlphaUp,
+  FaQuestionCircle,
+  FaCheckCircle,
+  FaCircle,
+} from "react-icons/fa"
+import SearchBox from "../../components/Search/SearchBox.jsx"
+import PopUp from "../../components/PopUp/PopUp.jsx"
+import { motion } from "framer-motion"
+
+const deckTypes = [
+  { label: "Luck", color: "var(--color-luck)" },
+  { label: "Question", color: "var(--color-question)" },
+  { label: "Joker", color: "var(--color-fun)" },
+]
+
+const origins = ["Mind", "Vállalati", "Saját"]
+
+const sortOptions = [
+  { value: "date-asc", label: "📅↑" },
+  { value: "date-desc", label: "📅↓" },
+  { value: "abc-asc", label: "A→Z" },
+  { value: "abc-desc", label: "Z→A" },
+]
+
+const ChooseDeck = () => {
+  const location = useLocation()
+  const locationUsername = location.state?.username ?? null
+
+  // always call hook (hooks must be called unconditionally) and use as fallback
+  const [authUsername] = useRequireAuth({ key: "username", redirectTo: "/" })
+
+  // prefer passed username (from navigate state) over authenticated username
+  const username = locationUsername ?? authUsername
+
+  const navigate = useNavigate()
+
+  const [selectedType, setSelectedType] = useState("All")
+  const [selectedOrigin, setSelectedOrigin] = useState("Mind")
+  const [sortBy, setSortBy] = useState("date-desc")
+  const [search, setSearch] = useState("")
+  const [showSortHelp, setShowSortHelp] = useState(false)
+  const [allDecks, setAllDecks] = useState([])
+  const [loading, setLoading] = useState(false)
+  const [selectedDeckIds, setSelectedDeckIds] = useState([])
+
+  // Load all decks once
+  useEffect(() => {
+    let mounted = true
+    const load = async () => {
+      setLoading(true)
+      try {
+        const result = await import("../../api/deckApi.js").then((m) => m.getDecksPage(0, 99))
+        if (!mounted) return
+
+        console.log("Loaded decks:", result)
+
+        const mapped = (result.decks || []).map((d) => ({
+          id: d.id,
+          name: d.name,
+          type: d.type === 2 ? "Question" : d.type === 1 ? "Joker" : "Luck",
+          created: d.creationdate ? new Date(d.creationdate).toLocaleDateString() : "",
+          origin: d.ctype === 2 ? "Vállalati" : d.ctype === 0 ? "Mind" : "Saját",
+          raw: d,
+        }))
+
+        console.log("Mapped decks:", mapped)
+        setAllDecks(mapped)
+      } catch (err) {
+        console.error("Failed to load decks", err)
+      } finally {
+        setLoading(false)
+      }
+    }
+    load()
+    return () => {
+      mounted = false
+    }
+  }, [])
+
+  // Filter logic
+  let filteredDecks = allDecks.filter((deck) => {
+    const typeMatch = selectedType === "All" || deck.type === selectedType
+    const originMatch = selectedOrigin === "Mind" || deck.origin === selectedOrigin
+    const searchMatch = !search || deck.name.toLowerCase().includes(search.toLowerCase())
+    return typeMatch && originMatch && searchMatch
+  })
+
+  // Sort logic
+  filteredDecks = [...filteredDecks].sort((a, b) => {
+    if (sortBy === "date-asc") {
+      return a.created.localeCompare(b.created)
+    } else if (sortBy === "date-desc") {
+      return b.created.localeCompare(a.created)
+    } else if (sortBy === "abc-asc") {
+      return a.name.localeCompare(b.name)
+    } else if (sortBy === "abc-desc") {
+      return b.name.localeCompare(a.name)
+    }
+    return 0
+  })
+
+  // Toggle deck selection
+  const toggleDeckSelection = (deckId) => {
+    setSelectedDeckIds((prev) => {
+      if (prev.includes(deckId)) {
+        return prev.filter((id) => id !== deckId)
+      } else {
+        return [...prev, deckId]
+      }
+    })
+  }
+
+  // Handle continue button
+  const handleContinue = () => {
+    if (selectedDeckIds.length === 0) {
+      alert("Kérlek válassz ki legalább egy paklit!")
+      return
+    }
+    console.log("Kiválasztott pakli ID-k:", selectedDeckIds)
+    navigate("/playersetup", { state: { deckIds: selectedDeckIds } })
+  }
+
+  return (
+    <div className="flex flex-col min-h-screen overflow-y-auto relative">
+      <div className="fixed top-0 left-0 w-full h-full -z-10">
+        <Background />
+      </div>
+
+      <div className="fixed top-0 left-0 right-0 z-30">
+        <Navbar />
+      </div>
+
+      <main className="flex-grow text-white px-6 pt-24 pb-20">
+        <motion.section
+          className="max-w-6xl mx-auto"
+          initial={{ opacity: 0, y: 20 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ duration: 0.7 }}
+        >
+          {/* Title */}
+          <motion.h1
+            className="text-5xl font-extrabold text-green-300 mb-6 text-center tracking-wide drop-shadow-lg"
+            initial={{ opacity: 0, y: 20 }}
+            animate={{ opacity: 1, y: 0 }}
+            transition={{ duration: 0.8, delay: 0.1 }}
+          >
+            Válassz Paklikat a Játékhoz
+          </motion.h1>
+
+          <motion.p
+            className="text-lg leading-relaxed text-zinc-200 mb-10 text-center max-w-3xl mx-auto"
+            initial={{ opacity: 0, y: 20 }}
+            animate={{ opacity: 1, y: 0 }}
+            transition={{ duration: 0.8, delay: 0.2 }}
+          >
+            Válaszd ki azokat a paklikat, amelyekkel játszani szeretnél. Több paklit is kiválaszthatsz
+            egyszerre.
+          </motion.p>
+
+          {/* Filters */}
+          <div className="flex flex-col md:flex-row gap-3 justify-between items-center mb-10 bg-[color:var(--color-surface)]/80 backdrop-blur-lg rounded-2xl px-6 py-4 shadow-lg">
+            <div className="flex gap-2 items-center w-full md:w-auto flex-wrap">
+              <SearchBox
+                value={search}
+                onChange={(e) => setSearch(e.target.value)}
+                width={240}
+                placeholder="Keresés..."
+                className="mr-4"
+              />
+              <FaFilter style={{ color: "var(--color-success)" }} className="mr-2" />
+              <span className="text-[color:var(--color-text)] font-semibold mr-2">Típus:</span>
+              <button
+                className={`px-3 py-1 rounded-lg font-medium transition-all duration-200 ${
+                  selectedType === "All"
+                    ? "bg-[color:var(--color-surface-selected)] text-[color:var(--color-text)] border border-[color:var(--color-surface)]"
+                    : "text-[color:var(--color-text)] bg-[color:var(--color-success)]/10 hover:bg-[color:var(--color-success)]/30"
+                }`}
+                onClick={() => setSelectedType("All")}
+              >
+                Mind
+              </button>
+              {deckTypes.map((type) => (
+                <button
+                  key={type.label}
+                  className={`px-3 py-1 rounded-lg font-medium transition-all duration-200 ml-1 ${
+                    selectedType === type.label
+                      ? "text-[color:var(--color-text-inverse)] border border-[color:var(--color-surface)]"
+                      : "text-[color:var(--color-text)] bg-[color:var(--color-success)]/10 hover:bg-[color:var(--color-success)]/30"
+                  }`}
+                  style={selectedType === type.label ? { background: type.color } : undefined}
+                  onClick={() => setSelectedType(type.label)}
+                >
+                  {type.label === "Luck" ? "Szerencse" : type.label === "Question" ? "Kérdés" : "Joker"}
+                </button>
+              ))}
+              <span className="text-[color:var(--color-text)] font-semibold mr-2 ml-2">Eredet:</span>
+              <select
+                className="px-3 py-1 rounded-lg bg-[color:var(--color-success)]/10 hover:bg-[color:var(--color-success)]/30 text-[color:var(--color-text)] border-none focus:ring-2 focus:ring-[color:var(--color-success)] outline-none"
+                value={selectedOrigin}
+                onChange={(e) => setSelectedOrigin(e.target.value)}
+              >
+                {origins.map((origin) => (
+                  <option
+                    key={origin}
+                    value={origin}
+                    style={{ backgroundColor: "var(--color-surface)", color: "var(--color-text)" }}
+                  >
+                    {origin}
+                  </option>
+                ))}
+              </select>
+              <span className="text-[color:var(--color-text)] font-semibold mr-2 ml-2 flex items-center gap-1">
+                Rendezés:
+                <button
+                  type="button"
+                  className="ml-1 text-[color:var(--color-success)] hover:text-[color:var(--color-text)] focus:outline-none"
+                  onClick={() => setShowSortHelp(true)}
+                  aria-label="Rendezési magyarázat"
+                  style={{ fontSize: 18, lineHeight: 1 }}
+                >
+                  <FaQuestionCircle />
+                </button>
+              </span>
+              <select
+                className="px-3 py-1 rounded-lg bg-[color:var(--color-success)]/10 hover:bg-[color:var(--color-success)]/30 text-[color:var(--color-text)] border-none focus:ring-2 focus:ring-[color:var(--color-success)] outline-none"
+                value={sortBy}
+                onChange={(e) => setSortBy(e.target.value)}
+              >
+                {sortOptions.map((opt) => (
+                  <option
+                    key={opt.value}
+                    value={opt.value}
+                    style={{ backgroundColor: "var(--color-surface)", color: "var(--color-text)" }}
+                  >
+                    {opt.label}
+                  </option>
+                ))}
+              </select>
+            </div>
+          </div>
+
+          {showSortHelp && (
+            <PopUp onClose={() => setShowSortHelp(false)}>
+              <h2 className="text-lg font-bold mb-4">Rendezési lehetőségek</h2>
+              <ul className="space-y-2 text-[color:var(--color-night)]">
+                <li>
+                  <span className="font-bold">📅↑</span> – Dátum szerint növekvő
+                </li>
+                <li>
+                  <span className="font-bold">📅↓</span> – Dátum szerint csökkenő
+                </li>
+                <li>
+                  <span className="font-bold">A→Z</span> – Név szerint növekvő
+                </li>
+                <li>
+                  <span className="font-bold">Z→A</span> – Név szerint csökkenő
+                </li>
+              </ul>
+              <button
+                className="mt-6 px-4 py-2 rounded-lg bg-[color:var(--color-success)] text-[color:var(--color-text-inverse)] font-semibold hover:bg-[color:var(--color-success)]/80"
+                onClick={() => setShowSortHelp(false)}
+              >
+                Bezárás
+              </button>
+            </PopUp>
+          )}
+
+          {/* Selection Info */}
+          <div className="mb-6 text-center">
+            <span className="text-[color:var(--color-text)] text-lg font-semibold">
+              Kiválasztva: {selectedDeckIds.length} pakli
+            </span>
+          </div>
+
+          {/* Decks Grid */}
+          <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5 gap-8 mt-8">
+            {loading && (
+              <div className="col-span-full text-center text-[color:var(--color-text-muted]">Betöltés...</div>
+            )}
+            {!loading && filteredDecks.length === 0 && (
+              <div className="col-span-full text-center text-[color:var(--color-text-muted]">
+                Nincsenek elérhető paklik.
+              </div>
+            )}
+            {!loading &&
+              filteredDecks.map((deck) => {
+                const deckType = deckTypes.find((t) => t.label === deck.type)
+                const borderColor = deckType ? deckType.color : "var(--color-success)"
+                const isSelected = selectedDeckIds.includes(deck.id)
+
+                return (
+                  <div
+                    key={deck.id}
+                    className={`relative flex flex-col justify-between h-48 bg-[color:var(--color-card)] rounded-2xl p-6 shadow-lg border-t-4 hover:scale-105 transition-transform duration-200 cursor-pointer ${
+                      isSelected ? "ring-4 ring-[color:var(--color-success)]" : ""
+                    }`}
+                    style={{ borderTopColor: borderColor }}
+                    onClick={() => toggleDeckSelection(deck.id)}
+                  >
+                    {/* Selection Indicator */}
+                    <div className="absolute top-3 right-3">
+                      {isSelected ? (
+                        <FaCheckCircle className="text-3xl text-[color:var(--color-success)]" />
+                      ) : (
+                        <FaCircle className="text-3xl text-[color:var(--color-text-muted)] opacity-30" />
+                      )}
+                    </div>
+
+                    <div>
+                      <span
+                        className="inline-block px-3 py-1 rounded-full text-xs font-bold mb-2"
+                        style={{
+                          background: deckType?.color,
+                          color: "var(--color-text-inverse)",
+                        }}
+                      >
+                        {deck.type === "Luck" ? "Szerencse" : deck.type === "Question" ? "Kérdés" : "Joker"}
+                      </span>
+                      <h2 className="text-xl font-bold text-[color:var(--color-text)] mb-1 truncate">
+                        {deck.name}
+                      </h2>
+                    </div>
+                    <div className="text-[color:var(--color-text-muted)] text-sm mt-2">
+                      Létrehozva: {deck.created}
+                    </div>
+                  </div>
+                )
+              })}
+          </div>
+
+          {/* Continue Button */}
+          <div className="flex justify-center mt-12">
+            <ButtonGreen
+              text={`Tovább (${selectedDeckIds.length} pakli kiválasztva)`}
+              onClick={handleContinue}
+              width="w-auto px-8"
+            />
+          </div>
+        </motion.section>
+      </main>
+
+      <footer className="mt-auto">
+        <Footer />
+      </footer>
+    </div>
+  )
+}
+
+export default ChooseDeck

SerpentRace_Frontend/src/pages/Game/Lobby.jsx

@@ -1,8 +1,8 @@
 import React, { useEffect, useRef, useState } from "react"
 import { useNavigate, useLocation } from "react-router-dom"
-import Navbar from "../../components/Navbar/Navbar"
+import Navbar from "../../components/Navbar/Navbar.jsx"
 import Background from "../../assets/backgrounds/Background.jsx"
-import useRequireAuth from "../../hooks/useRequireAuth"
+import useRequireAuth from "../../hooks/useRequireAuth.jsx"
 
 const Lobby = () => {
   const [visible, setVisible] = useState(false)
@@ -10,7 +10,6 @@ const Lobby = () => {
   const navigate = useNavigate()
   const location = useLocation()
 
-  
   const [user, setUser] = useRequireAuth()
 
   useEffect(() => {

SerpentRace_Frontend/src/pages/Game/PlayerSetup.jsx

@@ -0,0 +1,134 @@
+import React, { useState } from "react"
+import { useNavigate, useLocation } from "react-router-dom"
+import Navbar from "../../components/Navbar/Navbar.jsx"
+import Background from "../../assets/backgrounds/Background.jsx"
+import Footer from "../../components/Footer/Footer.jsx"
+import useRequireAuth from "../../hooks/useRequireAuth.jsx"
+import ButtonGreen from "../../components/Buttons/ButtonGreen.jsx"
+import { motion } from "framer-motion"
+
+const GameLobbySetup = () => {
+  const [username] = useRequireAuth({ key: "username", redirectTo: "/login" })
+  const navigate = useNavigate()
+  const location = useLocation()
+
+  const deckIds = location.state?.deckIds || []
+
+  const [maxPlayers, setMaxPlayers] = useState(4)
+  const [isPublic, setIsPublic] = useState(true)
+
+  const handleCreateLobby = () => {
+    console.log({
+      deckIds,
+      maxPlayers,
+      isPublic,
+    })
+    // Itt küldd el az API-nak a lobby létrehozását
+    // navigate("/game-lobby", { state: { lobbyId: response.lobbyId } })
+  }
+
+  if (deckIds.length === 0) {
+    navigate("/choose-deck")
+    return null
+  }
+
+  return (
+    <div className="flex flex-col min-h-screen overflow-y-auto relative">
+      <div className="fixed top-0 left-0 w-full h-full -z-10">
+        <Background />
+      </div>
+
+      <div className="fixed top-0 left-0 right-0 z-30">
+        <Navbar />
+      </div>
+
+      <main className="flex-grow text-white px-6 pt-24 pb-20">
+        <motion.section
+          className="max-w-2xl mx-auto"
+          initial={{ opacity: 0, y: 20 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ duration: 0.7 }}
+        >
+          <motion.h1
+            className="text-5xl font-extrabold text-green-300 mb-6 text-center tracking-wide drop-shadow-lg"
+            initial={{ opacity: 0, y: 20 }}
+            animate={{ opacity: 1, y: 0 }}
+            transition={{ duration: 0.8, delay: 0.1 }}
+          >
+            Lobby Beállítások
+          </motion.h1>
+
+          <motion.p
+            className="text-lg leading-relaxed text-zinc-200 mb-10 text-center"
+            initial={{ opacity: 0, y: 20 }}
+            animate={{ opacity: 1, y: 0 }}
+            transition={{ duration: 0.8, delay: 0.2 }}
+          >
+            {deckIds.length} pakli kiválasztva. Add meg a játék részleteit.
+          </motion.p>
+
+          <div className="bg-[color:var(--color-surface)]/80 backdrop-blur-lg rounded-2xl p-8 shadow-lg space-y-6">
+            {/* Max Players */}
+            <div>
+              <label className="block text-[color:var(--color-text)] font-semibold mb-2">
+                Maximális játékosszám:
+              </label>
+              <input
+                type="number"
+                min="2"
+                max="10"
+                value={maxPlayers}
+                onChange={(e) => setMaxPlayers(parseInt(e.target.value) || 2)}
+                className="w-full px-4 py-2 rounded-lg bg-[color:var(--color-card)] text-[color:var(--color-text)] border border-[color:var(--color-surface)] focus:ring-2 focus:ring-[color:var(--color-success)] outline-none"
+              />
+            </div>
+
+            {/* Public/Private */}
+            <div>
+              <label className="block text-[color:var(--color-text)] font-semibold mb-2">Játék típusa:</label>
+              <div className="flex gap-4">
+                <button
+                  className={`flex-1 px-4 py-3 rounded-lg font-medium transition-all duration-200 ${
+                    isPublic
+                      ? "bg-[color:var(--color-success)] text-[color:var(--color-text-inverse)]"
+                      : "bg-[color:var(--color-card)] text-[color:var(--color-text)] hover:bg-[color:var(--color-success)]/30"
+                  }`}
+                  onClick={() => setIsPublic(true)}
+                >
+                  🌐 Publikus
+                </button>
+                <button
+                  className={`flex-1 px-4 py-3 rounded-lg font-medium transition-all duration-200 ${
+                    !isPublic
+                      ? "bg-[color:var(--color-success)] text-[color:var(--color-text-inverse)]"
+                      : "bg-[color:var(--color-card)] text-[color:var(--color-text)] hover:bg-[color:var(--color-success)]/30"
+                  }`}
+                  onClick={() => setIsPublic(false)}
+                >
+                  🔒 Privát
+                </button>
+              </div>
+            </div>
+          </div>
+
+          {/* Action Buttons */}
+          <div className="flex justify-center gap-4 mt-8">
+            <ButtonGreen
+              text="Vissza"
+              onClick={() => navigate("/choose-deck")}
+              width="w-auto px-8"
+              className="bg-gray-600 hover:bg-gray-700"
+            />
+            <ButtonGreen text="Lobby Létrehozása" onClick={handleCreateLobby} width="w-auto px-8" />
+          </div>
+        </motion.section>
+      </main>
+
+      <footer className="mt-auto">
+        <Footer />
+      </footer>
+    </div>
+  )
+}
+
+export default GameLobbySetup