From 6305c3b070ab6318b7d302b30af8b07f4b36d370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Slengman?=
 <99735480+Slengm4n@users.noreply.github.com>
Date: Mon, 8 Jun 2026 12:13:05 -0300
Subject: [PATCH 1/3] Revamp home header, carousel and footer UI

Refactors and modernizes the home view: updated header with animated logo, improved desktop nav and conditional dashboard link, redesigned language picker (accessible modal) and user menu with avatar handling and polished dropdown. Reworked intro carousel slides for consistent hover/scale effects and pagination, refreshed About section (image path, cards, hover effects), and rebuilt supporters marquee for smooth infinite scroll. Footer layout adjusted and newsletter input fixed for accessibility. General styling, spacing and accessibility tweaks throughout.
---
 app/views/home/index.php | 526 +++++++++++++++++++++++++--------------
 package-lock.json        |   4 -
 2 files changed, 334 insertions(+), 196 deletions(-)

diff --git a/app/views/home/index.php b/app/views/home/index.php
index 470b8fd..8c83fb8 100644
--- a/app/views/home/index.php
+++ b/app/views/home/index.php
@@ -80,143 +80,174 @@
         <i class="fas fa-moon block dark:hidden text-blue-600"></i>
     </button>
 
-    <header class="absolute top-0 left-0 w-full z-30 py-6">
-        <div class="container mx-auto px-4 flex justify-between items-center">
-
-            <img src="<?php echo BASE_URL; ?>/assets/img/kolae_branca.png" alt="Logo Kolae" class="h-10 drop-shadow-md filter dark:filter-none invert dark:invert-0">
+   <header class="absolute top-0 left-0 w-full z-40 py-6 transition-all duration-300">
+    <div class="container mx-auto px-4 flex justify-between items-center">
+
+        <!-- Logo com animação suave de hover -->
+        <a href="<?php echo BASE_URL; ?>" aria-label="Página Inicial" class="group">
+            <img src="<?php echo BASE_URL; ?>/assets/img/kolae_branca.png" alt="Logo Kolae" class="h-10 drop-shadow-md filter dark:filter-none invert dark:invert-0 transition-transform duration-300 group-hover:scale-105">
+        </a>
+
+        <!-- Navegação Desktop -->
+        <nav class="hidden md:block">
+            <ul class="flex items-center space-x-10">
+                <li>
+                    <!-- Link com brilho suave (glow) no hover -->
+                    <a href="#sobre-nos" class="font-semibold text-white/90 hover:text-cyan-400 transition-all duration-300 drop-shadow-md hover:drop-shadow-[0_0_8px_rgba(34,211,238,0.5)]">
+                        <?php echo $lang['global_menu_about']; ?>
+                    </a>
+                </li>
 
-            <nav class="hidden md:block">
-                <ul class="flex items-center space-x-10">
+                <?php if ($isLoggedIn): ?>
                     <li>
-                        <a href="#sobre-nos" class="font-semibold text-white hover:text-cyan-400 transition-colors drop-shadow-md">
-                            <?php echo $lang['global_menu_about']; ?>
+                        <a href="<?php echo BASE_URL; ?>/dashboard" class="font-bold text-cyan-400 border border-cyan-400/70 px-5 py-2.5 rounded-full bg-cyan-400/10 backdrop-blur-md hover:bg-cyan-400 hover:text-black hover:shadow-[0_0_15px_rgba(34,211,238,0.5)] transition-all duration-300">
+                            <?php echo $lang['global_home_panel']; ?>
                         </a>
                     </li>
-
-                    <?php if ($isLoggedIn): ?>
-                        <li>
-                            <a href="<?php echo BASE_URL; ?>/dashboard" class="font-bold text-cyan-400 hover:text-cyan-300 transition-colors border border-cyan-400 px-4 py-2 rounded-full backdrop-blur-sm">
-                                <?php echo $lang['global_home_panel']; ?>
-                            </a>
-                        </li>
-                    <?php endif; ?>
-                </ul>
-            </nav>
-
-            <div class="flex items-center gap-4">
-
-
-                <div class="relative z-50"> <button id="lang-btn" class="flex items-center justify-center w-10 h-10 rounded-full bg-surface-elevated/50 backdrop-blur-sm border border-gray-700/50 hover:bg-surface-elevated transition-all text-white">
-                        <i class="fas fa-globe"></i>
-                    </button>
-
-                    <div id="lang-modal" class="fixed inset-0 bg-black/60 flex items-center justify-center z-50 opacity-0 invisible transition-all duration-300 ease-in-out">
-
-                        <div id="lang-box" class="bg-[#1e293b] border border-gray-700/50 text-white rounded-2xl shadow-2xl w-72 p-6 transform scale-95 opacity-0 transition-all duration-300 ease-in-out">
-
-                            <div class="flex justify-between items-center mb-4">
-                                <h3 class="text-lg font-bold">Selecione o Idioma</h3>
-                                <button id="close-lang-btn" class="text-gray-400 hover:text-red-500 transition-colors p-2">
-                                    <i class="fas fa-times"></i>
-                                </button>
-                            </div>
-
-                            <ul class="space-y-2 font-medium">
-                                <li>
-                                    <a href="?lang=pt-br" class="block w-full text-left px-4 py-3 rounded-xl bg-gray-800/50 hover:bg-cyan-500/20 hover:text-cyan-400 transition-all duration-200 flex items-center gap-3 hover:scale-105 active:scale-95">
-                                        <span class="text-2xl">🇧🇷</span> Português
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="?lang=en-us" class="block w-full text-left px-4 py-3 rounded-xl bg-gray-800/50 hover:bg-cyan-500/20 hover:text-cyan-400 transition-all duration-200 flex items-center gap-3 hover:scale-105 active:scale-95">
-                                        <span class="text-2xl">🇺🇸</span> English
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="?lang=es-es" class="block w-full text-left px-4 py-3 rounded-xl bg-gray-800/50 hover:bg-cyan-500/20 hover:text-cyan-400 transition-all duration-200 flex items-center gap-3 hover:scale-105 active:scale-95">
-                                        <span class="text-2xl">🇪🇸</span> Español
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="?lang=hi-in" class="block w-full text-left px-4 py-3 rounded-xl bg-gray-800/50 hover:bg-cyan-500/20 hover:text-cyan-400 transition-all duration-200 flex items-center gap-3 hover:scale-105 active:scale-95">
-                                        <span class="text-2xl">HI</span> मानक हिन्दी
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="?lang=zh-cn" class="block w-full text-left px-4 py-3 rounded-xl bg-gray-800/50 hover:bg-cyan-500/20 hover:text-cyan-400 transition-all duration-200 flex items-center gap-3 hover:scale-105 active:scale-95">
-                                        <span class="text-2xl">ZH</span> 官话
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="?lang=it-it" class="block w-full text-left px-4 py-3 rounded-xl bg-gray-800/50 hover:bg-cyan-500/20 hover:text-cyan-400 transition-all duration-200 flex items-center gap-3 hover:scale-105 active:scale-95">
-                                        <span class="text-2xl">IT</span> Italiano
-                                    </a>
-                                </li>
-                                <li>
-                                    <a href="?lang=ja-jp" class="block w-full text-left px-4 py-3 rounded-xl bg-gray-800/50 hover:bg-cyan-500/20 hover:text-cyan-400 transition-all duration-200 flex items-center gap-3 hover:scale-105 active:scale-95">
-                                        <span class="text-2xl">JA</span> 日本語
-                                    </a>
-                                </li>
-                            </ul>
+                <?php endif; ?>
+            </ul>
+        </nav>
+
+        <div class="flex items-center gap-4">
+
+            <!-- Botão de Idioma -->
+            <div class="relative z-50"> 
+                <button id="lang-btn" aria-haspopup="dialog" aria-expanded="false" class="flex items-center justify-center w-11 h-11 rounded-full bg-surface-elevated/40 backdrop-blur-md border border-gray-700/50 hover:bg-surface-elevated hover:border-cyan-400/50 hover:text-cyan-400 transition-all duration-300 text-white shadow-lg">
+                    <i class="fas fa-globe text-lg transition-transform duration-300 hover:rotate-12"></i>
+                </button>
+
+                <!-- Modal de Idioma -->
+                <div id="lang-modal" role="dialog" aria-modal="true" class="fixed inset-0 bg-black/60 backdrop-blur-sm flex items-center justify-center z-50 opacity-0 invisible transition-all duration-300 ease-in-out">
+                    <!-- Fundo Glassmorphism na caixa -->
+                    <div id="lang-box" class="bg-[#1e293b]/95 backdrop-blur-xl border border-gray-700/50 text-white rounded-2xl shadow-2xl w-72 p-6 transform scale-95 opacity-0 transition-all duration-300 ease-in-out">
+
+                        <div class="flex justify-between items-center mb-5">
+                            <h3 class="text-lg font-bold">Selecione o Idioma</h3>
+                            <button id="close-lang-btn" aria-label="Fechar" class="text-gray-400 hover:text-red-500 bg-gray-800/50 hover:bg-gray-800 rounded-full w-8 h-8 flex items-center justify-center transition-all duration-200">
+                                <i class="fas fa-times"></i>
+                            </button>
                         </div>
+
+                        <ul class="space-y-2 font-medium max-h-[60vh] overflow-y-auto pr-1 custom-scrollbar">
+                            <!-- Efeito de deslizar (translate-x) no hover dos itens -->
+                            <li>
+                                <a href="?lang=pt-br" class="flex items-center gap-3 w-full text-left px-4 py-3 rounded-xl bg-gray-800/40 hover:bg-cyan-500/10 hover:border-cyan-500/30 border border-transparent hover:text-cyan-400 transition-all duration-300 hover:translate-x-1">
+                                    <span class="text-2xl drop-shadow-md">🇧🇷</span> Português
+                                </a>
+                            </li>
+                            <li>
+                                <a href="?lang=en-us" class="flex items-center gap-3 w-full text-left px-4 py-3 rounded-xl bg-gray-800/40 hover:bg-cyan-500/10 hover:border-cyan-500/30 border border-transparent hover:text-cyan-400 transition-all duration-300 hover:translate-x-1">
+                                    <span class="text-2xl drop-shadow-md">🇺🇸</span> English
+                                </a>
+                            </li>
+                            <li>
+                                <a href="?lang=es-es" class="flex items-center gap-3 w-full text-left px-4 py-3 rounded-xl bg-gray-800/40 hover:bg-cyan-500/10 hover:border-cyan-500/30 border border-transparent hover:text-cyan-400 transition-all duration-300 hover:translate-x-1">
+                                    <span class="text-2xl drop-shadow-md">🇪🇸</span> Español
+                                </a>
+                            </li>
+                            <li>
+                                <a href="?lang=hi-in" class="flex items-center gap-3 w-full text-left px-4 py-3 rounded-xl bg-gray-800/40 hover:bg-cyan-500/10 hover:border-cyan-500/30 border border-transparent hover:text-cyan-400 transition-all duration-300 hover:translate-x-1">
+                                    <span class="text-2xl drop-shadow-md border border-gray-700 bg-gray-800 rounded px-1 text-sm">HI</span> मानक हिन्दी
+                                </a>
+                            </li>
+                            <li>
+                                <a href="?lang=zh-cn" class="flex items-center gap-3 w-full text-left px-4 py-3 rounded-xl bg-gray-800/40 hover:bg-cyan-500/10 hover:border-cyan-500/30 border border-transparent hover:text-cyan-400 transition-all duration-300 hover:translate-x-1">
+                                    <span class="text-2xl drop-shadow-md border border-gray-700 bg-gray-800 rounded px-1 text-sm">ZH</span> 官话
+                                </a>
+                            </li>
+                            <li>
+                                <a href="?lang=it-it" class="flex items-center gap-3 w-full text-left px-4 py-3 rounded-xl bg-gray-800/40 hover:bg-cyan-500/10 hover:border-cyan-500/30 border border-transparent hover:text-cyan-400 transition-all duration-300 hover:translate-x-1">
+                                    <span class="text-2xl drop-shadow-md border border-gray-700 bg-gray-800 rounded px-1 text-sm">IT</span> Italiano
+                                </a>
+                            </li>
+                            <li>
+                                <a href="?lang=ja-jp" class="flex items-center gap-3 w-full text-left px-4 py-3 rounded-xl bg-gray-800/40 hover:bg-cyan-500/10 hover:border-cyan-500/30 border border-transparent hover:text-cyan-400 transition-all duration-300 hover:translate-x-1">
+                                    <span class="text-2xl drop-shadow-md border border-gray-700 bg-gray-800 rounded px-1 text-sm">JA</span> 日本語
+                                </a>
+                            </li>
+                        </ul>
                     </div>
                 </div>
+            </div>
 
-                <div class="relative">
-                    <div id="user-menu-button" class="flex items-center gap-4 p-2 border border-gray-700/50 rounded-full cursor-pointer transition-colors hover:bg-surface-secondary bg-surface-elevated/80 backdrop-blur-sm text-content-primary">
-                        <i class="fas fa-bars text-lg ml-2"></i>
+            <!-- Botão do Usuário -->
+            <div class="relative">
+                <button id="user-menu-button" aria-haspopup="true" aria-expanded="false" class="flex items-center gap-3 p-1.5 pr-3 border border-gray-700/50 rounded-full cursor-pointer transition-all duration-300 hover:bg-surface-elevated hover:border-cyan-400/50 bg-surface-elevated/40 backdrop-blur-md text-white shadow-lg group">
+                    <i class="fas fa-bars text-[15px] pl-2 text-gray-300 group-hover:text-cyan-400 transition-colors"></i>
 
-                        <?php if ($isLoggedIn): ?>
-                            <?php if (!empty($_SESSION['user_avatar'])): ?>
-                                <img src="<?php echo BASE_URL . '/uploads/avatars/' . $_SESSION['user_id'] . '/' . $_SESSION['user_avatar']; ?>"
-                                    class="w-8 h-8 rounded-full object-cover border border-gray-600"
-                                    alt="Avatar"
-                                    onerror="this.style.display='none'; this.nextElementSibling.style.display='flex';">
-
-                                <div class="w-8 h-8 rounded-full bg-gradient-to-br from-cyan-500 to-blue-600 flex items-center justify-center text-white font-bold text-sm" style="display:none;">
-                                    <?php echo strtoupper(substr($userName, 0, 1)); ?>
-                                </div>
-                            <?php else: ?>
-                                <div class="w-8 h-8 rounded-full bg-gradient-to-br from-cyan-500 to-blue-600 flex items-center justify-center text-white font-bold text-sm">
-                                    <?php echo strtoupper(substr($userName, 0, 1)); ?>
-                                </div>
-                            <?php endif; ?>
+                    <?php if ($isLoggedIn): ?>
+                        <?php if (!empty($_SESSION['user_avatar'])): ?>
+                            <img src="<?php echo BASE_URL . '/uploads/avatars/' . $_SESSION['user_id'] . '/' . $_SESSION['user_avatar']; ?>"
+                                class="w-8 h-8 rounded-full object-cover border-2 border-gray-600 group-hover:border-cyan-400 transition-colors"
+                                alt="Avatar"
+                                onerror="this.style.display='none'; this.nextElementSibling.style.display='flex';">
+
+                            <div class="w-8 h-8 rounded-full bg-gradient-to-br from-cyan-500 to-blue-600 flex items-center justify-center text-white font-bold text-sm shadow-inner" style="display:none;">
+                                <?php echo strtoupper(substr($userName, 0, 1)); ?>
+                            </div>
                         <?php else: ?>
-                            <i class="fas fa-user-circle text-3xl text-content-secondary"></i>
+                            <div class="w-8 h-8 rounded-full bg-gradient-to-br from-cyan-500 to-blue-600 flex items-center justify-center text-white font-bold text-sm shadow-inner">
+                                <?php echo strtoupper(substr($userName, 0, 1)); ?>
+                            </div>
                         <?php endif; ?>
-                    </div>
+                    <?php else: ?>
+                        <i class="fas fa-user-circle text-3xl text-gray-400 group-hover:text-cyan-400 transition-colors"></i>
+                    <?php endif; ?>
+                </button>
 
-                    <div id="profile-dropdown" class="absolute top-full right-0 mt-4 w-72 bg-surface-elevated border border-gray-700/50 rounded-xl shadow-2xl opacity-0 invisible transform -translate-y-2 transition-all duration-300 z-50">
-                        <ul class="py-2 text-content-primary">
+                <!-- Dropdown de Perfil -->
+                <div id="profile-dropdown" class="absolute top-full right-0 mt-3 w-64 bg-[#1e293b]/95 backdrop-blur-xl border border-gray-700/50 rounded-2xl shadow-[0_10px_40px_-10px_rgba(0,0,0,0.5)] opacity-0 invisible transform -translate-y-2 transition-all duration-300 z-50 overflow-hidden">
+                    <ul class="py-2 text-content-primary">
 
-                            <li class="md:hidden">
-                                <a href="#sobre-nos" class="flex items-center gap-4 px-5 py-3 text-sm hover:bg-surface-secondary transition-colors">
-                                    <i class="fas fa-info-circle w-5 text-center text-content-secondary"></i> <?php echo $lang['global_menu_about']; ?>
-                                </a>
-                            </li>
+                        <!-- Item visível apenas no Mobile -->
+                        <li class="md:hidden">
+                            <a href="#sobre-nos" class="flex items-center gap-3 px-5 py-3 text-sm hover:bg-cyan-500/10 hover:text-cyan-400 transition-colors">
+                                <i class="fas fa-info-circle w-5 text-center opacity-70"></i> <?php echo $lang['global_menu_about']; ?>
+                            </a>
+                        </li>
 
-                            <li class="border-t border-gray-700/50 my-2 md:hidden"></li>
+                        <li class="border-t border-gray-700/50 my-1 md:hidden"></li>
 
-                            <?php if ($isLoggedIn): ?>
-                                <li>
-                                    <div class="px-5 py-2 text-xs text-content-secondary uppercase font-bold"><?php echo $lang['global_account']; ?></div>
-                                </li>
-                                <li><a href="<?php echo BASE_URL; ?>/dashboard" class="flex items-center gap-4 px-5 py-3 text-sm hover:bg-surface-secondary transition-colors"><i class="fas fa-columns w-5 text-center text-cyan-400"></i> <?php echo $lang['global_home_panel']; ?></a></li>
-                                <li><a href="<?php echo BASE_URL; ?>/dashboard/perfil" class="flex items-center gap-4 px-5 py-3 text-sm hover:bg-surface-secondary transition-colors"><i class="fas fa-user-cog w-5 text-center text-content-secondary"></i> <?php echo $lang['global_menu_profile']; ?></a></li>
-                                <li class="border-t border-gray-700/50 my-2"></li>
-                                <li><a href="<?php echo BASE_URL; ?>/logout" class="flex items-center gap-4 px-5 py-3 text-sm text-red-400 hover:bg-surface-secondary transition-colors"><i class="fas fa-sign-out-alt w-5 text-center"></i> <?php echo $lang['global_menu_exit']; ?></a></li>
+                        <?php if ($isLoggedIn): ?>
+                            <li>
+                                <div class="px-5 py-2 text-xs text-gray-400 uppercase font-bold tracking-wider"><?php echo $lang['global_account']; ?></div>
+                            </li>
+                            <li>
+                                <a href="<?php echo BASE_URL; ?>/dashboard" class="flex items-center gap-3 px-5 py-3 text-sm hover:bg-cyan-500/10 transition-colors">
+                                    <i class="fas fa-columns w-5 text-center text-cyan-400"></i> <span class="font-medium"><?php echo $lang['global_home_panel']; ?></span>
+                                </a>
+                            </li>
+                            <li>
+                                <a href="<?php echo BASE_URL; ?>/dashboard/perfil" class="flex items-center gap-3 px-5 py-3 text-sm hover:bg-cyan-500/10 hover:text-cyan-400 transition-colors">
+                                    <i class="fas fa-user-cog w-5 text-center opacity-70"></i> <?php echo $lang['global_menu_profile']; ?>
+                                </a>
+                            </li>
+                            <li class="border-t border-gray-700/50 my-1"></li>
+                            <li>
+                                <a href="<?php echo BASE_URL; ?>/logout" class="flex items-center gap-3 px-5 py-3 text-sm text-red-400 hover:bg-red-500/10 transition-colors">
+                                    <i class="fas fa-sign-out-alt w-5 text-center"></i> <?php echo $lang['global_menu_exit']; ?>
+                                </a>
+                            </li>
 
-                            <?php else: ?>
-                                <li><a href="<?php echo BASE_URL; ?>/login" class="flex items-center gap-4 px-5 py-3 text-sm hover:bg-surface-secondary transition-colors"><i class="fas fa-sign-in-alt w-5 text-center text-content-secondary"></i> <?php echo $lang['global_menu_login']; ?></a></li>
-                                <li><a href="<?php echo BASE_URL; ?>/register" class="flex items-center gap-4 px-5 py-3 text-sm font-bold text-cyan-400 hover:bg-surface-secondary transition-colors"><i class="fas fa-user-plus w-5 text-center"></i> <?php echo $lang['global_menu_register']; ?></a></li>
-                            <?php endif; ?>
+                        <?php else: ?>
+                            <li>
+                                <a href="<?php echo BASE_URL; ?>/login" class="flex items-center gap-3 px-5 py-3 text-sm hover:bg-cyan-500/10 hover:text-cyan-400 transition-colors">
+                                    <i class="fas fa-sign-in-alt w-5 text-center opacity-70"></i> <?php echo $lang['global_menu_login']; ?>
+                                </a>
+                            </li>
+                            <li>
+                                <a href="<?php echo BASE_URL; ?>/register" class="flex items-center gap-3 px-5 py-3 text-sm font-bold text-cyan-400 hover:bg-cyan-500/10 transition-colors">
+                                    <i class="fas fa-user-plus w-5 text-center"></i> <?php echo $lang['global_menu_register']; ?>
+                                </a>
+                            </li>
+                        <?php endif; ?>
 
-                        </ul>
-                    </div>
+                    </ul>
                 </div>
             </div>
         </div>
-    </header>
+    </div>
+</header>
 
     <main>
         <section class="relative h-screen flex items-center justify-center text-center md:justify-start md:text-left p-0 overflow-hidden">
@@ -239,94 +270,189 @@ class="w-8 h-8 rounded-full object-cover border border-gray-600"
             </div>
         </section>
 
-        <section class="bg-surface-secondary py-16 md:py-24 overflow-hidden transition-colors duration-500">
-            <div class="container mx-auto px-4 text-center">
-                <h2 class="text-3xl md:text-4xl font-bold max-w-2xl mx-auto text-content-primary">
-                    <?php echo $lang['home_connect_message']; ?>
-                </h2>
-                <p class="max-w-3xl mx-auto mt-4 text-content-secondary">
-                    <?php echo $lang['home_search_message']; ?>
-                </p>
-            </div>
-            <div class="container mx-auto px-4 mt-12 md:mt-16 pb-10">
-                <div class="swiper intro-carousel h-[480px]">
-                    <div class="swiper-wrapper">
-                        <div class="swiper-slide h-[450px] rounded-xl overflow-hidden transition-transform duration-300 hover:scale-105 hover:-translate-y-1">
-                            <img src="https://images.pexels.com/photos/47730/the-ball-stadion-football-the-pitch-47730.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1" class="w-full h-full object-cover" loading="lazy">
-                        </div>
-                        <div class="swiper-slide h-[450px] rounded-xl overflow-hidden transition-transform duration-300 hover:scale-105 hover:-translate-y-1">
-                            <img src="https://images.pexels.com/photos/270085/pexels-photo-270085.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1" class="w-full h-full object-cover" loading="lazy">
-                        </div>
-                        <div class="swiper-slide h-[450px] rounded-xl overflow-hidden transition-transform duration-300 hover:scale-105 hover:-translate-y-1">
-                            <img src="https://images.pexels.com/photos/163452/basketball-dunk-blue-game-163452.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1" class="w-full h-full object-cover" loading="lazy">
-                        </div>
-                        <div class="swiper-slide h-[450px] rounded-xl overflow-hidden transition-transform duration-300 hover:scale-105 hover:-translate-y-1">
-                            <img src="https://images.pexels.com/photos/1263349/pexels-photo-1263349.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1" class="w-full h-full object-cover" loading="lazy">
-                        </div>
-                        <div class="swiper-slide h-[450px] rounded-xl overflow-hidden transition-transform duration-300 hover:scale-105 hover:-translate-y-1">
-                            <img src="https://images.pexels.com/photos/863988/pexels-photo-863988.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1" class="w-full h-full object-cover" loading="lazy">
-                        </div>
-                        <div class="swiper-slide h-[450px] rounded-xl overflow-hidden transition-transform duration-300 hover:scale-105 hover:-translate-y-1">
-                            <img src="https://images.pexels.com/photos/1080884/pexels-photo-1080884.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1" class="w-full h-full object-cover" loading="lazy">
-                        </div>
+      <section class="bg-surface-secondary py-16 md:py-24 overflow-hidden transition-colors duration-500">
+    <div class="container mx-auto px-4 text-center">
+        <h2 class="text-3xl md:text-4xl font-bold max-w-2xl mx-auto text-content-primary">
+            <?php echo $lang['home_connect_message']; ?>
+        </h2>
+        <p class="max-w-3xl mx-auto mt-4 text-content-secondary">
+            <?php echo $lang['home_search_message']; ?>
+        </p>
+    </div>
+    
+    <div class="container mx-auto px-4 mt-12 md:mt-16 pb-10">
+        <div class="swiper intro-carousel">
+            <!-- Adicionado py-4 para dar espaço para o efeito de scale não ser cortado -->
+            <div class="swiper-wrapper py-4">
+                
+                <!-- Slide 1 -->
+                <div class="swiper-slide">
+                    <!-- O efeito de hover fica na div interna -->
+                    <div class="h-[450px] rounded-xl overflow-hidden transition-transform duration-300 hover:scale-105 hover:-translate-y-2 shadow-lg cursor-pointer">
+                        <img src="https://images.pexels.com/photos/47730/the-ball-stadion-football-the-pitch-47730.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1" alt="Futebol" class="w-full h-full object-cover" loading="lazy">
                     </div>
-                    <div class="swiper-pagination"></div>
                 </div>
-            </div>
-        </section>
 
-        <section id="sobre-nos" class="py-16 md:py-24 bg-surface-base text-content-primary transition-colors duration-500">
-            <div class="container mx-auto px-4 grid lg:grid-cols-2 gap-12 items-center">
-                <div class="order-last lg:order-first">
-                    <img src="./assets/img/about_us_img.png" alt="About" class="w-full rounded-xl shadow-lg" loading="lazy">
+                <!-- Slide 2 -->
+                <div class="swiper-slide">
+                    <div class="h-[450px] rounded-xl overflow-hidden transition-transform duration-300 hover:scale-105 hover:-translate-y-2 shadow-lg cursor-pointer">
+                        <img src="https://images.pexels.com/photos/270085/pexels-photo-270085.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1" alt="Estádio" class="w-full h-full object-cover" loading="lazy">
+                    </div>
                 </div>
-                <div class="text-center lg:text-left">
-                    <h2 class="text-3xl md:text-4xl font-bold"><?php echo $lang['global_title_about']; ?></h2>
-                    <p class="mt-4 text-content-secondary"><?php echo $lang['global_text_about']; ?></p>
-
-                    <div class="mt-8 flex flex-col sm:flex-row gap-8 justify-center lg:justify-start">
-                        <div>
-                            <i class="fas fa-users text-cyan-400 text-3xl mb-3"></i>
-                            <h3 class="text-lg font-bold"><?php echo $lang['home_title_community']; ?></h3>
-                            <p class="text-sm text-content-secondary"><?php echo $lang['home_text_community']; ?></p>
-                        </div>
-                        <div>
-                            <i class="fas fa-map-marker-alt text-cyan-400 text-3xl mb-3"></i>
-                            <h3 class="text-lg font-bold"><?php echo $lang['home_title_location']; ?></h3>
-                            <p class="text-sm text-content-secondary"><?php echo $lang['home_text_location']; ?></p>
-                        </div>
+
+                <!-- Slide 3 -->
+                <div class="swiper-slide">
+                    <div class="h-[450px] rounded-xl overflow-hidden transition-transform duration-300 hover:scale-105 hover:-translate-y-2 shadow-lg cursor-pointer">
+                        <img src="https://images.pexels.com/photos/163452/basketball-dunk-blue-game-163452.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1" alt="Basquete" class="w-full h-full object-cover" loading="lazy">
+                    </div>
+                </div>
+
+                <!-- Slide 4 -->
+                <div class="swiper-slide">
+                    <div class="h-[450px] rounded-xl overflow-hidden transition-transform duration-300 hover:scale-105 hover:-translate-y-2 shadow-lg cursor-pointer">
+                        <img src="https://images.pexels.com/photos/1263349/pexels-photo-1263349.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1" alt="Vôlei" class="w-full h-full object-cover" loading="lazy">
+                    </div>
+                </div>
+
+                <!-- Slide 5 -->
+                <div class="swiper-slide">
+                    <div class="h-[450px] rounded-xl overflow-hidden transition-transform duration-300 hover:scale-105 hover:-translate-y-2 shadow-lg cursor-pointer">
+                        <img src="https://images.pexels.com/photos/863988/pexels-photo-863988.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1" alt="Natação" class="w-full h-full object-cover" loading="lazy">
+                    </div>
+                </div>
+
+                <!-- Slide 6 -->
+                <div class="swiper-slide">
+                    <div class="h-[450px] rounded-xl overflow-hidden transition-transform duration-300 hover:scale-105 hover:-translate-y-2 shadow-lg cursor-pointer">
+                        <img src="https://images.pexels.com/photos/1080884/pexels-photo-1080884.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1" alt="Esportes diversos" class="w-full h-full object-cover" loading="lazy">
                     </div>
                 </div>
+
             </div>
-        </section>
+            <div class="swiper-pagination"></div>
+        </div>
+    </div>
+</section>
+        <section id="sobre-nos" class="py-16 md:py-24 bg-surface-base text-content-primary transition-colors duration-500">
+    <div class="container mx-auto px-4 grid lg:grid-cols-2 gap-12 items-center">
+        
+        <!-- Coluna da Imagem -->
+        <div class="order-last lg:order-first relative group">
+            <!-- Efeito de brilho suave atrás da imagem (opcional, dá um toque moderno) -->
+            <div class="absolute inset-0 bg-cyan-400/20 blur-3xl rounded-full opacity-0 group-hover:opacity-100 transition-opacity duration-700 pointer-events-none"></div>
+            
+            <!-- Caminho corrigido com BASE_URL e animação de scale suave -->
+            <img src="<?php echo BASE_URL; ?>/assets/img/about_us_img.png" alt="Ilustração da equipe Kolae" class="w-full rounded-xl shadow-lg relative z-10 transition-transform duration-500 hover:scale-[1.02]" loading="lazy">
+        </div>
+        
+        <!-- Coluna de Texto -->
+        <div class="text-center lg:text-left">
+            <h2 class="text-3xl md:text-4xl font-bold"><?php echo $lang['global_title_about']; ?></h2>
+            <p class="mt-4 text-content-secondary leading-relaxed"><?php echo $lang['global_text_about']; ?></p>
+
+            <!-- Grid de Recursos (Transformados em Cards Suaves) -->
+            <div class="mt-8 flex flex-col sm:flex-row gap-6 justify-center lg:justify-start">
+                
+                <!-- Card Comunidade -->
+                <div class="flex-1 p-6 rounded-2xl bg-surface-elevated/40 border border-gray-700/30 hover:border-cyan-400/50 hover:bg-surface-elevated/60 hover:-translate-y-1 transition-all duration-300 group cursor-default">
+                    <!-- Círculo com o ícone -->
+                    <div class="w-12 h-12 rounded-full bg-cyan-400/10 flex items-center justify-center mb-4 mx-auto lg:mx-0 group-hover:scale-110 transition-transform duration-300">
+                        <i class="fas fa-users text-cyan-400 text-xl"></i>
+                    </div>
+                    <h3 class="text-lg font-bold mb-2"><?php echo $lang['home_title_community']; ?></h3>
+                    <p class="text-sm text-content-secondary"><?php echo $lang['home_text_community']; ?></p>
+                </div>
+                
+                <!-- Card Localização -->
+                <div class="flex-1 p-6 rounded-2xl bg-surface-elevated/40 border border-gray-700/30 hover:border-cyan-400/50 hover:bg-surface-elevated/60 hover:-translate-y-1 transition-all duration-300 group cursor-default">
+                    <!-- Círculo com o ícone -->
+                    <div class="w-12 h-12 rounded-full bg-cyan-400/10 flex items-center justify-center mb-4 mx-auto lg:mx-0 group-hover:scale-110 transition-transform duration-300">
+                        <i class="fas fa-map-marker-alt text-cyan-400 text-xl"></i>
+                    </div>
+                    <h3 class="text-lg font-bold mb-2"><?php echo $lang['home_title_location']; ?></h3>
+                    <p class="text-sm text-content-secondary"><?php echo $lang['home_text_location']; ?></p>
+                </div>
 
+            </div>
+        </div>
+        
+    </div>
+</section>
         <section class="bg-surface-secondary py-16 md:py-24 transition-colors duration-500">
-            <div class="container mx-auto px-4 text-center">
-                <h2 class="text-3xl md:text-4xl font-bold text-content-primary"><?php echo $lang['home_title_supporters']; ?></h2>
-                <p class="max-w-3xl mx-auto mt-4 text-content-secondary"><?php echo $lang['home_text_supporters']; ?></p>
+    <div class="container mx-auto px-4 text-center">
+        <h2 class="text-3xl md:text-4xl font-bold text-content-primary"><?php echo $lang['home_title_supporters']; ?></h2>
+        <p class="max-w-3xl mx-auto mt-4 text-content-secondary"><?php echo $lang['home_text_supporters']; ?></p>
+    </div>
+
+    <!-- Container com o efeito de máscara (fade nas bordas) -->
+    <div class="w-full overflow-hidden relative mt-16 [mask-image:linear-gradient(to_right,transparent,black_20%,black_80%,transparent)]">
+        
+        <!-- Adicionado 'w-max' aqui. Isso é essencial para o cálculo do translate(-50%) funcionar -->
+        <div class="flex w-max animate-scroll hover:[animation-play-state:paused]">
+            
+            <!-- Logo Fatec (1) -->
+            <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4">
+                <img src="<?php echo BASE_URL; ?>/assets/img/logo_fatec.png" alt="Logo Fatec" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy">
+            </div>
+            <!-- Logo Adidas (2) -->
+            <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4">
+                <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a8/Original_Adidas_logo.svg/1280px-Original_Adidas_logo.svg.png" alt="Logo Adidas" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy">
+            </div>
+            <!-- Logo Nike (3) -->
+            <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4">
+                <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a6/Logo_NIKE.svg/1200px-Logo_NIKE.svg.png" alt="Logo Nike" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy">
+            </div>
+            <!-- Logo Atletica (4) -->
+            <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4">
+                <img src="<?php echo BASE_URL; ?>/assets/img/logo_atletica_sagui.png" alt="Logo Atletica Sagui" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy">
+            </div>
+            <!-- Logo BRTZ (5) -->
+            <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4">
+                <img src="<?php echo BASE_URL; ?>/assets/img/logo_brtz.png" alt="Logo BRTZ" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy">
+            </div>
+            <!-- Logo Leos (6) -->
+            <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4">
+                <img src="<?php echo BASE_URL; ?>/assets/img/logo_leos_de_ferraz.png" alt="Logo Leos de Ferraz" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy">
             </div>
 
-            <div class="w-full overflow-hidden relative mt-16 [mask-image:linear-gradient(to_right,transparent,black_20%,black_80%,transparent)]">
-                <div class="flex animate-scroll hover:[animation-play-state:paused]">
-                    <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4"><img src="<?php echo BASE_URL; ?>/assets/img/logo_fatec.png" alt="Logo Fatec" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy"></div>
-                    <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a8/Original_Adidas_logo.svg/1280px-Original_Adidas_logo.svg.png" alt="Logo Adidas" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy"></div>
-                    <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a6/Logo_NIKE.svg/1200px-Logo_NIKE.svg.png" alt="Logo Nike" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy"></div>
-                    <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4"><img src="<?php echo BASE_URL; ?>/assets/img/logo_atletica_sagui.png" alt="Logo Atletica Sagui" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy"></div>
-                    <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4"><img src="<?php echo BASE_URL; ?>/assets/img/logo_brtz.png" alt="Logo BRTZ" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy"></div>
-                    <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4"><img src="<?php echo BASE_URL; ?>/assets/img/logo_leos_de_ferraz.png" alt="Logo Leos de Ferraz" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy"></div>
-                    <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4"><img src="<?php echo BASE_URL; ?>/assets/img/logo_fatec.png" alt="Logo Fatec" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy"></div>
-                    <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a8/Original_Adidas_logo.svg/1280px-Original_Adidas_logo.svg.png" alt="Logo Adidas" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy"></div>
-                    <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a6/Logo_NIKE.svg/1200px-Logo_NIKE.svg.png" alt="Logo Nike" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy"></div>
-                    <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4"><img src="<?php echo BASE_URL; ?>/assets/img/logo_atletica_sagui.png" alt="Logo Atletica Sagui" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy"></div>
-                    <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4"><img src="<?php echo BASE_URL; ?>/assets/img/logo_brtz.png" alt="Logo BRTZ" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy"></div>
-                    <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4"><img src="<?php echo BASE_URL; ?>/assets/img/logo_leos_de_ferraz.png" alt="Logo Leos de Ferraz" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy"></div>
-                </div>
+            <!-- ========================================== -->
+            <!-- CÓPIAS EXATAS PARA O LOOP INFINITO (7 a 12)  -->
+            <!-- ========================================== -->
+            
+            <!-- Logo Fatec (7) -->
+            <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4">
+                <img src="<?php echo BASE_URL; ?>/assets/img/logo_fatec.png" alt="Logo Fatec" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy">
             </div>
-        </section>
+            <!-- Logo Adidas (8) -->
+            <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4">
+                <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a8/Original_Adidas_logo.svg/1280px-Original_Adidas_logo.svg.png" alt="Logo Adidas" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy">
+            </div>
+            <!-- Logo Nike (9) -->
+            <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4">
+                <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a6/Logo_NIKE.svg/1200px-Logo_NIKE.svg.png" alt="Logo Nike" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy">
+            </div>
+            <!-- Logo Atletica (10) -->
+            <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4">
+                <img src="<?php echo BASE_URL; ?>/assets/img/logo_atletica_sagui.png" alt="Logo Atletica Sagui" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy">
+            </div>
+            <!-- Logo BRTZ (11) -->
+            <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4">
+                <img src="<?php echo BASE_URL; ?>/assets/img/logo_brtz.png" alt="Logo BRTZ" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy">
+            </div>
+            <!-- Logo Leos (12) -->
+            <div class="w-52 flex-shrink-0 flex items-center justify-center mx-4">
+                <img src="<?php echo BASE_URL; ?>/assets/img/logo_leos_de_ferraz.png" alt="Logo Leos de Ferraz" class="h-12 transition-all duration-300 filter grayscale brightness-75 opacity-70 hover:filter-none hover:opacity-100" loading="lazy">
+            </div>
+
+        </div>
+    </div>
+</section>
     </main>
 
-    <footer class="bg-surface-elevated pt-16 md:pt-20 border-t border-gray-700/30 transition-colors duration-500">
+<footer class="bg-surface-elevated pt-16 md:pt-20 border-t border-gray-700/30 transition-colors duration-500">
         <div class="container mx-auto px-4 grid md:grid-cols-2 lg:grid-cols-3 gap-12">
+            
+            <!-- Coluna 1: Logo e Redes Sociais -->
             <div class="mb-8 text-center md:text-left">
                 <img src="<?php echo BASE_URL; ?>/assets/img/kolae_branca.png" alt="Logo Kolae" class="h-10 mx-auto md:mx-0 filter dark:filter-none invert dark:invert-0" loading="lazy">
                 <p class="text-sm text-content-secondary mt-4"><?php echo $lang['home_footer_activity']; ?></p>
@@ -336,24 +462,40 @@ class="w-8 h-8 rounded-full object-cover border border-gray-600"
                     <a href="#" class="text-xl hover:text-cyan-400 transition-colors" aria-label="Facebook"><i class="fab fa-facebook-f"></i></a>
                 </div>
             </div>
+
+            <!-- Coluna 2: Contato -->
             <div class="mb-8 text-center md:text-left">
                 <h3 class="text-lg font-semibold mb-4 text-content-primary"><?php echo $lang['global_contact_kolae']; ?></h3>
                 <p class="text-sm text-content-secondary"><a href="mailto:kolae.gg@gmail.com" class="hover:text-cyan-400 transition-colors">kolae.gg@gmail.com</a></p>
                 <p class="text-sm text-content-secondary mt-2">+55 (11) 99860-0253</p>
             </div>
+
+            <!-- Coluna 3: Newsletter -->
             <div class="mb-8 text-center md:text-left">
                 <h3 class="text-lg font-semibold mb-4 text-content-primary"><?php echo $lang['home_footer_register']; ?></h3>
                 <p class="text-sm text-content-secondary">Cadastre-se para ficar por dentro dos próximos eventos e atualizações.</p>
+                
                 <form class="flex mt-4">
-                    <input type="email" class="sr-only" placeholder="Seu melhor e-mail" required class="w-full bg-surface-base text-content-primary border border-gray-700 rounded-l-md px-4 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-cyan-400">
-                    <button type="submit" aria-label="Enviar email" class="bg-cyan-400 text-black font-bold px-4 py-2 rounded-r-md hover:bg-cyan-300 transition-colors"><i class="fas fa-paper-plane"></i></button>
+                    <!-- Label adicionada para acessibilidade (leitores de tela) -->
+                    <label for="newsletter-email" class="sr-only">Seu melhor e-mail</label>
+                    
+                    <!-- Input corrigido: sem duplicação de 'class' e visível na tela -->
+                    <input type="email" id="newsletter-email" placeholder="Seu melhor e-mail" required class="w-full bg-surface-base text-content-primary border border-gray-700 rounded-l-md px-4 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-cyan-400 transition-colors">
+                    
+                    <button type="submit" aria-label="Enviar email" class="bg-cyan-400 text-black font-bold px-4 py-2 rounded-r-md hover:bg-cyan-300 transition-colors">
+                        <i class="fas fa-paper-plane"></i>
+                    </button>
                 </form>
             </div>
+
         </div>
+
+        <!-- Copyright -->
         <div class="mt-8 md:mt-12 py-6 border-t border-gray-700/30 text-center">
             <p class="text-sm text-content-secondary">&copy; <?php echo $lang['global_Copyright_message']; ?></p>
         </div>
     </footer>
+
     <script type="module" src="<?php echo BASE_URL; ?>/assets/js/bundle.js"></script>
     <script>
         document.addEventListener('DOMContentLoaded', () => {
diff --git a/package-lock.json b/package-lock.json
index a1e4597..eaec28a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1485,7 +1485,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.25",
         "caniuse-lite": "^1.0.30001754",
@@ -2058,7 +2057,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -2221,7 +2219,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -2855,7 +2852,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },

From c31a290ff066bc81d8c75b987a9c32e1b636198e Mon Sep 17 00:00:00 2001
From: Fernando <jpcslengman@outlook.com>
Date: Fri, 12 Jun 2026 10:39:53 -0300
Subject: [PATCH 2/3] Refactor auth, user, address, venue & views

Large refactor across controllers, models and views to align code with schema and improve address/venue handling and auth security. Key changes: switch user password column from password_hash to password; consolidate "remember me" to users.remember_token (cookie stores token, logout clears DB token); password reset moved to password_reset_tokens with 1-hour validity; User role defaults/allowed values updated (player/owner/admin). Address model rewritten to use hierarchical tables (countries, states, cities, neighborhoods, streets), with transaction-safe find-or-create flow and Google Geocoding lookup; Venue and VenueImage adjusted to use venues_images table and richer JOINs to return street/city/state and a cover image; Sport model uses icon_path column. Other fixes: CNPJ encryption/decryption robustness, session regeneration on login, various view title and label corrections (e.g. English typos, floor options), and small controller cleanups. Breaking changes: DB migrations required (rename/add columns and tables: users.remember_token, users.password, venues_images, password_reset_tokens, and address-related tables/relations, sports.icon_path). Update configs (GOOGLE_MAPS_API_KEY, ENCRYPTION_IV/KEY) and run migrations before deploying.
---
 app/Controllers/AuthController.php |  88 +++++------
 app/Controllers/UserController.php |  32 ++--
 app/Models/Address.php             | 243 +++++++++++++++++++++--------
 app/Models/PasswordReset.php       |  18 ++-
 app/Models/Sport.php               |  27 +++-
 app/Models/User.php                |  74 +++------
 app/Models/Venue.php               | 159 ++++++++++++++-----
 app/Models/VenueImage.php          |  16 +-
 app/views/admin/dashboard.php      |   2 +-
 app/views/admin/map.php            |   2 +-
 app/views/admin/users.php          |   2 +-
 app/views/sports/index.php         |   5 +-
 app/views/venues/edit.php          |   8 +-
 app/views/venues/index.php         |   2 +-
 lang/en-us.php                     |   4 +-
 15 files changed, 429 insertions(+), 253 deletions(-)

diff --git a/app/Controllers/AuthController.php b/app/Controllers/AuthController.php
index 21d7831..8f318fc 100644
--- a/app/Controllers/AuthController.php
+++ b/app/Controllers/AuthController.php
@@ -12,13 +12,13 @@
 
 class AuthController
 {
-    //Exibe o formulário de login
+    // Exibe o formulário de login
     public function index()
     {
         ViewHelper::render('auth/login');
     }
 
-    //Processa login do usuairo
+    // Processa login do usuário
     public function authenticate()
     {
         if ($_SERVER['REQUEST_METHOD'] === 'POST') {
@@ -27,44 +27,44 @@ public function authenticate()
 
             $user = User::findByEmail($email);
 
-            if ($user && password_verify($password, $user['password_hash'])) {
-                // Troca o ID da sessão para um novo e deleta o antigo.
-                // Isso impede que alguém use um cookie antigo roubado.
+            // Ajustado de 'password_hash' para 'password' conforme o novo SQL
+            if ($user && password_verify($password, $user['password'])) {
+                
+                // Impede fixação de sessão usando cookie antigo
                 session_regenerate_id(true);
-                //Inicia a sessão
+                
+                // Inicia a sessão
                 $_SESSION['user_id'] = $user['id'];
                 $_SESSION['user_name'] = $user['name'];
                 $_SESSION['user_role'] = $user['role'];
                 $_SESSION['user_avatar'] = $user['avatar_path'];
 
-                //"Lembrar de mim"
+                // "Lembrar de mim" usando a nova coluna 'remember_token' da tabela 'users'
                 if (isset($_POST['remember-me'])) {
-                    $selector = bin2hex(random_bytes(16));
-                    $validator = bin2hex(random_bytes(32));
-                    $expiry = date('Y-m-d H:i:s', time() + (30 * 24 * 60 * 60)); // 30 dias
-                    $hashedValidator = hash('sha256', $validator);
+                    $rememberToken = bin2hex(random_bytes(32)); // Gera um token seguro de 64 caracteres
 
                     try {
                         $conn = \App\Core\Database::getConnection();
-                        $sql = "INSERT INTO user_tokens (user_id, selector, hashed_validator, expiry) VALUES (?, ?, ?, ?)";
+                        // Atualiza o token diretamente na linha do usuário
+                        $sql = "UPDATE users SET remember_token = ? WHERE id = ?";
                         $stmt = $conn->prepare($sql);
-                        $stmt->execute([$user['id'], $selector, $hashedValidator, $expiry]);
+                        $stmt->execute([$rememberToken, $user['id']]);
 
                         setcookie(
                             'remember_me',
-                            $selector . ':' . $validator,
-                            time() + (30 * 24 * 60 * 60),
+                            $rememberToken,
+                            time() + (30 * 24 * 60 * 60), // 30 dias
                             '/',
                             '',
-                            false, //Mudar para true em produção com HTTPS
-                            true // HttpOnly
+                            false, // Mudar para true em produção com HTTPS
+                            true   // HttpOnly
                         );
                     } catch (\Exception $e) {
-                        error_log("Erro ao criar token remember me: " . $e->getMessage());
+                        error_log("Erro ao salvar remember_token: " . $e->getMessage());
                     }
                 }
 
-                //Redireciona
+                // Redireciona dependendo do nível de acesso
                 $redirect_to = ($user['role'] === 'admin') ? '/admin' : '/dashboard';
                 header('Location: ' . BASE_URL . $redirect_to);
                 exit;
@@ -75,18 +75,18 @@ public function authenticate()
         }
     }
 
-    //Exibe o formulário de registro
+    // Exibe o formulário de registro
     public function register()
     {
         ViewHelper::render('auth/register');
     }
 
-    //Processa o registro de um novo usuário
+    // Processa o registro de um novo usuário
     public function store()
     {
         if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 
-            //Verifica se 'password' é igual a 'password_confirmation'
+            // Verifica se 'password' é igual a 'password_confirmation'
             if ($_POST['password'] !== $_POST['password_confirmation']) {
                 header('Location: ' . BASE_URL . '/register?error=password_mismatch');
                 exit;
@@ -102,12 +102,14 @@ public function store()
                 exit;
             }
 
+            // DADOS DO USUÁRIO ADAPTADOS:
+            // Campo 'password' corrigido e 'role' alterado para 'player' (atendendo ao ENUM do banco)
             $userData = [
                 'name' => $_POST['name'],
                 'email' => $_POST['email'],
                 'birthdate' => $_POST['birthdate'],
-                'password_hash' => password_hash($_POST['password'], PASSWORD_DEFAULT),
-                'role' => 'user'
+                'password' => password_hash($_POST['password'], PASSWORD_DEFAULT),
+                'role' => 'player' 
             ];
 
             if (User::create($userData)) {
@@ -120,13 +122,13 @@ public function store()
         }
     }
 
-    //Exibe o formulário "Esqueci minha senha"
+    // Exibe o formulário "Esqueci minha senha"
     public function showForgotPasswordForm()
     {
         ViewHelper::render('auth/forgot-password');
     }
 
-    //Processa a solicitação de redefinição de senha e envia o e-mail
+    // Processa a solicitação de redefinição de senha e envia o e-mail
     public function handleForgotPassword()
     {
         if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
@@ -145,10 +147,10 @@ public function handleForgotPassword()
         if ($user) {
             try {
                 $token = bin2hex(random_bytes(32));
-                $expires_at = (new DateTime('+1 hour'))->format('Y-m-d H:i:s');
 
+                // Removido o parâmetro $expires_at pois a tabela 'password_reset_tokens' só possui 'created_at'
                 PasswordReset::deleteTokensForEmail($email);
-                PasswordReset::createToken($email, $token, $expires_at);
+                PasswordReset::createToken($email, $token);
 
                 $mail = new PHPMailer(true);
                 $mail->SMTPDebug = 2;
@@ -198,7 +200,7 @@ public function showResetForm()
         ViewHelper::render('auth/reset-password', ['token' => $token]);
     }
 
-    //Processa a submissão da nova senha
+    // Processa a submissão da nova senha
     public function handleResetPassword()
     {
         if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
@@ -234,23 +236,19 @@ public function handleResetPassword()
         }
     }
 
-    //Processa o logout do usuário
+    // Processa o logout do usuário
     public function logout()
     {
+        // Limpa o remember_token do banco antes de destruir o cookie
         if (isset($_COOKIE['remember_me'])) {
-            $parts = explode(':', $_COOKIE['remember_me']);
-
-            if (count($parts) === 2) {
-                list($selector,) = $parts;
-                try {
-                    // Usa namespace completo para evitar erros
-                    $conn = \App\Core\Database::getConnection();
-                    $sql = "DELETE FROM user_tokens WHERE selector = ?";
-                    $stmt = $conn->prepare($sql);
-                    $stmt->execute([$selector]);
-                } catch (\Exception $e) {
-                    error_log("Erro ao limpar token de logout: " . $e->getMessage());
-                }
+            $token = $_COOKIE['remember_me'];
+            try {
+                $conn = \App\Core\Database::getConnection();
+                $sql = "UPDATE users SET remember_token = NULL WHERE remember_token = ?";
+                $stmt = $conn->prepare($sql);
+                $stmt->execute([$token]);
+            } catch (\Exception $e) {
+                error_log("Erro ao limpar token de logout: " . $e->getMessage());
             }
             setcookie('remember_me', '', time() - 3600, '/');
             unset($_COOKIE['remember_me']);
@@ -276,7 +274,7 @@ public function logout()
         exit;
     }
 
-    //Função para verificar maioridade
+    // Função para verificar maioridade
     private function isOver18($birthdate): bool
     {
         if (empty($birthdate)) return false;
@@ -289,4 +287,4 @@ private function isOver18($birthdate): bool
             return false;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php
index f446590..d4ad4ad 100644
--- a/app/Controllers/UserController.php
+++ b/app/Controllers/UserController.php
@@ -8,11 +8,8 @@
 use App\Models\User;
 use App\Models\Venue;
 
-
 class UserController
 {
-
-
     public function dashboard()
     {
         AuthHelper::check();
@@ -22,7 +19,6 @@ public function dashboard()
         $data = [
             'userName' => $_SESSION['user_name'] ?? 'Usuario',
             'userVenues' => Venue::findByUserId($userId),
-
             'showCnpjModal' => empty($user['cnpj'])
         ];
 
@@ -39,8 +35,6 @@ public function profile()
         ViewHelper::render('users/profile', $data);
     }
 
-
-
     public function updateProfile()
     {
         AuthHelper::check();
@@ -52,7 +46,6 @@ public function updateProfile()
         $userId = $_SESSION['user_id'];
         $newAvatarFileName = null; // Variável para guardar o nome do novo arquivo
 
-
         if (isset($_FILES['avatar']) && $_FILES['avatar']['error'] === UPLOAD_ERR_OK) {
 
             // Define o diretório CORRETO
@@ -68,7 +61,6 @@ public function updateProfile()
             }
         }
 
-
         $updateData = [
             'name' => htmlspecialchars(trim($_POST['name'] ?? ''))
             // A data de nascimento é desabilitada no form, então não precisamos enviá-la
@@ -118,14 +110,13 @@ public function updatePasswordFromProfile()
             $newPassword = $_POST['new_password'] ?? '';
             $confirmPassword = $_POST['confirm_password'] ?? '';
 
-
             $user = User::findById($userId);
             if (!$user) {
                 header('Location: ' . BASE_URL . '/dashboard/perfil/seguranca?error=update_failed');
                 exit;
             }
 
-            if (!password_verify($currentPassword, $user['password_hash'])) {
+            if (!password_verify($currentPassword, $user['password'])) {
                 header('Location: ' . BASE_URL . '/dashboard/perfil/seguranca?error=current_mismatch');
                 exit;
             }
@@ -140,12 +131,9 @@ public function updatePasswordFromProfile()
                 exit;
             }
 
-
-            // Se todas as validações passaram, hash a nova senha
             $newPasswordHash = password_hash($newPassword, PASSWORD_DEFAULT);
 
-            // Tenta atualizar no banco de dados
-            if (User::update($userId, ['password_hash' => $newPasswordHash])) {
+            if (User::update($userId, ['password' => $newPasswordHash])) {
                 // Sucesso! Redireciona com status=success
                 header('Location: ' . BASE_URL . '/dashboard/perfil/seguranca?status=success');
             } else {
@@ -174,12 +162,10 @@ public function storeCnpj()
             $userId = $_SESSION['user_id'];
 
             if (!$this->validateCnpj($cnpj)) {
-                // Se o CNPJ for inválido, redireciona de volta com um erro para o popup.
                 header('Location: ' . BASE_URL . '/dashboard?error=cnpj_invalid');
                 exit;
             }
             if (User::isCnpjInUse($cnpj, $userId)) {
-                // Se o CNPJ já estiver em uso, redireciona com outro erro.
                 header('Location: ' . BASE_URL . '/dashboard?error=cnpj_in_use');
                 exit;
             }
@@ -188,12 +174,10 @@ public function storeCnpj()
                 exit;
             }
         }
-        // Se ocorrer um erro geral, redireciona.
         header('Location: ' . BASE_URL . '/dashboard?error=generic');
         exit;
     }
 
-
     // --- MÉTODOS DA ÁREA DO ADMINISTRADOR ---
 
     public function index()
@@ -217,12 +201,13 @@ public function store()
         AuthHelper::checkAdmin();
         if ($_SERVER['REQUEST_METHOD'] === 'POST') {
             $randomPassword = bin2hex(random_bytes(4));
+            
             $data = [
                 'name'      => trim($_POST['name']),
                 'email'     => trim($_POST['email']),
                 'birthdate' => $_POST['birthdate'],
-                'role'      => in_array($_POST['role'], ['user', 'admin']) ? $_POST['role'] : 'user',
-                'password_hash' => password_hash($randomPassword, PASSWORD_DEFAULT)
+                'role'      => in_array($_POST['role'], ['admin', 'owner', 'player']) ? $_POST['role'] : 'player',
+                'password'  => password_hash($randomPassword, PASSWORD_DEFAULT)
             ];
             if (User::create($data)) {
                 $_SESSION['flash_message'] = ['type' => 'success_with_password', 'password' => $randomPassword];
@@ -255,11 +240,14 @@ public function update()
         AuthHelper::checkAdmin();
         if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['id'])) {
             $id = (int)$_POST['id'];
+            
+            $role = in_array($_POST['role'], ['admin', 'owner', 'player']) ? $_POST['role'] : 'player';
+
             $data = [
                 'name'      => trim($_POST['name']),
                 'email'     => trim($_POST['email']),
                 'birthdate' => $_POST['birthdate'],
-                'role'      => $_POST['role']
+                'role'      => $role
             ];
             if (User::update($id, $data)) {
                 header('Location: ' . BASE_URL . '/admin/usuarios?status=updated');
@@ -312,4 +300,4 @@ private function validateCnpj(string $cnpj): bool
         }
         return true;
     }
-}
+}
\ No newline at end of file
diff --git a/app/Models/Address.php b/app/Models/Address.php
index 2d24bd7..8040d83 100644
--- a/app/Models/Address.php
+++ b/app/Models/Address.php
@@ -7,114 +7,229 @@
 
 /**
  * Class Address
- * Gerencia operações de banco de dados para endereços com Geocodificação.
+ * Gerencia operações de banco de dados para endereços com relacionamentos hierárquicos e Geocodificação.
  */
 class Address
 {
     /**
-     * Cria um novo endereço e busca coordenadas automaticamente.
+     * Cria um novo endereço lidando com as tabelas relacionais (states, cities, neighborhoods, streets)
+     * e busca coordenadas automaticamente.
      */
     public static function create(array $data)
     {
-        // Busca coordenadas antes de salvar
-        $coords = self::getCoordinates($data);
-        $latitude = $coords['lat'] ?? null;
-        $longitude = $coords['lng'] ?? null;
-
         $pdo = Database::getConnection();
 
-        $query = "INSERT INTO addresses (cep, street, number, neighborhood, complement, city, state, latitude, longitude) 
-                  VALUES (:cep, :street, :number, :neighborhood, :complement, :city, :state, :latitude, :longitude)";
+        try {
+            // Inicia uma transação para garantir que tudo seja salvo ou nada
+            $pdo->beginTransaction();
 
-        $stmt = $pdo->prepare($query);
+            // 1. Resolve a hierarquia geográfica para obter o street_id
+            $streetId = self::resolveAddressHierarchy($pdo, $data);
 
-        $params = [
-            ':cep' => $data['cep'],
-            ':street' => $data['street'],
-            ':number' => $data['number'],
-            ':neighborhood' => $data['neighborhood'],
-            ':complement' => $data['complement'] ?? null,
-            ':city' => $data['city'],
-            ':state' => $data['state'],
-            ':latitude' => $latitude,
-            ':longitude' => $longitude
-        ];
-
-        if ($stmt->execute($params)) {
-            return $pdo->lastInsertId();
+            if (!$streetId) {
+                throw new \Exception("Falha ao resolver a hierarquia de endereço.");
+            }
+
+            // 2. Busca coordenadas
+            $coords = self::getCoordinates($data);
+            $latitude = $coords['lat'] ?? null;
+            $longitude = $coords['lng'] ?? null;
+
+            // 3. Insere na tabela de endereços final
+            $query = "INSERT INTO addresses (street_id, cep, number, complement, latitude, longitude) 
+                      VALUES (:street_id, :cep, :number, :complement, :latitude, :longitude)";
+
+            $stmt = $pdo->prepare($query);
+
+            $params = [
+                ':street_id'  => $streetId,
+                ':cep'        => $data['cep'] ?? null,
+                ':number'     => $data['number'] ?? null,
+                ':complement' => $data['complement'] ?? null,
+                ':latitude'   => $latitude,
+                ':longitude'  => $longitude
+            ];
+
+            if ($stmt->execute($params)) {
+                $addressId = $pdo->lastInsertId();
+                $pdo->commit();
+                return $addressId;
+            }
+
+            $pdo->rollBack();
+            return false;
+
+        } catch (\Exception $e) {
+            $pdo->rollBack();
+            error_log("Erro ao salvar endereço: " . $e->getMessage());
+            return false;
         }
-        return false;
     }
 
     /**
-     * Atualiza um endereço e RECALCULA as coordenadas.
+     * Atualiza um endereço existente.
      */
     public static function update(int $id, array $data): bool
     {
-        // Recalcula coordenadas pois o endereço mudou
-        $coords = self::getCoordinates($data);
-        $latitude = $coords['lat'] ?? null;
-        $longitude = $coords['lng'] ?? null;
-
         $pdo = Database::getConnection();
 
-        $query = "UPDATE addresses SET 
-                    cep = :cep, 
-                    street = :street, 
-                    number = :number, 
-                    neighborhood = :neighborhood, 
-                    complement = :complement, 
-                    city = :city, 
-                    state = :state,
-                    latitude = :latitude,
-                    longitude = :longitude
-                  WHERE id = :id";
+        try {
+            $pdo->beginTransaction();
 
-        $stmt = $pdo->prepare($query);
+            // 1. Resolve a hierarquia para ver se a rua/cidade/etc mudou e pega o novo street_id
+            $streetId = self::resolveAddressHierarchy($pdo, $data);
 
-        $params = [
-            ':cep' => $data['cep'],
-            ':street' => $data['street'],
-            ':number' => $data['number'],
-            ':neighborhood' => $data['neighborhood'],
-            ':complement' => $data['complement'] ?? null,
-            ':city' => $data['city'],
-            ':state' => $data['state'],
-            ':latitude' => $latitude,
-            ':longitude' => $longitude,
-            ':id' => $id
-        ];
-
-        return $stmt->execute($params);
+            if (!$streetId) {
+                throw new \Exception("Falha ao resolver a hierarquia de endereço.");
+            }
+
+            // 2. Recalcula coordenadas pois o endereço pode ter mudado
+            $coords = self::getCoordinates($data);
+            $latitude = $coords['lat'] ?? null;
+            $longitude = $coords['lng'] ?? null;
+
+            // 3. Atualiza a tabela addresses
+            $query = "UPDATE addresses SET 
+                        street_id = :street_id,
+                        cep = :cep, 
+                        number = :number, 
+                        complement = :complement, 
+                        latitude = :latitude,
+                        longitude = :longitude
+                      WHERE id = :id";
+
+            $stmt = $pdo->prepare($query);
+
+            $params = [
+                ':street_id'  => $streetId,
+                ':cep'        => $data['cep'] ?? null,
+                ':number'     => $data['number'] ?? null,
+                ':complement' => $data['complement'] ?? null,
+                ':latitude'   => $latitude,
+                ':longitude'  => $longitude,
+                ':id'         => $id
+            ];
+
+            $result = $stmt->execute($params);
+            $pdo->commit();
+            return $result;
+
+        } catch (\Exception $e) {
+            $pdo->rollBack();
+            error_log("Erro ao atualizar endereço: " . $e->getMessage());
+            return false;
+        }
     }
 
     public static function findById(int $id)
     {
         $pdo = Database::getConnection();
-        $query = "SELECT * FROM addresses WHERE id = :id";
+        // Faz JOIN com todas as tabelas para retornar os nomes reais ao invés de apenas IDs
+        $query = "SELECT a.id, a.cep, a.number, a.complement, a.latitude, a.longitude,
+                         s.name AS street, n.name AS neighborhood, c.name AS city, st.name AS state, co.name AS country
+                  FROM addresses a
+                  JOIN streets s ON a.street_id = s.id
+                  JOIN neighborhoods n ON s.neighborhood_id = n.id
+                  JOIN cities c ON n.city_id = c.id
+                  JOIN states st ON c.state_id = st.id
+                  JOIN countries co ON st.country_id = co.id
+                  WHERE a.id = :id";
+                  
         $stmt = $pdo->prepare($query);
         $stmt->bindParam(':id', $id);
         $stmt->execute();
         return $stmt->fetch(PDO::FETCH_ASSOC);
     }
 
+    /**
+     * Lida com a inserção hierárquica (Country -> State -> City -> Neighborhood -> Street)
+     * Retorna o ID da Street para ser usado na tabela Address.
+     */
+    private static function resolveAddressHierarchy(PDO $pdo, array $data): ?int
+    {
+        // 1. Country (Assumindo 'Brasil' como padrão se não for fornecido, já que as Cidades costumam vir do ViaCEP)
+        $countryName = $data['country'] ?? 'Brasil';
+        $countryId = self::findOrCreate($pdo, 'countries', ['name' => $countryName]);
+
+        // 2. State
+        $stateName = $data['state'] ?? 'Desconhecido';
+        $stateId = self::findOrCreate($pdo, 'states', ['name' => $stateName, 'country_id' => $countryId]);
+
+        // 3. City
+        $cityName = $data['city'] ?? 'Desconhecido';
+        $cityId = self::findOrCreate($pdo, 'cities', ['name' => $cityName, 'state_id' => $stateId]);
+
+        // 4. Neighborhood
+        $neighborhoodName = $data['neighborhood'] ?? 'Desconhecido';
+        $neighborhoodId = self::findOrCreate($pdo, 'neighborhoods', ['name' => $neighborhoodName, 'city_id' => $cityId]);
+
+        // 5. Street
+        $streetName = $data['street'] ?? 'Desconhecido';
+        $streetId = self::findOrCreate($pdo, 'streets', ['name' => $streetName, 'neighborhood_id' => $neighborhoodId]);
+
+        return $streetId;
+    }
+
+    /**
+     * Busca um registro ou o cria se não existir. Retorna o ID.
+     */
+    private static function findOrCreate(PDO $pdo, string $table, array $conditions): ?int
+    {
+        // Constrói a query de SELECT
+        $whereClauses = [];
+        $params = [];
+        foreach ($conditions as $key => $value) {
+            $whereClauses[] = "$key = :$key";
+            $params[":$key"] = $value;
+        }
+        $whereSql = implode(' AND ', $whereClauses);
+
+        $selectQuery = "SELECT id FROM $table WHERE $whereSql LIMIT 1";
+        $stmt = $pdo->prepare($selectQuery);
+        $stmt->execute($params);
+        $id = $stmt->fetchColumn();
+
+        if ($id) {
+            return (int)$id; // Retorna se já existe
+        }
+
+        // Se não existe, faz o INSERT
+        $insertColumns = implode(', ', array_keys($conditions));
+        $insertPlaceholders = implode(', ', array_keys($params));
+        
+        $insertQuery = "INSERT INTO $table ($insertColumns) VALUES ($insertPlaceholders)";
+        $insertStmt = $pdo->prepare($insertQuery);
+        
+        if ($insertStmt->execute($params)) {
+            return (int)$pdo->lastInsertId();
+        }
+
+        return null; // Falha na inserção
+    }
+
     /**
      * Método auxiliar privado para obter Latitude e Longitude.
      */
     private static function getCoordinates(array $data): ?array
     {
-        // Verifica se a chave está definida e não está vazia
         if (!defined('GOOGLE_MAPS_API_KEY') || empty(GOOGLE_MAPS_API_KEY)) {
             return null;
         }
 
-        // Monta string do endereço
-        $addressString = "{$data['street']}, {$data['number']} - {$data['neighborhood']}, {$data['city']} - {$data['state']}, {$data['cep']}";
-        $fullAddress = urlencode($addressString);
+        $street = $data['street'] ?? '';
+        $number = $data['number'] ?? '';
+        $neighborhood = $data['neighborhood'] ?? '';
+        $city = $data['city'] ?? '';
+        $state = $data['state'] ?? '';
+        $cep = $data['cep'] ?? '';
+
+        $addressString = "{$street}, {$number} - {$neighborhood}, {$city} - {$state}, {$cep}";
+        $fullAddress = urlencode(trim($addressString, " ,-"));
+
+        if (empty($fullAddress)) return null;
 
         $url = "https://maps.googleapis.com/maps/api/geocode/json?address={$fullAddress}&key=" . GOOGLE_MAPS_API_KEY;
 
-        // Usa @ para suprimir warnings, mas idealmente usar cURL em produção
         $responseJson = @file_get_contents($url);
 
         if ($responseJson) {
@@ -130,4 +245,4 @@ private static function getCoordinates(array $data): ?array
 
         return null;
     }
-}
+}
\ No newline at end of file
diff --git a/app/Models/PasswordReset.php b/app/Models/PasswordReset.php
index 3b24ba3..facd456 100644
--- a/app/Models/PasswordReset.php
+++ b/app/Models/PasswordReset.php
@@ -8,12 +8,14 @@
 class PasswordReset
 {
     /**
-     * Encontra um token válido que ainda não expirou.
+     * Encontra um token válido que ainda não expirou (válido por 1 hora).
      */
     public static function findValidToken($token)
     {
         $pdo = Database::getConnection();
-        $stmt = $pdo->prepare("SELECT * FROM password_resets WHERE token = ? AND expires_at > NOW()");
+        
+        // Verifica se o token existe e se foi criado há menos de 1 hora
+        $stmt = $pdo->prepare("SELECT * FROM password_reset_tokens WHERE token = ? AND created_at >= DATE_SUB(NOW(), INTERVAL 1 HOUR)");
         $stmt->execute([$token]);
 
         return $stmt->fetch(PDO::FETCH_ASSOC);
@@ -21,15 +23,17 @@ public static function findValidToken($token)
 
     /**
      * Cria um novo registro de token de reset.
+     * Agora recebe apenas email e token, já que o created_at é automático no banco.
      */
-    public static function createToken($email, $token, $expires_at)
+    public static function createToken($email, $token)
     {
         $pdo = Database::getConnection();
 
         try {
-            $stmt = $pdo->prepare("INSERT INTO password_resets (email, token, expires_at) VALUES (?, ?, ?)");
-            return $stmt->execute([$email, $token, $expires_at]);
+            $stmt = $pdo->prepare("INSERT INTO password_reset_tokens (email, token) VALUES (?, ?)");
+            return $stmt->execute([$email, $token]);
         } catch (\Exception $e) {
+            error_log("Erro ao criar token de reset: " . $e->getMessage());
             return false;
         }
     }
@@ -41,7 +45,7 @@ public static function createToken($email, $token, $expires_at)
     public static function deleteTokensForEmail($email)
     {
         $pdo = Database::getConnection();
-        $stmt = $pdo->prepare("DELETE FROM password_resets WHERE email = ?");
+        $stmt = $pdo->prepare("DELETE FROM password_reset_tokens WHERE email = ?");
         return $stmt->execute([$email]);
     }
-}
+}
\ No newline at end of file
diff --git a/app/Models/Sport.php b/app/Models/Sport.php
index 7c05d73..7dde80f 100644
--- a/app/Models/Sport.php
+++ b/app/Models/Sport.php
@@ -53,8 +53,8 @@ public static function findById(int $id)
         return $stmt->fetch(PDO::FETCH_ASSOC);
     }
 
-    /**
-     * Cria um novo esportes no banco de dados.
+  /**
+     * Cria um novo esporte no banco de dados.
      * @param array $data
      * @return bool
      */
@@ -62,19 +62,34 @@ public static function create(array $data): bool
     {
         $pdo = Database::getConnection();
         $data['status'] = 'active';
-        $query = "INSERT INTO sports (name, icon, status) VALUES (:name, :icon, :status)";
+        
+        // Verificação de segurança: se o Controller ainda estiver enviando a chave 'icon',
+        // nós a renomeamos para 'icon_path' antes de executar no banco.
+        if (isset($data['icon'])) {
+            $data['icon_path'] = $data['icon'];
+            unset($data['icon']);
+        }
+
+        // Atualizado de 'icon' para 'icon_path'
+        $query = "INSERT INTO sports (name, icon_path, status) VALUES (:name, :icon_path, :status)";
         $stmt = $pdo->prepare($query);
         return $stmt->execute($data);
     }
 
-    /**
-     * Atualiza um esportes existente.
+   /**
+     * Atualiza um esporte existente.
      * @param int $id
      * @param array $data
      * @return bool
      */
     public static function update(int $id, array $data): bool
     {
+        // Renomeia 'icon' para 'icon_path' caso o Controller ainda envie o nome antigo
+        if (isset($data['icon'])) {
+            $data['icon_path'] = $data['icon'];
+            unset($data['icon']);
+        }
+
         if (empty($data)) {
             return true;
         }
@@ -92,7 +107,7 @@ public static function update(int $id, array $data): bool
         $data['id'] = $id;
         return $stmt->execute($data);
     }
-
+    
     /**
      * Realiza um "soft delete" de um esportes.
      * @param int $id
diff --git a/app/Models/User.php b/app/Models/User.php
index c120496..911c1ec 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -5,19 +5,12 @@
 use App\Core\Database;
 use PDO;
 
-/**
- * Class User
- * Gerencia todas as operações de banco de dados para a entidade de utilizador.
- */
 class User
 {
-    // --- MÉTODOS DE CONTAGEM E BUSCA RECENTE ---
-
     public static function countAll(): int
     {
         $pdo = Database::getConnection();
-        $query = "SELECT COUNT(id) FROM users WHERE status = 'active'";
-        $stmt = $pdo->prepare($query);
+        $stmt = $pdo->prepare("SELECT COUNT(id) FROM users WHERE status = 'active'");
         $stmt->execute();
         return (int) $stmt->fetchColumn();
     }
@@ -25,24 +18,20 @@ public static function countAll(): int
     public static function getRecent(int $limit): array
     {
         $pdo = Database::getConnection();
-        $query = "SELECT id, name, email, role, status, created_at 
-                  FROM users 
-                  WHERE status = 'active'
-                  ORDER BY created_at DESC 
-                  LIMIT :limit";
-        $stmt = $pdo->prepare($query);
+        $stmt = $pdo->prepare("SELECT id, name, email, role, status, created_at 
+                               FROM users 
+                               WHERE status = 'active'
+                               ORDER BY created_at DESC 
+                               LIMIT :limit");
         $stmt->bindParam(':limit', $limit, PDO::PARAM_INT);
         $stmt->execute();
         return $stmt->fetchAll(PDO::FETCH_ASSOC);
     }
 
-    // --- MÉTODOS DE CRUD ---
-
     public static function getAll(): array
     {
         $pdo = Database::getConnection();
-        $query = "SELECT * FROM users ORDER BY created_at DESC";
-        $stmt = $pdo->prepare($query);
+        $stmt = $pdo->prepare("SELECT * FROM users ORDER BY created_at DESC");
         $stmt->execute();
         return $stmt->fetchAll(PDO::FETCH_ASSOC);
     }
@@ -50,8 +39,7 @@ public static function getAll(): array
     public static function findById(int $id)
     {
         $pdo = Database::getConnection();
-        $query = "SELECT * FROM users WHERE id = :id";
-        $stmt = $pdo->prepare($query);
+        $stmt = $pdo->prepare("SELECT * FROM users WHERE id = :id");
         $stmt->bindParam(':id', $id);
         $stmt->execute();
         $user = $stmt->fetch(PDO::FETCH_ASSOC);
@@ -65,35 +53,32 @@ public static function findById(int $id)
     public static function findByEmail(string $email)
     {
         $pdo = Database::getConnection();
-        $query = "SELECT * FROM users WHERE email = :email AND status = 'active'";
-        $stmt = $pdo->prepare($query);
+        $stmt = $pdo->prepare("SELECT * FROM users WHERE email = :email AND status = 'active'");
         $stmt->bindParam(':email', $email);
         $stmt->execute();
         return $stmt->fetch(PDO::FETCH_ASSOC);
     }
 
-    public static function create(array $data)
+    public static function create(array $data): bool
     {
         $pdo = Database::getConnection();
         $data['status'] = 'active';
         $data['force_password_change'] = 1;
 
-        $query = "INSERT INTO users (name, email, birthdate, password_hash, role, status, force_password_change) 
-                  VALUES (:name, :email, :birthdate, :password_hash, :role, :status, :force_password_change)";
+        $stmt = $pdo->prepare("INSERT INTO users (name, email, birthdate, password, role, status, force_password_change) 
+                               VALUES (:name, :email, :birthdate, :password, :role, :status, :force_password_change)");
 
-        $stmt = $pdo->prepare($query);
         return $stmt->execute($data);
     }
 
     public static function update(int $id, array $data): bool
     {
         if (isset($data['cnpj'])) {
-            $encryptedCnpj = self::encryptCnpj($data['cnpj']);
-            if ($encryptedCnpj === false) {
-                // Se a encriptação falhar, não continue para não salvar um valor inválido
+            $encrypted = self::encryptCnpj($data['cnpj']);
+            if ($encrypted === false) {
                 return false;
             }
-            $data['cnpj'] = $encryptedCnpj;
+            $data['cnpj'] = $encrypted;
         }
 
         if (empty($data)) {
@@ -105,9 +90,8 @@ public static function update(int $id, array $data): bool
         foreach (array_keys($data) as $key) {
             $fields[] = "$key = :$key";
         }
-        $query = "UPDATE users SET " . implode(', ', $fields) . " WHERE id = :id";
 
-        $stmt = $pdo->prepare($query);
+        $stmt = $pdo->prepare("UPDATE users SET " . implode(', ', $fields) . " WHERE id = :id");
         $data['id'] = $id;
 
         return $stmt->execute($data);
@@ -118,51 +102,41 @@ public static function delete(int $id): bool
         return self::update($id, ['status' => 'inactive']);
     }
 
-    // --- MÉTODOS DE CNPJ ---
-
     public static function isCnpjInUse(string $cnpj, int $excludeUserId): bool
     {
         $pdo = Database::getConnection();
-        $query = "SELECT id, cnpj FROM users WHERE id != :exclude_id AND cnpj IS NOT NULL";
-        $stmt = $pdo->prepare($query);
+        $stmt = $pdo->prepare("SELECT id, cnpj FROM users WHERE id != :exclude_id AND cnpj IS NOT NULL");
         $stmt->bindParam(':exclude_id', $excludeUserId);
         $stmt->execute();
         $users = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
         foreach ($users as $user) {
-            $decryptedCnpj = self::decryptCnpj($user['cnpj']);
-            if ($decryptedCnpj === $cnpj) {
+            if (self::decryptCnpj($user['cnpj']) === $cnpj) {
                 return true;
             }
         }
         return false;
     }
 
-    // --- MÉTODOS DE SENHA ---
-
     public static function clearPasswordChangeFlag(int $userId): bool
     {
         return self::update($userId, ['force_password_change' => 0]);
     }
 
-    public static function updatePassword($email, $newPasswordHash)
+    public static function updatePassword(string $email, string $newPasswordHash): bool
     {
         $pdo = Database::getConnection();
-
         try {
-            $stmt = $pdo->prepare("UPDATE users SET password_hash = ? WHERE email = ?");
+            $stmt = $pdo->prepare("UPDATE users SET password = ? WHERE email = ?");
             return $stmt->execute([$newPasswordHash, $email]);
         } catch (\Exception $e) {
             return false;
         }
     }
 
-    // --- MÉTODOS DE CRIPTOGRAFIA ---
-
     private static function getIvBinary()
     {
         if (!defined('ENCRYPTION_IV') || strlen(ENCRYPTION_IV) !== 32 || !ctype_xdigit(ENCRYPTION_IV)) {
-            // Lançar um erro ou logar, pois o IV não é um hexadecimal de 32 caracteres.
             error_log("ENCRYPTION_IV não está definida ou não é um hexadecimal de 32 caracteres.");
             return false;
         }
@@ -178,13 +152,13 @@ private static function encryptCnpj(string $cnpj)
         return openssl_encrypt($cnpj, 'aes-256-cbc', ENCRYPTION_KEY, 0, $iv);
     }
 
-    private static function decryptCnpj(?string $encrypted_cnpj)
+    private static function decryptCnpj(?string $encryptedCnpj)
     {
         $iv = self::getIvBinary();
-        if ($iv === false || empty($encrypted_cnpj || !extension_loaded('openssl') || !defined('ENCRYPTION_KEY'))) {
+        if ($iv === false || empty($encryptedCnpj) || !extension_loaded('openssl') || !defined('ENCRYPTION_KEY')) {
             return null;
         }
-        $decrypted = openssl_decrypt($encrypted_cnpj, 'aes-256-cbc', ENCRYPTION_KEY, 0, $iv);
+        $decrypted = openssl_decrypt($encryptedCnpj, 'aes-256-cbc', ENCRYPTION_KEY, 0, $iv);
         return $decrypted === false ? null : $decrypted;
     }
-}
+}
\ No newline at end of file
diff --git a/app/Models/Venue.php b/app/Models/Venue.php
index 71d9b19..8f69413 100644
--- a/app/Models/Venue.php
+++ b/app/Models/Venue.php
@@ -28,34 +28,73 @@ public static function countAll(): int
      * Busca todas as quadras disponíveis (para utilizadores finais).
      * @return array
      */
-    public static function getAll(): array
+   public static function getAll()
     {
-        $pdo = Database::getConnection();
-        $query = "SELECT v.*, a.street, a.number, a.city 
-                  FROM venues v
-                  JOIN addresses a ON v.address_id = a.id
-                  WHERE v.status = 'available'";
-        $stmt = $pdo->prepare($query);
-        $stmt->execute();
-        return $stmt->fetchAll(PDO::FETCH_ASSOC);
+        try {
+            $conn = \App\Core\Database::getConnection();
+            
+            // Fazemos os JOINs encadeados E buscamos a imagem de capa!
+            $sql = "SELECT v.*, 
+                           s.name AS street, 
+                           a.number, 
+                           a.cep, 
+                           a.complement,
+                           n.name AS neighborhood,
+                           c.name AS city,
+                           st.name AS state,
+                           (SELECT file_path FROM venues_images vi WHERE vi.venue_id = v.id ORDER BY id ASC LIMIT 1) AS image_path
+                    FROM venues v
+                    JOIN addresses a ON v.address_id = a.id
+                    JOIN streets s ON a.street_id = s.id
+                    JOIN neighborhoods n ON s.neighborhood_id = n.id
+                    JOIN cities c ON n.city_id = c.id
+                    JOIN states st ON c.state_id = st.id";
+            
+            $stmt = $conn->query($sql);
+            
+            return $stmt->fetchAll(\PDO::FETCH_ASSOC);
+            
+        } catch (\PDOException $e) {
+            error_log("Erro ao buscar todas as quadras para o mapa: " . $e->getMessage());
+            return []; // Retorna array vazio para não quebrar a tela do mapa
+        }
     }
 
     /**
      * Busca TODAS as quadras no sistema para o painel de admin.
      * @return array
      */
-    public static function getAllForAdmin(): array
+    public static function getAllForAdmin()
     {
-        $pdo = Database::getConnection();
-        $query = "SELECT v.*, u.name as owner_name, a.street, a.number
-              FROM venues v
-              LEFT JOIN users u ON v.user_id = u.id
-              LEFT JOIN addresses a ON v.address_id = a.id
-              ORDER BY v.created_at DESC";
-
-        $stmt = $pdo->prepare($query);
-        $stmt->execute();
-        return $stmt->fetchAll(PDO::FETCH_ASSOC);
+        try {
+            $conn = \App\Core\Database::getConnection();
+            
+            // Fazemos os JOINs encadeados para as tabelas de endereço e buscamos a capa
+            $sql = "SELECT v.*, 
+                           s.name AS street, 
+                           a.number, 
+                           a.cep, 
+                           a.complement,
+                           n.name AS neighborhood,
+                           c.name AS city,
+                           st.name AS state,
+                           (SELECT file_path FROM venues_images vi WHERE vi.venue_id = v.id ORDER BY id ASC LIMIT 1) AS image_path
+                    FROM venues v
+                    JOIN addresses a ON v.address_id = a.id
+                    JOIN streets s ON a.street_id = s.id
+                    JOIN neighborhoods n ON s.neighborhood_id = n.id
+                    JOIN cities c ON n.city_id = c.id
+                    JOIN states st ON c.state_id = st.id
+                    ORDER BY v.created_at DESC";
+            
+            $stmt = $conn->query($sql);
+            
+            return $stmt->fetchAll(\PDO::FETCH_ASSOC);
+            
+        } catch (\PDOException $e) {
+            error_log("Erro ao buscar todas as quadras para o admin: " . $e->getMessage());
+            return []; // Retorna um array vazio para não quebrar a tela de listagem
+        }
     }
 
     /**
@@ -63,19 +102,32 @@ public static function getAllForAdmin(): array
      * @param int $userId
      * @return array
      */
-    public static function findByUserId(int $userId): array
+    public static function findByUserId($userId)
     {
-        $pdo = Database::getConnection();
-        $query = "SELECT v.*, a.street, a.number,
-                         (SELECT vi.file_path FROM venue_images vi WHERE vi.venue_id = v.id ORDER BY vi.id DESC LIMIT 1) as image_path
-                  FROM venues v
-                  LEFT JOIN addresses a ON v.address_id = a.id
-                  WHERE v.user_id = :user_id AND v.status = 'available'
-                  ORDER BY v.created_at DESC";
-        $stmt = $pdo->prepare($query);
-        $stmt->bindParam(':user_id', $userId, PDO::PARAM_INT);
-        $stmt->execute();
-        return $stmt->fetchAll(PDO::FETCH_ASSOC);
+        try {
+            $conn = \App\Core\Database::getConnection();
+            
+            // Adicionamos uma subquery (SELECT file_path...) para buscar a capa da quadra
+            $sql = "SELECT v.*, 
+                           s.name AS street, 
+                           a.number, 
+                           a.cep, 
+                           a.complement,
+                           (SELECT file_path FROM venues_images vi WHERE vi.venue_id = v.id ORDER BY id ASC LIMIT 1) AS image_path
+                    FROM venues v
+                    JOIN addresses a ON v.address_id = a.id
+                    JOIN streets s ON a.street_id = s.id
+                    WHERE v.user_id = ?";
+            
+            $stmt = $conn->prepare($sql);
+            $stmt->execute([$userId]);
+            
+            return $stmt->fetchAll(\PDO::FETCH_ASSOC);
+            
+        } catch (\PDOException $e) {
+            error_log("Erro ao buscar as quadras do usuário: " . $e->getMessage());
+            return []; // Retorna array vazio em caso de erro para não quebrar a tela
+        }
     }
 
     /**
@@ -100,18 +152,39 @@ public static function findById(int $id)
      * Busca todas as quadras com coordenadas para exibição no mapa.
      * @return array
      */
-    public static function getAllWithCoordinates(): array
+    public static function getAllWithCoordinates()
     {
-        $pdo = Database::getConnection();
-        $query = "SELECT v.id, v.name, a.street, a.number, a.city, a.latitude, a.longitude,
-                         u.name as owner_name,
-                         (SELECT vi.file_path FROM venue_images vi WHERE vi.venue_id = v.id ORDER BY vi.id DESC LIMIT 1) as image_path
-                  FROM venues v
-                  JOIN addresses a ON v.address_id = a.id
-                  LEFT JOIN users u ON v.user_id = u.id WHERE v.status = 'available'";
-        $stmt = $pdo->prepare($query);
-        $stmt->execute();
-        return $stmt->fetchAll(PDO::FETCH_ASSOC);
+        try {
+            $conn = \App\Core\Database::getConnection();
+            
+            // Fazemos os JOINs encadeados, buscamos as coordenadas reais e a imagem de capa
+            $sql = "SELECT v.*, 
+                           s.name AS street, 
+                           a.number, 
+                           a.cep, 
+                           a.complement,
+                           a.latitude,
+                           a.longitude,
+                           n.name AS neighborhood,
+                           c.name AS city,
+                           st.name AS state,
+                           (SELECT file_path FROM venues_images vi WHERE vi.venue_id = v.id ORDER BY id ASC LIMIT 1) AS image_path
+                    FROM venues v
+                    JOIN addresses a ON v.address_id = a.id
+                    JOIN streets s ON a.street_id = s.id
+                    JOIN neighborhoods n ON s.neighborhood_id = n.id
+                    JOIN cities c ON n.city_id = c.id
+                    JOIN states st ON c.state_id = st.id
+                    WHERE a.latitude IS NOT NULL AND a.longitude IS NOT NULL";
+            
+            $stmt = $conn->query($sql);
+            
+            return $stmt->fetchAll(\PDO::FETCH_ASSOC);
+            
+        } catch (\PDOException $e) {
+            error_log("Erro ao buscar quadras com coordenadas para o mapa: " . $e->getMessage());
+            return []; // Retorna array vazio para não quebrar a tela
+        }
     }
 
     /**
diff --git a/app/Models/VenueImage.php b/app/Models/VenueImage.php
index bf14717..e46a501 100644
--- a/app/Models/VenueImage.php
+++ b/app/Models/VenueImage.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Core\Database;
-
 use PDO;
 
 /**
@@ -21,7 +20,8 @@ class VenueImage
     public static function create(int $venueId, string $filePath): bool
     {
         $pdo = Database::getConnection();
-        $sql = "INSERT INTO venue_images (venue_id, file_path) VALUES (:venue_id, :file_path)";
+        // CORRIGIDO: venue_images para venues_images
+        $sql = "INSERT INTO venues_images (venue_id, file_path) VALUES (:venue_id, :file_path)";
         $stmt = $pdo->prepare($sql);
         $stmt->bindParam(':venue_id', $venueId, PDO::PARAM_INT);
         $stmt->bindParam(':file_path', $filePath);
@@ -36,7 +36,8 @@ public static function create(int $venueId, string $filePath): bool
     public static function findByVenueId(int $venueId): array
     {
         $pdo = Database::getConnection();
-        $sql = "SELECT * FROM venue_images WHERE venue_id = :venue_id ORDER BY id DESC";
+        // CORRIGIDO: venue_images para venues_images
+        $sql = "SELECT * FROM venues_images WHERE venue_id = :venue_id ORDER BY id DESC";
         $stmt = $pdo->prepare($sql);
         $stmt->bindParam(':venue_id', $venueId, PDO::PARAM_INT);
         $stmt->execute();
@@ -46,12 +47,14 @@ public static function findByVenueId(int $venueId): array
     public static function findById(int $id)
     {
         $pdo = Database::getConnection();
-        $sql = "SELECT * FROM venue_images WHERE id = :id";
+        // CORRIGIDO: venue_images para venues_images
+        $sql = "SELECT * FROM venues_images WHERE id = :id";
         $stmt = $pdo->prepare($sql);
         $stmt->bindParam(':id', $id, PDO::PARAM_INT);
         $stmt->execute();
         return $stmt->fetch(PDO::FETCH_ASSOC);
     }
+
     /**
      * Deleta uma imagem específica pelo seu ID.
      * @param int $imageId O ID da imagem a ser deletada.
@@ -60,9 +63,10 @@ public static function findById(int $id)
     public static function delete(int $imageId): bool
     {
         $pdo = Database::getConnection();
-        $sql = "DELETE FROM venue_images WHERE id = :id";
+        // CORRIGIDO: venue_images para venues_images
+        $sql = "DELETE FROM venues_images WHERE id = :id";
         $stmt = $pdo->prepare($sql);
         $stmt->bindParam(':id', $imageId, PDO::PARAM_INT);
         return $stmt->execute();
     }
-}
+}
\ No newline at end of file
diff --git a/app/views/admin/dashboard.php b/app/views/admin/dashboard.php
index 878e58c..5c11309 100644
--- a/app/views/admin/dashboard.php
+++ b/app/views/admin/dashboard.php
@@ -13,7 +13,7 @@
     <link rel="icon" href="https://i.postimg.cc/Ss21pvVJ/Favicon.png" type="image/png">
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Kolae - Admin Dashboard</title>
+    <title>Kolae</title>
 
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
diff --git a/app/views/admin/map.php b/app/views/admin/map.php
index 0cf9344..f4f8d96 100644
--- a/app/views/admin/map.php
+++ b/app/views/admin/map.php
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <title>Kolae - Mapa de Quadras</title>
+    <title>Kolae</title>
     <link rel="icon" href="https://i.postimg.cc/Ss21pvVJ/Favicon.png" type="image/png">
     
     <link rel="preconnect" href="https://fonts.googleapis.com">
diff --git a/app/views/admin/users.php b/app/views/admin/users.php
index 273fbb0..2193db0 100644
--- a/app/views/admin/users.php
+++ b/app/views/admin/users.php
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <title>Kolae - Gerir Usuários</title>
+    <title>Kolae</title>
     <link rel="icon" href="https://i.postimg.cc/Ss21pvVJ/Favicon.png" type="image/png">
     
     <link rel="preconnect" href="https://fonts.googleapis.com">
diff --git a/app/views/sports/index.php b/app/views/sports/index.php
index 60f1a52..c5cba4e 100644
--- a/app/views/sports/index.php
+++ b/app/views/sports/index.php
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <title>Kolae - Gerir Esportes</title>
+    <title>Kolae</title>
     <link rel="icon" href="https://i.postimg.cc/Ss21pvVJ/Favicon.png" type="image/png">
     
     <link rel="preconnect" href="https://fonts.googleapis.com">
@@ -138,8 +138,7 @@
                     <?php foreach ($sports as $sport) : ?>
                         <div class="card-sport group relative bg-surface-elevated p-6 rounded-2xl border border-content-secondary/10 text-center flex flex-col items-center justify-center aspect-square transition-all duration-300 hover:border-cyan-500/50 hover:shadow-lg hover:shadow-cyan-500/10 hover:-translate-y-1">
 
-                            <i class="fas <?php echo htmlspecialchars($sport['icon'] ?? 'fa-question-circle'); ?> text-4xl md:text-5xl text-content-secondary transition-colors duration-300 group-hover:text-cyan-500 group-hover:scale-110 transform"></i>
-
+                          <i class="fas <?php echo htmlspecialchars($sport['icon_path'] ?? 'fa-question-circle'); ?> text-4xl md:text-5xl text-content-secondary transition-colors duration-300 group-hover:text-cyan-500 group-hover:scale-110 transform"></i>
                             <h3 class="mt-4 font-bold text-sm md:text-lg text-content-primary"><?php echo htmlspecialchars($sport['name']); ?></h3>
 
                             <div class="absolute top-2 right-2 md:top-3 md:right-3 md:opacity-0 md:group-hover:opacity-100 transition-all duration-300 flex space-x-1 md:space-x-2">
diff --git a/app/views/venues/edit.php b/app/views/venues/edit.php
index f295727..d00113b 100644
--- a/app/views/venues/edit.php
+++ b/app/views/venues/edit.php
@@ -153,7 +153,13 @@ class="w-full bg-input-base border border-content-secondary/20 rounded-xl pl-10
                         <h2 class="text-xl font-bold text-content-primary mb-4 flex items-center gap-3"><i class="fas fa-layer-group text-purple-500"></i><?php echo $lang['edit_venue_floor_title'] ?></h2>
                         <div class="grid grid-cols-2 gap-3">
                             <?php
-                            $floors = ['grama sintética' => $lang['venue_floor_answer_1'], 'cimento' => $lang['venue_floor_answer_2'], 'areia' => $lang['venue_floor_answer_3'], 'saibro' => $lang['venue_floor_answer_4'], 'grama natural' => $lang['venue_floor_answer_5'], 'taco' => $lang['venue_floor_answer_6']];
+                            $floors = [
+                                'synthetic' => 'Grama Sintética',
+                                'court' => 'Quadra/Cimento', 
+                                'sand' => 'Areia', 
+                                'grass' => 'Grama Natural', 
+                                'wood' => 'Madeira/Taco'
+                            ];
                             foreach ($floors as $val => $label):
                             ?>
                                 <div class="option-card border border-content-secondary/20 bg-surface-base p-3 rounded-xl text-center" data-value="<?php echo $val; ?>">
diff --git a/app/views/venues/index.php b/app/views/venues/index.php
index 2a10e13..d834054 100644
--- a/app/views/venues/index.php
+++ b/app/views/venues/index.php
@@ -9,7 +9,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <title>Kolae - Gerenciar Quadras</title>
+    <title>Kolae</title>
     <link rel="icon" href="https://i.postimg.cc/Ss21pvVJ/Favicon.png" type="image/png">
     
     <link rel="preconnect" href="https://fonts.googleapis.com">
diff --git a/lang/en-us.php b/lang/en-us.php
index 72c9e46..6ce26c8 100644
--- a/lang/en-us.php
+++ b/lang/en-us.php
@@ -10,8 +10,8 @@
     'global_home_panel' => 'My panel',
     'global_menu_profile' => 'Profile',
     'global_menu_exit' => 'Exit',
-    'global_menu_register' => 'Sig up',
-    'global_menu_login' => 'Sig in',
+    'global_menu_register' => 'Sign up',
+    'global_menu_login' => 'Sign in',
     'global_and' =>  'and',
     'global_menu_help' => 'Help',
     'global_menu_config' => 'Settings',

From d3ac6e9e122bbb060814208d7bbd30f38cd62b54 Mon Sep 17 00:00:00 2001
From: Fernando <jpcslengman@outlook.com>
Date: Fri, 12 Jun 2026 10:43:32 -0300
Subject: [PATCH 3/3] Update deploy.yml

---
 .github/workflows/deploy.yml | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0fbc6d2..45d7a35 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,38 +1,26 @@
-# Nome do seu workflow
 name: Deploy to InfinityFree
 
 on:
     push:
         branches:
-            - main # Mude para 'master' se for o nome da sua branch principal
+            - main
 
 jobs:
     ftp-deploy:
-        # O tipo de máquina que o workflow vai usar
         runs-on: ubuntu-latest
 
         steps:
-            # 1. Baixa o código do seu repositório para a máquina virtual
             - name: Check out code
               uses: actions/checkout@v4
 
-            # --- NOVOS PASSOS ADICIONADOS AQUI ---
-
-            # 1.1 Prepara o ambiente PHP na máquina do GitHub
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.2' # Importante: Use a mesma versão que configurou no InfinityFree (geralmente 8.1 ou 8.2)
+                  php-version: '8.2'
 
-            # 1.2 Roda o composer para criar a pasta 'vendor'
             - name: Install Dependencies
               run: composer install --no-dev --optimize-autoloader
-              # --no-dev: Não baixa ferramentas de teste (economiza espaço/inodes no InfinityFree)
-              # --optimize-autoloader: Deixa o carregamento das classes mais rápido
-
-            # -------------------------------------
 
-            # 2. Executa a ação de deploy via FTP
             - name: FTP Deploy
               uses: SamKirkland/FTP-Deploy-Action@v4.3.4
               with:
@@ -40,9 +28,11 @@ jobs:
                   username: ${{ secrets.FTP_USERNAME }}
                   password: ${{ secrets.FTP_PASSWORD }}
                   server-dir: /htdocs/
-
-                  # Nota: A ação vai pegar a pasta 'vendor' criada no passo anterior e enviar junto
                   exclude: |
                       **/.git*
                       **/.git*/**
                       **/node_modules/**
+                      config.php
+                      .env
+                      logs/**
+                      tests/**
\ No newline at end of file