Compare commits
1 Commits
Game1-layo
...
3737e8f581
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3737e8f581 |
@@ -60,15 +60,6 @@ document.addEventListener('DOMContentLoaded', async () => {
|
|||||||
|
|
||||||
// Look for config injected by Twig in the page
|
// Look for config injected by Twig in the page
|
||||||
const cfgEl = document.getElementById('mercure-config');
|
const cfgEl = document.getElementById('mercure-config');
|
||||||
|
|
||||||
// Prevent/warn on page reload
|
|
||||||
window.addEventListener('beforeunload', (event) => {
|
|
||||||
// Standard way to trigger the browser's confirmation dialog
|
|
||||||
event.preventDefault();
|
|
||||||
// Included for compatibility with older browsers
|
|
||||||
event.returnValue = '';
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!cfgEl) {
|
if (!cfgEl) {
|
||||||
console.warn('[Mercure][game1] #mercure-config element not found on page');
|
console.warn('[Mercure][game1] #mercure-config element not found on page');
|
||||||
return;
|
return;
|
||||||
@@ -78,6 +69,7 @@ document.addEventListener('DOMContentLoaded', async () => {
|
|||||||
const topic = cfgEl.dataset.topic;
|
const topic = cfgEl.dataset.topic;
|
||||||
const apiPingUrl = cfgEl.dataset.apiPingUrl;
|
const apiPingUrl = cfgEl.dataset.apiPingUrl;
|
||||||
const apiEchoUrl = cfgEl.dataset.apiEchoUrl;
|
const apiEchoUrl = cfgEl.dataset.apiEchoUrl;
|
||||||
|
const userId = cfgEl.dataset.userId;
|
||||||
|
|
||||||
if (mercurePublicUrl && topic) {
|
if (mercurePublicUrl && topic) {
|
||||||
subscribeToMercure(mercurePublicUrl, topic);
|
subscribeToMercure(mercurePublicUrl, topic);
|
||||||
@@ -97,7 +89,7 @@ document.addEventListener('DOMContentLoaded', async () => {
|
|||||||
if (apiEchoUrl) {
|
if (apiEchoUrl) {
|
||||||
const echo = await fetchJson(apiEchoUrl, {
|
const echo = await fetchJson(apiEchoUrl, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: { message: 'from game1.js', ts: new Date().toISOString() },
|
body: { message: 'from game1.js', ts: new Date().toISOString(), user: userId },
|
||||||
});
|
});
|
||||||
console.log('[API][game1] echo →', echo);
|
console.log('[API][game1] echo →', echo);
|
||||||
} else {
|
} else {
|
||||||
@@ -106,67 +98,4 @@ document.addEventListener('DOMContentLoaded', async () => {
|
|||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error('[API][game1] Request failed:', e);
|
console.error('[API][game1] Request failed:', e);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add messages to message-container
|
|
||||||
const messageContainer = document.getElementById('message-container');
|
|
||||||
if (messageContainer) {
|
|
||||||
let messages = [
|
|
||||||
['System initializing...', 500],
|
|
||||||
['Connection established.', 200],
|
|
||||||
['Welcome agent to the mainframe.', 1000],
|
|
||||||
['Scanning...', 3000],
|
|
||||||
['Virus detected.', 500],
|
|
||||||
['Starting Mainframe help modus...', 2000],
|
|
||||||
['Help modus activated.', 500],
|
|
||||||
['Blocking virus activated', 0]
|
|
||||||
];
|
|
||||||
|
|
||||||
let currentMessageIndex = 0;
|
|
||||||
|
|
||||||
const printNextMessage = () => {
|
|
||||||
if (currentMessageIndex < messages.length) {
|
|
||||||
const msg = messages[currentMessageIndex];
|
|
||||||
const msgEl = document.createElement('div');
|
|
||||||
msgEl.className = 'message';
|
|
||||||
msgEl.textContent = msg[0];
|
|
||||||
msgEl.style.color = '#F00';
|
|
||||||
msgEl.style.marginBottom = '10px';
|
|
||||||
messageContainer.appendChild(msgEl);
|
|
||||||
|
|
||||||
currentMessageIndex++;
|
|
||||||
setTimeout(printNextMessage, msg[1]);
|
|
||||||
} else {
|
|
||||||
// After it has printed a set of messages, it has to start a timer of 2 seconds
|
|
||||||
console.log('[Game1] All messages printed. Starting 2s timer to expand message-container height...');
|
|
||||||
setTimeout(() => {
|
|
||||||
messageContainer.style.height = '400vh';
|
|
||||||
const inputField = document.getElementById('input-message');
|
|
||||||
inputField.disabled = false;
|
|
||||||
|
|
||||||
// Add event listener for Enter key
|
|
||||||
inputField.addEventListener('keypress', async (e) => {
|
|
||||||
if (e.key === 'Enter') {
|
|
||||||
const message = inputField.value.trim();
|
|
||||||
if (message && apiEchoUrl) {
|
|
||||||
inputField.value = '';
|
|
||||||
try {
|
|
||||||
const response = await fetchJson(apiEchoUrl, {
|
|
||||||
method: 'POST',
|
|
||||||
body: { message, ts: new Date().toISOString() },
|
|
||||||
});
|
|
||||||
console.log('[API][game1] message sent →', response);
|
|
||||||
} catch (err) {
|
|
||||||
console.error('[API][game1] Failed to send message:', err);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log('[Game1] message-container height changed to 400vh and input enabled');
|
|
||||||
}, 2000);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
printNextMessage();
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,63 +1,17 @@
|
|||||||
/* Styles specific to Game1 */
|
/* Styles specific to Game1 */
|
||||||
|
|
||||||
/* page-level indicator to confirm CSS is loaded */
|
/* page-level indicator to confirm CSS is loaded */
|
||||||
/* Custom scrollbar for WebKit browsers */
|
body.game1-page {
|
||||||
html::-webkit-scrollbar,
|
/* subtle background tint so you can visually confirm on /game */
|
||||||
body::-webkit-scrollbar {
|
background-color: #f9fbff;
|
||||||
width: 1px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
html::-webkit-scrollbar-track,
|
/* example component style */
|
||||||
body::-webkit-scrollbar-track {
|
.game1-banner {
|
||||||
background: #000;
|
padding: 1rem 1.25rem;
|
||||||
}
|
border: 1px solid #cfe2ff;
|
||||||
|
background: #e9f2ff;
|
||||||
html::-webkit-scrollbar-thumb,
|
color: #0b5ed7;
|
||||||
body::-webkit-scrollbar-thumb {
|
border-radius: 8px;
|
||||||
background: #F00;
|
margin: 1rem 0;
|
||||||
}
|
|
||||||
|
|
||||||
/* Standard properties for Firefox */
|
|
||||||
body {
|
|
||||||
background-color: #000;
|
|
||||||
min-height: 100vh;
|
|
||||||
font-family: monospace;
|
|
||||||
margin: 0;
|
|
||||||
scrollbar-width: thin;
|
|
||||||
scrollbar-color: #F00 #000;
|
|
||||||
}
|
|
||||||
|
|
||||||
div#game-timer {
|
|
||||||
position: fixed;
|
|
||||||
top: 20px;
|
|
||||||
left: 20px;
|
|
||||||
color: #F00;
|
|
||||||
font-size: 28px;
|
|
||||||
z-index: 100;
|
|
||||||
}
|
|
||||||
|
|
||||||
div#message-container {
|
|
||||||
padding: 20px;
|
|
||||||
padding-top: 60px; /* Space for fixed timer */
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: flex-end;
|
|
||||||
min-height: calc(100vh - 100px); /* Fill most of the viewport initially */
|
|
||||||
box-sizing: border-box;
|
|
||||||
font-size: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
div#input {
|
|
||||||
padding: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
input#input-message {
|
|
||||||
width: 100%;
|
|
||||||
padding: 10px;
|
|
||||||
background: #000;
|
|
||||||
border: 1px solid #F00;
|
|
||||||
color: #F00;
|
|
||||||
font-size: 18px;
|
|
||||||
box-sizing: border-box;
|
|
||||||
font-family: monospace;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ services:
|
|||||||
php:
|
php:
|
||||||
build:
|
build:
|
||||||
context: ..
|
context: ..
|
||||||
dockerfile: docker/php/Dockerfile
|
dockerfile: php/Dockerfile
|
||||||
container_name: escapepage-php
|
container_name: escapepage-php
|
||||||
volumes:
|
volumes:
|
||||||
- ../:/var/www/html:delegated
|
- ../:/var/www/html:delegated
|
||||||
@@ -18,23 +18,6 @@ services:
|
|||||||
- backend
|
- backend
|
||||||
restart: unless-stopped
|
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:
|
nginx:
|
||||||
image: nginx:1.29.4-alpine
|
image: nginx:1.29.4-alpine
|
||||||
container_name: escapepage-nginx
|
container_name: escapepage-nginx
|
||||||
|
|||||||
@@ -1,20 +1,11 @@
|
|||||||
FROM php:8.3-fpm-alpine
|
FROM php:8.5.1-fpm-alpine3.23
|
||||||
|
|
||||||
# Install system deps
|
# Install system deps
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache bash git icu-dev libzip-dev oniguruma-dev
|
||||||
bash \
|
|
||||||
git \
|
|
||||||
icu-dev \
|
|
||||||
libzip-dev \
|
|
||||||
oniguruma-dev \
|
|
||||||
g++ \
|
|
||||||
make \
|
|
||||||
nodejs \
|
|
||||||
npm
|
|
||||||
|
|
||||||
# Install PHP extensions
|
# Install PHP extensions
|
||||||
RUN docker-php-ext-configure intl \
|
RUN docker-php-ext-configure intl \
|
||||||
&& docker-php-ext-install -j$(nproc) intl pdo pdo_mysql opcache zip
|
&& docker-php-ext-install -j$(nproc) intl pdo pdo_mysql opcache
|
||||||
|
|
||||||
# Install composer
|
# Install composer
|
||||||
ENV COMPOSER_ALLOW_SUPERUSER=1 \
|
ENV COMPOSER_ALLOW_SUPERUSER=1 \
|
||||||
@@ -22,7 +13,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1 \
|
|||||||
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
|
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
|
||||||
|
|
||||||
# Configure PHP
|
# Configure PHP
|
||||||
COPY docker/php/php.ini $PHP_INI_DIR/conf.d/zz-custom.ini
|
COPY php.ini $PHP_INI_DIR/conf.d/zz-custom.ini
|
||||||
|
|
||||||
WORKDIR /var/www/html
|
WORKDIR /var/www/html
|
||||||
|
|
||||||
|
|||||||
@@ -66,15 +66,12 @@ dc up "${BUILD_ARGS[@]}"
|
|||||||
# Helper to run commands in php container
|
# Helper to run commands in php container
|
||||||
pexec() { dc exec -T php "$@"; }
|
pexec() { dc exec -T php "$@"; }
|
||||||
|
|
||||||
# Wait for database to be healthy (mariadb/mysql)
|
# Wait for database to be healthy (mariadb)
|
||||||
printf "Waiting for database to be healthy..."
|
printf "Waiting for database to be healthy..."
|
||||||
# Use docker inspect health status
|
# Use docker inspect health status
|
||||||
DB_HEALTH=""
|
DB_HEALTH=""
|
||||||
for i in {1..60}; do
|
for i in {1..60}; do
|
||||||
DB_ID=$(dc ps -q database 2>/dev/null || true)
|
DB_HEALTH=$(docker inspect -f '{{.State.Health.Status}}' "$(docker ps --filter name=_database_ --format '{{.ID}}' | head -n1)" 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
|
if [ "$DB_HEALTH" = "healthy" ]; then
|
||||||
echo " OK"
|
echo " OK"
|
||||||
break
|
break
|
||||||
@@ -82,7 +79,7 @@ for i in {1..60}; do
|
|||||||
printf "."
|
printf "."
|
||||||
sleep 2
|
sleep 2
|
||||||
if [ "$i" -eq 60 ]; then
|
if [ "$i" -eq 60 ]; then
|
||||||
echo -e "\nWarning: database health check not healthy yet, continuing anyway."
|
echo "\nWarning: database health check not healthy yet, continuing anyway."
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
@@ -103,23 +100,11 @@ if grep -q '^APP_SECRET=$' "$ROOT_DIR/.env" 2>/dev/null; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Prepare DB
|
# Prepare DB
|
||||||
echo "Creating database if it doesn't exist..."
|
pexec php bin/console doctrine:database:create --if-not-exists || true
|
||||||
pexec php bin/console doctrine:database:create --if-not-exists
|
pexec php bin/console doctrine:migrations:migrate -n || true
|
||||||
echo "Running migrations..."
|
|
||||||
pexec php bin/console doctrine:migrations:migrate -n
|
|
||||||
|
|
||||||
# Import JS deps (Importmap/Asset Mapper)
|
# Import JS deps (Importmap/Asset Mapper)
|
||||||
if [ -f "$ROOT_DIR/importmap.php" ]; then
|
pexec php bin/console importmap:install || true
|
||||||
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
|
APP_URL=http://localhost:8080
|
||||||
MAILPIT_URL=http://localhost:8025
|
MAILPIT_URL=http://localhost:8025
|
||||||
@@ -132,12 +117,10 @@ Open the app: $APP_URL
|
|||||||
Mailpit (dev): $MAILPIT_URL
|
Mailpit (dev): $MAILPIT_URL
|
||||||
|
|
||||||
Common commands:
|
Common commands:
|
||||||
(cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f nginx)
|
(cd docker && $DOCKER_COMPOSE logs -f nginx)
|
||||||
(cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f php)
|
(cd docker && $DOCKER_COMPOSE logs -f php)
|
||||||
(cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f php-worker)
|
(cd docker && $DOCKER_COMPOSE exec php bash)
|
||||||
(cd "$DOCKER_DIR" && $DOCKER_COMPOSE exec php bash)
|
(cd docker && $DOCKER_COMPOSE down)
|
||||||
(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.
|
You can re-run this script any time. Use --no-build to skip rebuilding images.
|
||||||
EOT
|
EOT
|
||||||
|
|||||||
@@ -3,17 +3,72 @@ 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')]
|
#[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]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,4 +10,5 @@ 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';
|
||||||
}
|
}
|
||||||
|
|||||||
48
src/Game/Security/Voter/SessionVoter.php
Normal file
48
src/Game/Security/Voter/SessionVoter.php
Normal file
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
116
src/Game/Service/GameDashboardService.php
Normal file
116
src/Game/Service/GameDashboardService.php
Normal file
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -31,6 +31,8 @@ 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="/game">{{ 'nav.game'|trans }}</a> |
|
<a href="{{ path('game_dashboard') }}">{{ '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 %}
|
||||||
|
|||||||
74
templates/game/dashboard.html.twig
Normal file
74
templates/game/dashboard.html.twig
Normal file
@@ -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 %}
|
||||||
@@ -1,41 +1,33 @@
|
|||||||
<!DOCTYPE html>
|
{% extends 'base.html.twig' %}
|
||||||
<html lang="{{ app.request.locale|default(app.request.defaultLocale|default('en')) }}">
|
|
||||||
<head>
|
{% block title %}{{ 'game.title'|trans({'%site%': ('site.name'|trans)}) }}{% endblock %}
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>{{ 'game.title'|trans({'%site%': ('site.name'|trans)}) }}</title>
|
|
||||||
|
|
||||||
{# Include Game1-specific CSS in addition to the base app assets #}
|
{# Include Game1-specific CSS in addition to the base app assets #}
|
||||||
{% block stylesheets %}
|
{% block stylesheets %}
|
||||||
{{ encore_entry_link_tags('app') }}
|
{{ parent() }}
|
||||||
{{ encore_entry_link_tags('game1') }}
|
{{ encore_entry_link_tags('game1') }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
</head>
|
|
||||||
<body>
|
{% block body %}
|
||||||
<div id="game-container">
|
<h1>{{ 'game.h1'|trans }}</h1>
|
||||||
<div id="mercure-config"
|
<p>{{ 'game.description'|trans }}</p>
|
||||||
|
<div class="game1-banner">Game 1 assets are active. Enjoy the challenge!</div>
|
||||||
|
|
||||||
|
{# Hidden config element read by assets/game1.js #}
|
||||||
|
<div id="mercure-config"
|
||||||
data-mercure-public-url="{{ mercure_public_url|e('html_attr') }}"
|
data-mercure-public-url="{{ mercure_public_url|e('html_attr') }}"
|
||||||
data-topic="{{ (mercure_topic_base ~ '/game/hub')|e('html_attr') }}"
|
data-topic="{{ (mercure_topic_base ~ '/game/hub')|e('html_attr') }}"
|
||||||
data-api-ping-url="{{ path('game_api_ping')|e('html_attr') }}"
|
data-api-ping-url="{{ path('game_api_ping')|e('html_attr') }}"
|
||||||
data-api-echo-url="{{ path('game_api_message')|e('html_attr') }}"
|
data-api-echo-url="{{ path('game_api_message')|e('html_attr') }}"
|
||||||
data-user-id="{{ user_id|e('html_attr') }}"
|
data-session-id="{{ session.id }}"
|
||||||
style="display:none">
|
style="display:none">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="game-timer">
|
<p><a href="{{ path('website_home') }}">{{ 'link.back_to_website'|trans }}</a></p>
|
||||||
00:30:00
|
{% endblock %}
|
||||||
</div>
|
|
||||||
<div id="message-container">
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<div id="input">
|
|
||||||
<input type="text" disabled id="input-message">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
{# Include Game1-specific JS in addition to the base app assets #}
|
{# Include Game1-specific JS in addition to the base app assets #}
|
||||||
{% block javascripts %}
|
{% block javascripts %}
|
||||||
{{ encore_entry_script_tags('app') }}
|
{{ parent() }}
|
||||||
{{ encore_entry_script_tags('game1') }}
|
{{ encore_entry_script_tags('game1') }}
|
||||||
{% endblock %}
|
{% 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') }}">{{ 'link.enter_game'|trans }}</a></p>
|
<p><a href="{{ path('game_dashboard') }}">{{ 'link.enter_game'|trans }}</a></p>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
Reference in New Issue
Block a user