back via given route

app/Http/Controllers/PokemonController.php

@@ -1,13 +1,10 @@
 <?php
 
 namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-
 namespace App\Http\Controllers;
-
-
 use App\Models\Pokemon;
+use Illuminate\Http\Client\Request;
+use Symfony\Component\Console\Input\Input;
 
 class PokemonController extends Controller
 {

app/Http/Controllers/TeamController.php

@@ -29,9 +29,8 @@ public function store(TeamRequest $request): \Illuminate\Http\RedirectResponse
         $team->user_id = auth()->id();
         $team->save();
 
-        $selectedPokemons = $request->input('selected_pokemons')
-            ? explode(',', $request->input('selected_pokemons'))
-            : [];
+        $selectedPokemons = $this->createSelectedPokemonsArray($request);
+
         $team->pokemons()->attach($selectedPokemons);
 
         return redirect()->route('teams.index')
@@ -43,7 +42,8 @@ public function edit($id)
         $team = Team::findOrFail($id);
 
         if ($team->user_id !== auth()->id()) {
-            return redirect()->route('teams.index')->with('error', 'You do not have permission to edit this team.');
+            return redirect()->route('teams.index')
+                ->with('error', 'You do not have permission to edit this team.');
         }
 
         $pokemons = Pokemon::all();
@@ -55,15 +55,14 @@ public function update(TeamRequest $request, $id): \Illuminate\Http\RedirectResp
         $team = Team::findOrFail($id);
 
         if ($team->user_id !== auth()->id()) {
-            return redirect()->route('teams.index')->with('error', 'You do not have permission to update this team.');
+            return redirect()->route('teams.index')
+                ->with('error', 'You do not have permission to update this team.');
         }
 
         $team->name = $request->name;
         $team->save();
 
-        $selectedPokemons = $request->input('selected_pokemons')
-            ? explode(',', $request->input('selected_pokemons'))
-            : [];
+        $selectedPokemons = $this->createSelectedPokemonsArray($request);
         $team->pokemons()->sync($selectedPokemons);
 
         return redirect()->route('teams.index')
@@ -81,12 +80,20 @@ public function destroy($id): \Illuminate\Http\RedirectResponse
         $team = Team::findOrFail($id);
 
         if ($team->user_id !== auth()->id()) {
-            return redirect()->route('teams.index')->with('error', 'You do not have permission to delete this team.');
+            return redirect()->route('teams.index')
+                ->with('error', 'You do not have permission to delete this team.');
         }
 
         $team->delete();
 
         return redirect()->route('teams.index')
             ->with('success', 'Team deleted successfully.');
     }
+
+    private function createSelectedPokemonsArray(TeamRequest $request): array
+    {
+        return $request->input('selected_pokemons')
+        ? explode(',', $request->input('selected_pokemons'))
+        : [];
+    }
 }

resources/js/initializePokemonSelection.js

@@ -2,57 +2,60 @@ export function initializePokemonSelection(slotSelector, pokemonCardSelector, mo
     const selectedPokemons = {};
     let currentSlotId = null;
 
-    document.querySelectorAll(slotSelector).forEach(slot => {
-        slot.addEventListener('click', function () {
-            currentSlotId = this.dataset.slotId;
-
-            document.querySelectorAll(pokemonCardSelector).forEach(card => {
-                card.classList.remove('selected-green', 'selected-blue');
+    function updateSlotDisplay(slotId, pokemonName) {
+        document.getElementById(`slot-${slotId}`).textContent = pokemonName || "Empty";
+    }
 
-                if (Object.values(selectedPokemons).includes(card.dataset.pokemonId)) {
-                    card.classList.add('selected-blue');
-                }
+    function updateHiddenInput() {
+        document.querySelector(hiddenInputSelector).value = Object.values(selectedPokemons).join(',');
+    }
 
-                if (selectedPokemons[currentSlotId] === card.dataset.pokemonId) {
-                    card.classList.remove('selected-blue');
-                    card.classList.add('selected-green');
-                }
-            });
+    function updateCardVisuals() {
+        document.querySelectorAll(pokemonCardSelector).forEach(card => {
+            card.classList.remove('selected-green', 'selected-blue');
 
-            $(modalSelector).modal('show');
+            if (Object.values(selectedPokemons).includes(card.dataset.pokemonId)) {
+                card.classList.add('selected-blue');
+            }
+            if (selectedPokemons[currentSlotId] === card.dataset.pokemonId) {
+                card.classList.remove('selected-blue');
+                card.classList.add('selected-green');
+            }
         });
+    }
+
+    function handleSlotClick(event) {
+        currentSlotId = event.currentTarget.dataset.slotId;
+        updateCardVisuals();
+        $(modalSelector).modal('show');
+    }
+
+    function handleCardClick(event) {
+        const card = event.currentTarget;
+        const pokemonId = card.dataset.pokemonId;
+        const pokemonName = card.dataset.pokemonName;
+
+        if (selectedPokemons[currentSlotId] === pokemonId) {
+            delete selectedPokemons[currentSlotId];
+            updateSlotDisplay(currentSlotId);
+        } else if (!Object.values(selectedPokemons).includes(pokemonId)) {
+            selectedPokemons[currentSlotId] = pokemonId;
+            updateSlotDisplay(currentSlotId, pokemonName);
+        } else {
+            alert("This Pokemon is already selected in another slot.");
+            return;
+        }
+
+        updateHiddenInput();
+        updateCardVisuals();
+        $(modalSelector).modal('hide');
+    }
+
+    document.querySelectorAll(slotSelector).forEach(slot => {
+        slot.addEventListener('click', handleSlotClick);
     });
 
     document.querySelectorAll(pokemonCardSelector).forEach(card => {
-        card.addEventListener('click', function () {
-            const pokemonId = this.dataset.pokemonId;
-            const pokemonName = this.dataset.pokemonName;
-
-            if (selectedPokemons[currentSlotId] === pokemonId) {
-                delete selectedPokemons[currentSlotId];
-                document.getElementById(`slot-${currentSlotId}`).textContent = "Empty";
-                document.querySelector(hiddenInputSelector).value = Object.values(selectedPokemons).join(',');
-
-                this.classList.remove('selected-green');
-            } else if (!Object.values(selectedPokemons).includes(pokemonId)) {
-                document.getElementById(`slot-${currentSlotId}`).textContent = pokemonName;
-                selectedPokemons[currentSlotId] = pokemonId;
-                document.querySelector(hiddenInputSelector).value = Object.values(selectedPokemons).join(',');
-
-                document.querySelectorAll(pokemonCardSelector).forEach(card => {
-                    card.classList.remove('selected-green', 'selected-blue');
-                    if (Object.values(selectedPokemons).includes(card.dataset.pokemonId)) {
-                        card.classList.add('selected-blue');
-                    }
-                    if (selectedPokemons[currentSlotId] === card.dataset.pokemonId) {
-                        card.classList.add('selected-green');
-                    }
-                });
-            } else {
-                alert("This Pokemon is already selected in another slot.");
-            }
-
-            $(modalSelector).modal('hide');
-        });
+        card.addEventListener('click', handleCardClick);
     });
 }

resources/views/partials/team-form.blade.php

@@ -22,7 +22,6 @@
 
 <input type="hidden" name="selected_pokemons" id="selectedPokemons">
 
-
 <style>
     .slot {
         height: 100px;

resources/views/pokemons/index.blade.php

@@ -20,7 +20,14 @@
             @foreach($pokemons as $pokemon)
                 <tr>
                     <td>
-                        <a href="{{ route('pokemons.show', $pokemon) }}">{{ $pokemon->name }}</a>
+                        <a href="{{ route('pokemons.show', [
+                                                        'pokemon' => $pokemon,
+                                                        'backRoute' => 'pokemons.index'
+                                                        ]
+                                                    )
+                                                }}">
+                            {{ $pokemon->name }}
+                        </a>
                     </td>
                     <td class="w-25">
                         <div class="type-wrapper">

resources/views/pokemons/show.blade.php

@@ -3,8 +3,9 @@
 @section("content")
 
 <div class="container mt-5 w-75">
-    <a href="{{ route('pokemons.index') }}" class="btn btn-primary mb-3"><i class="bi bi-arrow-return-left"></i>
-        Back to Pokemons</a>
+    <a href="{{ route($_GET['backRoute']) }}" class="btn btn-primary mb-3"><i class="bi bi-arrow-return-left"></i>
+        Back
+    </a>
 
     <h1>{{ $pokemon->name }}</h1>
 

resources/views/teams/edit.blade.php

@@ -25,5 +25,4 @@
 </div>
 
 @include("partials.pokemon-modal")
-
 @endsection