5 Commits

Author SHA1 Message Date
Donat Magda d25e3f505e development 2025-11-27 00:31:15 +01:00
Donat Magda f82bd6d304 save 2025-11-26 20:23:35 +01:00
Donat Magda 9ba8c95142 save 2025-11-26 01:42:25 +01:00
Donat Magda a9546dcc63 save 2025-11-26 01:42:07 +01:00
Donat Magda d7b47f2abe save 2025-11-26 01:41:54 +01:00
12 changed files with 99 additions and 83 deletions
Binary file not shown.
@@ -286,7 +286,7 @@ export class CardDrawingService {
return {
correct: true, // Luck cards are always "correct" since no answer is needed
consequence: consequence,
description: `🍀 ${this.getConsequenceDescription(consequence, true)}`
description: card.question || this.getConsequenceDescription(consequence, true)
};
}
@@ -1234,7 +1234,7 @@ export class GameWebSocketService {
// Process luck card with multi-turn support
// Note: processLuckCard will update position again if consequence moves player
if (card.consequence) {
await this.processLuckCard(gameCode, playerId, playerName, card.consequence, position);
await this.processLuckCard(gameCode, playerId, playerName, card.consequence, position, card.question);
} else {
// Fallback to old method if no consequence object
await this.applyCardConsequence(gameCode, playerId, playerName, result.consequence);
@@ -2238,7 +2238,8 @@ export class GameWebSocketService {
playerId: string,
playerName: string,
consequence: { type: number; value?: number },
currentPosition: number
currentPosition: number,
lucktext?: string
): Promise<void> {
const gameRoomName = `game_${gameCode}`;
let newPosition = currentPosition;
@@ -2343,6 +2344,13 @@ export class GameWebSocketService {
message: `${playerName} goes back to START!`,
timestamp: new Date().toISOString()
});
this.io.of('/game').to(gameRoomName).emit('game:player-arrived', {
playerId,
playerName,
position: 1,
fieldType: 'luck',
timestamp: new Date().toISOString()
});
break;
}
+3
View File
@@ -38,6 +38,9 @@ RUN npm ci --only=production && npm cache clean --force
COPY --from=builder /app/dist ./dist
COPY --from=builder /app/package.json ./
# Copy assets directory for email templates and logos
COPY --from=builder /app/assets ./assets
# Create logs directory with proper permissions
RUN mkdir -p logs && chmod 777 logs
+8 -7
View File
@@ -28,12 +28,12 @@ JWT_REFRESH_EXPIRATION=7d
# Email Configuration (SMTP)
# CHANGE THESE: Configure your email provider
EMAIL_HOST=smtp.yourmailprovider.com
EMAIL_PORT=587
EMAIL_SECURE=false
EMAIL_USER=your_email@yourdomain.com
EMAIL_PASS=your_email_password
EMAIL_FROM="SerpentRace <noreply@yourdomain.com>"
EMAIL_HOST=mail.serpentrace.hu
EMAIL_PORT=465
EMAIL_SECURE=true
EMAIL_USER=noreply@serpentrace.hu
EMAIL_PASS=ZUx720ece&Cin&F{
EMAIL_FROM="SerpentRace <noreply@serpentrace.hu>"
# MinIO Object Storage
MINIO_ENDPOINT=minio
@@ -45,7 +45,8 @@ MINIO_SECRET_KEY=CHANGE_THIS_MINIO_SECRET_KEY_123!
MINIO_BUCKET_NAME=serpentrace-logs
# Application Settings
APP_BASE_URL=http://your-domain.com
APP_BASE_URL=https://szesnake.ddc.sze.hu
FRONTEND_URL=https://szesnake.ddc.sze.hu
PORT=3000
# Chat System Limits
+26 -67
View File
@@ -8,31 +8,8 @@ services:
restart: unless-stopped
ports:
- "3000:3000"
environment:
- NODE_ENV=production
- PORT=3000
- DB_HOST=postgres
- DB_PORT=5432
- DB_NAME=serpentrace
- DB_USERNAME=postgres
- DB_PASSWORD=${POSTGRES_PASSWORD}
- REDIS_URL=redis://redis:6379
- REDIS_HOST=redis
- REDIS_PORT=6379
- JWT_SECRET=${JWT_SECRET}
- JWT_EXPIRATION=${JWT_EXPIRATION:-24h}
- JWT_REFRESH_EXPIRATION=${JWT_REFRESH_EXPIRATION:-7d}
- MINIO_ENDPOINT=minio
- MINIO_PORT=9000
- MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY}
- MINIO_SECRET_KEY=${MINIO_SECRET_KEY}
- MINIO_USE_SSL=false
- EMAIL_HOST=${EMAIL_HOST}
- EMAIL_PORT=${EMAIL_PORT}
- EMAIL_SECURE=${EMAIL_SECURE}
- EMAIL_USER=${EMAIL_USER}
- EMAIL_PASS=${EMAIL_PASS}
- EMAIL_FROM=${EMAIL_FROM}
env_file:
- .env.server
volumes:
- backend_logs:/app/logs
depends_on:
@@ -44,12 +21,7 @@ services:
condition: service_healthy
networks:
- serpentrace-network
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"]
interval: 30s
timeout: 10s
retries: 3
start_period: 40s
tty: true
# Frontend service using pre-built image
frontend:
@@ -57,8 +29,10 @@ services:
container_name: serpentrace-frontend
restart: unless-stopped
ports:
- "80:80"
- "8080:80"
- "443:443"
volumes:
- ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
depends_on:
- backend
networks:
@@ -79,7 +53,7 @@ services:
environment:
POSTGRES_DB: serpentrace
POSTGRES_USER: postgres
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
POSTGRES_PASSWORD: postgres
POSTGRES_INITDB_ARGS: "--encoding=UTF-8"
volumes:
- postgres_data:/var/lib/postgresql/data
@@ -101,7 +75,7 @@ services:
- "6379:6379"
volumes:
- redis_data:/data
command: redis-server --appendonly yes --requirepass ${REDIS_PASSWORD}
command: redis-server --appendonly yes
networks:
- serpentrace-network
healthcheck:
@@ -119,8 +93,8 @@ services:
- "9000:9000"
- "9001:9001"
environment:
MINIO_ROOT_USER: ${MINIO_ACCESS_KEY}
MINIO_ROOT_PASSWORD: ${MINIO_SECRET_KEY}
MINIO_ROOT_USER: serpentrace
MINIO_ROOT_PASSWORD: serpentrace123!
volumes:
- minio_data:/data
command: server /data --console-address ":9001"
@@ -132,45 +106,32 @@ services:
timeout: 5s
retries: 5
# Adminer Database Viewer
adminer:
image: adminer:latest
container_name: serpentrace-adminer
restart: unless-stopped
ports:
- "8083:8080" # Access via http://<server-ip>:8083
depends_on:
- postgres
networks:
- serpentrace-network
# Redis Commander for internal administration
# Redis Commander
redis-commander:
image: rediscommander/redis-commander:latest
container_name: serpentrace-redis-commander-dev
container_name: serpentrace-redis-commander
restart: unless-stopped
ports:
- "8081:8081"
- "8082:8081" # Access via http://<server-ip>:8082
environment:
- REDIS_HOSTS=local:redis:6379
REDIS_HOSTS: local:serpentrace-redis:6379
depends_on:
redis:
condition: service_healthy
- redis
networks:
- serpentrace-network
# Database administration tool for internal administration
pgadmin:
image: dpage/pgadmin4:latest
container_name: serpentrace-pgadmin
restart: unless-stopped
ports:
- "5050:80"
environment:
PGADMIN_DEFAULT_EMAIL: admin@serpentrace.dev
PGADMIN_DEFAULT_PASSWORD: admin
PGADMIN_CONFIG_SERVER_MODE: 'False'
PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED: 'False'
PGADMIN_CONFIG_WTF_CSRF_ENABLED: 'False'
volumes:
- pgadmin_data:/var/lib/pgadmin
- ./deployment/pgadmin_servers_deployment.json:/pgadmin4/servers.json:ro
depends_on:
postgres:
condition: service_healthy
networks:
- serpentrace-network
volumes:
postgres_data:
driver: local
@@ -180,8 +141,6 @@ volumes:
driver: local
backend_logs:
driver: local
pgadmin_data:
driver: local
networks:
serpentrace-network:
+37 -4
View File
@@ -45,10 +45,43 @@ server {
proxy_set_header X-Forwarded-Proto $scheme;
}
# Static assets caching
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ {
expires 1y;
add_header Cache-Control "public, immutable";
# Adminer Database Viewer proxy
location /adminer/ {
proxy_pass http://adminer:8080/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
# Redis Commander proxy
location /redis/ {
proxy_pass http://redis-commander:8081/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_redirect http://redis-commander:8081/ /redis/;
proxy_cache_bypass $http_upgrade;
}
# MinIO Console proxy
location /minio/ {
proxy_pass http://minio:9001/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_redirect http://minio:9001/ /minio/;
sub_filter '<base href="/"' '<base href="/minio/"';
sub_filter_types text/html;
proxy_cache_bypass $http_upgrade;
}
# Health check endpoint
+11 -1
View File
@@ -2,7 +2,7 @@ import axios from "axios"
export const API_CONFIG = {
baseURL: (import.meta.env.VITE_API_URL ? import.meta.env.VITE_API_URL : "") + "/api",
wsURL: "http://localhost:3000",
wsURL: (import.meta.env.VITE_API_URL ? import.meta.env.VITE_API_URL : ""),
timeout: 10000,
retryAttempts: 3,
}
@@ -26,6 +26,16 @@ export const login = async (username, password) => {
}
}
//logout
export const logout = async () => {
try {
const response = await apiClient.post("/users/logout")
return response
} catch (error) {
throw error
}
}
//register
export const register = async (username, email, password, fname, lname, phone) => {
try {
@@ -3,6 +3,7 @@ import Logo from "../../assets/pictures/Logo"
import { Link } from "react-router-dom"
import HandleNavigate from "../../utils/HandleNavigate/HandleNavigate" // ✅ importáld a navigációs hookot
import { FaSignOutAlt, FaChartBar, FaUser, FaBars } from "react-icons/fa"
import { logout } from "../../api/userApi" // ✅ importáld a logout API hívást
const navLinkClass = "px-3 py-2 rounded-lg text-white transition-all duration-200 hover:bg-white/10"
const navLinkClassPlay =
@@ -17,8 +18,9 @@ const Navbar = () => {
const { goLanding, goAbout, goHome, goLogin, goContacts } = HandleNavigate()
// ✅ Logout logika
const handleLogout = () => {
const handleLogout = async () => {
localStorage.clear()
await logout()
goLanding()
}
Binary file not shown.
Binary file not shown.
Binary file not shown.