Created a dashboard and created an invite code for game sessions.

Reviewed-on: #4

docker/compose.yaml

@@ -5,7 +5,7 @@ services:
   php:
     build:
       context: ..
-      dockerfile: php/Dockerfile
+      dockerfile: docker/php/Dockerfile
     container_name: escapepage-php
     volumes:
       - ../:/var/www/html:delegated
@@ -18,6 +18,23 @@ services:
       - backend
     restart: unless-stopped
 
+  php-worker:
+    build:
+      context: ..
+      dockerfile: docker/php/Dockerfile
+    container_name: escapepage-php-worker
+    volumes:
+      - ../:/var/www/html:delegated
+    environment:
+      APP_ENV: dev
+    depends_on:
+      - database
+      - mercure
+    command: ["php", "bin/console", "messenger:consume", "async", "-vv"]
+    networks:
+      - backend
+    restart: unless-stopped
+
   nginx:
     image: nginx:1.29.4-alpine
     container_name: escapepage-nginx

docker/php/Dockerfile

@@ -1,11 +1,20 @@
-FROM php:8.5.1-fpm-alpine3.23
+FROM php:8.3-fpm-alpine
 
 # Install system deps
-RUN apk add --no-cache bash git icu-dev libzip-dev oniguruma-dev
+RUN apk add --no-cache \
+    bash \
+    git \
+    icu-dev \
+    libzip-dev \
+    oniguruma-dev \
+    g++ \
+    make \
+    nodejs \
+    npm
 
 # Install PHP extensions
 RUN docker-php-ext-configure intl \
-    && docker-php-ext-install -j$(nproc) intl pdo pdo_mysql opcache
+    && docker-php-ext-install -j$(nproc) intl pdo pdo_mysql opcache zip
 
 # Install composer
 ENV COMPOSER_ALLOW_SUPERUSER=1 \
@@ -13,7 +22,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1 \
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
 # Configure PHP
-COPY php.ini $PHP_INI_DIR/conf.d/zz-custom.ini
+COPY docker/php/php.ini $PHP_INI_DIR/conf.d/zz-custom.ini
 
 WORKDIR /var/www/html
 

docker/setup.sh

@@ -66,12 +66,15 @@ dc up "${BUILD_ARGS[@]}"
 # Helper to run commands in php container
 pexec() { dc exec -T php "$@"; }
 
-# Wait for database to be healthy (mariadb)
+# Wait for database to be healthy (mariadb/mysql)
 printf "Waiting for database to be healthy..."
 # Use docker inspect health status
 DB_HEALTH=""
 for i in {1..60}; do
-  DB_HEALTH=$(docker inspect -f '{{.State.Health.Status}}' "$(docker ps --filter name=_database_ --format '{{.ID}}' | head -n1)" 2>/dev/null || true)
+  DB_ID=$(dc ps -q database 2>/dev/null || true)
+  if [ -n "$DB_ID" ]; then
+    DB_HEALTH=$(docker inspect -f '{{.State.Health.Status}}' "$DB_ID" 2>/dev/null || true)
+  fi
   if [ "$DB_HEALTH" = "healthy" ]; then
     echo " OK"
     break
@@ -79,7 +82,7 @@ for i in {1..60}; do
   printf "."
   sleep 2
   if [ "$i" -eq 60 ]; then
-    echo "\nWarning: database health check not healthy yet, continuing anyway."
+    echo -e "\nWarning: database health check not healthy yet, continuing anyway."
   fi
 done
 
@@ -100,11 +103,23 @@ if grep -q '^APP_SECRET=$' "$ROOT_DIR/.env" 2>/dev/null; then
 fi
 
 # Prepare DB
-pexec php bin/console doctrine:database:create --if-not-exists || true
+echo "Creating database if it doesn't exist..."
-pexec php bin/console doctrine:migrations:migrate -n || true
+pexec php bin/console doctrine:database:create --if-not-exists
+echo "Running migrations..."
+pexec php bin/console doctrine:migrations:migrate -n
 
 # Import JS deps (Importmap/Asset Mapper)
-pexec php bin/console importmap:install || true
+if [ -f "$ROOT_DIR/importmap.php" ]; then
+  pexec php bin/console importmap:install || true
+fi
+
+# Build assets if using Webpack Encore
+if [ -f "$ROOT_DIR/package.json" ]; then
+  echo "Installing npm dependencies..."
+  pexec npm install
+  echo "Building assets..."
+  pexec npm run build
+fi
 
 APP_URL=http://localhost:8080
 MAILPIT_URL=http://localhost:8025
@@ -117,10 +132,12 @@ Open the app:      $APP_URL
 Mailpit (dev):     $MAILPIT_URL
 
 Common commands:
-  (cd docker && $DOCKER_COMPOSE logs -f nginx)
+  (cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f nginx)
-  (cd docker && $DOCKER_COMPOSE logs -f php)
+  (cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f php)
-  (cd docker && $DOCKER_COMPOSE exec php bash)
+  (cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f php-worker)
-  (cd docker && $DOCKER_COMPOSE down)
+  (cd "$DOCKER_DIR" && $DOCKER_COMPOSE exec php bash)
+  (cd "$DOCKER_DIR" && $DOCKER_COMPOSE exec php npm run watch)
+  (cd "$DOCKER_DIR" && $DOCKER_COMPOSE down)
 
 You can re-run this script any time. Use --no-build to skip rebuilding images.
 EOT

src/Game/Controller/GameController.php

@@ -3,17 +3,72 @@ declare(strict_types=1);
 
 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\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+use Symfony\Component\ExpressionLanguage\Expression;
 
 final class GameController extends AbstractController
 {
-    #[Route(path: '', name: 'game')]
+    #[Route(path: '', name: 'game_dashboard', methods: ['GET', 'POST'])]
-    public function index(): Response
+    #[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
-    {
+    public function dashboard(
-        return $this->render('game/index.html.twig', [
+        Request $request,
-            'user_id' => $this->getUser()?->getId(),
+        GameRepository $gameRepository,
+        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]);
+    }
 }

src/Game/Enum/SessionSettingType.php

@@ -10,4 +10,5 @@ enum SessionSettingType: string
     case RIGHTS_FOR_PLAYER1 = 'RightsForPlayer1';
     case RIGHTS_FOR_PLAYER2 = 'RightsForPlayer2';
     case RIGHTS_FOR_PLAYER3 = 'RightsForPlayer3';
+    case INVITE_CODE = 'InviteCode';
 }

src/Game/Security/Voter/SessionVoter.php

@@ -0,0 +1,48 @@
+<?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;
+    }
+}

src/Game/Service/GameDashboardService.php

@@ -0,0 +1,116 @@
+<?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;
+    }
+}

src/Tech/Controller/RegistrationController.php

@@ -31,6 +31,8 @@ class RegistrationController extends AbstractController
                 )
             );
 
+            $user->setRoles(['ROLE_USER', 'ROLE_PLAYER']);
+
             $entityManager->persist($user);
             $entityManager->flush();
 

templates/base.html.twig

@@ -14,7 +14,7 @@
     <nav>
         {% set pathinfo = app.request.pathinfo %}
         <a href="/">{{ 'nav.home'|trans }}</a> |
-        <a href="/game">{{ 'nav.game'|trans }}</a> |
+        <a href="{{ path('game_dashboard') }}">{{ 'nav.game'|trans }}</a> |
         {% if app.user %}
             <a href="{{ path('app_logout') }}">Logout</a>
         {% else %}

templates/game/dashboard.html.twig

@@ -0,0 +1,74 @@
+{% 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 %}

templates/website/home/index.html.twig

@@ -5,5 +5,5 @@
 {% block body %}
 <h1>{{ 'home.h1'|trans({'%site%': ('site.name'|trans)}) }}</h1>
 <p>{{ 'home.description'|trans }}</p>
-<p><a href="{{ path('game') }}">{{ 'link.enter_game'|trans }}</a></p>
+<p><a href="{{ path('game_dashboard') }}">{{ 'link.enter_game'|trans }}</a></p>
 {% endblock %}