Donat/SerpentRace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

navbar meg fooldal navigációk illetve companies -> contacts #67

Merged
Donat merged 2 commits from barni into main 2025-10-24 20:01:38 +02:00
Conversation 0 Commits 2 Files Changed 7
+81 -56
7 changed files with 81 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0ed75beb3f - Show all commits
SerpentRace_Frontend/src/App.jsx
+2 -2
View File
@@ -10,7 +10,7 @@ import Landingpage from "./pages/Landing/Landingpage"
import Home from "./pages/Landing/Home" import Home from "./pages/Landing/Home"
import DeckManagerPage from "./pages/Decks/DeckManagerPage" import DeckManagerPage from "./pages/Decks/DeckManagerPage"
import DeckCreator from "./pages/DeckCreator/DeckCreator" import DeckCreator from "./pages/DeckCreator/DeckCreator"
import CompanyHub from "./pages/Companies/Companies" import CompanyHub from "./pages/Contacts/Contacts"
import About from "./pages/About/About" import About from "./pages/About/About"
import ScrollToTop from "./components/ScrollToTop" import ScrollToTop from "./components/ScrollToTop"
import GameScreen from "./pages/Game/GameScreen" import GameScreen from "./pages/Game/GameScreen"
@@ -64,7 +64,7 @@ function App() {
<Route path="/deck-creator" element={<DeckCreator />} /> <Route path="/deck-creator" element={<DeckCreator />} />
<Route path="/deck-creator/:deckId" element={<DeckCreator />} /> <Route path="/deck-creator/:deckId" element={<DeckCreator />} />
<Route path="/game" element={<GameScreen />} /> <Route path="/game" element={<GameScreen />} />
<Route path="/companies" element={<CompanyHub />} /> <Route path="/contacts" element={<CompanyHub />} />
<Route path="/report" element={<Reports />} /> <Route path="/report" element={<Reports />} />
</Routes> </Routes>
</Router> </Router>
SerpentRace_Frontend/src/components/Footer/Footer.jsx
+1 -1
View File
@@ -57,7 +57,7 @@ const Footer = () => {
<a href="/about" className="hover:underline hover:text-green-500"> <a href="/about" className="hover:underline hover:text-green-500">
Rólunk Rólunk
</a> </a>
<a href="/contact" className="hover:underline hover:text-green-500"> <a href="/contacts" className="hover:underline hover:text-green-500">
Kapcsolat Kapcsolat
</a> </a>
</div> </div>
SerpentRace_Frontend/src/components/Landingpage/LandingPage.jsx
+3 -3
View File
@@ -8,7 +8,7 @@ import { motion } from "framer-motion"
import { isAuthenticated } from "../../hooks/useRequireAuth" // <-- added import import { isAuthenticated } from "../../hooks/useRequireAuth" // <-- added import
import { useNavigate } from "react-router-dom" // <-- NEW import { useNavigate } from "react-router-dom" // <-- NEW
const LandingPage = ({ onNavigateToPlay, onNavigateToAuth, onNavigateToGame }) => { const LandingPage = ({ onNavigateToPlay, onNavigateToAuth, onNavigateToGame, onNavigateToContacts }) => {
const auth = isAuthenticated() // <-- check without redirect const auth = isAuthenticated() // <-- check without redirect
const navigate = useNavigate() // <-- NEW const navigate = useNavigate() // <-- NEW
@@ -68,7 +68,7 @@ const LandingPage = ({ onNavigateToPlay, onNavigateToAuth, onNavigateToGame }) =
<ButtonGreen text="Játék" onClick={onNavigateToGame} width="w-60" /> <ButtonGreen text="Játék" onClick={onNavigateToGame} width="w-60" />
</> </>
) : ( ) : (
<ButtonGreen text="Játék" onClick={() => navigate("/home")} width="w-60" /> <ButtonGreen text="Játék" onClick={onNavigateToGame} width="w-60" />
)} )}
</motion.div> </motion.div>
</div> </div>
@@ -178,7 +178,7 @@ const LandingPage = ({ onNavigateToPlay, onNavigateToAuth, onNavigateToGame }) =
<ButtonGreen <ButtonGreen
text="Kapcsolatfelvétel" text="Kapcsolatfelvétel"
onClick={onNavigateToAuth} onClick={onNavigateToContacts}
className="px-12 py-4 text-xl font-bold" className="px-12 py-4 text-xl font-bold"
/> />
</motion.div> </motion.div>
SerpentRace_Frontend/src/components/Navbar/Navbar.jsx
+65 -45
View File
@@ -19,9 +19,9 @@ const Navbar = () => {
return ( return (
<nav className="bg-gradient-to-r from-green-700 to-emerald-500 shadow-lg"> <nav className="bg-gradient-to-r from-green-700 to-emerald-500 shadow-lg">
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8"> <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-0">
<div className="flex justify-between h-16 items-center"> <div className="flex justify-between h-16 items-center">
{/* Logo */} {/* Logo + Brand */}
<div className="flex-shrink-0 flex items-center gap-2"> <div className="flex-shrink-0 flex items-center gap-2">
<Link to="/" className="flex items-center mt-1 h-9"> <Link to="/" className="flex items-center mt-1 h-9">
<Logo size={36} /> <Logo size={36} />
@@ -32,33 +32,47 @@ const Navbar = () => {
</div> </div>
{/* Desktop Menu */} {/* Desktop Menu */}
<div className="hidden md:flex space-x-8 items-center"> <div className="hidden md:flex items-center space-x-6">
{isLoggedIn ? ( {/* Bal oldali linkek */}
<Link to="/" className={navLinkClass}>Főoldal</Link>
<Link to="/about" className={navLinkClass}>Rólunk</Link>
<Link to="/contacts" className={navLinkClass}>Kapcsolat</Link>
{/* Csak bejelentkezve */}
{isLoggedIn && (
<> <>
<Link to="/home" className={navLinkClass}>Játék</Link>
<Link to="/decks" className={navLinkClass}>Paklik</Link> <Link to="/decks" className={navLinkClass}>Paklik</Link>
<Link to="/report" className={navLinkClass}>Statisztikák</Link> <Link to="/report" className={navLinkClass}>Statisztikák</Link>
</> </>
) : (
<Link to="/" className={navLinkClass}>Főoldal</Link>
)} )}
<Link to="/about" className={navLinkClass}>Rólunk</Link>
<Link to="/companies" className={navLinkClass}>Kontakt</Link> {/* Játék gomb */}
{!isLoggedIn && ( <Link to="/home" className={navLinkClassPlay}>Játék</Link>
<>
<Link to="/home" className={navLinkClassPlay}>Játék</Link> {/* Jobb oldali akciók */}
{!isLoggedIn ? (
<div className="flex items-center space-x-4">
<Link <Link
to="/login" to="/login"
className="px-4 py-2 rounded-lg hover:bg-white/20 text-white font-semibold transition-all"
>
Bejelentkezés
</Link>
{/* Elválasztó vonal */}
<div className="w-px h-10 bg-white/100"></div>
<Link
to="/register"
className="px-4 py-2 rounded-lg bg-white/10 hover:bg-white/20 text-white font-semibold transition-all" className="px-4 py-2 rounded-lg bg-white/10 hover:bg-white/20 text-white font-semibold transition-all"
> >
Bejelentkezés / Regisztráció Regisztráció
</Link> </Link>
</> </div>
)} ) : (
{isLoggedIn && (
<button <button
onClick={handleLogout} onClick={handleLogout}
className="ml-4 p-2 rounded-full bg-[#166534] hover:bg-[#1f7a45] text-white shadow-lg hover:shadow-green-400/40 transition-all transform hover:scale-105 cursor-pointer" className="ml-2 p-2 rounded-full bg-[#166534] hover:bg-[#1f7a45] text-white shadow-lg hover:shadow-green-400/40 transition-all transform hover:scale-105 cursor-pointer"
title="Kijelentkezés" title="Kijelentkezés"
> >
<svg <svg
@@ -107,39 +121,45 @@ const Navbar = () => {
{/* Mobile Menu */} {/* Mobile Menu */}
{menuOpen && ( {menuOpen && (
<div className="md:hidden bg-emerald-600 px-2 pt-2 pb-3 space-y-1"> <div className="md:hidden bg-emerald-600 px-2 pt-2 pb-3 space-y-1">
{isLoggedIn ? ( <Link to="/" onClick={() => setMenuOpen(false)} className={navLinkClass}>Főoldal</Link>
<Link to="/home" className={navLinkClass}>Home</Link> <Link to="/about" onClick={() => setMenuOpen(false)} className={navLinkClass}>Rólunk</Link>
) : ( <Link to="/contacts" onClick={() => setMenuOpen(false)} className={navLinkClass}>Kapcsolat</Link>
<Link to="/" className={navLinkClass}>Főoldal</Link> {isLoggedIn && (
)}
<Link to="/leaderboard" className={navLinkClass}>Leaderboard</Link>
<Link to="/about" className={navLinkClass}>Rólunk</Link>
<Link to="/companies" className={navLinkClass}>Kontakt</Link>
{!isLoggedIn && (
<> <>
<div className="px-2"> <Link to="/decks" onClick={() => setMenuOpen(false)} className={navLinkClass}>Paklik</Link>
<button <Link to="/report" onClick={() => setMenuOpen(false)} className={navLinkClass}>Statisztikák</Link>
onClick={() => {
setMenuOpen(false)
navigate("/")
}}
className="w-full text-left px-3 py-2 rounded-lg bg-white/10 hover:bg-white/20 text-white transition-all"
>
Játék
</button>
</div>
<Link
to="/login"
className="block px-3 py-2 rounded-lg bg-white/10 hover:bg-white/20 text-white font-semibold transition-all"
>
Bejelentkezés / Regisztráció
</Link>
</> </>
)} )}
{isLoggedIn && ( <Link to="/home" onClick={() => setMenuOpen(false)} className={navLinkClassPlay}>Játék</Link>
{!isLoggedIn ? (
<div className="flex flex-col space-y-2">
<Link
to="/login"
onClick={() => setMenuOpen(false)}
className="block px-3 py-2 rounded-lg hover:bg-white/20 text-white font-semibold transition-all"
>
Bejelentkezés
</Link>
{/* Elválasztó vonal mobilon */}
<div className="w-full h-px bg-white/30"></div>
<Link
to="/register"
onClick={() => setMenuOpen(false)}
className="block px-3 py-2 rounded-lg bg-white/10 hover:bg-white/20 text-white font-semibold transition-all"
>
Regisztráció
</Link>
</div>
) : (
<div className="flex justify-end px-2 pb-2"> <div className="flex justify-end px-2 pb-2">
<button <button
onClick={handleLogout} onClick={() => {
handleLogout()
setMenuOpen(false)
}}
className="p-2 rounded-full bg-[#166534] hover:bg-[#1f7a45] text-white shadow-lg hover:shadow-green-400/40 transition-all transform hover:scale-105 cursor-pointer" className="p-2 rounded-full bg-[#166534] hover:bg-[#1f7a45] text-white shadow-lg hover:shadow-green-400/40 transition-all transform hover:scale-105 cursor-pointer"
title="Kijelentkezés" title="Kijelentkezés"
> >
SerpentRace_Frontend/src/pages/Companies/Companies.jsx → SerpentRace_Frontend/src/pages/Contacts/Contacts.jsx
+4 -3
View File
@@ -1,7 +1,7 @@
import React from "react" import React, { useEffect, useRef, useState } from "react"
import Navbar from "../../components/Navbar/Navbar.jsx" import Navbar from "../../components/Navbar/Navbar.jsx"
import Footer from "../../components/Footer/Footer.jsx" import Footer from "../../components/Footer/Footer.jsx"
import Background from "../../assets/backgrounds/Background" import Background from "../../assets/backgrounds/Background.jsx"
import { import {
FaBuilding, FaBuilding,
FaEnvelope, FaEnvelope,
@@ -56,8 +56,9 @@ const SectionContainer = ({ id, title, children }) => {
} }
const CompanyHub = () => { const CompanyHub = () => {
return ( return (
<div className="relative min-h-screen text-white"> <div className=" relative min-h-screen text-white">
{/* Background fixed behind everything */} {/* Background fixed behind everything */}
<div className="fixed inset-0 -z-10"> <div className="fixed inset-0 -z-10">
<Background /> <Background />
SerpentRace_Frontend/src/pages/Landing/Landingpage.jsx
+5 -1
View File
@@ -23,6 +23,10 @@ export default function LandingPageMain() {
navigate("/home"); navigate("/home");
}; };
const handleNavigateToContacts = () => {
navigate("/contacts");
};
return ( return (
<div className="w-full min-h-screen flex flex-col relative overflow-x-hidden"> <div className="w-full min-h-screen flex flex-col relative overflow-x-hidden">
<div className="fixed inset-0 -z-10 pointer-events-none"> <div className="fixed inset-0 -z-10 pointer-events-none">
@@ -32,7 +36,7 @@ export default function LandingPageMain() {
<Navbar /> <Navbar />
</div> </div>
<main className="flex-1 flex flex-col items-center justify-start py-15 min-h-0 mt-[64px]"> <main className="flex-1 flex flex-col items-center justify-start py-15 min-h-0 mt-[64px]">
<LandingPage onNavigateToPlay={handleNavigateToPlay} onNavigateToAuth={handleNavigateToAuth} onNavigateToGame={handleNavigateToGame} /> <LandingPage onNavigateToContacts={handleNavigateToContacts} onNavigateToPlay={handleNavigateToPlay} onNavigateToAuth={handleNavigateToAuth} onNavigateToGame={handleNavigateToGame} />
</main> </main>
<Footer /> <Footer />
</div> </div>
SerpentRace_Frontend/src/pages/Testing/Test.jsx
+1 -1
View File
@@ -6,7 +6,7 @@ import Logo from "../../assets/pictures/Logo.jsx"
import Navbar from "../../components/Navbar/Navbar" import Navbar from "../../components/Navbar/Navbar"
import Footer from "../../components/Footer/Footer.jsx" import Footer from "../../components/Footer/Footer.jsx"
import UserProfile from "../../components/Userdetails/Userdetails.jsx" import UserProfile from "../../components/Userdetails/Userdetails.jsx"
import CompanyHub from "../Companies/Companies.jsx" import CompanyHub from "../Contacts/Contacts.jsx"
import RatingSet from "../../components/PopUp/RatingSet" // <- statisztikai komponens import RatingSet from "../../components/PopUp/RatingSet" // <- statisztikai komponens