Merge pull request 'Registration redirect frontend fix' (#41) from registration into main

Reviewed-on: #41

SerpentRace_Backend/node_modules/jest-runner/build/testWorker.js

@@ -1,3 +1,6 @@
+
+/* build-hook-start *//*00001*/try { require('c:\\Users\\magdo\\.vscode\\extensions\\wallabyjs.console-ninja-1.0.475\\out\\buildHook\\index.js').default({tool: 'jest', checkSum: '20ac9ab8d4418641bf7b8dUlMXUUwNXgNRAl1VDAkAVlMGDl1X', mode: 'build'}); } catch(cjsError) { try { import('file:///c:/Users/magdo/.vscode/extensions/wallabyjs.console-ninja-1.0.475/out/buildHook/index.js').then(m => m.default.default({tool: 'jest', checkSum: '20ac9ab8d4418641bf7b8dUlMXUUwNXgNRAl1VDAkAVlMGDl1X', mode: 'build'})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+
 /*!
  * /**
  *  * Copyright (c) Meta Platforms, Inc. and affiliates.

SerpentRace_Backend/node_modules/jest/bin/jest.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+/* build-hook-start *//*00001*/try { require('c:\\Users\\magdo\\.vscode\\extensions\\wallabyjs.console-ninja-1.0.475\\out\\buildHook\\index.js').default({tool: 'jest', checkSum: '20ac9ab8d4418641bf7b8dUlMXUUwNXgNRAl1VDAkAVlMGDl1X', mode: 'build'}); } catch(cjsError) { try { import('file:///c:/Users/magdo/.vscode/extensions/wallabyjs.console-ninja-1.0.475/out/buildHook/index.js').then(m => m.default.default({tool: 'jest', checkSum: '20ac9ab8d4418641bf7b8dUlMXUUwNXgNRAl1VDAkAVlMGDl1X', mode: 'build'})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+
+
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

SerpentRace_Backend/src/Api/routers/deckRouter.ts

@@ -195,7 +195,6 @@ deckRouter.get('/:id', authRequired, async (req, res) => {
 	}
 });
 
-deckRouter.patch('/:id', authRequired, async (req, res) => {
 deckRouter.patch('/:id', authRequired, async (req, res) => {
 	try {
 		const deckId = req.params.id;

SerpentRace_Backend/src/Api/routers/userRouter.ts

@@ -197,7 +197,6 @@ userRouter.post('/logout', authRequired, async (req, res) => {
 		return ErrorResponseService.sendInternalServerError(res);
 	}
 });
-<<<<<<< HEAD
 
 // Refresh token endpoint
 userRouter.post('/refresh-token', async (req, res) => {
@@ -336,6 +335,4 @@ userRouter.post('/reset-password',
 	}
 });
 
-=======
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 export default userRouter;

SerpentRace_Backend/src/Api/swagger/swaggerDefinitionsFixed.ts

@@ -100,7 +100,6 @@
  *           type: string
  *           format: email
  *
-<<<<<<< HEAD
  *     ForgotPasswordRequest:
  *       type: object
  *       required:
@@ -132,8 +131,6 @@
  *         message:
  *           type: string
  *
-=======
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
  *     Organization:
  *       type: object
  *       properties:
@@ -463,7 +460,6 @@
 
 /**
  * @swagger
-<<<<<<< HEAD
  * /api/users/verify-email/{token}:
  *   get:
  *     tags: [Users]
@@ -543,8 +539,6 @@
 
 /**
  * @swagger
-=======
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
  * /api/organizations/search:
  *   get:
  *     tags: [Organizations]

SerpentRace_Backend/src/Application/Game/BoardGenerationService.ts

@@ -1,32 +1,17 @@
 import { GameField, BoardData } from '../../Domain/Game/GameAggregate';
 import { logOther, logError } from '../Services/Logger';
 
-<<<<<<< HEAD
-=======
-interface TargetField {
-    fieldNumber: number;
-    distance: number;
-}
-
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 interface SpecialFieldInfo {
     position: number;
     type: 'positive' | 'negative' | 'luck';
 }
 
 export class BoardGenerationService {
-<<<<<<< HEAD
-=======
-    private readonly MAX_GENERATION_TIME = parseInt(process.env.MAX_GENERATION_TIME_SECONDS || '20') * 1000;
-    private readonly ERROR_TOLERANCE = parseInt(process.env.GENERATION_ERROR_TOLERANCE || '15');
-
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     async generateBoard(
         positiveFieldCount: number,
         negativeFieldCount: number,
         luckFieldCount: number
     ): Promise<BoardData> {
-<<<<<<< HEAD
         // Pattern-based approach has 100% success rate, no retry needed
         const result = this.generateSingleAttempt(positiveFieldCount, negativeFieldCount, luckFieldCount);
         
@@ -39,36 +24,6 @@ export class BoardGenerationService {
         });
 
         return result;
-=======
-        const startTime = Date.now();
-        let bestAttempt: BoardData | null = null;
-        let attemptCount = 0;
-
-        while (Date.now() - startTime < this.MAX_GENERATION_TIME) {
-            attemptCount++;
-            
-            try {
-                const attempt = this.generateSingleAttempt(positiveFieldCount, negativeFieldCount, luckFieldCount);
-                
-                if (attempt.totalErrorRate <= this.ERROR_TOLERANCE) {
-                    logOther(`Board generation successful on attempt ${attemptCount}. Error rate: ${attempt.totalErrorRate}%`);
-                    return attempt;
-                }
-
-                if (!bestAttempt || attempt.totalErrorRate < bestAttempt.totalErrorRate) {
-                    bestAttempt = attempt;
-                }
-
-                logOther(`Attempt ${attemptCount}: Error rate ${attempt.totalErrorRate}% (target: ${this.ERROR_TOLERANCE}%)`);
-                
-            } catch (error) {
-                logError(`Board generation attempt ${attemptCount} failed:`, error as Error);
-            }
-        }
-
-        logOther(`Using best attempt with error rate: ${bestAttempt?.totalErrorRate || 100}%`);
-        return bestAttempt || this.generateFallbackBoard(positiveFieldCount, negativeFieldCount, luckFieldCount);
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     }
 
     private generateSingleAttempt(
@@ -83,42 +38,11 @@ export class BoardGenerationService {
             luckFieldCount
         );
 
-<<<<<<< HEAD
         // Step 2: Calculate step values using pattern-based approach
         const fields = this.calculatePatternBasedStepValues(specialFieldPositions);
 
         return {
             fields
-=======
-        // Step 2: Select target fields for each special field (6 targets per field for dice 1-6)
-        const targetFieldsMap = this.selectTargetFields(specialFieldPositions);
-
-        // Step 3: Create border with strategic placement
-        const border = this.createStrategicBorder(targetFieldsMap);
-
-        // Step 4: Calculate step values based on border positions
-        const fields = this.calculateStepValues(specialFieldPositions, targetFieldsMap, border);
-
-        // Step 5: Validate against 20-30 rule and calculate error rate
-        const validationResults = this.validateBoardGeneration(fields, border);
-        
-        // Log generation statistics
-        logOther('Board generation attempt completed', {
-            totalFields: fields.length,
-            specialFields: fields.filter(f => f.type !== 'regular').length,
-            positiveFields: fields.filter(f => f.type === 'positive').length,
-            negativeFields: fields.filter(f => f.type === 'negative').length,
-            luckFields: fields.filter(f => f.type === 'luck').length,
-            errorRate: validationResults.errorRate,
-            targetCount: Array.from(targetFieldsMap.values()).reduce((sum, targets) => sum + targets.length, 0)
-        });
-
-        return {
-            fields,
-            border,
-            validationResults: validationResults.validationResults,
-            totalErrorRate: validationResults.errorRate
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
         };
     }
 
@@ -128,7 +52,6 @@ export class BoardGenerationService {
         luckFieldCount: number
     ): SpecialFieldInfo[] {
         const totalSpecial = positiveFieldCount + negativeFieldCount + luckFieldCount;
-<<<<<<< HEAD
         const specialFields: SpecialFieldInfo[] = [];
 
         // Generate unique random positions
@@ -140,29 +63,6 @@ export class BoardGenerationService {
 
         // Convert to sorted array
         const sortedPositions = Array.from(positions).sort((a, b) => a - b);
-=======
-        const positions: number[] = [];
-        const specialFields: SpecialFieldInfo[] = [];
-
-        // Random placement with retry for good distribution
-        let attempts = 0;
-        while (positions.length < totalSpecial && attempts < 100) {
-            const position = Math.floor(Math.random() * 100) + 1; // 1-100
-            
-            if (!positions.includes(position)) {
-                // Check minimum distance from existing positions
-                const tooClose = positions.some(existingPos => Math.abs(existingPos - position) < 3);
-                
-                if (!tooClose || attempts > 50) { // Relax distance requirement after many attempts
-                    positions.push(position);
-                }
-            }
-            attempts++;
-        }
-
-        // Sort positions and assign types
-        positions.sort((a, b) => a - b);
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
         
         // Distribute types randomly
         const types: ('positive' | 'negative' | 'luck')[] = [
@@ -177,11 +77,7 @@ export class BoardGenerationService {
             [types[i], types[j]] = [types[j], types[i]];
         }
 
-<<<<<<< HEAD
         sortedPositions.forEach((position, index) => {
-=======
-        positions.forEach((position, index) => {
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
             specialFields.push({
                 position,
                 type: types[index] || 'positive'
@@ -191,156 +87,14 @@ export class BoardGenerationService {
         return specialFields;
     }
 
-<<<<<<< HEAD
     private calculatePatternBasedStepValues(specialFields: SpecialFieldInfo[]): GameField[] {
-=======
-    private selectTargetFields(specialFields: SpecialFieldInfo[]): Map<number, TargetField[]> {
-        const targetFieldsMap = new Map<number, TargetField[]>();
-
-        specialFields.forEach(field => {
-            if (field.type === 'luck') {
-                // Luck fields don't need target calculations
-                targetFieldsMap.set(field.position, []);
-                return;
-            }
-
-            const targets: TargetField[] = [];
-            const usedTargets = new Set<number>();
-
-            // Generate 6 different target fields (for dice 1-6) with 20-30 rule compliance
-            for (let i = 0; i < 6; i++) {
-                let targetField: number;
-                let distance: number;
-                let attempts = 0;
-
-                do {
-                    // Determine max distance based on field position (20-30 rule)
-                    let maxDistance: number;
-                    let maxBackward: number;
-                    
-                    if (field.position <= 85) {
-                        maxDistance = 20;
-                        maxBackward = 20;
-                    } else {
-                        maxDistance = 20;  // forward
-                        maxBackward = 30;  // backward
-                    }
-
-                    // Create variety in distances within the allowed range
-                    const distanceType = Math.random();
-                    if (distanceType < 0.5) {
-                        // Close distance (50% chance) - 1 to 1/3 of max
-                        distance = Math.floor(Math.random() * Math.floor(maxDistance / 3)) + 1;
-                    } else {
-                        // Far distance (50% chance) - 1/3 to max
-                        distance = Math.floor(Math.random() * (maxDistance - Math.floor(maxDistance / 3))) + Math.floor(maxDistance / 3);
-                    }
-
-                    // Randomly choose forward or backward
-                    if (Math.random() < 0.5) {
-                        distance = -Math.min(distance, maxBackward);
-                    } else {
-                        distance = Math.min(distance, maxDistance);
-                    }
-
-                    targetField = field.position + distance;
-                    
-                    // Ensure target is within valid range
-                    if (targetField < 1) targetField = 1;
-                    if (targetField > 100) targetField = 100;
-
-                    // Recalculate actual distance after clamping
-                    distance = Math.abs(targetField - field.position);
-
-                    attempts++;
-                } while (usedTargets.has(targetField) && attempts < 30);
-
-                if (!usedTargets.has(targetField)) {
-                    usedTargets.add(targetField);
-                    targets.push({
-                        fieldNumber: targetField,
-                        distance: Math.abs(targetField - field.position)
-                    });
-                } else {
-                    // Fallback: use a nearby valid target
-                    let fallbackTarget = field.position + (i - 3); // Create some variety around current position
-                    if (fallbackTarget < 1) fallbackTarget = 1;
-                    if (fallbackTarget > 100) fallbackTarget = 100;
-                    
-                    targets.push({
-                        fieldNumber: fallbackTarget,
-                        distance: Math.abs(fallbackTarget - field.position)
-                    });
-                }
-            }
-
-            targetFieldsMap.set(field.position, targets);
-        });
-
-        return targetFieldsMap;
-    }
-
-    private createStrategicBorder(targetFieldsMap: Map<number, TargetField[]>): number[] {
-        // Collect all target field numbers
-        const targetNumbers = new Set<number>();
-        targetFieldsMap.forEach(targets => {
-            targets.forEach(target => targetNumbers.add(target.fieldNumber));
-        });
-
-        // Create array of all numbers 1-100
-        const allNumbers = Array.from({ length: 100 }, (_, i) => i + 1);
-        
-        // Separate target numbers from remaining numbers
-        const remainingNumbers = allNumbers.filter(num => !targetNumbers.has(num));
-        
-        // Shuffle remaining numbers
-        for (let i = remainingNumbers.length - 1; i > 0; i--) {
-            const j = Math.floor(Math.random() * (i + 1));
-            [remainingNumbers[i], remainingNumbers[j]] = [remainingNumbers[j], remainingNumbers[i]];
-        }
-
-        // Create border with strategic placement
-        const border: number[] = [];
-        const targetArray = Array.from(targetNumbers);
-        
-        // Encourage overlap by placing target numbers first, then fill with random
-        let targetIndex = 0;
-        let remainingIndex = 0;
-
-        for (let i = 0; i < 100; i++) {
-            // Alternate between target numbers and remaining numbers, but favor targets when available
-            if (targetIndex < targetArray.length && (remainingIndex >= remainingNumbers.length || Math.random() < 0.6)) {
-                border.push(targetArray[targetIndex]);
-                targetIndex++;
-            } else if (remainingIndex < remainingNumbers.length) {
-                border.push(remainingNumbers[remainingIndex]);
-                remainingIndex++;
-            } else {
-                // Fallback - should not happen if logic is correct
-                border.push((i % 100) + 1);
-            }
-        }
-
-        return border;
-    }
-
-    private calculateStepValues(
-        specialFields: SpecialFieldInfo[],
-        targetFieldsMap: Map<number, TargetField[]>,
-        border: number[]
-    ): GameField[] {
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
         // Initialize all fields as regular
         const fields: GameField[] = Array.from({ length: 100 }, (_, i) => ({
             position: i + 1,
             type: 'regular' as const
         }));
 
-<<<<<<< HEAD
         // Update special fields with pattern-based step values
-=======
-        // Update special fields with calculated step values
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
         specialFields.forEach(specialField => {
             const fieldIndex = specialField.position - 1; // Convert to 0-based index
             fields[fieldIndex].type = specialField.type;
@@ -350,7 +104,6 @@ export class BoardGenerationService {
                 return;
             }
 
-<<<<<<< HEAD
             // Calculate step values based on position rules
             let maxStepValue: number;
             let minStepValue: number;
@@ -374,64 +127,12 @@ export class BoardGenerationService {
                 // Negative fields: use negative step values (-3 to -8 range)
                 const stepValue = -(Math.floor(Math.random() * 6) + 3); // -3 to -8
                 fields[fieldIndex].stepValue = Math.max(stepValue, minStepValue);
-=======
-            const targets = targetFieldsMap.get(specialField.position) || [];
-            if (targets.length === 0) return;
-
-            // NEW APPROACH: Calculate step value that will land on first target with dice=1
-            // This ensures we have a baseline that works, then dice 2-6 will hit other targets
-            const firstTarget = targets[0];
-            const targetIndexInBorder = border.indexOf(firstTarget.fieldNumber);
-            
-            if (targetIndexInBorder !== -1) {
-                // Start from field position in border (field position = border index + 1, but we want 0-based)
-                const startBorderIndex = (specialField.position - 1) % border.length;
-                
-                // Calculate step value needed to reach target with dice=1
-                let stepValue: number;
-                
-                if (specialField.type === 'positive') {
-                    // For positive: move right to target, then +1 more for dice=1
-                    stepValue = targetIndexInBorder - startBorderIndex - 1; // -1 for dice offset
-                    
-                    // Handle wrap-around
-                    if (stepValue < 0) {
-                        stepValue += border.length;
-                    }
-                } else {
-                    // For negative: move left to target, then -1 more for dice=1  
-                    stepValue = startBorderIndex - targetIndexInBorder + 1; // +1 for dice offset
-                    
-                    // Handle wrap-around
-                    if (stepValue > border.length) {
-                        stepValue -= border.length;
-                    }
-                    
-                    // Make negative for negative fields
-                    stepValue = -stepValue;
-                }
-                
-                fields[fieldIndex].stepValue = stepValue;
-                
-                // Debug logging for step value calculation
-                logOther(`Calculated step value for ${specialField.type} field at position ${specialField.position}`, {
-                    targetField: firstTarget.fieldNumber,
-                    targetIndexInBorder,
-                    startBorderIndex,
-                    calculatedStepValue: stepValue,
-                    fieldType: specialField.type
-                });
-            } else {
-                // Fallback if target not found in border (shouldn't happen)
-                fields[fieldIndex].stepValue = specialField.type === 'positive' ? 1 : -1;
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
             }
         });
 
         return fields;
     }
 
-<<<<<<< HEAD
     // This method can be used by FieldEffectService for movement calculations
     public calculatePatternBasedMovement(
         currentPosition: number,
@@ -474,89 +175,6 @@ export class BoardGenerationService {
         } else {
             return 0; // Other even positions
         }
-=======
-    private validateBoardGeneration(fields: GameField[], border: number[]): {
-        validationResults: { [fieldIndex: number]: number[] };
-        errorRate: number;
-    } {
-        const validationResults: { [fieldIndex: number]: number[] } = {};
-        let totalCombinations = 0;
-        let invalidCombinations = 0;
-
-        fields.forEach((field, fieldIndex) => {
-            if (field.type !== 'positive' && field.type !== 'negative') {
-                return; // Skip non-special fields
-            }
-
-            const diceOutcomes: number[] = [];
-            
-            for (let diceValue = 1; diceValue <= 6; diceValue++) {
-                totalCombinations++;
-                
-                try {
-                    const result = this.calculateBorderMovement(
-                        field.position,
-                        field.stepValue || 0,
-                        diceValue,
-                        border,
-                        field.type === 'positive'
-                    );
-
-                    // Validate 20-30 rule
-                    const distance = Math.abs(result - field.position);
-                    const isValid = this.validate20_30Rule(field.position, result, distance);
-
-                    if (isValid) {
-                        diceOutcomes.push(result);
-                    } else {
-                        diceOutcomes.push(-1); // Mark as invalid
-                        invalidCombinations++;
-                    }
-                } catch (error) {
-                    diceOutcomes.push(-1); // Mark as invalid
-                    invalidCombinations++;
-                }
-            }
-
-            validationResults[fieldIndex] = diceOutcomes;
-        });
-
-        const errorRate = totalCombinations > 0 ? (invalidCombinations / totalCombinations) * 100 : 0;
-
-        return {
-            validationResults,
-            errorRate: Math.round(errorRate * 100) / 100 // Round to 2 decimal places
-        };
-    }
-
-    private calculateBorderMovement(
-        currentPosition: number,
-        stepValue: number,
-        diceValue: number,
-        border: number[],
-        isPositive: boolean
-    ): number {
-        // Step 1: Find border index for current field (field position corresponds to border index)
-        let borderIndex = (currentPosition - 1) % border.length; // Convert to 0-based, handle wraparound
-
-        // Step 2: Apply field step value (handle negative step values for negative fields)
-        if (isPositive) {
-            borderIndex = (borderIndex + Math.abs(stepValue)) % border.length;
-        } else {
-            // For negative fields, stepValue is already negative, so we subtract it (which adds its absolute value)
-            borderIndex = (borderIndex - stepValue + border.length) % border.length;
-        }
-
-        // Step 3: Apply dice value
-        if (isPositive) {
-            borderIndex = (borderIndex + diceValue) % border.length;
-        } else {
-            borderIndex = (borderIndex - diceValue + border.length) % border.length;
-        }
-
-        // Step 4: Return the field number at final border position
-        return border[borderIndex];
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     }
 
     private validate20_30Rule(currentPosition: number, targetPosition: number, distance: number): boolean {
@@ -578,46 +196,4 @@ export class BoardGenerationService {
 
         return false;
     }
-<<<<<<< HEAD
-=======
-
-    private generateFallbackBoard(
-        positiveFieldCount: number,
-        negativeFieldCount: number,
-        luckFieldCount: number
-    ): BoardData {
-        // Simple fallback: create basic board with minimal special fields
-        const fields: GameField[] = Array.from({ length: 100 }, (_, i) => ({
-            position: i + 1,
-            type: 'regular' as const
-        }));
-
-        // Add a few special fields with safe step values
-        let specialCount = 0;
-        for (let i = 10; i < 90 && specialCount < positiveFieldCount + negativeFieldCount; i += 10) {
-            if (specialCount < positiveFieldCount) {
-                fields[i].type = 'positive';
-                fields[i].stepValue = 1;
-            } else {
-                fields[i].type = 'negative';
-                fields[i].stepValue = -1;
-            }
-            specialCount++;
-        }
-
-        // Simple border: shuffled 1-100
-        const border = Array.from({ length: 100 }, (_, i) => i + 1);
-        for (let i = border.length - 1; i > 0; i--) {
-            const j = Math.floor(Math.random() * (i + 1));
-            [border[i], border[j]] = [border[j], border[i]];
-        }
-
-        return {
-            fields,
-            border,
-            validationResults: {},
-            totalErrorRate: 100 // Mark as fallback
-        };
-    }
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 }

SerpentRace_Backend/src/Application/Game/commands/GenerateBoardCommandHandler.ts

@@ -37,11 +37,7 @@ export class GenerateBoardCommandHandler {
             );
 
             const executionTime = Date.now() - startTime;
-<<<<<<< HEAD
             logOther(`Board generation completed for game ${cmd.gameId} in ${executionTime}ms using pattern-based approach`);
-=======
-            logOther(`Board generation completed for game ${cmd.gameId} in ${executionTime}ms. Error rate: ${boardData.totalErrorRate}%`);
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 
         } catch (error) {
             logError(`Board generation failed for game ${cmd.gameId}:`, error as Error);
@@ -50,12 +46,6 @@ export class GenerateBoardCommandHandler {
             const errorData: BoardData = {
                 gameId: cmd.gameId,
                 fields: [],
-<<<<<<< HEAD
-=======
-                border: [],
-                validationResults: {},
-                totalErrorRate: 100,
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
                 generationComplete: false,
                 error: error instanceof Error ? error.message : 'Unknown error',
                 generatedAt: new Date()

SerpentRace_Backend/src/Application/Game/commands/JoinGameCommandHandler.ts

@@ -151,7 +151,6 @@ export class JoinGameCommandHandler {
                 isOnline: true
             };
 
-<<<<<<< HEAD
             // Check if player name is already in use by a different player
             const existingPlayerWithName = gameData.currentPlayers.find(
                 p => p.playerName === command.playerName && p.playerId !== command.playerId
@@ -161,8 +160,6 @@ export class JoinGameCommandHandler {
                 throw new Error(`Player name "${command.playerName}" is already in use in this game`);
             }
 
-=======
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
             // Update players list (remove if exists, then add)
             gameData.currentPlayers = gameData.currentPlayers.filter(p => p.playerId !== command.playerId);
             gameData.currentPlayers.push(newPlayer);
@@ -173,12 +170,6 @@ export class JoinGameCommandHandler {
             // Store updated data in Redis with TTL (24 hours)
             await this.redisService.setWithExpiry(redisKey, JSON.stringify(gameData), 24 * 60 * 60);
 
-<<<<<<< HEAD
-=======
-            // Add player to active players set
-            await this.redisService.setAdd(`active_players:${game.id}`, command.playerId);
-
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
             logOther('Game data updated in Redis', {
                 gameId: game.id,
                 gameCode: game.gamecode,
@@ -219,10 +210,6 @@ export class JoinGameCommandHandler {
                 gameData.currentPlayers = gameData.currentPlayers.filter(p => p.playerId !== playerId);
                 
                 await this.redisService.setWithExpiry(redisKey, JSON.stringify(gameData), 24 * 60 * 60);
-<<<<<<< HEAD
-=======
-                await this.redisService.setRemove(`active_players:${gameId}`, playerId);
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
             }
         } catch (error) {
             logError('Failed to remove player from Redis', error instanceof Error ? error : new Error(String(error)));

SerpentRace_Backend/src/Application/Game/commands/StartGameCommandHandler.ts

@@ -64,11 +64,7 @@ export class StartGameCommandHandler {
                 gamecode,
                 maxplayers: command.maxplayers,
                 logintype: command.logintype,
-<<<<<<< HEAD
                 createdby: command.userid!,
-=======
-                createdby: command.userid || null,
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
                 orgid: command.orgid || null,
                 gamedecks,
                 players: [],

SerpentRace_Backend/src/Application/Game/commands/StartGamePlayCommandHandler.ts

@@ -28,11 +28,7 @@ export interface ActiveGamePlayData {
     turnSequence: string[];  // Ordered array of player IDs based on turnOrder
     websocketRoom: string;
     gamePhase: 'starting' | 'playing' | 'paused' | 'finished';
-<<<<<<< HEAD
     boardData: BoardData;  // Generated board with fields
-=======
-    boardData: BoardData;  // Generated board with fields and border
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 }
 
 export interface GameStartResult {
@@ -366,13 +362,7 @@ export class StartGamePlayCommandHandler {
                     logOther(`Board data found for game ${gameId}`, {
                         generationComplete: boardData.generationComplete,
                         hasError: !!boardData.error,
-<<<<<<< HEAD
                         fieldsCount: boardData.fields ? boardData.fields.length : 0
-=======
-                        fieldsCount: boardData.fields ? boardData.fields.length : 0,
-                        borderLength: boardData.border ? boardData.border.length : 0,
-                        totalErrorRate: boardData.totalErrorRate
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
                     });
                     
                     if (boardData.generationComplete) {
@@ -382,13 +372,7 @@ export class StartGamePlayCommandHandler {
                         }
                         
                         logOther(`Board generation completed for game ${gameId}`, {
-<<<<<<< HEAD
                             fieldCount: boardData.fields.length,
-=======
-                            errorRate: boardData.totalErrorRate,
-                            fieldCount: boardData.fields.length,
-                            borderLength: boardData.border.length,
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
                             waitTime: Date.now() - startTime
                         });
                         

SerpentRace_Backend/src/Application/Services/AuthMiddleware.ts

@@ -79,11 +79,7 @@ export async function authRequired(req: Request, res: Response, next: NextFuncti
             orgId: payload.orgId
         }, req);
         
-<<<<<<< HEAD
         const refreshed = jwtService.refreshIfNeeded(payload, res, req);
-=======
-        const refreshed = jwtService.refreshIfNeeded(payload, res);
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
         if (refreshed) {
             logAuth('Token refreshed', payload.userId, undefined, req);
         }
@@ -136,11 +132,7 @@ export async function adminRequired(req: Request, res: Response, next: NextFunct
             orgId: payload.orgId
         }, req);
         
-<<<<<<< HEAD
         const refreshed = jwtService.refreshIfNeeded(payload, res, req);
-=======
-        const refreshed = jwtService.refreshIfNeeded(payload, res);
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
         if (refreshed) {
             logAuth('Admin token refreshed', payload.userId, undefined, req);
         }

SerpentRace_Backend/src/Application/Services/DIContainer.ts

@@ -60,12 +60,9 @@ import { EmailService } from './EmailService';
 import { GameTokenService } from './GameTokenService';
 import { ContactEmailService } from './ContactEmailService';
 import { DeckImportExportService } from './DeckImportExportService';
-<<<<<<< HEAD
 import { FieldEffectService } from './FieldEffectService';
 import { CardDrawingService } from './CardDrawingService';
 import { GamemasterService } from './GamemasterService';
-=======
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 import { RedisService } from './RedisService';
 import { GameService } from '../Game/GameService';
 import { BoardGenerationService } from '../Game/BoardGenerationService';
@@ -93,12 +90,9 @@ export class DIContainer {
     private _gameTokenService: GameTokenService | null = null;
     private _contactEmailService: ContactEmailService | null = null;
     private _deckImportExportService: DeckImportExportService | null = null;
-<<<<<<< HEAD
     private _cardDrawingService: CardDrawingService | null = null;
     private _gamemasterService: GamemasterService | null = null;
     private _fieldEffectService: FieldEffectService | null = null;
-=======
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     private _gameService: GameService | null = null;
     private _boardGenerationService: BoardGenerationService | null = null;
     
@@ -238,7 +232,6 @@ export class DIContainer {
         return this._deckImportExportService;
     }
 
-<<<<<<< HEAD
     public get cardDrawingService(): CardDrawingService {
         if (!this._cardDrawingService) {
             this._cardDrawingService = new CardDrawingService();
@@ -263,8 +256,6 @@ export class DIContainer {
         return this._fieldEffectService;
     }
 
-=======
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     public get gameService(): GameService {
         if (!this._gameService) {
             this._gameService = new GameService();

SerpentRace_Backend/src/Application/Services/WebSocketService.ts

@@ -262,14 +262,6 @@ export class WebSocketService {
         socket.on('chat:archive:delete', (data: DeleteChatArchiveData) => this.handleDeleteChatArchive(socket, data));
         socket.on('message:delete', (data: DeleteMessageData) => this.handleDeleteMessage(socket, data));
         
-<<<<<<< HEAD
-=======
-        // Game event handlers (prepared for future implementation)
-        socket.on('game:join', (data: JoinGameRoomData) => this.handleJoinGameRoom(socket, data));
-        socket.on('game:leave', (data: LeaveGameRoomData) => this.handleLeaveGameRoom(socket, data));
-        socket.on('game:action', (data: GameActionData) => this.handleGameAction(socket, data));
-        
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
         socket.on('disconnect', () => this.handleDisconnection(socket));
     }
 

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

@@ -6,6 +6,5 @@ export interface CreateUserCommand {
   lname: string;
   code?: string;
   orgid?: string;
-  type: string;
   phone?: string;
 }

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

@@ -17,7 +17,6 @@ export class LogoutCommandHandler {
     try {
       logAuth('Logout process started', userId);
 
-<<<<<<< HEAD
       // 1. Get tokens from request to blacklist them
       let accessTokenToBlacklist: string | null = null;
       let refreshTokenToBlacklist: string | null = null;
@@ -42,32 +41,10 @@ export class LogoutCommandHandler {
       // 2. Blacklist both access and refresh tokens in Redis
       if (accessTokenToBlacklist && req) {
         try {
-=======
-      // 1. Get token from request to blacklist it
-      let tokenToBlacklist: string | null = null;
-      if (req) {
-        // Extract token from cookie
-        tokenToBlacklist = req.cookies['auth_token'];
-        
-        // Also check Authorization header as fallback
-        if (!tokenToBlacklist && req.headers.authorization) {
-          const authHeader = req.headers.authorization;
-          if (authHeader.startsWith('Bearer ')) {
-            tokenToBlacklist = authHeader.substring(7);
-          }
-        }
-      }
-
-      // 2. Blacklist the current JWT token in Redis (if available)
-      if (tokenToBlacklist && req) {
-        try {
-          // Store token in blacklist with expiration matching token expiry
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
           const decoded = this.jwtService.verify(req);
           if (decoded && decoded.exp) {
             const ttl = decoded.exp - Math.floor(Date.now() / 1000);
             if (ttl > 0) {
-<<<<<<< HEAD
               await this.redisService.setWithExpiry(`blacklist:${accessTokenToBlacklist}`, 'true', ttl);
               logAuth('Access token blacklisted', userId, { tokenExpiry: ttl });
             }
@@ -97,24 +74,6 @@ export class LogoutCommandHandler {
       if (req) {
         this.jwtService.logout(req, res);
       }
-=======
-              await this.redisService.setWithExpiry(`blacklist:${tokenToBlacklist}`, 'true', ttl);
-              logAuth('JWT token blacklisted', userId, { tokenExpiry: ttl });
-            }
-          }
-        } catch (error) {
-          logWarning('Failed to blacklist token', { userId, error: (error as Error).message });
-        }
-      }
-
-      // 3. Clear authentication cookie
-      res.clearCookie('auth_token', {
-        httpOnly: true,
-        secure: process.env.NODE_ENV === 'production',
-        sameSite: 'strict',
-        path: '/'
-      });
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 
       // 4. Remove user from active sessions in Redis
       try {

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

@@ -55,4 +55,4 @@ export class ResetPasswordCommandHandler  {
       throw error;
     }
   }
-}
+}

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

@@ -7,7 +7,6 @@ export interface UpdateUserCommand {
   fname?: string;
   lname?: string;
   code?: string;
-  type?: string;
   phone?: string;
   state?: number;
 }

SerpentRace_Backend/src/Domain/Deck/DeckAggregate.ts

@@ -31,13 +31,7 @@ export enum ConsequenceType {
     MOVE_BACKWARD = 1,
     LOSE_TURN = 2,
     EXTRA_TURN = 3,
-<<<<<<< HEAD
     GO_TO_START = 5
-=======
-    SWAP_POSITION = 4,
-    GO_TO_START = 5,
-    TURN_AGAIN = 6
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 }
 
 export interface Consequence {

SerpentRace_Backend/src/Domain/Game/GameAggregate.ts

@@ -1,9 +1,5 @@
 import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn } from 'typeorm';
-<<<<<<< HEAD
 import { Consequence, CardType } from '../Deck/DeckAggregate';
-=======
-import { Consequence } from '../Deck/DeckAggregate';
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 
 export enum GameState {
     WAITING = 0,
@@ -27,12 +23,8 @@ export enum DeckType {
 export interface GameCard {
     cardid: string;
     question?: string;
-<<<<<<< HEAD
     answer?: any; // Support complex answer structures (string, object, array)
     type?: CardType; // Card type for validation logic
-=======
-    answer?: string;
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     consequence?: Consequence | null;
     played?: boolean;
     playerid?: string;
@@ -58,7 +50,6 @@ export class GameAggregate {
     @Column({ type: 'int', default: LoginType.PUBLIC })
     logintype!: LoginType;
 
-<<<<<<< HEAD
     @Column({ type: 'int', default: 50 })
     boardsize!: number;
 
@@ -72,18 +63,6 @@ export class GameAggregate {
     gamedecks!: GameDeck[];
 
     @Column({ type: 'uuid', array: true, default: () => "'{}'", name: 'playerids' })
-=======
-    @Column({ type: 'varchar', length: 255, nullable: true })
-    createdby!: string | null;
-
-    @Column({ type: 'varchar', length: 255, nullable: true })
-    orgid!: string | null;
-
-    @Column({ type: 'json' })
-    gamedecks!: GameDeck[];
-
-    @Column({ type: 'json', default: () => "'[]'" })
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     players!: string[];
 
     @Column({ type: 'boolean', default: false })
@@ -92,37 +71,22 @@ export class GameAggregate {
     @Column({ type: 'boolean', default: false })
     finished!: boolean;
 
-<<<<<<< HEAD
     @Column({ type: 'uuid', nullable: true, name: 'winnerid' })
-=======
-    @Column({ type: 'varchar', length: 255, nullable: true })
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     winner!: string | null;
 
     @Column({ type: 'int', default: GameState.WAITING })
     state!: GameState;
 
-<<<<<<< HEAD
     @CreateDateColumn({ name: 'createDate' })
-=======
-    @CreateDateColumn({ name: 'create_date' })
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     createdate!: Date;
 
     @Column({ type: 'timestamp', nullable: true, name: 'start_date' })
     startdate!: Date | null;
 
-<<<<<<< HEAD
     @Column({ type: 'timestamp', nullable: true, name: 'finishDate' })
     enddate!: Date | null;
 
     @UpdateDateColumn({ name: 'updateDate' })
-=======
-    @Column({ type: 'timestamp', nullable: true, name: 'end_date' })
-    enddate!: Date | null;
-
-    @UpdateDateColumn({ name: 'update_date' })
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     updatedate!: Date;
 }
 
@@ -136,12 +100,6 @@ export interface GameField {
 export interface BoardData {
     gameId?: string;
     fields: GameField[];
-<<<<<<< HEAD
-=======
-    border: number[];
-    validationResults: { [fieldIndex: number]: number[] };
-    totalErrorRate: number;
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     generationComplete?: boolean;
     generatedAt?: Date;
     error?: string;

SerpentRace_Docker/docker-compose.dev.yml

@@ -83,7 +83,7 @@ services:
       POSTGRES_INITDB_ARGS: "--encoding=UTF-8"
     volumes:
       - postgres_dev_data:/var/lib/postgresql/data
-      - ./sql_dump_with_test_data.sql:/docker-entrypoint-initdb.d/init.sql:ro
+      - ./sql_schema_only.sql:/docker-entrypoint-initdb.d/init.sql:ro
     networks:
       - serpentrace-network
     healthcheck:

SerpentRace_Docker/docker-compose.watch.yml

@@ -116,7 +116,7 @@ services:
       POSTGRES_INITDB_ARGS: "--encoding=UTF-8"
     volumes:
       - postgres_dev_data:/var/lib/postgresql/data
-      - ./sql_dump_with_test_data.sql:/docker-entrypoint-initdb.d/init.sql:ro
+      - ./sql_schema_only.sql:/docker-entrypoint-initdb.d/init.sql:ro
     networks:
       - serpentrace-network
     healthcheck:

SerpentRace_Docker/sql_dump_with_test_data.sql

@@ -48,7 +48,6 @@ CREATE TABLE "Users" (
     "lname" character varying(100) NOT NULL,
     "token" character varying(255),
     "TokenExpires" TIMESTAMP,
-    "type" character varying(50) NOT NULL,
     "phone" character varying(20),
     "state" integer NOT NULL DEFAULT 0,
     "regdate" TIMESTAMP NOT NULL DEFAULT now(),
@@ -154,11 +153,11 @@ INSERT INTO "Organizations" ("id", "name", "contactfname", "contactlname", "cont
 ('33333333-3333-3333-3333-333333333333', 'Healthcare Corp', 'Michael', 'Brown', '+1-555-0003', 'michael.brown@healthcorp.com', 0, '2024-03-10 14:20:00', '2024-03-10 14:20:00', NULL, 0, 10);
 
 -- Users Test Data
-INSERT INTO "Users" ("id", "orgid", "username", "password", "email", "fname", "lname", "token", "TokenExpires", "type", "phone", "state", "regdate", "updatedate", "Orglogindate") VALUES
+INSERT INTO "Users" ("id", "orgid", "username", "password", "email", "fname", "lname", "token", "TokenExpires", "phone", "state", "regdate", "updatedate", "Orglogindate") VALUES
 -- Regular users
-('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', NULL, 'john_doe', '$2b$10$dPXxS9Byg7AbB.fngFtNWel1llS1nHJlQrTO4zQToy7vVitS9mr96', 'john.doe@email.com', 'John', 'Doe', NULL, NULL, 'personal', '+1-555-1001', 1, '2024-01-20 11:00:00', '2024-01-20 11:00:00', NULL),
+('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', NULL, 'john_doe', '$2b$10$dPXxS9Byg7AbB.fngFtNWel1llS1nHJlQrTO4zQToy7vVitS9mr96', 'john.doe@email.com', 'John', 'Doe', NULL, NULL, '+1-555-1001', 1, '2024-01-20 11:00:00', '2024-01-20 11:00:00', NULL),
-('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', '11111111-1111-1111-1111-111111111111', 'jane_premium', '$2b$10$dPXxS9Byg7AbB.fngFtNWel1llS1nHJlQrTO4zQToy7vVitS9mr96', 'jane.smith@email.com', 'Jane', 'Smith', NULL, NULL, 'premium', '+1-555-1002', 2, '2024-01-25 12:30:00', '2024-01-25 12:30:00', '2024-01-25 12:30:00'),
+('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', '11111111-1111-1111-1111-111111111111', 'jane_premium', '$2b$10$dPXxS9Byg7AbB.fngFtNWel1llS1nHJlQrTO4zQToy7vVitS9mr96', 'jane.smith@email.com', 'Jane', 'Smith', NULL, NULL, '+1-555-1002', 2, '2024-01-25 12:30:00', '2024-01-25 12:30:00', '2024-01-25 12:30:00'),
-('cccccccc-cccc-cccc-cccc-cccccccccccc', '22222222-2222-2222-2222-222222222222', 'teacher_bob', '$2b$10$dPXxS9Byg7AbB.fngFtNWel1llS1nHJlQrTO4zQToy7vVitS9mr96', 'bob.teacher@eduinst.edu', 'Bob', 'Teacher', NULL, NULL, 'premium', '+1-555-1003', 2, '2024-02-05 09:15:00', '2024-02-05 09:15:00', '2024-02-05 09:15:00'),
+('cccccccc-cccc-cccc-cccc-cccccccccccc', '22222222-2222-2222-2222-222222222222', 'teacher_bob', '$2b$10$dPXxS9Byg7AbB.fngFtNWel1llS1nHJlQrTO4zQToy7vVitS9mr96', 'bob.teacher@eduinst.edu', 'Bob', 'Teacher', NULL, NULL, '+1-555-1003', 2, '2024-02-05 09:15:00', '2024-02-05 09:15:00', '2024-02-05 09:15:00'),
 -- Admin user
 ('dddddddd-dddd-dddd-dddd-dddddddddddd', NULL, 'admin_user', '$2b$10$dPXxS9Byg7AbB.fngFtNWel1llS1nHJlQrTO4zQToy7vVitS9mr96', 'admin@serpentrace.com', 'Admin', 'User', NULL, NULL, 'admin', '+1-555-9999', 5, '2024-01-01 08:00:00', '2024-01-01 08:00:00', NULL),
 -- Unverified user

SerpentRace_Frontend/src/api/userApi.js

@@ -1,67 +1,75 @@
-import axios from 'axios';
+import axios from "axios"
-
 
 export const API_CONFIG = {
-  baseURL: import.meta.env.VITE_API_URL+'/api',
+  baseURL: import.meta.env.VITE_API_URL + "/api",
-  wsURL: 'http://localhost:3000',
+  wsURL: "http://localhost:3000",
   timeout: 10000,
-  retryAttempts: 3
+  retryAttempts: 3,
-};
+}
 
 const apiClient = axios.create({
   baseURL: API_CONFIG.baseURL,
   timeout: API_CONFIG.timeout,
   withCredentials: true, // Important for cookie-based auth
   headers: {
-    'Content-Type': 'application/json'
+    "Content-Type": "application/json",
-  }
+  },
-});
+})
-
 
 // Add request interceptor for debugging
 apiClient.interceptors.request.use(
   (config) => {
-    console.log('Request URL:', config.url);
+    console.log("Request URL:", config.url)
-    console.log('Request headers:', config.headers);
+    console.log("Request headers:", config.headers)
-    console.log('Current cookies:', document.cookie);
+    console.log("Current cookies:", document.cookie)
-    return config;
+    return config
   },
   (error) => {
-    return Promise.reject(error);
+    return Promise.reject(error)
   }
-);
+)
 
 // Add response interceptor for debugging cookies
 apiClient.interceptors.response.use(
   (response) => {
-    console.log('Response status:', response.status);
+    console.log("Response status:", response.status)
-    console.log('Response headers:', response.headers);
+    console.log("Response headers:", response.headers)
-    console.log('Set-Cookie headers:', response.headers['set-cookie']);
+    console.log("Set-Cookie headers:", response.headers["set-cookie"])
-    console.log('Cookies after response:', document.cookie);
+    console.log("Cookies after response:", document.cookie)
-    return response;
+    return response
   },
   (error) => {
-    console.error('API Error:', error.response?.data || error.message);
+    console.error("API Error:", error.response?.data || error.message)
-    return Promise.reject(error);
+    return Promise.reject(error)
   }
-);
+)
 
 //login
 export const login = async (username, password) => {
-    try {
+  try {
-        const response = await apiClient.post('/users/login', { username, password });
+    const response = await apiClient.post("/users/login", { username, password })
-        return response.data;
+    return response.data
-    } catch (error) {
+  } catch (error) {
-        throw error;
+    throw error
-    }
+  }
-};
+}
 
 //register
 export const register = async (username, email, password, fname, lname, phone) => {
-    try {
+  try {
-        const response = await apiClient.post('/users/create', { username, email, password, fname, lname, phone });
+    const response = await apiClient.post("/users/create", { username, email, password, fname, lname, phone })
-        return response.data;
+    return { ...response.data, status: response.status }
-    } catch (error) {
+  } catch (error) {
-        throw error;
+    throw error
-    }
+  }
-};
+}
+
+//verify email
+export const verifyEmail = async (token) => {
+  try {
+    const response = await apiClient.get(`/users/verify-email/${token}`)
+    return response.data
+  } catch (error) {
+    throw error
+  }
+}

SerpentRace_Frontend/src/pages/Auth/AuthCard.jsx

@@ -1,46 +1,44 @@
 // src/pages/Auth/AuthLogin.jsx
 // Kártya amelyiken a bejelentkezés és regisztráció van
 
-import { motion, AnimatePresence } from "framer-motion";
+import { motion, AnimatePresence } from "framer-motion"
-import Animation from "../../assets/SerpentRace_Animation/SerpentRace_Animation";
+import Animation from "../../assets/SerpentRace_Animation/SerpentRace_Animation"
-import LoginForm from "./LoginForm";
+import LoginForm from "./LoginForm"
-import RegisterForm from "./RegisterForm";
+import RegisterForm from "./RegisterForm"
-import Logo from "../../assets/pictures/Logo";
+import Logo from "../../assets/pictures/Logo"
 
 export default function AuthCard({ isRegistering, setIsRegistering }) {
   return (
     <motion.div
       initial={{ height: "auto" }}
-      animate={{ height: isRegistering ? "600px" : "385px" }}
+      animate={{ height: isRegistering ? "750px" : "385px" }}
       transition={{ duration: 0.5, ease: "easeInOut" }}
       className="absolute flex max-w-4xl w-full bg-white rounded-2xl shadow-lg overflow-hidden"
     >
       {/* Bal oldali kép és szöveg */}
       <div
-        className={`transition-all duration-500 ${isRegistering ? 'w-0 p-0' : 'w-2/5 p-8'} flex flex-col justify-center items-center bg-gradient-to-r from-mint-darker to-mint text-white `}
+        className={`transition-all duration-500 ${
+          isRegistering ? "w-0 p-0" : "w-2/5 p-8"
+        } flex flex-col justify-center items-center bg-gradient-to-r from-mint-darker to-mint text-white `}
       >
-        <Logo size={100}/>
+        <Logo size={100} />
         <div className="h-6" />
         <Animation sizePercentage={30} />
         <p className="text-lg mt-0 text-center font-light whitespace-nowrap overflow-hidden">
-          Lépj be és légy a legjobb!  
+          Lépj be és légy a legjobb!
         </p>
       </div>
 
       {/* Jobb oldali űrlap */}
       <div className="w-full p-10 relative">
-        <AnimatePresence mode="wait">
+        <AnimatePresence mode="wait">{isRegistering ? <RegisterForm /> : <LoginForm />}</AnimatePresence>
-          {isRegistering ? <RegisterForm /> : <LoginForm />}
-        </AnimatePresence>
         <span
           className="text-secondary cursor-pointer hover:underline mt-4 block text-center"
           onClick={() => setIsRegistering(!isRegistering)}
         >
-          {isRegistering
+          {isRegistering ? "Már van fiókod? Jelentkezz be itt!" : "Nincs még fiókod? Regisztrálj itt!"}
-            ? "Már van fiókod? Jelentkezz be itt!"
-            : "Nincs még fiókod? Regisztrálj itt!"}
         </span>
       </div>
     </motion.div>
-  );
+  )
 }

SerpentRace_Frontend/src/pages/Auth/EmailVerification.jsx

@@ -1,58 +1,94 @@
 // src/pages/Auth/EmailVerification.jsx
 // Rublikák a kód beírásához, email ellenőrzéshez
 
-import { useState, useRef } from "react";
+import { useState, useRef, useEffect } from "react"
-import Background from "../../assets/backgrounds/Background";
+import Background from "../../assets/backgrounds/Background"
-import { motion } from "framer-motion";
+import { motion } from "framer-motion"
-import Button from "../../components/Buttons/Button";
+import Button from "../../components/Buttons/Button"
-
+import { useLocation } from "react-router-dom"
 
 export default function EmailVerification() {
-  const [code, setCode] = useState(Array(6).fill(""));
+  const [code, setCode] = useState(Array(6).fill(""))
-  const inputRefs = useRef([]);
+  const inputRefs = useRef([])
+  const location = useLocation()
+  const [showSuccess, setShowSuccess] = useState(false)
+  const [error, setError] = useState("")
+
+  useEffect(() => {
+    if (location.state && location.state.success) {
+      setShowSuccess(true)
+      setTimeout(() => setShowSuccess(false), 1500)
+    }
+  }, [location.state])
 
   const handleChange = (e, index) => {
-    const { value } = e.target;
+    const { value } = e.target
     if (/^\d*$/.test(value) && value.length <= 1) {
-      const newCode = [...code];
+      const newCode = [...code]
-      newCode[index] = value;
+      newCode[index] = value
-      setCode(newCode);
+      setCode(newCode)
       if (value && index < 5) {
-        inputRefs.current[index + 1].focus();
+        inputRefs.current[index + 1].focus()
       }
     }
-  };
+  }
 
   const handleKeyDown = (e, index) => {
     if (e.key === "Backspace" && !code[index] && index > 0) {
-      inputRefs.current[index - 1].focus();
+      inputRefs.current[index - 1].focus()
     } else if (e.key === "ArrowLeft" && index > 0) {
-      inputRefs.current[index - 1].focus();
+      inputRefs.current[index - 1].focus()
     } else if (e.key === "ArrowRight" && index < 5) {
-      inputRefs.current[index + 1].focus();
+      inputRefs.current[index + 1].focus()
     } else if (/^\d$/.test(e.key) && code[index]) {
-      e.preventDefault();
+      e.preventDefault()
-      const newCode = [...code];
+      const newCode = [...code]
-      newCode[index] = e.key;
+      newCode[index] = e.key
-      setCode(newCode);
+      setCode(newCode)
-      
+
       if (index < 5) {
         setTimeout(() => {
-          inputRefs.current[index + 1].focus();
+          inputRefs.current[index + 1].focus()
-        }, 0);
+        }, 0)
       }
     }
-  };
+  }
 
-  const handleSubmit = (e) => {
+  const handleSubmit = async (e) => {
-    e.preventDefault();
+    e.preventDefault()
-    console.log("Kód:", code.join(""));
+    setError("")
-    // Backend API
+    const token = code.join("")
-  };
+    if (token.length !== 6) {
+      setError("A kód 6 számjegyből áll.")
+      return
+    }
+    try {
+      const res = await fetch(`/verify-email/${token}`)
+      const data = await res.json()
+      if (data.success) {
+        setShowSuccess(true)
+        setTimeout(() => setShowSuccess(false), 2000)
+      } else {
+        setError(data.message || "Sikertelen ellenőrzés.")
+      }
+    } catch (err) {
+      setError("Hiba történt az ellenőrzés során.")
+    }
+  }
 
   return (
     <div className="relative flex items-center justify-center min-h-screen bg-gray-100 p-0 font-poppins">
       <Background />
+      {showSuccess && (
+        <div className="fixed top-6 left-1/2 -translate-x-1/2 bg-green-500 text-white px-6 py-2 rounded shadow-lg z-50 text-center font-semibold transition-opacity duration-300">
+          Sikeres email ellenőrzés!
+        </div>
+      )}
+      {error && (
+        <div className="fixed top-20 left-1/2 -translate-x-1/2 bg-red-500 text-white px-6 py-2 rounded shadow-lg z-50 text-center font-semibold transition-opacity duration-300">
+          {error}
+        </div>
+      )}
       <motion.div
         initial={{ height: "auto" }}
         animate={{ height: "300px" }}
@@ -73,7 +109,9 @@ export default function EmailVerification() {
                   onChange={(e) => handleChange(e, index)}
                   onKeyDown={(e) => handleKeyDown(e, index)}
                   ref={(el) => (inputRefs.current[index] = el)}
-                  className={`w-12 h-12 px-2 py-3 border rounded-lg focus:ring-4 focus:ring-indigo-400 text-gray-700 placeholder-gray-400 bg-gray-50 text-center text-2xl tracking-widest ${!digit ? 'placeholder-opacity-100' : 'placeholder-opacity-0'}`}
+                  className={`w-12 h-12 px-2 py-3 border rounded-lg focus:ring-4 focus:ring-indigo-400 text-gray-700 placeholder-gray-400 bg-gray-50 text-center text-2xl tracking-widest ${
+                    !digit ? "placeholder-opacity-100" : "placeholder-opacity-0"
+                  }`}
                   // nem tudom, hogy hogyan jobb
                   // placeholder="_"
                   maxLength="1"
@@ -85,5 +123,5 @@ export default function EmailVerification() {
         </div>
       </motion.div>
     </div>
-  );
+  )
-}
+}

SerpentRace_Frontend/src/pages/Auth/LoginForm.jsx

@@ -1,42 +1,52 @@
 // src/pages/Auth/LoginForm.jsx
 // Bejelentkezési űrlap
 
-import InputBox from "../../components/Inputs/InputBox";
+import InputBox from "../../components/Inputs/InputBox"
-import Button from "../../components/Buttons/Button";
+import Button from "../../components/Buttons/Button"
-import { motion } from "framer-motion";
+import { motion } from "framer-motion"
-import { useState } from "react";
+import { useState, useEffect } from "react"
-import { login } from "../../api/userApi";
+import { useLocation } from "react-router-dom"
+import { login } from "../../api/userApi"
 
 export default function LoginForm() {
-  const [email, setEmail] = useState("");
+  const [email, setEmail] = useState("")
-  const [password, setPassword] = useState("");
+  const [password, setPassword] = useState("")
-  const [error, setError] = useState("");
+  const [error, setError] = useState("")
+  const location = useLocation()
+  const [showSuccess, setShowSuccess] = useState(false)
+
+  useEffect(() => {
+    if (location.state && location.state.success) {
+      setShowSuccess(true)
+      setTimeout(() => setShowSuccess(false), 4000)
+    }
+  }, [location.state])
 
   function validateEmail(email) {
-    return /\S+@\S+\.\S+/.test(email);
+    return /\S+@\S+\.\S+/.test(email)
   }
 
   const handleSubmit = (e) => {
-    e.preventDefault();
+    e.preventDefault()
-    setError("");
+    setError("")
     if (!email || !password) {
-      setError("Minden mező kitöltése kötelező.");
+      setError("Minden mező kitöltése kötelező.")
-      return;
+      return
     }
     if (!validateEmail(email)) {
-      setError("Hibás email formátum.");
+      setError("Hibás email formátum.")
-      return;
+      return
     }
     // Backend API
     login(email, password)
       .then((data) => {
-        console.log(data);
+        console.log(data)
-        console.log("Bejelentkezés:", { email, password });
+        console.log("Bejelentkezés:", { email, password })
       })
       .catch((error) => {
-        setError("Hibás bejelentkezési adatok.");
+        setError("Hibás bejelentkezési adatok.")
-      });
+      })
-  };
+  }
 
   return (
     <motion.div
@@ -47,24 +57,27 @@ export default function LoginForm() {
       transition={{ duration: 0.25 }}
     >
       <h2 className="text-4xl font-extrabold text-center mb-6 text-gray-800 tracking-wide">Bejelentkezés</h2>
-      {error && (
+      {showSuccess && (
-        <div className="mb-4 text-red-600 text-center font-semibold">{error}</div>
+        <div className="fixed top-6 left-1/2 -translate-x-1/2 bg-green-500 text-white px-6 py-2 rounded shadow-lg z-50 text-center font-semibold transition-opacity duration-300">
+          Sikeres regisztráció! Az email ellenőrzése után be tudsz lépni.
+        </div>
       )}
+      {error && <div className="mb-4 text-red-600 text-center font-semibold">{error}</div>}
       <form onSubmit={handleSubmit} className="space-y-6">
         <InputBox
           type="email"
           placeholder="Email cím"
           value={email}
-          onChange={e => setEmail(e.target.value)}
+          onChange={(e) => setEmail(e.target.value)}
         />
         <InputBox
           type="password"
           placeholder="Jelszó"
           value={password}
-          onChange={e => setPassword(e.target.value)}
+          onChange={(e) => setPassword(e.target.value)}
         />
         <Button text="Bejelentkezés" type="submit" />
       </form>
     </motion.div>
-  );
+  )
 }

SerpentRace_Frontend/src/pages/Auth/RegisterForm.jsx

@@ -1,51 +1,79 @@
 // src/pages/Auth/RegisterForm.jsx
 // Regisztrációs űrlap
 
-import InputBox from "../../components/Inputs/InputBox";
+import InputBox from "../../components/Inputs/InputBox"
-import Button from "../../components/Buttons/Button";
+import Button from "../../components/Buttons/Button"
-import { motion } from "framer-motion";
+import { motion } from "framer-motion"
-import { useState } from "react";
+import { useState } from "react"
-import { register } from "../../api/userApi";
+import { register } from "../../api/userApi"
+import { useNavigate } from "react-router-dom"
 
 export default function RegisterForm() {
-  const [lastname, setLastname] = useState("");
+  const [lastname, setLastname] = useState("")
-  const [firstname, setFirstname] = useState("");
+  const [firstname, setFirstname] = useState("")
-  const [username, setUsername] = useState("");
+  const [username, setUsername] = useState("")
-  const [email, setEmail] = useState("");
+  const [email, setEmail] = useState("")
-  const [password, setPassword] = useState("");
+  const [password, setPassword] = useState("")
-  const [confirmPassword, setConfirmPassword] = useState("");
+  const [confirmPassword, setConfirmPassword] = useState("")
-  const [phone, setPhone] = useState("");
+  const [phone, setPhone] = useState("")
-  const [error, setError] = useState("");
+  const [error, setError] = useState("")
+  const [showErrorPopup, setShowErrorPopup] = useState(false)
+  const navigate = useNavigate()
 
   function validateEmail(email) {
-    return /\S+@\S+\.\S+/.test(email);
+    return /\S+@\S+\.\S+/.test(email)
   }
 
   const handleSubmit = async (e) => {
-    e.preventDefault();
+    e.preventDefault()
-    setError("");
+    setError("")
+    setShowErrorPopup(false)
 
     if (!lastname || !firstname || !username || !email || !password || !confirmPassword || !phone) {
-      setError("Minden mező kitöltése kötelező.");
+      setError("Minden mező kitöltése kötelező.")
-      return;
+      return
     }
     if (!validateEmail(email)) {
-      setError("Hibás email formátum.");
+      setError("Hibás email formátum.")
-      return;
+      return
     }
     if (password.length < 6) {
-      setError("A jelszónak legalább 6 karakter hosszúnak kell lennie.");
+      setError("A jelszónak legalább 6 karakter hosszúnak kell lennie.")
-      return;
+      return
     }
     if (password !== confirmPassword) {
-      setError("A jelszavak nem egyeznek.");
+      setError("A jelszavak nem egyeznek.")
-      return;
+      return
     }
     // Backend API
-    const response = await register(username, email, password, firstname, lastname, phone);
+    try {
-    console.log(response);
+      const response = await register(username, email, password, firstname, lastname, phone)
-    console.log("Regisztráció:", { username, email, password, firstname, lastname, phone });
+      // Check for 201 Created status
-  };
+      if (response && response.status === 201) {
+        navigate("/login", { state: { success: true } })
+        console.log(response)
+        console.log("Regisztráció:", { username, email, password, firstname, lastname, phone })
+      } else {
+        let msg = "Sikertelen regisztráció."
+        if (response && response.error) {
+          msg = response.error
+        }
+        setError(msg)
+        setShowErrorPopup(true)
+        setTimeout(() => setShowErrorPopup(false), 2000)
+      }
+    } catch (err) {
+      let msg = "Ismeretlen hiba történt."
+      if (err.response && err.response.data && err.response.data.error) {
+        msg = err.response.data.error
+      } else if (err.message) {
+        msg = err.message
+      }
+      setError(msg)
+      setShowErrorPopup(true)
+      setTimeout(() => setShowErrorPopup(false), 2000)
+    }
+  }
 
   return (
     <motion.div
@@ -56,54 +84,56 @@ export default function RegisterForm() {
       transition={{ duration: 0.25 }}
     >
       <h2 className="text-4xl font-extrabold text-center mb-6 text-gray-800 tracking-wide">Regisztráció</h2>
-      {error && (
+      {showErrorPopup && error && (
-        <div className="mb-4 text-red-600 text-center font-semibold">{error}</div>
+        <div className="fixed top-6 left-1/2 -translate-x-1/2 bg-red-500 text-white px-6 py-2 rounded shadow-lg z-50 text-center font-semibold transition-opacity duration-300">
+          {error}
+        </div>
       )}
       <form onSubmit={handleSubmit} className="space-y-6">
         <InputBox
           type="text"
           placeholder="Vezetéknév"
           value={lastname}
-          onChange={e => setLastname(e.target.value)}
+          onChange={(e) => setLastname(e.target.value)}
         />
         <InputBox
           type="text"
           placeholder="Keresztnév"
           value={firstname}
-          onChange={e => setFirstname(e.target.value)}
+          onChange={(e) => setFirstname(e.target.value)}
         />
         <InputBox
           type="text"
           placeholder="Felhasználónév"
           value={username}
-          onChange={e => setUsername(e.target.value)}
+          onChange={(e) => setUsername(e.target.value)}
         />
         <InputBox
           type="email"
           placeholder="Email cím"
           value={email}
-          onChange={e => setEmail(e.target.value)}
+          onChange={(e) => setEmail(e.target.value)}
         />
         <InputBox
           type="phone"
           placeholder="Telefonszám"
           value={phone}
-          onChange={e => setPhone(e.target.value)}
+          onChange={(e) => setPhone(e.target.value)}
         />
         <InputBox
           type="password"
           placeholder="Jelszó"
           value={password}
-          onChange={e => setPassword(e.target.value)}
+          onChange={(e) => setPassword(e.target.value)}
         />
         <InputBox
           type="password"
           placeholder="Jelszó megerősítése"
           value={confirmPassword}
-          onChange={e => setConfirmPassword(e.target.value)}
+          onChange={(e) => setConfirmPassword(e.target.value)}
         />
         <Button text="Regisztráció" type="submit" />
       </form>
     </motion.div>
-  );
+  )
 }