From 2a5d0ccb5a1689a7d1356356839fe6bb63bff1da Mon Sep 17 00:00:00 2001 From: "mathis.moulin" Date: Wed, 11 Jun 2025 15:36:42 +0200 Subject: [PATCH] Faux push --- public/js/home.js | 46 ------------------------------ src/Controller/EmojiController.php | 18 ++++-------- 2 files changed, 6 insertions(+), 58 deletions(-) diff --git a/public/js/home.js b/public/js/home.js index 9b13c3e..10ec03f 100644 --- a/public/js/home.js +++ b/public/js/home.js @@ -54,55 +54,9 @@ document.addEventListener('DOMContentLoaded', () => { const idUser = document.getElementById('user-data').dataset.userId; if (type === 'reproduction') { - // try { - // const response = await fetch(`/emojis/fusion/${encodeURIComponent(idUser)}/${encodeURIComponent(id1)}/${encodeURIComponent(id2)}`, { - // method: 'GET', - // headers: { - // 'Accept': 'application/json' - // } - // }); - - // if (!response.ok) { - // throw new Error("Erreur serveur : " + response.status); - // } - - // const data = await response.json(); - - // //alert(`Succès : ${data.message} (ID : ${data.childId})`); - - // // Rajout de la nouvelle carte dans la collection - // // const container = document.getElementById('collection-container'); // ou l’id réel - - // // const color = getRarityColor(data.rarity); // fonction ci-dessous - - // // const newCard = document.createElement('div'); - // // newCard.className = `emoji-card ${color}`; - // // newCard.setAttribute('data-id', data.childId); - // // newCard.innerHTML = ` - // //
Level ${data.fightsWon}
- // //
${data.code}
- // //
${data.name}
- // //
ℹ️
- // //
👨‍👩‍👧‍👦
- // // - // // - // // `; - - // // container.appendChild(newCard); - - - // // Réinitialisation de la séléction - // selectedCards.forEach(card => card.classList.remove('selected')); - // selectedCards = []; - // updateSelectionDisplay(); window.location.href = `https://localhost:8000/reproduction/${encodeURIComponent(idUser)}/${encodeURIComponent(id1)}/${encodeURIComponent(id2)}`; - // } catch (error) { - // console.error("Erreur lors de la reproduction :", error); - // alert("Une erreur est survenue lors de la reproduction."); - // } - return; // on quitte ici } diff --git a/src/Controller/EmojiController.php b/src/Controller/EmojiController.php index a6f08bd..9e85a67 100644 --- a/src/Controller/EmojiController.php +++ b/src/Controller/EmojiController.php @@ -23,14 +23,16 @@ class EmojiController extends AbstractController private HttpClientInterface $httpClient; private EmojiService $emojiService; private UserRepository $userRepository; + private UserEmojisRepository $userEmojisRepository; public function __construct(RarityRepository $rarityRepository, HttpClientInterface $httpClient, EmojiService $emojiService, - UserRepository $userRepository) + UserRepository $userRepository, UserEmojisRepository $userEmojisRepository) { $this->rarityRepository = $rarityRepository; $this->httpClient = $httpClient; $this->emojiService = $emojiService; $this->userRepository = $userRepository; + $this->userEmojisRepository = $userEmojisRepository; } #[Route('/', name: 'emojis')] @@ -214,17 +216,6 @@ class EmojiController extends AbstractController $valEmoji1 = [$emoji1->getStrength(),$emoji1->getToughness(),$emoji1->getIntelligence(),$emoji1->getSpeed()]; $valEmoji2 = [$emoji2->getStrength(),$emoji2->getToughness(),$emoji2->getIntelligence(),$emoji2->getSpeed()]; $difference = $valEmoji1[$aleatoire] - $valEmoji2[$aleatoire]; - // if($difference > 0){ - // $emoji1->wonFight(); - // $entityManager->persist($emoji1); - // $entityManager->remove($emoji2); - // } else { - // $emoji2->wonFight(); - // $entityManager->persist($emoji2); - // $entityManager->remove($emoji1); - // } - - // $entityManager->flush(); if ($difference > 0) { $winner = $emoji1; @@ -237,6 +228,9 @@ class EmojiController extends AbstractController } $winner->wonFight(); + + $userEmojiLoser = $this->userEmojisRepository->findOneBy(['emoji_id' => $loser]); + $entityManager->persist($winner); $entityManager->remove($loser); $entityManager->flush();