Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d1b4141e63 | |||
| 76fa204ae8 | |||
| 75f2b215a1 | |||
| 367524d611 | |||
| 86bf2675eb | |||
| 2c190dc874 | |||
| 36db09e5e7 | |||
| f7885dc440 | |||
| a9c2f63adc | |||
| bec9d83ef3 | |||
| cf68530fc2 | |||
| f2b154d491 | |||
| 1e10a93e32 | |||
| a5dd9003c1 |
@@ -32,3 +32,10 @@ MINIO_USE_SSL=false
|
|||||||
MAX_SPECIAL_FIELDS_PERCENTAGE=67
|
MAX_SPECIAL_FIELDS_PERCENTAGE=67
|
||||||
MAX_GENERATION_TIME_SECONDS=20
|
MAX_GENERATION_TIME_SECONDS=20
|
||||||
GENERATION_ERROR_TOLERANCE=15
|
GENERATION_ERROR_TOLERANCE=15
|
||||||
|
|
||||||
|
# EMAIL SERVICE CONFIGURATION
|
||||||
|
EMAIL_HOST=smtp.gmail.com
|
||||||
|
EMAIL_PORT=587
|
||||||
|
EMAIL_USER=your_email@domain.com
|
||||||
|
EMAIL_PASS=your_email_password
|
||||||
|
EMAIL_FROM=noreply@serpentrace.com
|
||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
/* build-hook-start *//*00001*/try { require('c:\\Users\\magdo\\.vscode\\extensions\\wallabyjs.console-ninja-1.0.475\\out\\buildHook\\index.js').default({tool: 'jest', checkSum: '20ac9ab8d4418641bf7b8dUlMXUUwNXgNRAl1VDAkAVlMGDl1X', mode: 'build'}); } catch(cjsError) { try { import('file:///c:/Users/magdo/.vscode/extensions/wallabyjs.console-ninja-1.0.475/out/buildHook/index.js').then(m => m.default.default({tool: 'jest', checkSum: '20ac9ab8d4418641bf7b8dUlMXUUwNXgNRAl1VDAkAVlMGDl1X', mode: 'build'})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
|
/* build-hook-start *//*00001*/try { require('c:\\Users\\magdo\\.vscode\\extensions\\wallabyjs.console-ninja-1.0.483\\out\\buildHook\\index.js').default({tool: 'jest', checkSum: '201794f25617bd9f0b124dAgcXBEgHD1IJVgZUCgQHUVUCDFwF', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/magdo/.vscode/extensions/wallabyjs.console-ninja-1.0.483/out/buildHook/index.js').then(m => m.default.default({tool: 'jest', checkSum: '201794f25617bd9f0b124dAgcXBEgHD1IJVgZUCgQHUVUCDFwF', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* /**
|
* /**
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
/* build-hook-start *//*00001*/try { require('c:\\Users\\magdo\\.vscode\\extensions\\wallabyjs.console-ninja-1.0.475\\out\\buildHook\\index.js').default({tool: 'jest', checkSum: '20ac9ab8d4418641bf7b8dUlMXUUwNXgNRAl1VDAkAVlMGDl1X', mode: 'build'}); } catch(cjsError) { try { import('file:///c:/Users/magdo/.vscode/extensions/wallabyjs.console-ninja-1.0.475/out/buildHook/index.js').then(m => m.default.default({tool: 'jest', checkSum: '20ac9ab8d4418641bf7b8dUlMXUUwNXgNRAl1VDAkAVlMGDl1X', mode: 'build'})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
|
/* build-hook-start *//*00001*/try { require('c:\\Users\\magdo\\.vscode\\extensions\\wallabyjs.console-ninja-1.0.483\\out\\buildHook\\index.js').default({tool: 'jest', checkSum: '201794f25617bd9f0b124dAgcXBEgHD1IJVgZUCgQHUVUCDFwF', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/magdo/.vscode/extensions/wallabyjs.console-ninja-1.0.483/out/buildHook/index.js').then(m => m.default.default({tool: 'jest', checkSum: '201794f25617bd9f0b124dAgcXBEgHD1IJVgZUCgQHUVUCDFwF', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { logAuth, logWarning } from './Logger';
|
|||||||
export const jwtService = new JWTService();
|
export const jwtService = new JWTService();
|
||||||
const redisService = RedisService.getInstance();
|
const redisService = RedisService.getInstance();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if a token is blacklisted
|
* Check if a token is blacklisted
|
||||||
*/
|
*/
|
||||||
async function isTokenBlacklisted(token: string): Promise<boolean> {
|
async function isTokenBlacklisted(token: string): Promise<boolean> {
|
||||||
@@ -23,9 +23,9 @@ async function isTokenBlacklisted(token: string): Promise<boolean> {
|
|||||||
/**
|
/**
|
||||||
* Extract token from request (cookie or Authorization header)
|
* Extract token from request (cookie or Authorization header)
|
||||||
*/
|
*/
|
||||||
function extractToken(req: Request): string | null {
|
function extractToken(req: Request, type: 'auth' | 'refresh'): string | null {
|
||||||
// First try to get token from cookie
|
// First try to get token from cookie
|
||||||
const cookieToken = req.cookies['auth_token'];
|
const cookieToken = req.cookies[`${type}_token`];
|
||||||
if (cookieToken) {
|
if (cookieToken) {
|
||||||
return cookieToken;
|
return cookieToken;
|
||||||
}
|
}
|
||||||
@@ -42,8 +42,9 @@ function extractToken(req: Request): string | null {
|
|||||||
export async function authRequired(req: Request, res: Response, next: NextFunction) {
|
export async function authRequired(req: Request, res: Response, next: NextFunction) {
|
||||||
try {
|
try {
|
||||||
// Extract token from request
|
// Extract token from request
|
||||||
const token = extractToken(req);
|
const token = extractToken(req, "auth");
|
||||||
if (!token) {
|
const refreshToken = extractToken(req, "refresh");
|
||||||
|
if (!token || !refreshToken) {
|
||||||
logAuth('Authentication failed - No token provided', undefined, {
|
logAuth('Authentication failed - No token provided', undefined, {
|
||||||
ip: req.ip,
|
ip: req.ip,
|
||||||
userAgent: req.get ? req.get('User-Agent') : 'unknown',
|
userAgent: req.get ? req.get('User-Agent') : 'unknown',
|
||||||
@@ -95,8 +96,9 @@ export async function authRequired(req: Request, res: Response, next: NextFuncti
|
|||||||
export async function adminRequired(req: Request, res: Response, next: NextFunction) {
|
export async function adminRequired(req: Request, res: Response, next: NextFunction) {
|
||||||
try {
|
try {
|
||||||
// Extract token from request
|
// Extract token from request
|
||||||
const token = extractToken(req);
|
const token = extractToken(req, "auth");
|
||||||
if (!token) {
|
const refreshToken = extractToken(req, "refresh");
|
||||||
|
if (!token || !refreshToken) {
|
||||||
logWarning('Admin access denied - No token provided', {
|
logWarning('Admin access denied - No token provided', {
|
||||||
ip: req.ip,
|
ip: req.ip,
|
||||||
path: req.path
|
path: req.path
|
||||||
|
|||||||
@@ -281,9 +281,7 @@ export class JWTService {
|
|||||||
} else {
|
} else {
|
||||||
// For cookie auth, create token pair and set cookies
|
// For cookie auth, create token pair and set cookies
|
||||||
const newTokenPair = this.create(freshPayload, res);
|
const newTokenPair = this.create(freshPayload, res);
|
||||||
res.setHeader('X-New-Access-Token', newTokenPair.accessToken);
|
this.setTokenCookies(res, newTokenPair);
|
||||||
res.setHeader('X-New-Refresh-Token', newTokenPair.refreshToken);
|
|
||||||
res.setHeader('X-Token-Refreshed', 'true');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ EMAIL_PORT=465
|
|||||||
EMAIL_SECURE=true
|
EMAIL_SECURE=true
|
||||||
EMAIL_USER=noreply@serpentrace.hu
|
EMAIL_USER=noreply@serpentrace.hu
|
||||||
EMAIL_PASS=ZUx720ece&Cin&F{
|
EMAIL_PASS=ZUx720ece&Cin&F{
|
||||||
EMAIL_FROM=noreply@serpentrace.com
|
EMAIL_FROM=noreply@serpentrace.hu
|
||||||
|
|
||||||
# CHAT SYSTEM CONFIGURATION
|
# CHAT SYSTEM CONFIGURATION
|
||||||
CHAT_INACTIVITY_TIMEOUT_MINUTES=30
|
CHAT_INACTIVITY_TIMEOUT_MINUTES=30
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
import { apiClient } from './userApi'
|
||||||
|
|
||||||
|
// Create a new deck in the backend
|
||||||
|
export const createDeck = async (deck) => {
|
||||||
|
try {
|
||||||
|
const response = await apiClient.post('/decks', deck)
|
||||||
|
return response.data
|
||||||
|
} catch (err) {
|
||||||
|
throw err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default {
|
||||||
|
createDeck
|
||||||
|
}
|
||||||
@@ -1,54 +1,26 @@
|
|||||||
import axios from "axios"
|
import axios from "axios"
|
||||||
|
|
||||||
export const API_CONFIG = {
|
export const API_CONFIG = {
|
||||||
baseURL: import.meta.env.VITE_API_URL + "/api",
|
baseURL: (import.meta.env.VITE_API_URL ? import.meta.env.VITE_API_URL : '') + "/api",
|
||||||
wsURL: "http://localhost:3000",
|
wsURL: "http://localhost:3000",
|
||||||
timeout: 10000,
|
timeout: 10000,
|
||||||
retryAttempts: 3,
|
retryAttempts: 3,
|
||||||
}
|
}
|
||||||
|
|
||||||
const apiClient = axios.create({
|
export const apiClient = axios.create({
|
||||||
baseURL: API_CONFIG.baseURL,
|
baseURL: API_CONFIG.baseURL,
|
||||||
timeout: API_CONFIG.timeout,
|
timeout: API_CONFIG.timeout,
|
||||||
withCredentials: true, // Important for cookie-based auth
|
withCredentials: true, // Important for cookie-based auth
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json",
|
'Content-Type': 'application/json'
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
// Add request interceptor for debugging
|
|
||||||
apiClient.interceptors.request.use(
|
|
||||||
(config) => {
|
|
||||||
console.log("Request URL:", config.url)
|
|
||||||
console.log("Request headers:", config.headers)
|
|
||||||
console.log("Current cookies:", document.cookie)
|
|
||||||
return config
|
|
||||||
},
|
|
||||||
(error) => {
|
|
||||||
return Promise.reject(error)
|
|
||||||
}
|
}
|
||||||
)
|
});
|
||||||
|
|
||||||
// Add response interceptor for debugging cookies
|
|
||||||
apiClient.interceptors.response.use(
|
|
||||||
(response) => {
|
|
||||||
console.log("Response status:", response.status)
|
|
||||||
console.log("Response headers:", response.headers)
|
|
||||||
console.log("Set-Cookie headers:", response.headers["set-cookie"])
|
|
||||||
console.log("Cookies after response:", document.cookie)
|
|
||||||
return response
|
|
||||||
},
|
|
||||||
(error) => {
|
|
||||||
console.error("API Error:", error.response?.data || error.message)
|
|
||||||
return Promise.reject(error)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
//login
|
//login
|
||||||
export const login = async (username, password) => {
|
export const login = async (username, password) => {
|
||||||
try {
|
try {
|
||||||
const response = await apiClient.post("/users/login", { username, password })
|
const response = await apiClient.post("/users/login", { username, password })
|
||||||
return response.data
|
return response
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw error
|
throw error
|
||||||
}
|
}
|
||||||
@@ -58,7 +30,7 @@ export const login = async (username, password) => {
|
|||||||
export const register = async (username, email, password, fname, lname, phone) => {
|
export const register = async (username, email, password, fname, lname, phone) => {
|
||||||
try {
|
try {
|
||||||
const response = await apiClient.post("/users/create", { username, email, password, fname, lname, phone })
|
const response = await apiClient.post("/users/create", { username, email, password, fname, lname, phone })
|
||||||
return { ...response.data, status: response.status }
|
return response
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw error
|
throw error
|
||||||
}
|
}
|
||||||
@@ -73,3 +45,13 @@ export const verifyEmail = async (token) => {
|
|||||||
throw error
|
throw error
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Get current user's game statistics
|
||||||
|
export const getUserStats = async () => {
|
||||||
|
try {
|
||||||
|
const response = await apiClient.get("/users/me/stats")
|
||||||
|
return response.data
|
||||||
|
} catch (error) {
|
||||||
|
throw error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import React, { useEffect, useRef, useState } from "react"
|
|||||||
import { Link } from "react-router-dom"
|
import { Link } from "react-router-dom"
|
||||||
import Logo from "../../assets/pictures/Logo"
|
import Logo from "../../assets/pictures/Logo"
|
||||||
|
|
||||||
|
|
||||||
const ArrowUpIcon = () => <span style={{ fontSize: "1.25rem" }}>↑</span>
|
const ArrowUpIcon = () => <span style={{ fontSize: "1.25rem" }}>↑</span>
|
||||||
|
|
||||||
const Footer = () => {
|
const Footer = () => {
|
||||||
@@ -35,54 +34,59 @@ const Footer = () => {
|
|||||||
return (
|
return (
|
||||||
<footer
|
<footer
|
||||||
ref={footerRef}
|
ref={footerRef}
|
||||||
className={`relative bg-zinc-900 text-white border-t-2 border-zinc-800 mt-auto py-8 transition-all duration-700 ease-out ${
|
className="relative bg-zinc-900 text-white border-t-2 border-zinc-800 mt-auto py-8"
|
||||||
isVisible ? "opacity-100 scale-100 translate-y-0" : "opacity-0 scale-95 translate-y-10"
|
|
||||||
}`}
|
|
||||||
style={{ transformOrigin: "bottom center" }}
|
style={{ transformOrigin: "bottom center" }}
|
||||||
>
|
>
|
||||||
<style>
|
|
||||||
{`
|
|
||||||
.footer-animate {
|
|
||||||
transition: opacity 0.8s ease, transform 0.8s ease;
|
|
||||||
}
|
|
||||||
`}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<div className="max-w-6xl mx-auto flex flex-wrap justify-between items-start gap-8 px-4">
|
<div className="max-w-6xl mx-auto flex flex-wrap justify-between items-start gap-8 px-4">
|
||||||
{/* Logó */}
|
{/* Logó */}
|
||||||
<div className="flex flex-col items-center footer-animate">
|
<div className="flex flex-col items-center">
|
||||||
<a
|
<a href="/" className="hover:scale-105 hover:brightness-125">
|
||||||
href="/"
|
|
||||||
className="transition-transform duration-500 hover:scale-105 hover:brightness-125"
|
|
||||||
>
|
|
||||||
<Logo size={100} />
|
<Logo size={100} />
|
||||||
</a>
|
</a>
|
||||||
<span className="font-extrabold text-xl mt-2 tracking-wide">SerpentRace</span>
|
<span className="font-extrabold text-xl mt-2 tracking-wide">SerpentRace</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Oldalak */}
|
{/* Oldalak */}
|
||||||
<div className="flex flex-col gap-1 footer-animate">
|
<div className="flex flex-col gap-1">
|
||||||
<span className="text-lg font-semibold text-green-400 underline underline-offset-4 mb-2 drop-shadow-sm">
|
<span className="text-lg font-semibold text-green-400 underline underline-offset-4 mb-2 drop-shadow-sm">
|
||||||
Oldalak
|
Oldalak
|
||||||
</span>
|
</span>
|
||||||
<a href="/" className="hover:underline hover:text-green-400 transition">Főoldal</a>
|
<a href="/" className="hover:underline hover:text-green-400">
|
||||||
<a href="/about" className="hover:underline hover:text-green-400 transition">
|
Főoldal
|
||||||
|
</a>
|
||||||
|
<a href="/about" className="hover:underline hover:text-green-400">
|
||||||
Rólunk
|
Rólunk
|
||||||
</a>
|
</a>
|
||||||
<a href="/contact" className="hover:underline hover:text-green-400 transition">Kapcsolat</a>
|
<a href="/contact" className="hover:underline hover:text-green-400">
|
||||||
|
Kapcsolat
|
||||||
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Közösség */}
|
{/* Közösség */}
|
||||||
<div className="flex flex-col gap-1 footer-animate">
|
<div className="flex flex-col gap-1">
|
||||||
<span className="text-lg font-semibold text-green-400 underline underline-offset-4 mb-2 drop-shadow-sm">
|
<span className="text-lg font-semibold text-green-400 underline underline-offset-4 mb-2 drop-shadow-sm">
|
||||||
Közösség
|
Közösség
|
||||||
</span>
|
</span>
|
||||||
<a href="https://discord.gg/" target="_blank" rel="noopener noreferrer" className="hover:underline hover:text-green-400 transition">Discord</a>
|
<a
|
||||||
<a href="https://github.com/" target="_blank" rel="noopener noreferrer" className="hover:underline hover:text-green-400 transition">GitHub</a>
|
href="https://discord.gg/"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
className="hover:underline hover:text-green-400"
|
||||||
|
>
|
||||||
|
Discord
|
||||||
|
</a>
|
||||||
|
<a
|
||||||
|
href="https://github.com/"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
className="hover:underline hover:text-green-400"
|
||||||
|
>
|
||||||
|
GitHub
|
||||||
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Elérhetőség */}
|
{/* Elérhetőség */}
|
||||||
<div className="flex flex-col gap-1 footer-animate">
|
<div className="flex flex-col gap-1">
|
||||||
<span className="text-lg font-semibold text-green-400 underline underline-offset-4 mb-2 drop-shadow-sm">
|
<span className="text-lg font-semibold text-green-400 underline underline-offset-4 mb-2 drop-shadow-sm">
|
||||||
Elérhetőség
|
Elérhetőség
|
||||||
</span>
|
</span>
|
||||||
@@ -91,7 +95,7 @@ const Footer = () => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="text-center mt-8 text-sm opacity-70 footer-animate">
|
<div className="text-center mt-8 text-sm opacity-70">
|
||||||
© {new Date().getFullYear()} SerpentRace. Minden jog fenntartva.
|
© {new Date().getFullYear()} SerpentRace. Minden jog fenntartva.
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -99,7 +103,7 @@ const Footer = () => {
|
|||||||
{isVisible && (
|
{isVisible && (
|
||||||
<button
|
<button
|
||||||
onClick={scrollToTop}
|
onClick={scrollToTop}
|
||||||
className="fixed bottom-6 right-6 bg-green-500 hover:bg-green-600 text-white p-3 rounded-full shadow-lg transition transform hover:scale-110"
|
className="fixed bottom-6 right-6 bg-green-500 hover:bg-green-600 text-white p-3 rounded-full shadow-lg hover:scale-110"
|
||||||
aria-label="Ugrás az oldal tetejére"
|
aria-label="Ugrás az oldal tetejére"
|
||||||
>
|
>
|
||||||
<ArrowUpIcon />
|
<ArrowUpIcon />
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ const LandingPage = ({ onNavigateToPlay, onNavigateToAuth }) => {
|
|||||||
animate={{ opacity: 1, y: 0 }}
|
animate={{ opacity: 1, y: 0 }}
|
||||||
transition={{ duration: 0.7, delay: 1 }}
|
transition={{ duration: 0.7, delay: 1 }}
|
||||||
>
|
>
|
||||||
<ButtonGreen text="Játék" onClick={onNavigateToPlay} width="w-60" />
|
<ButtonGreen text="Bejelntekezés" onClick={onNavigateToPlay} width="w-60" />
|
||||||
<ButtonGreen text="Regisztráció" onClick={onNavigateToAuth} width="w-60" />
|
<ButtonGreen text="Regisztráció" onClick={onNavigateToAuth} width="w-60" />
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,41 +1,75 @@
|
|||||||
import React, { useState } from "react"
|
import React, { useState } from "react"
|
||||||
import Logo from "../../assets/pictures/Logo"
|
import Logo from "../../assets/pictures/Logo"
|
||||||
import About from "../../pages/About/About"
|
import { Link, useNavigate } from "react-router-dom"
|
||||||
import Home from "../../pages/Landing/Home"
|
|
||||||
|
|
||||||
const navLinkClass = "px-3 py-2 rounded-lg text-white transition-all duration-200 hover:bg-white/10"
|
const navLinkClass = "px-3 py-2 rounded-lg text-white transition-all duration-200 hover:bg-white/10"
|
||||||
|
|
||||||
const Navbar = () => {
|
const Navbar = () => {
|
||||||
const [menuOpen, setMenuOpen] = useState(false)
|
const [menuOpen, setMenuOpen] = useState(false)
|
||||||
|
const navigate = useNavigate()
|
||||||
|
// Check if authLevel and username exist in localStorage
|
||||||
|
const isLoggedIn = Boolean(localStorage.getItem("authLevel") && localStorage.getItem("username"))
|
||||||
|
|
||||||
|
// Logout function: töröljük az adatokat és navigálunk a /login-ra (SPA, nincs reload)
|
||||||
|
const handleLogout = () => {
|
||||||
|
localStorage.removeItem("authLevel")
|
||||||
|
localStorage.removeItem("username")
|
||||||
|
navigate("/login")
|
||||||
|
}
|
||||||
|
|
||||||
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-8">
|
||||||
<div className="flex justify-between h-16 items-center">
|
<div className="flex justify-between h-16 items-center">
|
||||||
{/* Logo */}
|
{/* Logo */}
|
||||||
<div className="flex-shrink-0 flex items-center gap-2">
|
<div className="flex-shrink-0 flex items-center gap-2">
|
||||||
<a href="/" className="flex items-center mt-1 h-9">
|
<Link to="/" className="flex items-center mt-1 h-9">
|
||||||
<Logo size={36} />
|
<Logo size={36} />
|
||||||
</a>
|
</Link>
|
||||||
<a href="/" className="flex items-center h-9 text-white font-bold text-2xl tracking-tight">
|
<Link to="/" className="flex items-center h-9 text-white font-bold text-2xl tracking-tight">
|
||||||
SerpentRace
|
SerpentRace
|
||||||
</a>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
{/* Desktop Menu */}
|
{/* Desktop Menu */}
|
||||||
<div className="hidden md:flex space-x-8">
|
<div className="hidden md:flex space-x-8 items-center">
|
||||||
<a href="/home" className={navLinkClass}>
|
<Link to="/home" className={navLinkClass}>
|
||||||
Home
|
Home
|
||||||
</a>
|
</Link>
|
||||||
<a href="/report" className={navLinkClass}>
|
<Link to="/decks" className={navLinkClass}>
|
||||||
|
Decks
|
||||||
|
</Link>
|
||||||
|
<Link to="/report" className={navLinkClass}>
|
||||||
Stats
|
Stats
|
||||||
</a>
|
</Link>
|
||||||
<a href="/about" className={navLinkClass}>
|
<Link to="/about" className={navLinkClass}>
|
||||||
About
|
About
|
||||||
</a>
|
</Link>
|
||||||
<a href="/companies" className={navLinkClass}>
|
<Link to="/companies" className={navLinkClass}>
|
||||||
Contact
|
Contact
|
||||||
</a>
|
</Link>
|
||||||
|
{isLoggedIn && (
|
||||||
|
<button
|
||||||
|
onClick={handleLogout}
|
||||||
|
className="ml-4 p-2 rounded-full bg-white/10 hover:bg-white/20 transition-all"
|
||||||
|
title="Logout"
|
||||||
|
>
|
||||||
|
{/* Simple logout icon */}
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
className="h-6 w-6 text-white"
|
||||||
|
fill="none"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
stroke="currentColor"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
strokeWidth={2}
|
||||||
|
d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a2 2 0 01-2 2H7a2 2 0 01-2-2V7a2 2 0 012-2h4a2 2 0 012 2v1"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
{/* Mobile Hamburger */}
|
{/* Mobile Hamburger */}
|
||||||
<div className="md:hidden flex items-center">
|
<div className="md:hidden flex items-center">
|
||||||
@@ -69,18 +103,42 @@ 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">
|
||||||
<a href="#" className={navLinkClass}>
|
<Link to="/home" className={navLinkClass}>
|
||||||
Home
|
Home
|
||||||
</a>
|
</Link>
|
||||||
<a href="#" className={navLinkClass}>
|
<Link to="/leaderboard" className={navLinkClass}>
|
||||||
Leaderboard
|
Leaderboard
|
||||||
</a>
|
</Link>
|
||||||
<a href="#" className={navLinkClass}>
|
<Link to="/about" className={navLinkClass}>
|
||||||
About
|
About
|
||||||
</a>
|
</Link>
|
||||||
<a href="#" className={navLinkClass}>
|
<Link to="/companies" className={navLinkClass}>
|
||||||
Contact
|
Contact
|
||||||
</a>
|
</Link>
|
||||||
|
{isLoggedIn && (
|
||||||
|
<div className="flex justify-end px-2 pb-2">
|
||||||
|
<button
|
||||||
|
onClick={handleLogout}
|
||||||
|
className="p-2 rounded-full bg-white/10 hover:bg-white/20 transition-all"
|
||||||
|
title="Logout"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
className="h-6 w-6 text-white"
|
||||||
|
fill="none"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
stroke="currentColor"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
strokeWidth={2}
|
||||||
|
d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a2 2 0 01-2 2H7a2 2 0 01-2-2V7a2 2 0 012-2h4a2 2 0 012 2v1"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</nav>
|
</nav>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import InputBox from "../../components/Inputs/InputBox"
|
|||||||
import Button from "../../components/Buttons/Button"
|
import Button from "../../components/Buttons/Button"
|
||||||
import { motion } from "framer-motion"
|
import { motion } from "framer-motion"
|
||||||
import { useState, useEffect } from "react"
|
import { useState, useEffect } from "react"
|
||||||
import { useLocation } from "react-router-dom"
|
import { useLocation, useNavigate } from "react-router-dom"
|
||||||
import { login } from "../../api/userApi"
|
import { login } from "../../api/userApi"
|
||||||
|
|
||||||
export default function LoginForm() {
|
export default function LoginForm() {
|
||||||
@@ -13,7 +13,9 @@ export default function LoginForm() {
|
|||||||
const [password, setPassword] = useState("")
|
const [password, setPassword] = useState("")
|
||||||
const [error, setError] = useState("")
|
const [error, setError] = useState("")
|
||||||
const location = useLocation()
|
const location = useLocation()
|
||||||
|
const navigate = useNavigate()
|
||||||
const [showSuccess, setShowSuccess] = useState(false)
|
const [showSuccess, setShowSuccess] = useState(false)
|
||||||
|
const [showErrorPopup, setShowErrorPopup] = useState(false)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (location.state && location.state.success) {
|
if (location.state && location.state.success) {
|
||||||
@@ -29,22 +31,40 @@ export default function LoginForm() {
|
|||||||
const handleSubmit = (e) => {
|
const handleSubmit = (e) => {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
setError("")
|
setError("")
|
||||||
|
setShowErrorPopup(false)
|
||||||
if (!email || !password) {
|
if (!email || !password) {
|
||||||
setError("Minden mező kitöltése kötelező.")
|
setError("Minden mező kitöltése kötelező.")
|
||||||
|
setShowErrorPopup(true)
|
||||||
|
setTimeout(() => setShowErrorPopup(false), 2000)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (!validateEmail(email)) {
|
if (!validateEmail(email)) {
|
||||||
setError("Hibás email formátum.")
|
setError("Hibás email formátum.")
|
||||||
|
setShowErrorPopup(true)
|
||||||
|
setTimeout(() => setShowErrorPopup(false), 2000)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Backend API
|
// Backend API
|
||||||
login(email, password)
|
login(email, password)
|
||||||
.then((data) => {
|
.then((response) => {
|
||||||
console.log(data)
|
console.log(response)
|
||||||
console.log("Bejelentkezés:", { email, password })
|
// Csak a response.status-t ellenőrizd!
|
||||||
|
if (response && response.status === 200) {
|
||||||
|
if (response.data && response.data.user) {
|
||||||
|
localStorage.setItem("username", response.data.user.username)
|
||||||
|
localStorage.setItem("authLevel", response.data.user.authLevel)
|
||||||
|
}
|
||||||
|
navigate("/home")
|
||||||
|
} else {
|
||||||
|
setError("Hibás bejelentkezési adatok.")
|
||||||
|
setShowErrorPopup(true)
|
||||||
|
setTimeout(() => setShowErrorPopup(false), 2000)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
setError("Hibás bejelentkezési adatok.")
|
setError("Hibás bejelentkezési adatok.")
|
||||||
|
setShowErrorPopup(true)
|
||||||
|
setTimeout(() => setShowErrorPopup(false), 2000)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,7 +82,11 @@ export default function LoginForm() {
|
|||||||
Sikeres regisztráció! Az email ellenőrzése után be tudsz lépni.
|
Sikeres regisztráció! Az email ellenőrzése után be tudsz lépni.
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{error && <div className="mb-4 text-red-600 text-center font-semibold">{error}</div>}
|
{showErrorPopup && error && (
|
||||||
|
<div className="fixed top-6 left-1/2 -translate-x-1/2 bg-red-500 text-white px-6 py-2 rounded shadow-lg z-50 text-center font-semibold transition-opacity duration-300">
|
||||||
|
{error}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
<form onSubmit={handleSubmit} className="space-y-6">
|
<form onSubmit={handleSubmit} className="space-y-6">
|
||||||
<InputBox
|
<InputBox
|
||||||
type="email"
|
type="email"
|
||||||
|
|||||||
@@ -51,12 +51,10 @@ export default function RegisterForm() {
|
|||||||
// Check for 201 Created status
|
// Check for 201 Created status
|
||||||
if (response && response.status === 201) {
|
if (response && response.status === 201) {
|
||||||
navigate("/login", { state: { success: true } })
|
navigate("/login", { state: { success: true } })
|
||||||
console.log(response)
|
|
||||||
console.log("Regisztráció:", { username, email, password, firstname, lastname, phone })
|
|
||||||
} else {
|
} else {
|
||||||
let msg = "Sikertelen regisztráció."
|
let msg = "Sikertelen regisztráció."
|
||||||
if (response && response.error) {
|
if (response && response.data && response.data.error) {
|
||||||
msg = response.error
|
msg = response.data.error
|
||||||
}
|
}
|
||||||
setError(msg)
|
setError(msg)
|
||||||
setShowErrorPopup(true)
|
setShowErrorPopup(true)
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import Navbar from "../../components/Navbar/Navbar.jsx"
|
|||||||
import DeckHeader from "../../components/DeckCreator/DeckHeader.jsx"
|
import DeckHeader from "../../components/DeckCreator/DeckHeader.jsx"
|
||||||
import CardsList from "../../components/DeckCreator/CardsList.jsx"
|
import CardsList from "../../components/DeckCreator/CardsList.jsx"
|
||||||
import CardEditor from "../../components/DeckCreator/CardEditor.jsx"
|
import CardEditor from "../../components/DeckCreator/CardEditor.jsx"
|
||||||
|
import { createDeck } from '../../api/deckApi'
|
||||||
|
|
||||||
export default function DeckCreator() {
|
export default function DeckCreator() {
|
||||||
const { deckId } = useParams() // URL-ből deck ID (új deck esetén undefined)
|
const { deckId } = useParams() // URL-ből deck ID (új deck esetén undefined)
|
||||||
@@ -86,12 +87,23 @@ export default function DeckCreator() {
|
|||||||
|
|
||||||
const handleSaveDeck = async () => {
|
const handleSaveDeck = async () => {
|
||||||
try {
|
try {
|
||||||
// TODO: API mentés
|
|
||||||
console.log("Deck mentése:", deck)
|
console.log("Deck mentése:", deck)
|
||||||
alert("✅ Deck sikeresen mentve!")
|
|
||||||
|
const payload = {
|
||||||
|
name: deck.name,
|
||||||
|
type: (deck.type || 'Question').toString().toUpperCase(),
|
||||||
|
ctype: deck.privacy === 'public' ? 'PUBLIC' : 'PRIVATE',
|
||||||
|
description: deck.description || '',
|
||||||
|
cards: deck.cards.map(c => ({ ...c, text: c.question || c.statement || c.text || '' }))
|
||||||
|
}
|
||||||
|
|
||||||
|
const saved = await createDeck(payload)
|
||||||
|
setDeck(prev => ({ ...prev, id: saved.id ?? prev.id, creationdate: saved.creationdate ?? prev.creationdate, updatedate: saved.updatedate ?? prev.updatedate }))
|
||||||
|
console.log('Deck saved (backend):', saved)
|
||||||
|
alert('✅ Deck sikeresen mentve!')
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Mentési hiba:", error)
|
console.error('Mentési hiba:', error)
|
||||||
alert("❌ Hiba történt a mentés során!")
|
alert('❌ Hiba történt a mentés során: ' + (error?.response?.data?.error || error.message || String(error)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
// src/pages/Home/Home.jsx
|
|
||||||
// Régi PlayMenu-s oldal, "Home" néven
|
|
||||||
|
|
||||||
import { useState } from "react"
|
|
||||||
import Navbar from "../../components/Navbar/Navbar"
|
|
||||||
import Footer from "../../components/Footer/Footer.jsx"
|
|
||||||
import Background from "../../assets/backgrounds/Background.jsx"
|
|
||||||
import PlayMenu from "../../components/Landingpage/PlayMenu.jsx"
|
|
||||||
|
|
||||||
export default function Home() {
|
|
||||||
// Dummy callbackok és user példa
|
|
||||||
const handleJoinGame = (code) => {
|
|
||||||
alert(`Csatlakozás játékhoz: ${code}`)
|
|
||||||
}
|
|
||||||
const handleCreateGame = () => {
|
|
||||||
alert("Új játék létrehozása")
|
|
||||||
}
|
|
||||||
const user = { name: "Teszt Elek" }
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="w-full min-h-screen flex flex-col relative overflow-x-hidden">
|
|
||||||
<div className="fixed inset-0 -z-10 pointer-events-none">
|
|
||||||
<Background />
|
|
||||||
</div>
|
|
||||||
<div className="fixed top-0 left-0 right-0 z-30">
|
|
||||||
<Navbar />
|
|
||||||
</div>
|
|
||||||
<main className="flex-1 flex flex-col items-center justify-start py-15 min-h-0 mt-[64px]">
|
|
||||||
<PlayMenu onJoinGame={handleJoinGame} onCreateGame={handleCreateGame} user={user} />
|
|
||||||
{/* Ide jöhetnek további szekciók, ha szeretnél még tartalmat */}
|
|
||||||
</main>
|
|
||||||
<Footer />
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,13 +1,20 @@
|
|||||||
// src/pages/Home/Home.jsx
|
// src/pages/Home/Home.jsx
|
||||||
// Régi PlayMenu-s oldal, "Home" néven
|
// Régi PlayMenu-s oldal, "Home" néven
|
||||||
|
|
||||||
import { useState } from "react"
|
import { useState, useEffect } from "react"
|
||||||
import Navbar from "../../components/Navbar/Navbar.jsx"
|
import { useNavigate } from "react-router-dom"
|
||||||
|
import Navbar from "../../components/Navbar/Navbar"
|
||||||
import Footer from "../../components/Footer/Footer.jsx"
|
import Footer from "../../components/Footer/Footer.jsx"
|
||||||
import Background from "../../assets/backgrounds/Background.jsx"
|
import Background from "../../assets/backgrounds/Background.jsx"
|
||||||
import PlayMenu from "../../components/Landingpage/PlayMenu.jsx"
|
import PlayMenu from "../../components/Landingpage/PlayMenu.jsx"
|
||||||
|
|
||||||
export default function Home() {
|
export default function Home() {
|
||||||
|
const navigate = useNavigate()
|
||||||
|
const user = localStorage.getItem("username")
|
||||||
|
|
||||||
|
// Logoljuk ki a user-t minden renderkor
|
||||||
|
console.log("Home user:", user)
|
||||||
|
|
||||||
// Dummy callbackok és user példa
|
// Dummy callbackok és user példa
|
||||||
const handleJoinGame = (code) => {
|
const handleJoinGame = (code) => {
|
||||||
alert(`Csatlakozás játékhoz: ${code}`)
|
alert(`Csatlakozás játékhoz: ${code}`)
|
||||||
@@ -15,7 +22,14 @@ export default function Home() {
|
|||||||
const handleCreateGame = () => {
|
const handleCreateGame = () => {
|
||||||
alert("Új játék létrehozása")
|
alert("Új játék létrehozása")
|
||||||
}
|
}
|
||||||
const user = { name: "Teszt Elek" }
|
const userObj = { name: user }
|
||||||
|
|
||||||
|
// Ha nincs bejelentkezett felhasználó a localStorage-ben, átirányítjuk a /login oldalra
|
||||||
|
useEffect(() => {
|
||||||
|
if (!user) {
|
||||||
|
navigate("/login")
|
||||||
|
}
|
||||||
|
}, [navigate, user])
|
||||||
|
|
||||||
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">
|
||||||
@@ -26,7 +40,7 @@ export default function Home() {
|
|||||||
<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]">
|
||||||
<PlayMenu onJoinGame={handleJoinGame} onCreateGame={handleCreateGame} user={user} />
|
<PlayMenu onJoinGame={handleJoinGame} onCreateGame={handleCreateGame} user={userObj} />
|
||||||
{/* Ide jöhetnek további szekciók, ha szeretnél még tartalmat */}
|
{/* Ide jöhetnek további szekciók, ha szeretnél még tartalmat */}
|
||||||
</main>
|
</main>
|
||||||
<Footer />
|
<Footer />
|
||||||
|
|||||||
@@ -1,23 +1,23 @@
|
|||||||
// src/pages/Landing/Landingpage.jsx
|
// src/pages/Landing/Landingpage.jsx
|
||||||
// Főoldal - Landing Page
|
// Főoldal - Landing Page
|
||||||
|
|
||||||
import { useState } from "react"
|
|
||||||
|
import { useNavigate } from "react-router-dom"
|
||||||
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 Background from "../../assets/backgrounds/Background.jsx"
|
import Background from "../../assets/backgrounds/Background.jsx"
|
||||||
import LandingPage from "../../components/Landingpage/LandingPage.jsx"
|
import LandingPage from "../../components/Landingpage/LandingPage.jsx"
|
||||||
|
|
||||||
export default function LandingPageMain() {
|
export default function LandingPageMain() {
|
||||||
// Navigációs callbackok
|
const navigate = useNavigate();
|
||||||
|
|
||||||
const handleNavigateToPlay = () => {
|
const handleNavigateToPlay = () => {
|
||||||
// Itt lehet navigálni a játék oldalra
|
navigate("/login");
|
||||||
alert("Navigáció a játék oldalra")
|
};
|
||||||
}
|
|
||||||
|
|
||||||
const handleNavigateToAuth = () => {
|
const handleNavigateToAuth = () => {
|
||||||
// Itt lehet navigálni a bejelentkezés oldalra
|
navigate("/register");
|
||||||
alert("Navigáció a bejelentkezés oldalra")
|
};
|
||||||
}
|
|
||||||
|
|
||||||
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">
|
||||||
@@ -32,5 +32,5 @@ export default function LandingPageMain() {
|
|||||||
</main>
|
</main>
|
||||||
<Footer />
|
<Footer />
|
||||||
</div>
|
</div>
|
||||||
)
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { 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.jsx"
|
import Background from "../../assets/backgrounds/Background.jsx"
|
||||||
|
import { getUserStats } from "../../api/userApi.js"
|
||||||
|
|
||||||
export default function Reports() {
|
export default function Reports() {
|
||||||
return (
|
return (
|
||||||
|
|||||||
Reference in New Issue
Block a user