Compare commits
18
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
28ee969c29 | ||
|
|
7230520551 | ||
|
|
59c1d97d84 | ||
|
|
3de1e907f2 | ||
|
|
91c0c3e6d1 | ||
|
|
8e3807e079 | ||
|
|
10c3dbc066 | ||
|
|
af13be2196 | ||
|
|
c0aa2ad44e | ||
|
|
d3cff2ef58 | ||
|
|
24b76f9700 | ||
|
|
03994dd54e | ||
|
|
499e699dbd | ||
|
|
c8b0a6e966 | ||
|
|
5b6bfaf5ad | ||
|
|
af61a3b920 | ||
|
|
0d6628e7c9 | ||
|
|
534175efb3 |
@@ -0,0 +1,63 @@
|
|||||||
|
# In all environments, the following files are loaded if they exist,
|
||||||
|
# the latter taking precedence over the former:
|
||||||
|
#
|
||||||
|
# * .env contains default values for the environment variables needed by the app
|
||||||
|
# * .env.local uncommitted file with local overrides
|
||||||
|
# * .env.$APP_ENV committed environment-specific defaults
|
||||||
|
# * .env.$APP_ENV.local uncommitted environment-specific overrides
|
||||||
|
#
|
||||||
|
# Real environment variables win over .env files.
|
||||||
|
#
|
||||||
|
# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
|
||||||
|
# https://symfony.com/doc/current/configuration/secrets.html
|
||||||
|
#
|
||||||
|
# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
|
||||||
|
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
|
||||||
|
|
||||||
|
###> symfony/framework-bundle ###
|
||||||
|
APP_ENV=dev
|
||||||
|
APP_SECRET=
|
||||||
|
###< symfony/framework-bundle ###
|
||||||
|
|
||||||
|
###> doctrine/doctrine-bundle ###
|
||||||
|
# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
|
||||||
|
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
|
||||||
|
#
|
||||||
|
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data_%kernel.environment%.db"
|
||||||
|
# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
|
||||||
|
DATABASE_URL="mysql://escapepage:b.0nqrxJ%%2FD%%2ALuf9N@localhost:3306/escapepage?serverVersion=8.0.32&charset=utf8mb4"
|
||||||
|
###< doctrine/doctrine-bundle ###
|
||||||
|
|
||||||
|
###> symfony/messenger ###
|
||||||
|
# Choose one of the transports below
|
||||||
|
# MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages
|
||||||
|
# MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages
|
||||||
|
MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
|
||||||
|
###< symfony/messenger ###
|
||||||
|
|
||||||
|
###> symfony/mailer ###
|
||||||
|
# Development: use Mailpit (docker compose override provides service `mailer` on port 1025)
|
||||||
|
MAILER_DSN=smtp://mailer:1025
|
||||||
|
# Production/Stage (uncomment and set SENDGRID_API_KEY in real env or secrets):
|
||||||
|
# MAILER_DSN=sendgrid+api://%env(SENDGRID_API_KEY)%
|
||||||
|
# Alternatively, via SMTP (no extra package needed):
|
||||||
|
# MAILER_DSN="smtp://apikey:%env(SENDGRID_API_KEY)%@smtp.sendgrid.net:587?encryption=tls"
|
||||||
|
# Optional default sender (used by test command if --from not passed):
|
||||||
|
# MAILER_FROM=no-reply@your-domain.tld
|
||||||
|
# SENDGRID_API_KEY=your_real_key_goes_here # Do NOT commit this; set in .env.local or deployment env
|
||||||
|
###< symfony/mailer ###
|
||||||
|
|
||||||
|
###> symfony/sendgrid-mailer ###
|
||||||
|
# MAILER_DSN=sendgrid://KEY@default
|
||||||
|
###< symfony/sendgrid-mailer ###
|
||||||
|
|
||||||
|
###> mercure ###
|
||||||
|
# Internal hub URL used by the PHP app (reachable from the php container)
|
||||||
|
MERCURE_URL=http://mercure/.well-known/mercure
|
||||||
|
# Public hub URL used by browsers
|
||||||
|
MERCURE_PUBLIC_URL=http://localhost:8090/.well-known/mercure
|
||||||
|
# Shared secret for signing JWTs (dev only). In prod, set via real env/secrets.
|
||||||
|
MERCURE_JWT_SECRET=!ChangeThisMercureJWT!
|
||||||
|
# Base URL for Mercure topics. Use .dev in development; override to .com in prod via .env.prod or real env.
|
||||||
|
MERCURE_TOPIC_BASE=https://escapepage.dev
|
||||||
|
###< mercure ###
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
|
||||||
|
###> symfony/framework-bundle ###
|
||||||
|
APP_SECRET=620e9ce5f88a714b636179eb39d5be4f
|
||||||
|
###< symfony/framework-bundle ###
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
### Compiled or real environment variables should be used in production.
|
||||||
|
### Configure MAILER_DSN to use SendGrid API transport.
|
||||||
|
### Prefer storing SENDGRID_API_KEY using Symfony Secrets or real env vars.
|
||||||
|
|
||||||
|
###> symfony/mailer ###
|
||||||
|
# Example using SendGrid API key (replace with real secret via vault/secrets):
|
||||||
|
# SENDGRID_API_KEY=SG.xxxxx
|
||||||
|
MAILER_DSN=sendgrid+api://%env(resolve:SENDGRID_API_KEY)%@default
|
||||||
|
###< symfony/mailer ###
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
# define your env variables for the test env here
|
||||||
|
KERNEL_CLASS='App\Kernel'
|
||||||
|
APP_SECRET='$ecretf0rt3st'
|
||||||
@@ -3,72 +3,17 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Game\Controller;
|
namespace App\Game\Controller;
|
||||||
|
|
||||||
use App\Game\Entity\Session;
|
|
||||||
use App\Game\Repository\GameRepository;
|
|
||||||
use App\Game\Repository\SessionRepository;
|
|
||||||
use App\Game\Service\GameDashboardService;
|
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\Routing\Annotation\Route;
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
|
||||||
use Symfony\Component\ExpressionLanguage\Expression;
|
|
||||||
|
|
||||||
final class GameController extends AbstractController
|
final class GameController extends AbstractController
|
||||||
{
|
{
|
||||||
#[Route(path: '', name: 'game_dashboard', methods: ['GET', 'POST'])]
|
#[Route(path: '', name: 'game')]
|
||||||
#[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
|
public function index(): Response
|
||||||
public function dashboard(
|
{
|
||||||
Request $request,
|
return $this->render('game/index.html.twig', [
|
||||||
GameRepository $gameRepository,
|
'user_id' => $this->getUser()?->getId(),
|
||||||
SessionRepository $sessionRepository,
|
|
||||||
GameDashboardService $dashboardService,
|
|
||||||
Security $security
|
|
||||||
): Response {
|
|
||||||
$user = $security->getUser();
|
|
||||||
$isAdmin = $this->isGranted('ROLE_ADMIN');
|
|
||||||
|
|
||||||
if ($request->isMethod('POST')) {
|
|
||||||
if ($request->request->has('create_session')) {
|
|
||||||
$gameId = $request->request->get('game_id');
|
|
||||||
$game = $gameRepository->find($gameId);
|
|
||||||
|
|
||||||
if ($game) {
|
|
||||||
if ($dashboardService->createSession($game, $user, $isAdmin)) {
|
|
||||||
$this->addFlash('success', 'New session created!');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} elseif ($request->request->has('create_invite')) {
|
|
||||||
$sessionId = $request->request->get('session_id');
|
|
||||||
$session = $sessionRepository->find($sessionId);
|
|
||||||
|
|
||||||
if (!$session) {
|
|
||||||
$this->addFlash('error', 'Session not found.');
|
|
||||||
return $this->redirectToRoute('game_dashboard');
|
|
||||||
}
|
|
||||||
|
|
||||||
$inviteCode = $dashboardService->generateInviteCode($session, $user, $isAdmin);
|
|
||||||
if ($inviteCode) {
|
|
||||||
$this->addFlash('success', 'Invite link created: ' . $inviteCode);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this->redirectToRoute('game_dashboard');
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this->render('game/dashboard.html.twig', [
|
|
||||||
'sessions' => $dashboardService->getSessionsForUser($user),
|
|
||||||
'availableGames' => $dashboardService->getAvailableGames($isAdmin),
|
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[Route(path: '/{session}', name: 'game')]
|
|
||||||
#[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
|
|
||||||
#[IsGranted('SESSION_VIEW', subject: 'session')]
|
|
||||||
public function index(
|
|
||||||
Session $session): Response
|
|
||||||
{
|
|
||||||
return $this->render('game/index.html.twig', ['session' => $session]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,5 +10,4 @@ enum SessionSettingType: string
|
|||||||
case RIGHTS_FOR_PLAYER1 = 'RightsForPlayer1';
|
case RIGHTS_FOR_PLAYER1 = 'RightsForPlayer1';
|
||||||
case RIGHTS_FOR_PLAYER2 = 'RightsForPlayer2';
|
case RIGHTS_FOR_PLAYER2 = 'RightsForPlayer2';
|
||||||
case RIGHTS_FOR_PLAYER3 = 'RightsForPlayer3';
|
case RIGHTS_FOR_PLAYER3 = 'RightsForPlayer3';
|
||||||
case INVITE_CODE = 'InviteCode';
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,48 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Game\Security\Voter;
|
|
||||||
|
|
||||||
use App\Game\Entity\Session;
|
|
||||||
use App\Tech\Entity\User;
|
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
|
||||||
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
|
|
||||||
use Symfony\Component\Security\Core\Authorization\Voter\Voter;
|
|
||||||
|
|
||||||
class SessionVoter extends Voter
|
|
||||||
{
|
|
||||||
public const VIEW = 'SESSION_VIEW';
|
|
||||||
|
|
||||||
public function __construct(
|
|
||||||
private readonly Security $security,
|
|
||||||
) {
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function supports(string $attribute, mixed $subject): bool
|
|
||||||
{
|
|
||||||
return $attribute === self::VIEW && $subject instanceof Session;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function voteOnAttribute(string $attribute, mixed $subject, TokenInterface $token): bool
|
|
||||||
{
|
|
||||||
$user = $token->getUser();
|
|
||||||
|
|
||||||
if (!$user instanceof User) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->security->isGranted('ROLE_ADMIN')) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @var Session $session */
|
|
||||||
$session = $subject;
|
|
||||||
|
|
||||||
foreach ($session->getPlayers() as $player) {
|
|
||||||
if ($player->getUser() === $user) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,116 +0,0 @@
|
|||||||
<?php
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace App\Game\Service;
|
|
||||||
|
|
||||||
use App\Game\Entity\Game;
|
|
||||||
use App\Game\Entity\Player;
|
|
||||||
use App\Game\Entity\Session;
|
|
||||||
use App\Game\Entity\SessionSetting;
|
|
||||||
use App\Game\Enum\GameStatus;
|
|
||||||
use App\Game\Enum\SessionSettingType;
|
|
||||||
use App\Game\Enum\SessionStatus;
|
|
||||||
use App\Game\Repository\GameRepository;
|
|
||||||
use App\Game\Repository\SessionRepository;
|
|
||||||
use App\Tech\Entity\User;
|
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
|
||||||
use Symfony\Component\Security\Core\User\UserInterface;
|
|
||||||
|
|
||||||
final class GameDashboardService
|
|
||||||
{
|
|
||||||
public function __construct(
|
|
||||||
private readonly GameRepository $gameRepository,
|
|
||||||
private readonly SessionRepository $sessionRepository,
|
|
||||||
private readonly EntityManagerInterface $entityManager,
|
|
||||||
) {
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Session[]
|
|
||||||
*/
|
|
||||||
public function getSessionsForUser(UserInterface $user): array
|
|
||||||
{
|
|
||||||
return $this->sessionRepository->createQueryBuilder('s')
|
|
||||||
->innerJoin('s.players', 'p')
|
|
||||||
->where('p.user = :user')
|
|
||||||
->setParameter('user', $user)
|
|
||||||
->getQuery()
|
|
||||||
->getResult();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Game[]
|
|
||||||
*/
|
|
||||||
public function getAvailableGames(bool $isAdmin): array
|
|
||||||
{
|
|
||||||
if ($isAdmin) {
|
|
||||||
return $this->gameRepository->findAll();
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this->gameRepository->findBy(['status' => GameStatus::OPEN]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function createSession(Game $game, UserInterface $user, bool $isAdmin): ?Session
|
|
||||||
{
|
|
||||||
if ($game->getStatus() !== GameStatus::OPEN && !$isAdmin) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!$user instanceof User)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
$session = new Session();
|
|
||||||
$session->setGame($game);
|
|
||||||
$session->setStatus(SessionStatus::CREATED);
|
|
||||||
$session->setTimer(0);
|
|
||||||
|
|
||||||
$player = new Player();
|
|
||||||
$player->setUser($user);
|
|
||||||
$player->setSession($session);
|
|
||||||
$player->setScreen(1);
|
|
||||||
|
|
||||||
$this->entityManager->persist($session);
|
|
||||||
$this->entityManager->persist($player);
|
|
||||||
$this->entityManager->flush();
|
|
||||||
|
|
||||||
return $session;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function generateInviteCode(Session $session, UserInterface $user, bool $isAdmin): ?string
|
|
||||||
{
|
|
||||||
// Security check: is user part of this session?
|
|
||||||
$isPlayer = false;
|
|
||||||
foreach ($session->getPlayers() as $player) {
|
|
||||||
if ($player->getUser() === $user) {
|
|
||||||
$isPlayer = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$isPlayer && !$isAdmin) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
$inviteCode = bin2hex(random_bytes(4));
|
|
||||||
|
|
||||||
$setting = null;
|
|
||||||
foreach ($session->getSettings() as $s) {
|
|
||||||
if ($s->getName() === SessionSettingType::INVITE_CODE) {
|
|
||||||
$setting = $s;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$setting) {
|
|
||||||
$setting = new SessionSetting();
|
|
||||||
$setting->setSession($session);
|
|
||||||
$setting->setName(SessionSettingType::INVITE_CODE);
|
|
||||||
}
|
|
||||||
|
|
||||||
$setting->setValue($inviteCode);
|
|
||||||
$this->entityManager->persist($setting);
|
|
||||||
$this->entityManager->flush();
|
|
||||||
|
|
||||||
return $inviteCode;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -31,8 +31,6 @@ class RegistrationController extends AbstractController
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
$user->setRoles(['ROLE_USER', 'ROLE_PLAYER']);
|
|
||||||
|
|
||||||
$entityManager->persist($user);
|
$entityManager->persist($user);
|
||||||
$entityManager->flush();
|
$entityManager->flush();
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<nav>
|
<nav>
|
||||||
{% set pathinfo = app.request.pathinfo %}
|
{% set pathinfo = app.request.pathinfo %}
|
||||||
<a href="/">{{ 'nav.home'|trans }}</a> |
|
<a href="/">{{ 'nav.home'|trans }}</a> |
|
||||||
<a href="{{ path('game_dashboard') }}">{{ 'nav.game'|trans }}</a> |
|
<a href="/game">{{ 'nav.game'|trans }}</a> |
|
||||||
{% if app.user %}
|
{% if app.user %}
|
||||||
<a href="{{ path('app_logout') }}">Logout</a>
|
<a href="{{ path('app_logout') }}">Logout</a>
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|||||||
@@ -1,74 +0,0 @@
|
|||||||
{% extends 'base.html.twig' %}
|
|
||||||
|
|
||||||
{% block title %}Game Dashboard{% endblock %}
|
|
||||||
|
|
||||||
{% block body %}
|
|
||||||
<h1>Game Dashboard</h1>
|
|
||||||
|
|
||||||
<h2>Create New Session</h2>
|
|
||||||
{% if availableGames is not empty %}
|
|
||||||
<form method="post">
|
|
||||||
<select name="game_id">
|
|
||||||
{% for game in availableGames %}
|
|
||||||
<option value="{{ game.id }}">
|
|
||||||
{{ game.name }} ({{ game.numberOfPlayers }} players)
|
|
||||||
{% if is_granted('ROLE_ADMIN') %}
|
|
||||||
[{{ game.status.value }}]
|
|
||||||
{% endif %}
|
|
||||||
</option>
|
|
||||||
{% endfor %}
|
|
||||||
</select>
|
|
||||||
<button type="submit" name="create_session">Create Session</button>
|
|
||||||
</form>
|
|
||||||
{% else %}
|
|
||||||
<p>No games available to start.</p>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<h2>Your Sessions</h2>
|
|
||||||
{% if sessions is not empty %}
|
|
||||||
<table>
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>ID</th>
|
|
||||||
<th>Game</th>
|
|
||||||
<th>Status</th>
|
|
||||||
<th>Created At</th>
|
|
||||||
<th>Invite Code</th>
|
|
||||||
<th>Actions</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{% for session in sessions %}
|
|
||||||
<tr>
|
|
||||||
<td>{{ session.id }}</td>
|
|
||||||
<td>{{ session.game.name }}</td>
|
|
||||||
<td>{{ session.status.value }}</td>
|
|
||||||
<td>{{ session.created|date('Y-m-d H:i') }}</td>
|
|
||||||
<td>
|
|
||||||
{% set inviteCode = '' %}
|
|
||||||
{% for setting in session.settings %}
|
|
||||||
{% if setting.name.value == 'InviteCode' %}
|
|
||||||
{% set inviteCode = setting.value %}
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
|
|
||||||
{% if inviteCode %}
|
|
||||||
<code>{{ inviteCode }}</code>
|
|
||||||
{% else %}
|
|
||||||
<form method="post" style="display:inline;">
|
|
||||||
<input type="hidden" name="session_id" value="{{ session.id }}">
|
|
||||||
<button type="submit" name="create_invite">Generate Invite</button>
|
|
||||||
</form>
|
|
||||||
{% endif %}
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<a href="{{ path('game', {session: session.id}) }}">Enter Game</a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
{% else %}
|
|
||||||
<p>You are not part of any sessions.</p>
|
|
||||||
{% endif %}
|
|
||||||
{% endblock %}
|
|
||||||
@@ -5,5 +5,5 @@
|
|||||||
{% block body %}
|
{% block body %}
|
||||||
<h1>{{ 'home.h1'|trans({'%site%': ('site.name'|trans)}) }}</h1>
|
<h1>{{ 'home.h1'|trans({'%site%': ('site.name'|trans)}) }}</h1>
|
||||||
<p>{{ 'home.description'|trans }}</p>
|
<p>{{ 'home.description'|trans }}</p>
|
||||||
<p><a href="{{ path('game_dashboard') }}">{{ 'link.enter_game'|trans }}</a></p>
|
<p><a href="{{ path('game') }}">{{ 'link.enter_game'|trans }}</a></p>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
Reference in New Issue
Block a user