fix

Reviewed-on: #86
HALLOD UGYES VAGY :)

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

@@ -13,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
     };
   }
 
@@ -40,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/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
-    words?: string[]; // For SENTENCE_PAIRING (scrambled)
+    answerOptions?: QuizOption[]; // For QUIZ
+    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') {
-            throw new Error('Sentence pairing card answer must be a string');
+        // NEW FORMAT: Array of pairs (left-right matching)
+        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 {
-        if (typeof card.answer !== 'string') {
-            throw new Error('Sentence pairing card answer must be a string');
+    private validateSentencePairingAnswer(card: GameCard, playerAnswer: any): CardValidationResult {
+        // NEW FORMAT: Array of pairs (left-right matching)
+        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/Domain/Deck/DeckAggregate.ts

@@ -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) => {
-            return this.user?.id.toString() === userId;
-        };
+        if (!this.user) {
+            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/User/UserAggregate.ts

@@ -55,4 +55,8 @@ export class UserAggregate {
 
     @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_Frontend/src/App.jsx

@@ -8,16 +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)
@@ -61,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="/report" element={<Reports />} />
+          <Route path="/choosedeck" element={<ChooseDeck />} />
+          <Route path="/playersetup" element={<PlayerSetup />} />
         </Routes>
       </Router>
 

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/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ó
-    alert("⚠️ A pakli megnyitás funkció még fejlesztés alatt áll!")
+    // Get the deck ID from raw data
+    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/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