Compare commits
111
Commits
Rechten
...
8554f04735
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8554f04735 | ||
|
|
839113c356 | ||
|
|
7dbb738da8 | ||
|
|
ec34a1ddb9 | ||
|
|
703d2af3d8 | ||
|
|
5b03bd1d1c | ||
|
|
05f4f2c32f | ||
|
|
ddd2726687 | ||
|
|
3721abcc5d | ||
|
|
e76d0b0f07 | ||
|
|
b7693bd9d0 | ||
|
|
b4f6a531c9 | ||
|
|
c4e5139ec4 | ||
|
|
238705495e | ||
|
|
4a5d83ef53 | ||
|
|
0e12e7fa8f | ||
|
|
3924b42ce0 | ||
|
|
58c9c60ad2 | ||
|
|
b11c50c237 | ||
|
|
2316266b80 | ||
|
|
2a45ebb953 | ||
|
|
a1ff6df721 | ||
|
|
487019d360 | ||
|
|
c045922c5b | ||
|
|
aa56617e50 | ||
|
|
831603e04e | ||
|
|
ac57385a9d | ||
|
|
0d8335dd2c | ||
|
|
6c40288fd8 | ||
|
|
994bbafba2 | ||
|
|
a05adfd316 | ||
|
|
9205db6611 | ||
|
|
3b1d3a5aad | ||
|
|
8b3bf68954 | ||
|
|
74dadf102d | ||
|
|
74d5cd15b6 | ||
|
|
4e696af231 | ||
|
|
539a243353 | ||
|
|
eb3d36c99f | ||
|
|
8564257761 | ||
|
|
be01de83ed | ||
|
|
700160e198 | ||
|
|
96c2e4ca61 | ||
|
|
e5f959210a | ||
|
|
e14cf8457b | ||
|
|
2c970fa9e7 | ||
|
|
714496fa77 | ||
|
|
2b7e667bb3 | ||
|
|
b8c1fecea2 | ||
|
|
4f40c96ce5 | ||
|
|
4545572b65 | ||
|
|
1c27c093c7 | ||
|
|
6d8d30e91a | ||
|
|
5c8a5f0bf5 | ||
|
|
6b5c205a27 | ||
|
|
70f5aa785e | ||
|
|
6c96d45a04 | ||
|
|
8d4e08e4bc | ||
|
|
6fba1cbcf3 | ||
|
|
1512a3dde9 | ||
|
|
5f4e2acd27 | ||
|
|
203dfaa13b | ||
|
|
799858d52c | ||
|
|
ce79b77244 | ||
|
|
5f17c9b89f | ||
|
|
5335e62cfd | ||
|
|
04b1ff6243 | ||
|
|
84b7b1c64a | ||
|
|
b0af41c5d2 | ||
|
|
a94b8cbef3 | ||
|
|
3f33ec6fef | ||
|
|
ab80d4de83 | ||
|
|
b2817c5d8c | ||
|
|
c59d131b80 | ||
|
|
e8a6c9cc7a | ||
|
|
e84f2c274e | ||
|
|
d9bc8c352f | ||
|
|
ece3b05a9c | ||
|
|
4cf614a98c | ||
|
|
24f51bf38d | ||
|
|
0acf60760f | ||
|
|
342858fa0e | ||
|
|
3c9bd13cc2 | ||
|
|
eeda97cef8 | ||
|
|
5a6616484f | ||
|
|
f0bcc9fe06 | ||
|
|
550cc1b2ed | ||
|
|
b1910a63c3 | ||
|
|
60d52d7b5e | ||
|
|
0c7bbc2670 | ||
|
|
3e73cba942 | ||
|
|
6027dcb56c | ||
|
|
81b91e052c | ||
|
|
a5a895b67f | ||
|
|
28c663749c | ||
|
|
b063e17863 | ||
|
|
2008a379a8 | ||
|
|
c0fc0b8e6e | ||
|
|
928ab3cbfe | ||
|
|
4d021e7cf1 | ||
|
|
834f12c40f | ||
|
|
30aa73bf53 | ||
|
|
9d9de0fd0d | ||
|
|
979623b35e | ||
|
|
2984a6acb2 | ||
|
|
cdb469456f | ||
|
|
0ac2618f7d | ||
|
|
b6c09c267f | ||
|
|
229d55390d | ||
|
|
5eff66c24d | ||
|
|
7c86c919c7 |
@@ -0,0 +1,25 @@
|
||||
# Git
|
||||
.git
|
||||
.gitignore
|
||||
|
||||
|
||||
# Symfony
|
||||
var/cache/*
|
||||
var/log/*
|
||||
var/sessions/*
|
||||
!var/cache/.gitkeep
|
||||
!var/log/.gitkeep
|
||||
!var/sessions/.gitkeep
|
||||
|
||||
# Node
|
||||
node_modules
|
||||
npm-debug.log
|
||||
|
||||
# Other
|
||||
.env.local
|
||||
.env.local.php
|
||||
.env.dev.local
|
||||
.env.test.local
|
||||
.env.prod.local
|
||||
vendor
|
||||
public/build
|
||||
@@ -0,0 +1,88 @@
|
||||
# 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
|
||||
#
|
||||
# Copy this file to .env (and .env.dev / .env.prod / .env.test as needed) and
|
||||
# fill in real values. Those files are gitignored and never committed.
|
||||
#
|
||||
# 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=prod
|
||||
APP_SECRET=CHANGEME_APP_SECRET
|
||||
TRUSTED_PROXIES=127.0.0.1,172.20.0.1,172.20.0.0/16
|
||||
TRUSTED_HOSTS=^.*$
|
||||
###< symfony/framework-bundle ###
|
||||
|
||||
SITE_BASE_URL=https://escapepage.com
|
||||
|
||||
###> 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"
|
||||
DB_DRIVER=pdo_mysql
|
||||
DB_SERVER_VERSION=8.0.32
|
||||
DB_CHARSET=utf8mb4
|
||||
DB_USER=escapepage
|
||||
DB_PASSWORD=CHANGEME_DB_PASSWORD
|
||||
DB_HOST=database
|
||||
DB_PORT=3306
|
||||
DB_NAME=escapepage
|
||||
MYSQL_ROOT_PASSWORD=CHANGEME_MYSQL_ROOT_PASSWORD
|
||||
DATABASE_URL="${DB_DRIVER}://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?serverVersion=${DB_SERVER_VERSION}&charset=${DB_CHARSET}"
|
||||
###< 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)
|
||||
MAILGUN_API_KEY=REPLACE_WITH_MAILGUN_API_KEY
|
||||
MAILGUN_DOMAIN=REPLACE_WITH_MAILGUN_SENDING_DOMAIN
|
||||
MAILER_DSN=mailgun+api://${MAILGUN_API_KEY}:${MAILGUN_DOMAIN}@default?region=eu
|
||||
MAILER_FROM=mailer@escapepage.nl
|
||||
# Optional default sender (used by test command if --from not passed):
|
||||
###< symfony/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=https://mercure.escapepage.com/.well-known/mercure
|
||||
# Shared secret for signing JWTs (dev only). In prod, set via real env/secrets.
|
||||
MERCURE_JWT_SECRET=!ChangeThisMercureJWTSignedBySymfonySecretKey!
|
||||
# Pre-generated JWT tokens for convenience (signed with the dev secret above)
|
||||
MERCURE_PUBLISHER_JWT_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJtZXJjdXJlIjp7InB1Ymxpc2giOlsiKiJdfX0.E5b7ma4k-kA7lVGOQtICh7r2sspwX4G1iOhwtbxHQck
|
||||
MERCURE_SUBSCRIBER_JWT_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJtZXJjdXJlIjp7InN1YnNjcmliZSI6WyIqIl19fQ.mwSAjvbm6vOnjMoRSHMdcqapNCwyGZs1s57uLK4T3UM
|
||||
# CORS allowed origins (default)
|
||||
MERCURE_CORS_ALLOWED_ORIGINS="https://www.escapepage.com https://escapepage.com"
|
||||
# Base URL for Mercure topics.
|
||||
MERCURE_TOPIC_BASE=https://escapepage.com
|
||||
###< mercure ###
|
||||
|
||||
###> docker ###
|
||||
USER_ID=1000
|
||||
GROUP_ID=1000
|
||||
###< docker ###
|
||||
|
||||
###> karser/karser-recaptcha3-bundle ###
|
||||
# Get your API key and secret from https://g.co/recaptcha/v3
|
||||
RECAPTCHA3_KEY=CHANGEME_RECAPTCHA3_KEY
|
||||
RECAPTCHA3_SECRET=CHANGEME_RECAPTCHA3_SECRET
|
||||
###< karser/karser-recaptcha3-bundle ###
|
||||
+11
@@ -1,11 +1,18 @@
|
||||
|
||||
###> symfony/framework-bundle ###
|
||||
/.env
|
||||
/.env.dev
|
||||
/.env.prod
|
||||
/.env.test
|
||||
/.env.local
|
||||
/.env.local.php
|
||||
/.env.*.local
|
||||
/config/secrets/prod/prod.decrypt.private.php
|
||||
/public/bundles/
|
||||
/var/
|
||||
!/var/volumes/
|
||||
/var/volumes/*
|
||||
!/var/volumes/.gitignore
|
||||
/vendor/
|
||||
###< symfony/framework-bundle ###
|
||||
|
||||
@@ -27,3 +34,7 @@ yarn-error.log
|
||||
###< symfony/webpack-encore-bundle ###
|
||||
|
||||
/.idea
|
||||
|
||||
###> docker env ###
|
||||
/docker/.env
|
||||
###< docker env ###
|
||||
|
||||
Generated
+1
@@ -140,6 +140,7 @@
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/webpack-encore-bundle" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfonycasts/reset-password-bundle" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfonycasts/verify-email-bundle" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/karser/karser-recaptcha3-bundle" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
|
||||
Generated
+2
-1
@@ -153,6 +153,7 @@
|
||||
<path value="$PROJECT_DIR$/vendor/lcobucci/jwt" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfonycasts/verify-email-bundle" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfonycasts/reset-password-bundle" />
|
||||
<path value="$PROJECT_DIR$/vendor/karser/karser-recaptcha3-bundle" />
|
||||
</include_path>
|
||||
</component>
|
||||
<component name="PhpProjectSharedConfiguration" php_language_level="8.2" />
|
||||
@@ -177,4 +178,4 @@
|
||||
<component name="PsalmOptionsConfiguration">
|
||||
<option name="transferred" value="true" />
|
||||
</component>
|
||||
</project>
|
||||
</project>
|
||||
@@ -16,7 +16,7 @@ This repository contains a Symfony 7.3 (PHP >= 8.5.1) application for a collabor
|
||||
6. Run tests: `vendor/bin/phpunit`
|
||||
|
||||
- With Docker:
|
||||
1. From `docker/`: `docker compose up -d`
|
||||
1. `cd docker && docker compose up -d`
|
||||
2. Install vendors inside the PHP container:
|
||||
- `docker compose exec php bash`
|
||||
- `composer install`
|
||||
@@ -25,23 +25,25 @@ This repository contains a Symfony 7.3 (PHP >= 8.5.1) application for a collabor
|
||||
- `php bin/console doctrine:migrations:migrate -n`
|
||||
4. App is at http://localhost:8080
|
||||
|
||||
## Email (Mailpit in dev, SendGrid for prod)
|
||||
## Email (Mailpit in dev, Mailgun for prod)
|
||||
- Dev: a `mailer` service (Mailpit) runs in Docker.
|
||||
- SMTP DSN in `.env`: `MAILER_DSN=smtp://mailer:1025`
|
||||
- Mailpit UI: http://localhost:8025
|
||||
- Mailpit UI: http://localhost:8025 (or mapped port 8025)
|
||||
- Send a test mail: `php bin/console app:mail:test you@example.com`
|
||||
- Staging/Prod: use SendGrid.
|
||||
- Require package (already in composer): `symfony/sendgrid-mailer`.
|
||||
- Staging/Prod: use Mailgun.
|
||||
- Require package (already in composer): `symfony/mailgun-mailer`.
|
||||
- Set environment variables (do NOT commit secrets):
|
||||
- `MAILER_DSN=sendgrid+api://%env(SENDGRID_API_KEY)%`
|
||||
- `SENDGRID_API_KEY=YOUR_REAL_KEY`
|
||||
- `MAILER_DSN=mailgun+api://${MAILGUN_API_KEY}:${MAILGUN_DOMAIN}@default?region=eu`
|
||||
- `MAILGUN_API_KEY=YOUR_REAL_KEY`
|
||||
- `MAILGUN_DOMAIN=YOUR_SENDING_DOMAIN` (e.g. `mg.escapepage.nl`)
|
||||
- Optional: `MAILER_FROM=no-reply@your-domain.tld`
|
||||
- Drop `region=eu` (or use `region=us`) depending on which region your Mailgun domain was created in.
|
||||
- Alternatively via SMTP (no extra package):
|
||||
- `MAILER_DSN="smtp://apikey:%env(SENDGRID_API_KEY)%@smtp.sendgrid.net:587?encryption=tls"`
|
||||
- `MAILER_DSN="mailgun+smtp://USERNAME:PASSWORD@default?region=eu"`
|
||||
|
||||
Troubleshooting:
|
||||
- If emails don’t appear in dev, open Mailpit at http://localhost:8025 and verify messages.
|
||||
- In prod, check logs for HTTP 2xx responses from SendGrid and verify sender domain is verified in SendGrid.
|
||||
- In prod, check logs for HTTP 2xx responses from Mailgun and verify sender domain is verified (SPF/DKIM) in Mailgun.
|
||||
|
||||
## Frontend assets with Webpack Encore
|
||||
We use Webpack Encore to build and minify JS/CSS from the `assets/` directory into `public/build/`.
|
||||
@@ -81,9 +83,9 @@ See doc/CONTRIBUTING.md for code style and more details.
|
||||
We use a Mercure hub (Docker service) to push server updates to browsers via Server‑Sent Events (SSE).
|
||||
|
||||
Quick start (dev):
|
||||
1. Start Docker stack from `docker/`:
|
||||
1. Start Docker stack:
|
||||
```
|
||||
docker compose up -d
|
||||
cd docker && docker compose up -d
|
||||
```
|
||||
This starts `mercure` at http://localhost:8090 and the app at http://localhost:8080.
|
||||
2. Install PHP deps inside the PHP container if you haven't yet:
|
||||
@@ -91,12 +93,6 @@ Quick start (dev):
|
||||
docker compose exec php bash
|
||||
composer install
|
||||
```
|
||||
3. Open the Game Hub page in your browser: http://localhost:8080/game
|
||||
- The page subscribes to a demo topic and logs messages in the console.
|
||||
4. Publish a test update (in the PHP container):
|
||||
```
|
||||
php bin/console app:mercure:publish
|
||||
```
|
||||
You should see a console log like `[Mercure] Update received: { ... }` on the Game Hub page.
|
||||
|
||||
Configuration:
|
||||
|
||||
+4
-3
@@ -1,6 +1,7 @@
|
||||
/*
|
||||
* Welcome to your app's main JavaScript file!
|
||||
*/
|
||||
import './styles/app.css';
|
||||
|
||||
console.log('This log comes from assets/app.js built by Webpack Encore! 🎉');
|
||||
import './styles/app.scss';
|
||||
import 'bootstrap/js/dist/collapse';
|
||||
import 'bootstrap/js/dist/alert';
|
||||
import 'bootstrap/js/dist/dropdown';
|
||||
|
||||
+77
-2
@@ -4,7 +4,7 @@ import './styles/game1.css';
|
||||
let sequenceFinished = false;
|
||||
let stillPlayingSound = true;
|
||||
|
||||
function subscribeToMercure(mercurePublicUrl, topic) {
|
||||
function subscribeToMercure(mercurePublicUrl, topic, myScreen) {
|
||||
try {
|
||||
const url = mercurePublicUrl + '?topic=' + encodeURIComponent(topic);
|
||||
const es = new EventSource(url);
|
||||
@@ -16,6 +16,13 @@ function subscribeToMercure(mercurePublicUrl, topic) {
|
||||
|
||||
// data is [sendTo, message]
|
||||
if (Array.isArray(data) && data.length >= 2) {
|
||||
const sendTo = parseInt(data[0]);
|
||||
// Filter: 0 means everyone, otherwise must match myScreen
|
||||
if (sendTo !== 0 && sendTo !== parseInt(myScreen)) {
|
||||
console.log('[Mercure][game1] Message not for this player, skipping.');
|
||||
return;
|
||||
}
|
||||
|
||||
const messageContainer = document.getElementById('message-container');
|
||||
if (messageContainer) {
|
||||
const msgEl = document.createElement('div');
|
||||
@@ -24,6 +31,7 @@ function subscribeToMercure(mercurePublicUrl, topic) {
|
||||
msgEl.style.color = '#0F0'; // Green for incoming messages
|
||||
msgEl.style.marginBottom = '10px';
|
||||
messageContainer.appendChild(msgEl);
|
||||
window.scrollTo(0, document.body.scrollHeight);
|
||||
if(stillPlayingSound)
|
||||
playSound();
|
||||
console.log('[Mercure][game1] sequenceFinished status:', sequenceFinished);
|
||||
@@ -120,15 +128,64 @@ document.addEventListener('DOMContentLoaded', async () => {
|
||||
|
||||
const mercurePublicUrl = cfgEl.dataset.mercurePublicUrl;
|
||||
const topic = cfgEl.dataset.topic;
|
||||
const screen = cfgEl.dataset.screen;
|
||||
const apiPingUrl = cfgEl.dataset.apiPingUrl;
|
||||
const apiEchoUrl = cfgEl.dataset.apiEchoUrl;
|
||||
const apiCheckFinishedUrl = cfgEl.dataset.apiCheckFinishedUrl;
|
||||
const lostUrl = cfgEl.dataset.lostUrl;
|
||||
|
||||
if (mercurePublicUrl && topic) {
|
||||
subscribeToMercure(mercurePublicUrl, topic);
|
||||
subscribeToMercure(mercurePublicUrl, topic, screen);
|
||||
} else {
|
||||
console.warn('[Mercure][game1] Missing data attributes on #mercure-config');
|
||||
}
|
||||
|
||||
// Timer logic
|
||||
const timerEl = document.getElementById('game-timer');
|
||||
if (timerEl && timerEl.dataset.endTime) {
|
||||
const endTime = parseInt(timerEl.dataset.endTime) * 1000;
|
||||
|
||||
const updateTimer = async () => {
|
||||
const now = Date.now();
|
||||
const diff = endTime - now;
|
||||
|
||||
if (diff <= 0) {
|
||||
timerEl.textContent = '00:00:00';
|
||||
|
||||
// Timer reached zero, check with server
|
||||
if (apiCheckFinishedUrl && lostUrl) {
|
||||
try {
|
||||
const response = await fetchJson(apiCheckFinishedUrl, { method: 'POST' });
|
||||
if (response && response.finished) {
|
||||
window.location.href = lostUrl;
|
||||
return; // Stop the timer loop
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('[API][game1] Failed to check finished status:', e);
|
||||
}
|
||||
}
|
||||
|
||||
// Even if check failed or not finished, stop the loop if diff <= 0
|
||||
// (though technically if the server says not finished, we might want to keep checking,
|
||||
// but 00:00:00 usually means it's over).
|
||||
return;
|
||||
}
|
||||
|
||||
const hours = Math.floor(diff / (1000 * 60 * 60));
|
||||
const minutes = Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60));
|
||||
const seconds = Math.floor((diff % (1000 * 60)) / 1000);
|
||||
|
||||
const hDisplay = hours.toString().padStart(2, '0');
|
||||
const mDisplay = minutes.toString().padStart(2, '0');
|
||||
const sDisplay = seconds.toString().padStart(2, '0');
|
||||
|
||||
timerEl.textContent = `${hDisplay}:${mDisplay}:${sDisplay}`;
|
||||
setTimeout(updateTimer, 1000);
|
||||
};
|
||||
|
||||
updateTimer();
|
||||
}
|
||||
|
||||
// Demo API calls
|
||||
try {
|
||||
if (apiPingUrl) {
|
||||
@@ -181,6 +238,7 @@ document.addEventListener('DOMContentLoaded', async () => {
|
||||
msgEl.textContent = msg[0];
|
||||
msgEl.style.marginBottom = '10px';
|
||||
messageContainer.appendChild(msgEl);
|
||||
window.scrollTo(0, document.body.scrollHeight);
|
||||
|
||||
playSound();
|
||||
|
||||
@@ -203,6 +261,13 @@ document.addEventListener('DOMContentLoaded', async () => {
|
||||
stillPlayingSound = false;
|
||||
sequenceFinished = false;
|
||||
const message = inputField.value.trim();
|
||||
|
||||
const msgEl = document.createElement('div');
|
||||
msgEl.className = 'message';
|
||||
msgEl.textContent = message;
|
||||
msgEl.style.marginBottom = '10px';
|
||||
messageContainer.appendChild(msgEl);
|
||||
|
||||
if (message && apiEchoUrl) {
|
||||
inputField.value = '';
|
||||
try {
|
||||
@@ -211,6 +276,16 @@ document.addEventListener('DOMContentLoaded', async () => {
|
||||
body: { message, ts: new Date().toISOString() },
|
||||
});
|
||||
console.log('[API][game1] message sent →', response);
|
||||
if (response && response.result && Array.isArray(response.result.result)) {
|
||||
response.result.result.forEach(text => {
|
||||
const msgEl = document.createElement('div');
|
||||
msgEl.className = 'message';
|
||||
msgEl.textContent = text;
|
||||
msgEl.style.marginBottom = '10px';
|
||||
messageContainer.appendChild(msgEl);
|
||||
});
|
||||
window.scrollTo(0, document.body.scrollHeight);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('[API][game1] Failed to send message:', err);
|
||||
}
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
body {
|
||||
background-color: skyblue;
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
// Brand palette derived from public/images/logo.png (teal key/globe on dark navy)
|
||||
$brand-teal: #2f8fae;
|
||||
$brand-teal-dark: #1c5a70;
|
||||
$brand-teal-light:#6fb8d1;
|
||||
$brand-navy: #0d1f26;
|
||||
$brand-navy-soft: #16323f;
|
||||
$brand-bg: #f4f8f9;
|
||||
|
||||
// Bootstrap variable overrides (must come before the bootstrap import)
|
||||
$primary: $brand-teal;
|
||||
$secondary: $brand-navy-soft;
|
||||
$dark: $brand-navy;
|
||||
$body-bg: $brand-bg;
|
||||
$body-color: $brand-navy-soft;
|
||||
$link-color: $brand-teal;
|
||||
$link-hover-color: $brand-teal-dark;
|
||||
$border-radius: .5rem;
|
||||
|
||||
@import "bootstrap/scss/bootstrap";
|
||||
@import "bootstrap-icons/font/bootstrap-icons.css";
|
||||
|
||||
:root {
|
||||
--brand-teal: #{$brand-teal};
|
||||
--brand-teal-dark: #{$brand-teal-dark};
|
||||
--brand-navy: #{$brand-navy};
|
||||
--brand-navy-soft: #{$brand-navy-soft};
|
||||
--brand-bg: #{$brand-bg};
|
||||
}
|
||||
|
||||
body {
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.site-main {
|
||||
flex: 1 0 auto;
|
||||
}
|
||||
|
||||
.site-header {
|
||||
background: linear-gradient(90deg, $brand-navy, $brand-navy-soft);
|
||||
}
|
||||
|
||||
.site-header .navbar-brand {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: .5rem;
|
||||
font-weight: 700;
|
||||
letter-spacing: .02em;
|
||||
}
|
||||
|
||||
.site-header .navbar-brand img {
|
||||
height: 36px;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.site-footer {
|
||||
flex-shrink: 0;
|
||||
background: $brand-navy;
|
||||
color: rgba(255, 255, 255, .65);
|
||||
}
|
||||
|
||||
.auth-card {
|
||||
max-width: 440px;
|
||||
margin: 3rem auto;
|
||||
}
|
||||
@@ -29,8 +29,11 @@ body {
|
||||
|
||||
div#game-timer {
|
||||
position: fixed;
|
||||
top: 20px;
|
||||
left: 20px;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
padding: 20px;
|
||||
background-color: #000;
|
||||
color: #F00;
|
||||
font-size: 28px;
|
||||
z-index: 100;
|
||||
@@ -38,7 +41,7 @@ div#game-timer {
|
||||
|
||||
div#message-container {
|
||||
padding: 20px;
|
||||
padding-top: 60px; /* Space for fixed timer */
|
||||
padding-top: 80px; /* Space for fixed timer */
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: flex-end;
|
||||
@@ -49,6 +52,7 @@ div#message-container {
|
||||
|
||||
div.message {
|
||||
color: #C0C0C0;
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
|
||||
div#input {
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
|
||||
services:
|
||||
###> symfony/mercure-bundle ###
|
||||
mercure:
|
||||
ports:
|
||||
- "80"
|
||||
###< symfony/mercure-bundle ###
|
||||
@@ -1,31 +0,0 @@
|
||||
|
||||
services:
|
||||
###> symfony/mercure-bundle ###
|
||||
mercure:
|
||||
image: dunglas/mercure
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
# Uncomment the following line to disable HTTPS,
|
||||
#SERVER_NAME: ':80'
|
||||
MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
|
||||
MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
|
||||
# Set the URL of your Symfony project (without trailing slash!) as value of the cors_origins directive
|
||||
MERCURE_EXTRA_DIRECTIVES: |
|
||||
cors_origins http://127.0.0.1:8000
|
||||
# Comment the following line to disable the development mode
|
||||
command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "https://localhost/healthz"]
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 60s
|
||||
volumes:
|
||||
- mercure_data:/data
|
||||
- mercure_config:/config
|
||||
###< symfony/mercure-bundle ###
|
||||
|
||||
volumes:
|
||||
###> symfony/mercure-bundle ###
|
||||
mercure_data:
|
||||
mercure_config:
|
||||
###< symfony/mercure-bundle ###
|
||||
+50
-49
@@ -7,48 +7,49 @@
|
||||
"php": ">=8.2",
|
||||
"ext-ctype": "*",
|
||||
"ext-iconv": "*",
|
||||
"doctrine/dbal": "^3",
|
||||
"doctrine/doctrine-bundle": "^2.16",
|
||||
"doctrine/doctrine-migrations-bundle": "^3.4",
|
||||
"doctrine/orm": "^3.5",
|
||||
"phpdocumentor/reflection-docblock": "^5.6",
|
||||
"phpstan/phpdoc-parser": "^2.3",
|
||||
"symfony/asset": "7.3.*",
|
||||
"symfony/asset-mapper": "7.3.*",
|
||||
"symfony/console": "7.3.*",
|
||||
"symfony/doctrine-messenger": "7.3.*",
|
||||
"symfony/dotenv": "7.3.*",
|
||||
"symfony/expression-language": "7.3.*",
|
||||
"symfony/flex": "^2",
|
||||
"symfony/form": "7.3.*",
|
||||
"symfony/framework-bundle": "7.3.*",
|
||||
"symfony/http-client": "7.3.*",
|
||||
"symfony/intl": "7.3.*",
|
||||
"symfony/mailer": "7.3.*",
|
||||
"symfony/mercure-bundle": "^0.3",
|
||||
"symfony/mime": "7.3.*",
|
||||
"symfony/monolog-bundle": "^3.0",
|
||||
"symfony/notifier": "7.3.*",
|
||||
"symfony/process": "7.3.*",
|
||||
"symfony/property-access": "7.3.*",
|
||||
"symfony/property-info": "7.3.*",
|
||||
"symfony/runtime": "7.3.*",
|
||||
"symfony/security-bundle": "7.3.*",
|
||||
"symfony/sendgrid-mailer": "7.3.*",
|
||||
"symfony/serializer": "7.3.*",
|
||||
"symfony/stimulus-bundle": "^2.30",
|
||||
"symfony/string": "7.3.*",
|
||||
"symfony/translation": "7.3.*",
|
||||
"symfony/twig-bundle": "7.3.*",
|
||||
"symfony/ux-turbo": "^2.30",
|
||||
"symfony/validator": "7.3.*",
|
||||
"symfony/web-link": "7.3.*",
|
||||
"symfony/webpack-encore-bundle": "^2.1",
|
||||
"symfony/yaml": "7.3.*",
|
||||
"symfonycasts/reset-password-bundle": "^1.24",
|
||||
"doctrine/dbal": "^3.10.5",
|
||||
"doctrine/doctrine-bundle": "^2.18.3",
|
||||
"doctrine/doctrine-migrations-bundle": "^3.7",
|
||||
"doctrine/orm": "^3.6.7",
|
||||
"karser/karser-recaptcha3-bundle": "^0.3.0",
|
||||
"phpdocumentor/reflection-docblock": "^5.6.7",
|
||||
"phpstan/phpdoc-parser": "^2.3.2",
|
||||
"symfony/asset": "7.4.*",
|
||||
"symfony/asset-mapper": "7.4.*",
|
||||
"symfony/console": "7.4.*",
|
||||
"symfony/doctrine-messenger": "7.4.*",
|
||||
"symfony/dotenv": "7.4.*",
|
||||
"symfony/expression-language": "7.4.*",
|
||||
"symfony/flex": "^2.11",
|
||||
"symfony/form": "7.4.*",
|
||||
"symfony/framework-bundle": "7.4.*",
|
||||
"symfony/http-client": "7.4.*",
|
||||
"symfony/intl": "7.4.*",
|
||||
"symfony/mailer": "7.4.*",
|
||||
"symfony/mailgun-mailer": "7.4.*",
|
||||
"symfony/mercure-bundle": "^0.3.9",
|
||||
"symfony/mime": "7.4.*",
|
||||
"symfony/monolog-bundle": "^3.11.2",
|
||||
"symfony/notifier": "7.4.*",
|
||||
"symfony/process": "7.4.*",
|
||||
"symfony/property-access": "7.4.*",
|
||||
"symfony/property-info": "7.4.*",
|
||||
"symfony/runtime": "7.4.*",
|
||||
"symfony/security-bundle": "7.4.*",
|
||||
"symfony/serializer": "7.4.*",
|
||||
"symfony/stimulus-bundle": "^2.36",
|
||||
"symfony/string": "7.4.*",
|
||||
"symfony/translation": "7.4.*",
|
||||
"symfony/twig-bundle": "7.4.*",
|
||||
"symfony/ux-turbo": "^2.36",
|
||||
"symfony/validator": "7.4.*",
|
||||
"symfony/web-link": "7.4.*",
|
||||
"symfony/webpack-encore-bundle": "^2.4.1",
|
||||
"symfony/yaml": "7.4.*",
|
||||
"symfonycasts/reset-password-bundle": "^1.25",
|
||||
"symfonycasts/verify-email-bundle": "^1.18",
|
||||
"twig/extra-bundle": "^2.12|^3.0",
|
||||
"twig/twig": "^2.12|^3.0"
|
||||
"twig/extra-bundle": "^2.12|^3.24",
|
||||
"twig/twig": "^2.12|^3.28.0"
|
||||
},
|
||||
"config": {
|
||||
"allow-plugins": {
|
||||
@@ -98,16 +99,16 @@
|
||||
"extra": {
|
||||
"symfony": {
|
||||
"allow-contrib": false,
|
||||
"require": "7.3.*"
|
||||
"require": "7.4.*"
|
||||
}
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^11.5",
|
||||
"symfony/browser-kit": "7.3.*",
|
||||
"symfony/css-selector": "7.3.*",
|
||||
"symfony/debug-bundle": "7.3.*",
|
||||
"symfony/maker-bundle": "^1.0",
|
||||
"symfony/stopwatch": "7.3.*",
|
||||
"symfony/web-profiler-bundle": "7.3.*"
|
||||
"phpunit/phpunit": "^11.5.55",
|
||||
"symfony/browser-kit": "7.4.*",
|
||||
"symfony/css-selector": "7.4.*",
|
||||
"symfony/debug-bundle": "7.4.*",
|
||||
"symfony/maker-bundle": "^1.67",
|
||||
"symfony/stopwatch": "7.4.*",
|
||||
"symfony/web-profiler-bundle": "7.4.*"
|
||||
}
|
||||
}
|
||||
|
||||
Generated
+1352
-1111
File diff suppressed because it is too large
Load Diff
@@ -17,4 +17,5 @@ return [
|
||||
Symfony\Bundle\MercureBundle\MercureBundle::class => ['all' => true],
|
||||
SymfonyCasts\Bundle\VerifyEmail\SymfonyCastsVerifyEmailBundle::class => ['all' => true],
|
||||
SymfonyCasts\Bundle\ResetPassword\SymfonyCastsResetPasswordBundle::class => ['all' => true],
|
||||
Karser\Recaptcha3Bundle\KarserRecaptcha3Bundle::class => ['all' => true],
|
||||
];
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
# Enable stateless CSRF protection for forms and logins/logouts
|
||||
framework:
|
||||
form:
|
||||
csrf_protection:
|
||||
token_id: submit
|
||||
|
||||
csrf_protection:
|
||||
stateless_token_ids:
|
||||
- submit
|
||||
- authenticate
|
||||
- logout
|
||||
# form:
|
||||
# csrf_protection:
|
||||
# token_id: submit
|
||||
# csrf_protection:
|
||||
# stateless_token_ids:
|
||||
# - submit
|
||||
# - authenticate
|
||||
# - logout
|
||||
|
||||
@@ -1,6 +1,14 @@
|
||||
doctrine:
|
||||
dbal:
|
||||
url: '%env(resolve:DATABASE_URL)%'
|
||||
# url: '%env(resolve:DATABASE_URL)%'
|
||||
driver: '%env(DB_DRIVER)%'
|
||||
server_version: '%env(DB_SERVER_VERSION)%'
|
||||
host: '%env(DB_HOST)%'
|
||||
port: '%env(DB_PORT)%'
|
||||
user: '%env(DB_USER)%'
|
||||
password: '%env(DB_PASSWORD)%'
|
||||
dbname: '%env(DB_NAME)%'
|
||||
charset: '%env(DB_CHARSET)%'
|
||||
|
||||
# IMPORTANT: You MUST configure your server version,
|
||||
# either here or in the DATABASE_URL env var (see .env file)
|
||||
|
||||
@@ -8,7 +8,21 @@ framework:
|
||||
fallbacks: ['en', 'nl']
|
||||
|
||||
# Note that the session will be started ONLY if you read or write from it.
|
||||
session: true
|
||||
session:
|
||||
handler_id: null
|
||||
cookie_secure: auto
|
||||
cookie_samesite: lax
|
||||
storage_factory_id: session.storage.factory.native
|
||||
save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%'
|
||||
|
||||
when@prod:
|
||||
framework:
|
||||
session:
|
||||
handler_id: null
|
||||
cookie_secure: true
|
||||
cookie_samesite: lax
|
||||
storage_factory_id: session.storage.factory.native
|
||||
save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%'
|
||||
|
||||
#esi: true
|
||||
#fragments: true
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
karser_recaptcha3:
|
||||
site_key: '%env(RECAPTCHA3_KEY)%'
|
||||
secret_key: '%env(RECAPTCHA3_SECRET)%'
|
||||
score_threshold: 0.5
|
||||
enabled: true
|
||||
@@ -3,4 +3,6 @@ mercure:
|
||||
default:
|
||||
url: '%env(MERCURE_URL)%'
|
||||
public_url: '%env(MERCURE_PUBLIC_URL)%'
|
||||
jwt: '%env(MERCURE_JWT_SECRET)%'
|
||||
jwt:
|
||||
secret: '%env(MERCURE_JWT_SECRET)%'
|
||||
publish: ['*']
|
||||
|
||||
@@ -2,7 +2,7 @@ framework:
|
||||
router:
|
||||
# Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
|
||||
# See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
|
||||
#default_uri: http://localhost
|
||||
default_uri: '%env(SITE_BASE_URL)%'
|
||||
|
||||
when@prod:
|
||||
framework:
|
||||
|
||||
@@ -30,6 +30,7 @@ security:
|
||||
# Easy way to control access for large sections of your site
|
||||
# Note: Only the *first* access control that matches will be used
|
||||
access_control:
|
||||
- { path: ^/, roles: PUBLIC_ACCESS, requires_channel: https }
|
||||
# - { path: ^/admin, roles: ROLE_ADMIN }
|
||||
# - { path: ^/profile, roles: ROLE_USER }
|
||||
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
karser_recaptcha3:
|
||||
enabled: false
|
||||
@@ -1,4 +1,5 @@
|
||||
twig:
|
||||
form_themes: ['bootstrap_5_layout.html.twig']
|
||||
globals:
|
||||
mercure_public_url: '%env(MERCURE_PUBLIC_URL)%'
|
||||
mercure_topic_base: '%env(MERCURE_TOPIC_BASE)%'
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
# Put parameters here that don't need to change on each machine where the app is deployed
|
||||
# https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
|
||||
parameters:
|
||||
mailer_from: '%env(MAILER_FROM)%'
|
||||
|
||||
services:
|
||||
# default configuration for services in *this* file
|
||||
@@ -16,5 +17,9 @@ services:
|
||||
App\:
|
||||
resource: '../src/'
|
||||
|
||||
App\Game\Service\GameResponseService:
|
||||
arguments:
|
||||
$projectDir: '%kernel.project_dir%'
|
||||
|
||||
# add more service definitions when explicit configuration is needed
|
||||
# please note that last definitions always *replace* previous ones
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ Use this index to quickly locate files and directories during development and in
|
||||
|
||||
## Top-Level
|
||||
- docker/compose.yaml / docker/compose.override.yaml — Docker services.
|
||||
- docker/ — Docker build contexts and configs (php Dockerfile, nginx vhost, compose files).
|
||||
- docker/ — Docker build contexts and configs (php Dockerfile, nginx vhost).
|
||||
- composer.json / composer.lock — Dependencies and scripts.
|
||||
- importmap.php — Importmap configuration for JS dependencies.
|
||||
- phpunit.dist.xml — PHPUnit configuration.
|
||||
|
||||
+15
-9
@@ -9,7 +9,7 @@ This app can run fully in Docker using docker compose with PHP-FPM, Nginx and My
|
||||
- mailer (dev only via compose.override.yaml): Mailpit (SMTP/UI)
|
||||
|
||||
## Prerequisites
|
||||
- Docker and Docker Compose (v2)
|
||||
- Docker and Docker Compose (docker compose)
|
||||
|
||||
## Usage
|
||||
|
||||
@@ -21,36 +21,42 @@ App will be served at http://localhost:8080
|
||||
|
||||
Alternatively (manual):
|
||||
```
|
||||
docker compose -f docker/compose.yaml -f docker/compose.override.yaml up -d --build
|
||||
cd docker
|
||||
docker compose up -d --build
|
||||
```
|
||||
|
||||
### 2) Install dependencies
|
||||
The setup script already runs composer install. To run manually:
|
||||
```
|
||||
docker compose -f docker/compose.yaml -f docker/compose.override.yaml exec php composer install
|
||||
cd docker
|
||||
docker compose exec php composer install
|
||||
```
|
||||
|
||||
### 3) Prepare DB
|
||||
The setup script already prepares the DB. To run manually:
|
||||
```
|
||||
docker compose -f docker/compose.yaml -f docker/compose.override.yaml exec php php bin/console doctrine:database:create --if-not-exists
|
||||
docker compose -f docker/compose.yaml -f docker/compose.override.yaml exec php php bin/console doctrine:migrations:migrate -n
|
||||
cd docker
|
||||
docker compose exec php php bin/console doctrine:database:create --if-not-exists
|
||||
docker compose exec php php bin/console doctrine:migrations:migrate -n
|
||||
```
|
||||
|
||||
### 4) Run tests
|
||||
```
|
||||
docker compose -f docker/compose.yaml -f docker/compose.override.yaml exec php vendor/bin/phpunit
|
||||
cd docker
|
||||
docker compose exec php vendor/bin/phpunit
|
||||
```
|
||||
|
||||
### 5) Logs
|
||||
```
|
||||
docker compose -f docker/compose.yaml -f docker/compose.override.yaml logs -f nginx
|
||||
docker compose -f docker/compose.yaml -f docker/compose.override.yaml logs -f php
|
||||
cd docker
|
||||
docker compose logs -f nginx
|
||||
docker compose logs -f php
|
||||
```
|
||||
|
||||
### 6) Stop
|
||||
```
|
||||
docker compose -f docker/compose.yaml -f docker/compose.override.yaml down
|
||||
cd docker
|
||||
docker compose down
|
||||
```
|
||||
|
||||
## Notes
|
||||
|
||||
+14
-11
@@ -1,9 +1,9 @@
|
||||
# Email Delivery: Dev Mailcatcher & Production SendGrid
|
||||
# Email Delivery: Dev Mailcatcher & Production Mailgun
|
||||
|
||||
This application uses Symfony Mailer. We separate development and production delivery:
|
||||
|
||||
- Development: Mailpit (mailcatcher) via SMTP in Docker.
|
||||
- Production: SendGrid via API transport.
|
||||
- Production: Mailgun via API transport.
|
||||
|
||||
## Development (Mailpit)
|
||||
|
||||
@@ -18,28 +18,31 @@ MAILER_DSN=smtp://mailer:1025
|
||||
```
|
||||
|
||||
- Usage:
|
||||
1. Start stack: `docker compose up -d`
|
||||
1. Start stack: `docker-compose up -d`
|
||||
2. Send an email from the app.
|
||||
3. Open http://localhost:8025 to view captured emails.
|
||||
|
||||
## Production (SendGrid)
|
||||
## Production (Mailgun)
|
||||
|
||||
Use the SendGrid API transport. Do not commit secrets.
|
||||
Use the Mailgun API transport (`symfony/mailgun-mailer` bridge). Do not commit secrets.
|
||||
|
||||
- Example configuration is in `.env.prod`:
|
||||
|
||||
```
|
||||
MAILER_DSN=sendgrid+api://%env(resolve:SENDGRID_API_KEY)%@default
|
||||
MAILER_DSN=mailgun+api://${MAILGUN_API_KEY}:${MAILGUN_DOMAIN}@default?region=eu
|
||||
```
|
||||
|
||||
- Provide `SENDGRID_API_KEY` via:
|
||||
- Real environment variable on the server/container, or
|
||||
- Symfony secrets: `php bin/console secrets:set SENDGRID_API_KEY` (and dump for prod), or
|
||||
- `region=eu` is only needed if the Mailgun account/domain was created in Mailgun's EU region (common for `.nl`/EU-based senders). Drop it (or use `region=us`) if the domain lives in the US region.
|
||||
- Provide `MAILGUN_API_KEY` and `MAILGUN_DOMAIN` via:
|
||||
- Real environment variables on the server/container, or
|
||||
- Symfony secrets: `php bin/console secrets:set MAILGUN_API_KEY` (and dump for prod), or
|
||||
- Orchestration secret stores (e.g., Docker/K8s).
|
||||
- The sending domain must be added and DNS-verified (SPF/DKIM/tracking CNAME) in the Mailgun dashboard before production sending will work reliably; unverified domains are rate-limited/sandboxed.
|
||||
|
||||
### Notes
|
||||
- No Mailpit container is defined in the base `compose.yaml`, only in `compose.override.yaml`. This ensures it is used in development only.
|
||||
- To test email locally without Docker, you can:
|
||||
- Run Mailpit on your host (ports 1025/8025) and set `MAILER_DSN=smtp://127.0.0.1:1025` in `.env.local`.
|
||||
- If you need to use SendGrid SMTP instead of API, a DSN example:
|
||||
`smtp://apikey:YOUR_SENDGRID_API_KEY@smtp.sendgrid.net:587`.
|
||||
- If you need to use Mailgun SMTP instead of API, a DSN example:
|
||||
`mailgun+smtp://USERNAME:PASSWORD@default?region=eu` (username/password come from the Mailgun domain's SMTP credentials).
|
||||
- Use `php bin/console app:mail:test you@example.com` to send a quick test email against whatever `MAILER_DSN` is currently configured.
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
# User and Group IDs
|
||||
USER_ID=1000
|
||||
GROUP_ID=1000
|
||||
|
||||
# Application
|
||||
APP_ENV=prod
|
||||
SITE_BASE_URL=https://escapepage.com
|
||||
|
||||
# Mailer
|
||||
MAILGUN_API_KEY=CHANGEME_MAILGUN_API_KEY
|
||||
MAILGUN_DOMAIN=CHANGEME_MAILGUN_DOMAIN
|
||||
MAILER_DSN=mailgun+api://CHANGEME_MAILGUN_API_KEY:CHANGEME_MAILGUN_DOMAIN@default?region=eu
|
||||
MAILER_FROM=mailer@escapepage.nl
|
||||
|
||||
# Database
|
||||
DATABASE_URL=mysql://escapepage:CHANGEME_DB_PASSWORD@database:3306/escapepage?serverVersion=8.0.32&charset=utf8mb4
|
||||
DB_NAME=escapepage
|
||||
DB_USER=escapepage
|
||||
DB_PASSWORD=CHANGEME_DB_PASSWORD
|
||||
MYSQL_ROOT_PASSWORD=CHANGEME_MYSQL_ROOT_PASSWORD
|
||||
|
||||
# Mercure
|
||||
MERCURE_URL=http://mercure/.well-known/mercure
|
||||
MERCURE_PUBLIC_URL=https://mercure.escapepage.com/.well-known/mercure
|
||||
MERCURE_JWT_SECRET=CHANGEME_MERCURE_JWT_SECRET
|
||||
MERCURE_CORS_ALLOWED_ORIGINS=https://www.escapepage.com https://escapepage.com
|
||||
MERCURE_TOPIC_BASE=https://escapepage.com
|
||||
|
||||
# Recaptcha
|
||||
RECAPTCHA3_KEY=CHANGEME_RECAPTCHA3_KEY
|
||||
RECAPTCHA3_SECRET=CHANGEME_RECAPTCHA3_SECRET
|
||||
@@ -1,20 +1,19 @@
|
||||
|
||||
services:
|
||||
php:
|
||||
environment:
|
||||
XDEBUG_MODE: off
|
||||
XDEBUG_MODE: "off"
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
depends_on:
|
||||
- mailer
|
||||
# networks:
|
||||
# backend:
|
||||
# ipv4_address: 172.23.0.10
|
||||
|
||||
###> doctrine/doctrine-bundle ###
|
||||
database:
|
||||
ports:
|
||||
- "3306"
|
||||
###< doctrine/doctrine-bundle ###
|
||||
###> doctrine/doctrine-bundle ###
|
||||
###< doctrine/doctrine-bundle ###
|
||||
|
||||
###> symfony/mailer ###
|
||||
###> symfony/mailer ###
|
||||
mailer:
|
||||
image: axllent/mailpit
|
||||
ports:
|
||||
@@ -23,4 +22,17 @@ services:
|
||||
environment:
|
||||
MP_SMTP_AUTH_ACCEPT_ANY: 1
|
||||
MP_SMTP_AUTH_ALLOW_INSECURE: 1
|
||||
# networks:
|
||||
# backend:
|
||||
# ipv4_address: 172.23.0.13
|
||||
|
||||
# networks:
|
||||
# backend:
|
||||
# name: escapepage_network
|
||||
# driver: bridge
|
||||
# ipam:
|
||||
# config:
|
||||
# - subnet: 172.23.0.0/16
|
||||
# gateway: 172.23.0.1
|
||||
# attachable: true
|
||||
###< symfony/mailer ###
|
||||
|
||||
+77
-34
@@ -1,4 +1,3 @@
|
||||
|
||||
version: '3.7'
|
||||
|
||||
services:
|
||||
@@ -6,33 +5,65 @@ services:
|
||||
build:
|
||||
context: ..
|
||||
dockerfile: docker/php/Dockerfile
|
||||
args:
|
||||
USER_ID: ${USER_ID}
|
||||
GROUP_ID: ${GROUP_ID}
|
||||
container_name: escapepage-php
|
||||
volumes:
|
||||
- ../:/var/www/html:delegated
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
environment:
|
||||
APP_ENV: dev
|
||||
APP_ENV: ${APP_ENV}
|
||||
SITE_BASE_URL: ${SITE_BASE_URL}
|
||||
MAILER_DSN: ${MAILER_DSN}
|
||||
MAILER_FROM: ${MAILER_FROM}
|
||||
DATABASE_URL: ${DATABASE_URL}
|
||||
MERCURE_URL: ${MERCURE_URL}
|
||||
MERCURE_PUBLIC_URL: ${MERCURE_PUBLIC_URL}
|
||||
MERCURE_JWT_SECRET: ${MERCURE_JWT_SECRET}
|
||||
MERCURE_CORS_ALLOWED_ORIGINS: ${MERCURE_CORS_ALLOWED_ORIGINS}
|
||||
MERCURE_TOPIC_BASE: ${MERCURE_TOPIC_BASE}
|
||||
RECAPTCHA3_KEY: ${RECAPTCHA3_KEY}
|
||||
RECAPTCHA3_SECRET: ${RECAPTCHA3_SECRET}
|
||||
depends_on:
|
||||
- database
|
||||
- mercure
|
||||
networks:
|
||||
- backend
|
||||
# networks:
|
||||
# backend:
|
||||
# ipv4_address: 172.23.0.10
|
||||
restart: unless-stopped
|
||||
|
||||
php-worker:
|
||||
build:
|
||||
context: ..
|
||||
dockerfile: docker/php/Dockerfile
|
||||
args:
|
||||
USER_ID: ${USER_ID}
|
||||
GROUP_ID: ${GROUP_ID}
|
||||
container_name: escapepage-php-worker
|
||||
volumes:
|
||||
- ../:/var/www/html:delegated
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
environment:
|
||||
APP_ENV: dev
|
||||
APP_ENV: ${APP_ENV}
|
||||
SITE_BASE_URL: ${SITE_BASE_URL}
|
||||
MAILER_DSN: ${MAILER_DSN}
|
||||
MAILER_FROM: ${MAILER_FROM}
|
||||
DATABASE_URL: ${DATABASE_URL}
|
||||
MERCURE_URL: ${MERCURE_URL}
|
||||
MERCURE_PUBLIC_URL: ${MERCURE_PUBLIC_URL}
|
||||
MERCURE_JWT_SECRET: ${MERCURE_JWT_SECRET}
|
||||
MERCURE_CORS_ALLOWED_ORIGINS: ${MERCURE_CORS_ALLOWED_ORIGINS}
|
||||
MERCURE_TOPIC_BASE: ${MERCURE_TOPIC_BASE}
|
||||
RECAPTCHA3_KEY: ${RECAPTCHA3_KEY}
|
||||
RECAPTCHA3_SECRET: ${RECAPTCHA3_SECRET}
|
||||
depends_on:
|
||||
- database
|
||||
- mercure
|
||||
command: ["php", "bin/console", "messenger:consume", "async", "-vv"]
|
||||
networks:
|
||||
- backend
|
||||
# networks:
|
||||
# backend:
|
||||
# ipv4_address: 172.23.0.11
|
||||
restart: unless-stopped
|
||||
|
||||
nginx:
|
||||
@@ -40,13 +71,17 @@ services:
|
||||
container_name: escapepage-nginx
|
||||
ports:
|
||||
- "8080:80"
|
||||
- "8443:443"
|
||||
volumes:
|
||||
- ../:/var/www/html:ro
|
||||
- ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
|
||||
- ./nginx/ssl:/etc/nginx/ssl:ro
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
depends_on:
|
||||
- php
|
||||
networks:
|
||||
- backend
|
||||
# networks:
|
||||
# backend:
|
||||
# ipv4_address: 172.23.0.12
|
||||
restart: unless-stopped
|
||||
|
||||
mailer:
|
||||
@@ -54,60 +89,68 @@ services:
|
||||
container_name: escapepage-mailer
|
||||
ports:
|
||||
- "8025:8025"
|
||||
volumes:
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
networks:
|
||||
- backend
|
||||
- default
|
||||
- nginx_proxy
|
||||
restart: unless-stopped
|
||||
|
||||
mercure:
|
||||
image: dunglas/mercure:v0.21
|
||||
container_name: escapepage-mercure
|
||||
environment:
|
||||
SERVER_NAME: ":80"
|
||||
MERCURE_PUBLISHER_JWT_KEY: ${MERCURE_JWT_SECRET:-!ChangeThisMercureJWT!}
|
||||
MERCURE_SUBSCRIBER_JWT_KEY: ${MERCURE_JWT_SECRET:-!ChangeThisMercureJWT!}
|
||||
MERCURE_CORS_ALLOWED_ORIGINS: http://localhost:8080
|
||||
MERCURE_PUBLISH_ALLOWED_ORIGINS: http://localhost:8080
|
||||
SERVER_NAME: "http://:80"
|
||||
MERCURE_PUBLISHER_JWT_KEY: ${MERCURE_JWT_SECRET}
|
||||
MERCURE_SUBSCRIBER_JWT_KEY: ${MERCURE_JWT_SECRET}
|
||||
MERCURE_CORS_ALLOWED_ORIGINS: ${MERCURE_CORS_ALLOWED_ORIGINS}
|
||||
MERCURE_PUBLISH_ALLOWED_ORIGINS: ${MERCURE_CORS_ALLOWED_ORIGINS}
|
||||
MERCURE_EXTRA_DIRECTIVES: |
|
||||
cors_origins http://localhost:8080
|
||||
# Allow anonymous subscribers in dev only
|
||||
cors_origins ${MERCURE_CORS_ALLOWED_ORIGINS}
|
||||
publish_origins ${MERCURE_CORS_ALLOWED_ORIGINS}
|
||||
anonymous
|
||||
ports:
|
||||
- "8090:80"
|
||||
volumes:
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
networks:
|
||||
- backend
|
||||
- default
|
||||
- nginx_proxy
|
||||
restart: unless-stopped
|
||||
|
||||
###> doctrine/doctrine-bundle ###
|
||||
###> doctrine/doctrine-bundle ###
|
||||
database:
|
||||
image: mysql:8.0
|
||||
container_name: escapepage-db
|
||||
environment:
|
||||
MYSQL_DATABASE: ${MYSQL_DATABASE:-app}
|
||||
MYSQL_USER: ${MYSQL_USER:-app}
|
||||
MYSQL_PASSWORD: ${MYSQL_PASSWORD:-!ChangeMe!}
|
||||
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-root}
|
||||
MYSQL_DATABASE: ${DB_NAME}
|
||||
MYSQL_USER: ${DB_USER}
|
||||
MYSQL_PASSWORD: ${DB_PASSWORD}
|
||||
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
|
||||
healthcheck:
|
||||
test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1", "-uroot", "-p${MYSQL_ROOT_PASSWORD:-root}"]
|
||||
test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1", "-uroot", "-p${MYSQL_ROOT_PASSWORD}"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
start_period: 30s
|
||||
command: ["--default-authentication-plugin=mysql_native_password", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci"]
|
||||
command: ["--default-authentication-plugin=mysql_native_password", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci", "--lower-case-table-names=1", "--innodb-use-native-aio=0"]
|
||||
volumes:
|
||||
- database_data:/var/lib/mysql:rw
|
||||
- ../var/volumes/db:/var/lib/mysql:rw
|
||||
- ./mysql/init:/docker-entrypoint-initdb.d:ro
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
# Uncomment the two lines below if you need to access MySQL from your host (workbench, etc.)
|
||||
# ports:
|
||||
# - "3306:3306"
|
||||
networks:
|
||||
- backend
|
||||
ports:
|
||||
- "3306:3306"
|
||||
# networks:
|
||||
# backend:
|
||||
# ipv4_address: 172.23.0.15
|
||||
restart: unless-stopped
|
||||
###< doctrine/doctrine-bundle ###
|
||||
|
||||
volumes:
|
||||
###> doctrine/doctrine-bundle ###
|
||||
database_data:
|
||||
###< doctrine/doctrine-bundle ###
|
||||
|
||||
networks:
|
||||
backend:
|
||||
driver: bridge
|
||||
nginx_proxy:
|
||||
external: true
|
||||
name: nginx_default
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
-- This script ensures the user has correct privileges.
|
||||
-- The user is actually created by the official MySQL image using environment variables.
|
||||
|
||||
GRANT ALL PRIVILEGES ON *.* TO 'escapepage'@'%';
|
||||
FLUSH PRIVILEGES;
|
||||
@@ -1,6 +1,18 @@
|
||||
server {
|
||||
listen 80;
|
||||
server_name _;
|
||||
return 301 https://$host$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name _;
|
||||
|
||||
ssl_certificate /etc/nginx/ssl/server.crt;
|
||||
ssl_certificate_key /etc/nginx/ssl/server.key;
|
||||
|
||||
ssl_protocols TLSv1.2 TLSv1.3;
|
||||
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||
|
||||
root /var/www/html/public;
|
||||
index index.php index.html;
|
||||
@@ -18,6 +30,14 @@ server {
|
||||
fastcgi_param DOCUMENT_ROOT $realpath_root;
|
||||
fastcgi_pass php:9000;
|
||||
fastcgi_read_timeout 120;
|
||||
|
||||
# Ensure HTTPS is correctly detected by Symfony if Nginx is behind a TLS termination proxy
|
||||
fastcgi_param HTTPS $https if_not_empty;
|
||||
# Standard forwarded headers
|
||||
fastcgi_param HTTP_X_FORWARDED_FOR $proxy_add_x_forwarded_for;
|
||||
fastcgi_param HTTP_X_FORWARDED_PROTO $scheme;
|
||||
fastcgi_param HTTP_X_FORWARDED_HOST $host;
|
||||
fastcgi_param HTTP_X_FORWARDED_PORT $server_port;
|
||||
}
|
||||
|
||||
location ~ /\.ht {
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIDrTCCApWgAwIBAgIURXHwywjcTFR43Q8+qtMAMuhHmW0wDQYJKoZIhvcNAQEL
|
||||
BQAwZjELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5
|
||||
MRUwEwYDVQQKDAxPcmdhbml6YXRpb24xDTALBgNVBAsMBFVuaXQxEjAQBgNVBAMM
|
||||
CWxvY2FsaG9zdDAeFw0yNjAxMTAxMjMzNTNaFw0yNzAxMTAxMjMzNTNaMGYxCzAJ
|
||||
BgNVBAYTAlVTMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
|
||||
CgwMT3JnYW5pemF0aW9uMQ0wCwYDVQQLDARVbml0MRIwEAYDVQQDDAlsb2NhbGhv
|
||||
c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0dQIpm6SeY/Qt1zTr
|
||||
GDfQuRAqowde6vzlNDwwC5hNQUaA4MCsDcmqmxj/YPUA8qG4MWQzYsj3HEn8l863
|
||||
a7BELIYy2kvHTO7mgZMsBiH6HzHilIOsZkMJEV3QLlFn7VRb7i6WSw48pbRJk77l
|
||||
sOX/e3vzE2pemnx4ggSORzNorrQ7UwyBpK374yisKSFzs6KKPnkVDbfBNX2k+fUT
|
||||
8Ncjq5WkllA93ztPzh1iHNcFThx+MiH5fcs9obdMbfNkcQy22J9Nbi0OT9Tf8R7k
|
||||
OaBEVPxFkT+moj6bCwetLkdQDGaoGA6AXTR1lrN812eU1TJ6KA4TAOj4ZAuygWa0
|
||||
kqi3AgMBAAGjUzBRMB0GA1UdDgQWBBSayyPInKCPbaliYycRx9GEK2tTFjAfBgNV
|
||||
HSMEGDAWgBSayyPInKCPbaliYycRx9GEK2tTFjAPBgNVHRMBAf8EBTADAQH/MA0G
|
||||
CSqGSIb3DQEBCwUAA4IBAQCT3r5wZd8fN/ognHFopJRKxjw3ZBBYl54ELb32OSVS
|
||||
NcKR63/2kZc7KQY5LjPbBMpDutLUPsVtJ97OSYY/JQDm/VVkJy0jIUtPD/bLnjEI
|
||||
bhMoIGKwUDtnSaYF3oXhwMX3XchDCLmpsk+E17LTTq+tHUzkhXZu+sHoHrE70Wls
|
||||
XfziM0O/zpApJQSeCLi8UDGffLVChFQd4uU//YW+4OMyk/mbu7dV4ckJXQVIvqTr
|
||||
7UuC7SgRChcYkaQpkDUnaoX+miKbr9SHUmBSbCsXDyPDth5TOUSZWbP6ewDKVWW7
|
||||
37OURA5UqT2RvnX75+FdLnBtqJrt/3X8wafOOLXILwmA
|
||||
-----END CERTIFICATE-----
|
||||
@@ -0,0 +1,28 @@
|
||||
-----BEGIN PRIVATE KEY-----
|
||||
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC0dQIpm6SeY/Qt
|
||||
1zTrGDfQuRAqowde6vzlNDwwC5hNQUaA4MCsDcmqmxj/YPUA8qG4MWQzYsj3HEn8
|
||||
l863a7BELIYy2kvHTO7mgZMsBiH6HzHilIOsZkMJEV3QLlFn7VRb7i6WSw48pbRJ
|
||||
k77lsOX/e3vzE2pemnx4ggSORzNorrQ7UwyBpK374yisKSFzs6KKPnkVDbfBNX2k
|
||||
+fUT8Ncjq5WkllA93ztPzh1iHNcFThx+MiH5fcs9obdMbfNkcQy22J9Nbi0OT9Tf
|
||||
8R7kOaBEVPxFkT+moj6bCwetLkdQDGaoGA6AXTR1lrN812eU1TJ6KA4TAOj4ZAuy
|
||||
gWa0kqi3AgMBAAECggEAfwOccgzK4XEY/OrspEx3fMHFTz1Qgs6DEhCiDG8c08OO
|
||||
DEglVPSfbSWdgqKL0A73JN4e2Mw/By8yJEf1h8SUXGe6TTC5BZ5wyG2LWQE4CQTL
|
||||
598AjuerZ0aB8XWodq3lIo+S2tYZPzainucPBjxsplYT+BNCWzQBSBC7hCk5VgPx
|
||||
6BvzlzBEWJYizpnT55Ta7zDV1tofP2RUt5Q6GT27Qm5fMlAj3a3LsmgeDLIPHhQd
|
||||
RCo0kEc56X4vZyojaNUrmTzh6+Ljoj7ahEsW9fr8kfQvIlvuR1qjkuuCEUDU7kS/
|
||||
iblwVkY1Lfrfm9mI82EYI287m28LBTP99ULk9KRhAQKBgQDpEjK0/OmsHSQfjiG7
|
||||
PHQXrmIdMzaz+BYttiGV9Fx5hsdVPvihdjzzwZck2MkSg5ODMtEthb7uBareS3Nl
|
||||
CG7a7brY8a/x5ZdnUPNXGykfix/oz557EENembKaWpsV8qiHM8vuADOWEvmqBTVt
|
||||
C0iXrwvyxgy/GuNz9A9Tfyya3wKBgQDGNb9Pr903/JzJKFkT+4dGpAgE0a3eQsDm
|
||||
HEJimbhNoOw79AyOHWbpV2f74kz0GdG2MjU3988lZ/VJ7FM0eyDkuBvv3c2YdKCm
|
||||
A/5tprB/8PefdNJD0HuVm4BE2XDLV74DbOCgoqsFMC1BdeUVBAhSqmRNrYFQYRqj
|
||||
DvqtDQiFKQKBgB5p6YQEnNmA0/3qJiywrtWIQ/VbgX/ql7pPUgKnaInTNJ/DH96x
|
||||
9zI3yOleAJ8R3GX6c6FlGo0k4C8x2VUNzKl07DTzFOqT8zXgMmDjgnJDTV6r+RpF
|
||||
/QSTOeM6f5JVn/hEog/kptamkz3EgDxChK6GgSClB3TIpXW0G2vh5IgxAoGBAIIl
|
||||
WHDicMcKP4h1zcepKLHhksJXS2rdOfveIljLxpByUassG/JUq/YbRlPFy/Gb4m9X
|
||||
mEoflQxirlTTr+6NypNjsDRX1197dOCNTsqA4POhLXauJkIQ6pTZfee3PrDF9CYb
|
||||
n4LaTKEjeRO6bajW9QASkbnPa1Fz8SGP/FkUbbvBAoGAKIuvVLwht1A8C0BXaFrb
|
||||
znZu3u90SB9TEcm2V9pU1ptiU6Q/CGlxm8UYvx1ahmxNYL6Ip/QNIFyb+HCqvIUf
|
||||
Id3C+4LlLeXVBP0uBCX828zREhuQutq3kju2iOQfsOkwc1McS4WXk6tExXoVwkzl
|
||||
2WYMu+GpSZLcti71L58tOf4=
|
||||
-----END PRIVATE KEY-----
|
||||
+36
-3
@@ -6,15 +6,32 @@ RUN apk add --no-cache \
|
||||
git \
|
||||
icu-dev \
|
||||
libzip-dev \
|
||||
libxml2-dev \
|
||||
oniguruma-dev \
|
||||
g++ \
|
||||
make \
|
||||
nodejs \
|
||||
npm
|
||||
npm \
|
||||
shadow
|
||||
|
||||
# Install PHP extension installer
|
||||
COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
|
||||
|
||||
# Install PHP extensions
|
||||
RUN docker-php-ext-configure intl \
|
||||
&& docker-php-ext-install -j$(nproc) intl pdo pdo_mysql opcache zip
|
||||
RUN install-php-extensions \
|
||||
intl \
|
||||
pdo_mysql \
|
||||
opcache \
|
||||
zip \
|
||||
tokenizer \
|
||||
ctype \
|
||||
iconv \
|
||||
mbstring \
|
||||
dom \
|
||||
xml \
|
||||
simplexml \
|
||||
xmlreader \
|
||||
xmlwriter
|
||||
|
||||
# Install composer
|
||||
ENV COMPOSER_ALLOW_SUPERUSER=1 \
|
||||
@@ -24,7 +41,23 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
|
||||
# Configure PHP
|
||||
COPY docker/php/php.ini $PHP_INI_DIR/conf.d/zz-custom.ini
|
||||
|
||||
# Adjust www-data UID/GID to match host user (default 1000)
|
||||
ARG USER_ID=1000
|
||||
ARG GROUP_ID=1000
|
||||
|
||||
RUN if [ ${USER_ID:-0} -ne 0 ] && [ ${GROUP_ID:-0} -ne 0 ]; then \
|
||||
userdel -f www-data &&\
|
||||
if getent group www-data ; then groupdel www-data; fi &&\
|
||||
groupadd -g ${GROUP_ID} www-data &&\
|
||||
useradd -l -u ${USER_ID} -g www-data www-data &&\
|
||||
install -d -m 0755 -o www-data -g www-data /home/www-data \
|
||||
;fi
|
||||
|
||||
WORKDIR /var/www/html
|
||||
|
||||
# Set permissions for Symfony directories
|
||||
RUN mkdir -p var/cache var/log var/sessions && \
|
||||
chown -R www-data:www-data var
|
||||
|
||||
# Default command
|
||||
CMD ["php-fpm"]
|
||||
|
||||
@@ -7,3 +7,8 @@ opcache.enable=1
|
||||
opcache.enable_cli=1
|
||||
opcache.validate_timestamps=1
|
||||
opcache.revalidate_freq=0
|
||||
|
||||
log_errors=On
|
||||
error_log=/var/www/html/var/log/errorlog_php.log
|
||||
session.gc_maxlifetime=1440
|
||||
session.cookie_lifetime=0
|
||||
|
||||
Executable
+29
@@ -0,0 +1,29 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# Script to completely restart the project as requested
|
||||
# Can be run from any directory
|
||||
|
||||
DOCKER_DIR=$(cd "$(dirname "$0")" && pwd)
|
||||
ROOT_DIR=$(cd "$DOCKER_DIR/.." && pwd)
|
||||
|
||||
echo "Stopping and removing containers..."
|
||||
(cd "$DOCKER_DIR" && docker compose -f compose.yaml -f compose.override.yaml down -v --remove-orphans) || true
|
||||
docker network rm escapepage_network || true
|
||||
docker network rm $(docker network ls -q --filter name=escapepage) || true
|
||||
docker network prune -f || true
|
||||
docker rm -f escapepage-db escapepage-php escapepage-nginx escapepage-mercure escapepage-mailer escapepage-php-worker || true
|
||||
docker system prune -f || true
|
||||
|
||||
echo "Clearing Docker build cache..."
|
||||
docker builder prune -af
|
||||
|
||||
echo "Setting permissions for var/volumes/db and var directories..."
|
||||
sudo chown -R 1000:1000 "$ROOT_DIR/var/volumes/db" || true
|
||||
sudo chmod -R 777 "$ROOT_DIR/var/volumes/db" || true
|
||||
sudo mkdir -p "$ROOT_DIR/var/cache" "$ROOT_DIR/var/log" "$ROOT_DIR/var/sessions"
|
||||
sudo chown -R 1000:1000 "$ROOT_DIR/var" || true
|
||||
sudo chmod -R 777 "$ROOT_DIR/var" || true
|
||||
|
||||
echo "Running setup script..."
|
||||
"$DOCKER_DIR/setup.sh" --no-build
|
||||
Regular → Executable
+15
-7
@@ -17,18 +17,18 @@ set -euo pipefail
|
||||
|
||||
ROOT_DIR=$(cd "$(dirname "$0")"/.. && pwd)
|
||||
DOCKER_DIR="$ROOT_DIR/docker"
|
||||
# Determine the docker compose command (V2 'docker compose' or V1 'docker-compose')
|
||||
# Determine the docker-compose command
|
||||
if docker compose version >/dev/null 2>&1; then
|
||||
DOCKER_COMPOSE="docker compose"
|
||||
elif command -v docker-compose >/dev/null 2>&1; then
|
||||
DOCKER_COMPOSE="docker-compose"
|
||||
else
|
||||
echo "Error: Neither 'docker compose' nor 'docker-compose' was found. Please install Docker Compose." >&2
|
||||
echo "Error: Neither 'docker-compose' nor 'docker compose' was found. Please install Docker Compose." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Helper to run docker compose from the docker/ directory
|
||||
dc() { (cd "$DOCKER_DIR" && $DOCKER_COMPOSE -f compose.yaml "$@"); }
|
||||
# Helper to run docker compose from the docker directory
|
||||
dc() { (cd "$DOCKER_DIR" && $DOCKER_COMPOSE -f compose.yaml -f compose.override.yaml "$@"); }
|
||||
|
||||
REBUILD=1
|
||||
RECREATE=0
|
||||
@@ -61,7 +61,7 @@ if [ "$RECREATE" -eq 1 ]; then
|
||||
fi
|
||||
|
||||
# Start stack
|
||||
dc up "${BUILD_ARGS[@]}"
|
||||
dc up -d "${BUILD_ARGS[@]}"
|
||||
|
||||
# Helper to run commands in php container
|
||||
pexec() { dc exec -T php "$@"; }
|
||||
@@ -104,9 +104,17 @@ fi
|
||||
|
||||
# Prepare DB
|
||||
echo "Creating database if it doesn't exist..."
|
||||
pexec php bin/console doctrine:database:create --if-not-exists
|
||||
if ! pexec php bin/console doctrine:database:create --if-not-exists; then
|
||||
echo "Error: Database creation failed. Check Docker logs for details." >&2
|
||||
dc logs database
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Running migrations..."
|
||||
pexec php bin/console doctrine:migrations:migrate -n
|
||||
if ! pexec php bin/console doctrine:migrations:migrate -n; then
|
||||
echo "Error: Migrations failed." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Import JS deps (Importmap/Asset Mapper)
|
||||
if [ -f "$ROOT_DIR/importmap.php" ]; then
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
/**
|
||||
* Auto-generated Migration: Please modify to your needs!
|
||||
*/
|
||||
final class Version20260117143000 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Make player.screen nullable';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
// this up() migration is auto-generated, please modify it to your needs
|
||||
$this->addSql('ALTER TABLE player CHANGE screen screen INT DEFAULT NULL');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
// this down() migration is auto-generated, please modify it to your needs
|
||||
$this->addSql('ALTER TABLE player CHANGE screen screen INT NOT NULL');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
final class Version20260627140000 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Seed initial game: AI Virus Deflection';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
$this->addSql("INSERT INTO game (name, number_of_players, status) VALUES ('AI Virus Deflection', 3, 'inDevelopment')");
|
||||
$this->addSql("INSERT INTO game_setting (game_id, name, value) VALUES (LAST_INSERT_ID(), 'totalTime', '1800')");
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
$this->addSql("DELETE gs FROM game_setting gs INNER JOIN game g ON gs.game_id = g.id WHERE g.name = 'AI Virus Deflection'");
|
||||
$this->addSql("DELETE FROM game WHERE name = 'AI Virus Deflection'");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
final class Version20260704160000 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Add marketing_opt_in column to user table';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE `user` ADD marketing_opt_in TINYINT(1) NOT NULL DEFAULT 0');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE `user` DROP marketing_opt_in');
|
||||
}
|
||||
}
|
||||
Generated
+494
@@ -8,6 +8,11 @@
|
||||
"name": "escapepage",
|
||||
"version": "1.0.0",
|
||||
"license": "UNLICENSED",
|
||||
"dependencies": {
|
||||
"@popperjs/core": "^2.11.8",
|
||||
"bootstrap": "^5.3.8",
|
||||
"bootstrap-icons": "^1.13.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.25.0",
|
||||
"@babel/preset-env": "^7.25.0",
|
||||
@@ -17,6 +22,8 @@
|
||||
"css-loader": "^7.1.2",
|
||||
"mini-css-extract-plugin": "^2.9.2",
|
||||
"regenerator-runtime": "^0.14.1",
|
||||
"sass": "^1.101.0",
|
||||
"sass-loader": "^14.2.1",
|
||||
"webpack": "^5.95.0",
|
||||
"webpack-cli": "^5.1.4",
|
||||
"webpack-notifier": "^1.15.0"
|
||||
@@ -1743,6 +1750,340 @@
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher": {
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
|
||||
"integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"dependencies": {
|
||||
"detect-libc": "^2.0.3",
|
||||
"is-glob": "^4.0.3",
|
||||
"node-addon-api": "^7.0.0",
|
||||
"picomatch": "^4.0.3"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 10.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/parcel"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"@parcel/watcher-android-arm64": "2.5.6",
|
||||
"@parcel/watcher-darwin-arm64": "2.5.6",
|
||||
"@parcel/watcher-darwin-x64": "2.5.6",
|
||||
"@parcel/watcher-freebsd-x64": "2.5.6",
|
||||
"@parcel/watcher-linux-arm-glibc": "2.5.6",
|
||||
"@parcel/watcher-linux-arm-musl": "2.5.6",
|
||||
"@parcel/watcher-linux-arm64-glibc": "2.5.6",
|
||||
"@parcel/watcher-linux-arm64-musl": "2.5.6",
|
||||
"@parcel/watcher-linux-x64-glibc": "2.5.6",
|
||||
"@parcel/watcher-linux-x64-musl": "2.5.6",
|
||||
"@parcel/watcher-win32-arm64": "2.5.6",
|
||||
"@parcel/watcher-win32-ia32": "2.5.6",
|
||||
"@parcel/watcher-win32-x64": "2.5.6"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher-android-arm64": {
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz",
|
||||
"integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"android"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/parcel"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher-darwin-arm64": {
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz",
|
||||
"integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/parcel"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher-darwin-x64": {
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz",
|
||||
"integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/parcel"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher-freebsd-x64": {
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz",
|
||||
"integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"freebsd"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/parcel"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher-linux-arm-glibc": {
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz",
|
||||
"integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==",
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/parcel"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher-linux-arm-musl": {
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz",
|
||||
"integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==",
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/parcel"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher-linux-arm64-glibc": {
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz",
|
||||
"integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/parcel"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher-linux-arm64-musl": {
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz",
|
||||
"integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/parcel"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher-linux-x64-glibc": {
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz",
|
||||
"integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/parcel"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher-linux-x64-musl": {
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz",
|
||||
"integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/parcel"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher-win32-arm64": {
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz",
|
||||
"integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/parcel"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher-win32-ia32": {
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz",
|
||||
"integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==",
|
||||
"cpu": [
|
||||
"ia32"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/parcel"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher-win32-x64": {
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz",
|
||||
"integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/parcel"
|
||||
}
|
||||
},
|
||||
"node_modules/@parcel/watcher/node_modules/picomatch": {
|
||||
"version": "4.0.5",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
|
||||
"integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/jonschlinkert"
|
||||
}
|
||||
},
|
||||
"node_modules/@popperjs/core": {
|
||||
"version": "2.11.8",
|
||||
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
|
||||
"integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
|
||||
"license": "MIT",
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/popperjs"
|
||||
}
|
||||
},
|
||||
"node_modules/@sinclair/typebox": {
|
||||
"version": "0.27.8",
|
||||
"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
|
||||
@@ -2884,6 +3225,41 @@
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/bootstrap": {
|
||||
"version": "5.3.8",
|
||||
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz",
|
||||
"integrity": "sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/twbs"
|
||||
},
|
||||
{
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/bootstrap"
|
||||
}
|
||||
],
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"@popperjs/core": "^2.11.8"
|
||||
}
|
||||
},
|
||||
"node_modules/bootstrap-icons": {
|
||||
"version": "1.13.1",
|
||||
"resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.13.1.tgz",
|
||||
"integrity": "sha512-ijombt4v6bv5CLeXvRWKy7CuM3TRTuPEuGaGKvTV5cz65rQSY8RQ2JcHt6b90cBBAC7s8fsf2EkQDldzCoXUjw==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/twbs"
|
||||
},
|
||||
{
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/bootstrap"
|
||||
}
|
||||
],
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/brace-expansion": {
|
||||
"version": "1.1.12",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
|
||||
@@ -3718,6 +4094,17 @@
|
||||
"npm": "1.2.8000 || >= 1.4.16"
|
||||
}
|
||||
},
|
||||
"node_modules/detect-libc": {
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
|
||||
"integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"optional": true,
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/detect-node": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
|
||||
@@ -4777,6 +5164,13 @@
|
||||
"postcss": "^8.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/immutable": {
|
||||
"version": "5.1.9",
|
||||
"resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.9.tgz",
|
||||
"integrity": "sha512-m8nVez3rwrgmWxtLMt1ZYXB2Lv7OKYn/disyxAlSDYAlKSlFoPPfIAmAM/M5xqL4m4C/wAPw7S2/CNaUii1Hxg==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/import-local": {
|
||||
"version": "3.2.0",
|
||||
"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
|
||||
@@ -5554,6 +5948,14 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/node-addon-api": {
|
||||
"version": "7.1.1",
|
||||
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
|
||||
"integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true
|
||||
},
|
||||
"node_modules/node-forge": {
|
||||
"version": "1.3.3",
|
||||
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.3.tgz",
|
||||
@@ -6861,6 +7263,98 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/sass": {
|
||||
"version": "1.101.0",
|
||||
"resolved": "https://registry.npmjs.org/sass/-/sass-1.101.0.tgz",
|
||||
"integrity": "sha512-OL3GoQyoUdDt843DpVmDO6y2k1sc5IhUDSpu8XucEI+35neq5QivZ1iuegnpraEVTJXlQGK1gl27zKcTLEPbQw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"chokidar": "^5.0.0",
|
||||
"immutable": "^5.1.5",
|
||||
"source-map-js": ">=0.6.2 <2.0.0"
|
||||
},
|
||||
"bin": {
|
||||
"sass": "sass.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20.19.0"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"@parcel/watcher": "^2.4.1"
|
||||
}
|
||||
},
|
||||
"node_modules/sass-loader": {
|
||||
"version": "14.2.1",
|
||||
"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.2.1.tgz",
|
||||
"integrity": "sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"neo-async": "^2.6.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 18.12.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/webpack"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@rspack/core": "0.x || 1.x",
|
||||
"node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
|
||||
"sass": "^1.3.0",
|
||||
"sass-embedded": "*",
|
||||
"webpack": "^5.0.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"@rspack/core": {
|
||||
"optional": true
|
||||
},
|
||||
"node-sass": {
|
||||
"optional": true
|
||||
},
|
||||
"sass": {
|
||||
"optional": true
|
||||
},
|
||||
"sass-embedded": {
|
||||
"optional": true
|
||||
},
|
||||
"webpack": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/sass/node_modules/chokidar": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz",
|
||||
"integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"readdirp": "^5.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 20.19.0"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://paulmillr.com/funding/"
|
||||
}
|
||||
},
|
||||
"node_modules/sass/node_modules/readdirp": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz",
|
||||
"integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">= 20.19.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "individual",
|
||||
"url": "https://paulmillr.com/funding/"
|
||||
}
|
||||
},
|
||||
"node_modules/schema-utils": {
|
||||
"version": "4.3.3",
|
||||
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
|
||||
|
||||
@@ -18,8 +18,15 @@
|
||||
"css-loader": "^7.1.2",
|
||||
"mini-css-extract-plugin": "^2.9.2",
|
||||
"regenerator-runtime": "^0.14.1",
|
||||
"sass": "^1.101.0",
|
||||
"sass-loader": "^14.2.1",
|
||||
"webpack": "^5.95.0",
|
||||
"webpack-cli": "^5.1.4",
|
||||
"webpack-notifier": "^1.15.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@popperjs/core": "^2.11.8",
|
||||
"bootstrap": "^5.3.8",
|
||||
"bootstrap-icons": "^1.13.1"
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.8 MiB |
@@ -1,9 +1,18 @@
|
||||
<?php
|
||||
|
||||
use App\Kernel;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
|
||||
require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
|
||||
|
||||
return function (array $context) {
|
||||
if ($trustedProxies = $context['TRUSTED_PROXIES'] ?? $_ENV['TRUSTED_PROXIES'] ?? false) {
|
||||
Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PREFIX);
|
||||
}
|
||||
|
||||
if ($trustedHosts = $context['TRUSTED_HOSTS'] ?? $_ENV['TRUSTED_HOSTS'] ?? false) {
|
||||
Request::setTrustedHosts([$trustedHosts]);
|
||||
}
|
||||
|
||||
return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
|
||||
};
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
<?php
|
||||
|
||||
namespace App\Command;
|
||||
|
||||
use App\Tech\Entity\User;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Symfony\Component\Console\Attribute\AsCommand;
|
||||
use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
|
||||
|
||||
#[AsCommand(
|
||||
name: 'app:create-user',
|
||||
description: 'Create a new user',
|
||||
)]
|
||||
class CreateUserCommand extends Command
|
||||
{
|
||||
public function __construct(
|
||||
private EntityManagerInterface $entityManager,
|
||||
private UserPasswordHasherInterface $passwordHasher,
|
||||
) {
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
protected function configure(): void
|
||||
{
|
||||
$this
|
||||
->addArgument('email', InputArgument::REQUIRED, 'Email address')
|
||||
->addArgument('username', InputArgument::REQUIRED, 'Username')
|
||||
->addArgument('password', InputArgument::REQUIRED, 'Plain-text password')
|
||||
->addOption('admin', null, InputOption::VALUE_NONE, 'Grant ROLE_ADMIN');
|
||||
}
|
||||
|
||||
protected function execute(InputInterface $input, OutputInterface $output): int
|
||||
{
|
||||
$io = new SymfonyStyle($input, $output);
|
||||
|
||||
$email = $input->getArgument('email');
|
||||
$username = $input->getArgument('username');
|
||||
$password = $input->getArgument('password');
|
||||
$isAdmin = $input->getOption('admin');
|
||||
|
||||
$user = new User();
|
||||
$user->setEmail($email);
|
||||
$user->setUsername($username);
|
||||
$user->setPassword($this->passwordHasher->hashPassword($user, $password));
|
||||
$user->setIsVerified(true);
|
||||
$user->setRoles($isAdmin ? ['ROLE_ADMIN'] : []);
|
||||
|
||||
$this->entityManager->persist($user);
|
||||
$this->entityManager->flush();
|
||||
|
||||
$io->success(sprintf(
|
||||
'User "%s" (%s) created%s.',
|
||||
$username,
|
||||
$email,
|
||||
$isAdmin ? ' with ROLE_ADMIN' : '',
|
||||
));
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@ final class MercurePublishCommand extends Command
|
||||
protected function configure(): void
|
||||
{
|
||||
$this
|
||||
->addArgument('topic', InputArgument::OPTIONAL, 'Topic URL to publish to', $_ENV['MERCURE_TOPIC_BASE'] . '/game/hub')
|
||||
->addArgument('topic', InputArgument::OPTIONAL, 'Topic URL to publish to', '/game/hub/test')
|
||||
->addOption('type', null, InputOption::VALUE_REQUIRED, 'Update type (for clients to filter)', 'game.event')
|
||||
->addOption('data', null, InputOption::VALUE_REQUIRED, 'JSON payload to send', '{"message":"Hello from Mercure!"}')
|
||||
->addOption('private', null, InputOption::VALUE_NONE, 'Mark the update as private');
|
||||
|
||||
@@ -15,7 +15,7 @@ use Symfony\Component\Mime\Email;
|
||||
|
||||
#[AsCommand(
|
||||
name: 'app:mail:test',
|
||||
description: 'Sends a simple test email using the configured mail transport (SendGrid in prod).'
|
||||
description: 'Sends a simple test email using the configured mail transport (Mailgun in prod).'
|
||||
)]
|
||||
final class TestEmailCommand extends Command
|
||||
{
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Game\Controller;
|
||||
|
||||
use App\Game\Entity\Session;
|
||||
use App\Game\Enum\SessionStatus;
|
||||
use App\Game\Repository\GameRepository;
|
||||
use App\Game\Repository\SessionRepository;
|
||||
use App\Tech\Repository\UserRepository;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||
|
||||
#[Route('/admin')]
|
||||
#[IsGranted('ROLE_ADMIN')]
|
||||
final class GameAdminController extends AbstractController
|
||||
{
|
||||
public function __construct(
|
||||
#[Autowire('%kernel.project_dir%')]
|
||||
private string $projectDir
|
||||
) {
|
||||
}
|
||||
|
||||
#[Route('', name: 'game_admin_dashboard', methods: ['GET'])]
|
||||
public function index(
|
||||
UserRepository $userRepository,
|
||||
SessionRepository $sessionRepository,
|
||||
GameRepository $gameRepository,
|
||||
): Response {
|
||||
$allUsers = $userRepository->findAll();
|
||||
$allSessions = $sessionRepository->findAll();
|
||||
$activeSessions = array_filter(
|
||||
$allSessions,
|
||||
fn(Session $s) => in_array($s->getStatus(), [SessionStatus::CREATED, SessionStatus::READY, SessionStatus::PLAYING])
|
||||
);
|
||||
|
||||
return $this->render('game/admin/index.html.twig', [
|
||||
'totalUsers' => count($allUsers),
|
||||
'totalPlayers' => count($userRepository->findByRole('ROLE_PLAYER')),
|
||||
'totalAdmins' => count($userRepository->findByRole('ROLE_ADMIN')),
|
||||
'totalGames' => count($gameRepository->findAll()),
|
||||
'totalSessions' => count($allSessions),
|
||||
'activeSessions' => count($activeSessions),
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route('/session/{session}', name: 'game_admin_view_session', methods: ['GET'])]
|
||||
public function viewSession(Session $session): Response
|
||||
{
|
||||
$playersLogs = [];
|
||||
foreach ($session->getPlayers() as $player) {
|
||||
$username = $player->getUser()->getUsername();
|
||||
$logFile = $this->projectDir . '/var/log/sessions/' . $session->getId() . '/' . $username . '.txt';
|
||||
|
||||
$playersLogs[] = [
|
||||
'username' => $username,
|
||||
'logs' => file_exists($logFile) ? file_get_contents($logFile) : '',
|
||||
];
|
||||
}
|
||||
|
||||
return $this->render('game/admin/sessions/view.html.twig', [
|
||||
'session' => $session,
|
||||
'playersLogs' => $playersLogs,
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Game\Controller;
|
||||
|
||||
use App\Tech\Repository\EmailLogRepository;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||
|
||||
#[Route('/admin/email-log')]
|
||||
#[IsGranted('ROLE_ADMIN')]
|
||||
final class GameAdminEmailLogController extends AbstractController
|
||||
{
|
||||
#[Route('', name: 'game_admin_email_log', methods: ['GET'])]
|
||||
public function index(EmailLogRepository $emailLogRepository): Response
|
||||
{
|
||||
return $this->render('game/admin/email_log/index.html.twig', [
|
||||
'logs' => $emailLogRepository->findBy([], ['sentAt' => 'DESC']),
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Game\Controller;
|
||||
|
||||
use App\Game\Entity\GameSetting;
|
||||
use App\Game\Enum\GameSettingType;
|
||||
use App\Game\Form\AdminGameType;
|
||||
use App\Game\Entity\Game;
|
||||
use App\Game\Repository\GameRepository;
|
||||
use App\Game\Repository\GameSettingRepository;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||
|
||||
#[Route('/admin/games')]
|
||||
#[IsGranted('ROLE_ADMIN')]
|
||||
final class GameAdminGameController extends AbstractController
|
||||
{
|
||||
#[Route('', name: 'game_admin_games', methods: ['GET'])]
|
||||
public function index(GameRepository $gameRepository): Response
|
||||
{
|
||||
return $this->render('game/admin/games/index.html.twig', [
|
||||
'games' => $gameRepository->findBy([], ['id' => 'ASC']),
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route('/{id}/edit', name: 'game_admin_game_edit', methods: ['GET', 'POST'])]
|
||||
public function edit(
|
||||
Game $game,
|
||||
Request $request,
|
||||
EntityManagerInterface $em,
|
||||
GameSettingRepository $gameSettingRepository,
|
||||
): Response {
|
||||
$totalTimeSetting = $gameSettingRepository->getSetting($game, GameSettingType::TOTAL_TIME);
|
||||
|
||||
$form = $this->createForm(AdminGameType::class, $game, [
|
||||
'total_time' => $totalTimeSetting?->getValue(),
|
||||
]);
|
||||
$form->handleRequest($request);
|
||||
|
||||
if ($form->isSubmitted() && $form->isValid()) {
|
||||
$totalTime = $form->get('totalTime')->getData();
|
||||
|
||||
if ($totalTime !== null) {
|
||||
if (!$totalTimeSetting) {
|
||||
$totalTimeSetting = new GameSetting();
|
||||
$totalTimeSetting->setGame($game);
|
||||
$totalTimeSetting->setName(GameSettingType::TOTAL_TIME);
|
||||
}
|
||||
$totalTimeSetting->setValue((string) $totalTime);
|
||||
$em->persist($totalTimeSetting);
|
||||
}
|
||||
|
||||
$em->flush();
|
||||
$this->addFlash('success', sprintf('Game "%s" updated.', $game->getName()));
|
||||
|
||||
return $this->redirectToRoute('game_admin_games');
|
||||
}
|
||||
|
||||
return $this->render('game/admin/games/edit.html.twig', [
|
||||
'game' => $game,
|
||||
'form' => $form,
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Game\Controller;
|
||||
|
||||
use App\Game\Entity\Session;
|
||||
use App\Game\Enum\SessionStatus;
|
||||
use App\Game\Repository\SessionRepository;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||
|
||||
#[Route('/admin/sessions')]
|
||||
#[IsGranted('ROLE_ADMIN')]
|
||||
final class GameAdminSessionController extends AbstractController
|
||||
{
|
||||
#[Route('', name: 'game_admin_sessions', methods: ['GET'])]
|
||||
public function index(SessionRepository $sessionRepository): Response
|
||||
{
|
||||
return $this->render('game/admin/sessions/index.html.twig', [
|
||||
'sessions' => $sessionRepository->findBy([], ['created' => 'DESC']),
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route('/{id}/close', name: 'game_admin_session_close', methods: ['POST'])]
|
||||
public function close(Session $session, Request $request, EntityManagerInterface $em): Response
|
||||
{
|
||||
if (!$this->isCsrfTokenValid('close_session_' . $session->getId(), $request->request->get('_token'))) {
|
||||
$this->addFlash('danger', 'Invalid CSRF token.');
|
||||
return $this->redirectToRoute('game_admin_sessions');
|
||||
}
|
||||
|
||||
$session->setStatus(SessionStatus::LOST);
|
||||
$em->flush();
|
||||
|
||||
$this->addFlash('success', sprintf('Session #%d closed.', $session->getId()));
|
||||
|
||||
return $this->redirectToRoute('game_admin_sessions');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Game\Controller;
|
||||
|
||||
use App\Tech\Entity\User;
|
||||
use App\Tech\Form\AdminUserType;
|
||||
use App\Tech\Repository\UserRepository;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||
|
||||
#[Route('/admin/users')]
|
||||
#[IsGranted('ROLE_ADMIN')]
|
||||
final class GameAdminUserController extends AbstractController
|
||||
{
|
||||
#[Route('', name: 'game_admin_users', methods: ['GET'])]
|
||||
public function index(UserRepository $userRepository): Response
|
||||
{
|
||||
$users = $userRepository->findBy([], ['id' => 'ASC']);
|
||||
|
||||
return $this->render('game/admin/users/index.html.twig', [
|
||||
'users' => $users,
|
||||
'marketingOptInCount' => count(array_filter($users, static fn (User $user) => $user->isMarketingOptIn())),
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route('/{id}/edit', name: 'game_admin_user_edit', methods: ['GET', 'POST'])]
|
||||
public function edit(
|
||||
User $user,
|
||||
Request $request,
|
||||
EntityManagerInterface $em,
|
||||
UserPasswordHasherInterface $passwordHasher,
|
||||
): Response {
|
||||
$form = $this->createForm(AdminUserType::class, $user);
|
||||
$form->handleRequest($request);
|
||||
|
||||
if ($form->isSubmitted() && $form->isValid()) {
|
||||
$plainPassword = $form->get('plainPassword')->getData();
|
||||
if ($plainPassword) {
|
||||
$user->setPassword($passwordHasher->hashPassword($user, $plainPassword));
|
||||
}
|
||||
|
||||
$em->flush();
|
||||
$this->addFlash('success', sprintf('User "%s" updated.', $user->getUsername()));
|
||||
|
||||
return $this->redirectToRoute('game_admin_users');
|
||||
}
|
||||
|
||||
return $this->render('game/admin/users/edit.html.twig', [
|
||||
'user' => $user,
|
||||
'form' => $form,
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route('/{id}/delete', name: 'game_admin_user_delete', methods: ['POST'])]
|
||||
public function delete(User $user, Request $request, EntityManagerInterface $em): Response
|
||||
{
|
||||
if (!$this->isCsrfTokenValid('delete_user_' . $user->getId(), $request->request->get('_token'))) {
|
||||
$this->addFlash('danger', 'Invalid CSRF token.');
|
||||
return $this->redirectToRoute('game_admin_users');
|
||||
}
|
||||
|
||||
$username = $user->getUsername();
|
||||
$em->remove($user);
|
||||
$em->flush();
|
||||
|
||||
$this->addFlash('success', sprintf('User "%s" deleted.', $username));
|
||||
|
||||
return $this->redirectToRoute('game_admin_users');
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,10 @@ declare(strict_types=1);
|
||||
|
||||
namespace App\Game\Controller;
|
||||
|
||||
use App\Game\Entity\Session;
|
||||
use App\Game\Enum\SessionStatus;
|
||||
use App\Game\Service\GameResponseService;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
@@ -15,7 +18,9 @@ final class GameApiController extends AbstractController
|
||||
{
|
||||
|
||||
public function __construct(
|
||||
protected GameResponseService $gameResponseService) {
|
||||
protected GameResponseService $gameResponseService,
|
||||
private EntityManagerInterface $entityManager
|
||||
) {
|
||||
|
||||
}
|
||||
|
||||
@@ -29,6 +34,30 @@ final class GameApiController extends AbstractController
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route('/check-finished/{session}', name: 'check_finished', methods: ['POST'])]
|
||||
public function checkFinished(Session $session): JsonResponse
|
||||
{
|
||||
$now = (new \DateTime())->getTimestamp();
|
||||
$isFinished = false;
|
||||
|
||||
if ($session->getStatus() === SessionStatus::PLAYING) {
|
||||
if ($session->getTimer() !== null && $now >= $session->getTimer()) {
|
||||
$session->setStatus(SessionStatus::LOST);
|
||||
$this->entityManager->persist($session);
|
||||
$this->entityManager->flush();
|
||||
$isFinished = true;
|
||||
}
|
||||
} elseif ($session->getStatus() === SessionStatus::LOST || $session->getStatus() === SessionStatus::WON) {
|
||||
$isFinished = true;
|
||||
}
|
||||
|
||||
return $this->json([
|
||||
'ok' => true,
|
||||
'finished' => $isFinished,
|
||||
'status' => $session->getStatus()->value,
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route('/message', name: 'message', methods: ['POST'])]
|
||||
public function message(Request $request): JsonResponse
|
||||
{
|
||||
|
||||
@@ -3,10 +3,17 @@ declare(strict_types=1);
|
||||
|
||||
namespace App\Game\Controller;
|
||||
|
||||
use App\Game\Entity\Player;
|
||||
use App\Game\Entity\Session;
|
||||
use App\Game\Entity\SessionSetting;
|
||||
use App\Game\Enum\SessionSettingType;
|
||||
use App\Game\Enum\SessionStatus;
|
||||
use App\Game\Repository\GameRepository;
|
||||
use App\Game\Repository\PlayerRepository;
|
||||
use App\Game\Repository\SessionRepository;
|
||||
use App\Game\Service\GameDashboardService;
|
||||
use App\Tech\Entity\User;
|
||||
use App\Game\Service\PlayerService;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Bundle\SecurityBundle\Security;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
@@ -14,9 +21,17 @@ use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||
use Symfony\Component\ExpressionLanguage\Expression;
|
||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||
|
||||
final class GameController extends AbstractController
|
||||
{
|
||||
public function __construct(
|
||||
#[Autowire('%env(MERCURE_PUBLIC_URL)%')]
|
||||
private string $mercurePublicUrl,
|
||||
private \Doctrine\ORM\EntityManagerInterface $entityManager
|
||||
) {
|
||||
}
|
||||
|
||||
#[Route(path: '', name: 'game_dashboard', methods: ['GET', 'POST'])]
|
||||
#[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
|
||||
public function dashboard(
|
||||
@@ -70,6 +85,17 @@ final class GameController extends AbstractController
|
||||
$this->addFlash('error', 'Could not leave session (game might have started).');
|
||||
}
|
||||
}
|
||||
} elseif ($request->request->has('start_session')) {
|
||||
$sessionId = $request->request->get('session_id');
|
||||
$session = $sessionRepository->find($sessionId);
|
||||
|
||||
if ($session) {
|
||||
if ($dashboardService->startSession($session)) {
|
||||
$this->addFlash('success', 'Session started! Screens have been assigned.');
|
||||
} else {
|
||||
$this->addFlash('error', 'Could not start session. Make sure all players have joined.');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $this->redirectToRoute('game_dashboard');
|
||||
@@ -81,12 +107,125 @@ final class GameController extends AbstractController
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route(path: '/{session}', name: 'game')]
|
||||
#[Route(path: '/{session}', name: 'game', methods: ['GET', 'POST'])]
|
||||
#[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
|
||||
#[IsGranted('SESSION_VIEW', subject: 'session')]
|
||||
public function index(
|
||||
Session $session): Response
|
||||
Session $session,
|
||||
Request $request,
|
||||
Security $security,
|
||||
PlayerRepository $playerRepository,
|
||||
GameDashboardService $dashboardService
|
||||
): Response
|
||||
{
|
||||
return $this->render('game/index.html.twig', ['session' => $session]);
|
||||
$user = $security->getUser();
|
||||
if (!$user instanceof User) {
|
||||
throw $this->createAccessDeniedException();
|
||||
}
|
||||
|
||||
$player = $playerRepository->findOneBy(['session' => $session, 'user' => $user]);
|
||||
|
||||
if ($request->isMethod('POST') && $request->request->has('toggle_ready')) {
|
||||
$dashboardService->toggleReady($session, $user);
|
||||
return $this->redirectToRoute('game', ['session' => $session->getId()]);
|
||||
}
|
||||
|
||||
// Periodically check readiness timeout
|
||||
$dashboardService->checkAllPlayersReady($session);
|
||||
|
||||
if ($session->getStatus() === SessionStatus::READY) {
|
||||
$isReady = false;
|
||||
$readyAt = null;
|
||||
if ($player) {
|
||||
$settingName = SessionSettingType::tryFrom('ReadyAtForPlayer' . $player->getScreen());
|
||||
if ($settingName) {
|
||||
$setting = $session->getSettings()->filter(fn(SessionSetting $s) => $s->getName() === $settingName && $s->getPlayer() === $player)->first();
|
||||
if ($setting) {
|
||||
$isReady = true;
|
||||
$readyAt = (int)$setting->getValue();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $this->render('game/waiting.html.twig', [
|
||||
'session' => $session,
|
||||
'isReady' => $isReady,
|
||||
'readyAt' => $readyAt,
|
||||
'mercure_public_url' => $this->mercurePublicUrl,
|
||||
]);
|
||||
}
|
||||
|
||||
$screen = $player ? $player->getScreen() : 0;
|
||||
$session_id = $session->getId();
|
||||
|
||||
return $this->render('game/index.html.twig', [
|
||||
'session' => $session,
|
||||
'screen' => $screen,
|
||||
'session_id' => $session_id,
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route(path: '/lost/{session}', name: 'game_lost', methods: ['GET', 'POST'])]
|
||||
#[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
|
||||
#[IsGranted('SESSION_VIEW', subject: 'session')]
|
||||
public function lost(
|
||||
Session $session,
|
||||
Request $request,
|
||||
Security $security,
|
||||
PlayerService $playerService,
|
||||
GameDashboardService $dashboardService
|
||||
): Response {
|
||||
/** @var User $user */
|
||||
$user = $security->getUser();
|
||||
$player = $playerService->GetCurrentlyActiveAsPlayer($user);
|
||||
|
||||
if ($request->isMethod('POST')) {
|
||||
$difficulty = $request->request->get('difficulty');
|
||||
$entertaining = $request->request->get('entertaining');
|
||||
$theme = $request->request->get('theme');
|
||||
$feedback = $request->request->get('feedback');
|
||||
|
||||
// Save feedback
|
||||
if ($player) {
|
||||
$this->saveFeedback($session, $player, $difficulty, $entertaining, $theme, $feedback);
|
||||
$this->addFlash('success', 'Thank you for your feedback!');
|
||||
return $this->redirectToRoute('game_dashboard');
|
||||
}
|
||||
}
|
||||
|
||||
return $this->render('game/lost.html.twig', [
|
||||
'session' => $session,
|
||||
]);
|
||||
}
|
||||
|
||||
private function saveFeedback(Session $session, Player $player, $difficulty, $entertaining, $theme, $feedback): void
|
||||
{
|
||||
$settings = [
|
||||
SessionSettingType::FEEDBACK_DIFFICULTY,
|
||||
SessionSettingType::FEEDBACK_ENTERTAINING,
|
||||
SessionSettingType::FEEDBACK_THEME,
|
||||
SessionSettingType::FEEDBACK_TEXT,
|
||||
];
|
||||
|
||||
$values = [
|
||||
$difficulty,
|
||||
$entertaining,
|
||||
$theme,
|
||||
$feedback,
|
||||
];
|
||||
|
||||
foreach ($settings as $index => $type) {
|
||||
$value = $values[$index];
|
||||
if ($value === null || $value === '') continue;
|
||||
|
||||
$setting = new SessionSetting();
|
||||
$setting->setSession($session);
|
||||
$setting->setPlayer($player);
|
||||
$setting->setName($type);
|
||||
$setting->setValue((string)$value);
|
||||
$this->entityManager->persist($setting);
|
||||
}
|
||||
|
||||
$this->entityManager->flush();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ class Player
|
||||
#[ORM\JoinColumn(nullable: false)]
|
||||
private ?User $user = null;
|
||||
|
||||
#[ORM\Column]
|
||||
#[ORM\Column(nullable: true)]
|
||||
private ?int $screen = null;
|
||||
|
||||
public function getId(): ?int
|
||||
@@ -60,7 +60,7 @@ class Player
|
||||
return $this->screen;
|
||||
}
|
||||
|
||||
public function setScreen(int $screen): static
|
||||
public function setScreen(?int $screen): static
|
||||
{
|
||||
$this->screen = $screen;
|
||||
|
||||
|
||||
@@ -7,18 +7,71 @@ enum SessionSettingType: string
|
||||
case PWD_FOR_PLAYER1 = 'PwdForPlayer1';
|
||||
case PWD_FOR_PLAYER2 = 'PwdForPlayer2';
|
||||
case PWD_FOR_PLAYER3 = 'PwdForPlayer3';
|
||||
case PWD_FOR_PLAYER4 = 'PwdForPlayer4';
|
||||
case PWD_FOR_PLAYER5 = 'PwdForPlayer5';
|
||||
case PWD_FOR_PLAYER6 = 'PwdForPlayer6';
|
||||
case PWD_FOR_PLAYER7 = 'PwdForPlayer7';
|
||||
case PWD_FOR_PLAYER8 = 'PwdForPlayer8';
|
||||
case PWD_FOR_PLAYER9 = 'PwdForPlayer9';
|
||||
case PWD_FOR_PLAYER10 = 'PwdForPlayer10';
|
||||
case RIGHTS_FOR_PLAYER1 = 'RightsForPlayer1';
|
||||
case RIGHTS_FOR_PLAYER2 = 'RightsForPlayer2';
|
||||
case RIGHTS_FOR_PLAYER3 = 'RightsForPlayer3';
|
||||
case RIGHTS_FOR_PLAYER4 = 'RightsForPlayer4';
|
||||
case RIGHTS_FOR_PLAYER5 = 'RightsForPlayer5';
|
||||
case RIGHTS_FOR_PLAYER6 = 'RightsForPlayer6';
|
||||
case RIGHTS_FOR_PLAYER7 = 'RightsForPlayer7';
|
||||
case RIGHTS_FOR_PLAYER8 = 'RightsForPlayer8';
|
||||
case RIGHTS_FOR_PLAYER9 = 'RightsForPlayer9';
|
||||
case RIGHTS_FOR_PLAYER10 = 'RightsForPlayer10';
|
||||
case INVITE_CODE = 'InviteCode';
|
||||
case SET_OF_DELETED_FILES = 'SetOfDeletedFiles';
|
||||
case CHAT_TRACKING_FOR_PLAYER1 = 'ChatTrackingForPlayer1';
|
||||
case CHAT_TRACKING_FOR_PLAYER2 = 'ChatTrackingForPlayer2';
|
||||
case CHAT_TRACKING_FOR_PLAYER3 = 'ChatTrackingForPlayer3';
|
||||
case CHAT_TRACKING_FOR_PLAYER4 = 'ChatTrackingForPlayer4';
|
||||
case CHAT_TRACKING_FOR_PLAYER5 = 'ChatTrackingForPlayer5';
|
||||
case CHAT_TRACKING_FOR_PLAYER6 = 'ChatTrackingForPlayer6';
|
||||
case CHAT_TRACKING_FOR_PLAYER7 = 'ChatTrackingForPlayer7';
|
||||
case CHAT_TRACKING_FOR_PLAYER8 = 'ChatTrackingForPlayer8';
|
||||
case CHAT_TRACKING_FOR_PLAYER9 = 'ChatTrackingForPlayer9';
|
||||
case CHAT_TRACKING_FOR_PLAYER10 = 'ChatTrackingForPlayer10';
|
||||
case VERIFY_CODES_FOR_PLAYER1 = 'VerifyCodesForPlayer1';
|
||||
case VERIFY_CODES_FOR_PLAYER2 = 'VerifyCodesForPlayer2';
|
||||
case VERIFY_CODES_FOR_PLAYER3 = 'VerifyCodesForPlayer3';
|
||||
case VERIFY_CODES_FOR_PLAYER4 = 'VerifyCodesForPlayer4';
|
||||
case VERIFY_CODES_FOR_PLAYER5 = 'VerifyCodesForPlayer5';
|
||||
case VERIFY_CODES_FOR_PLAYER6 = 'VerifyCodesForPlayer6';
|
||||
case VERIFY_CODES_FOR_PLAYER7 = 'VerifyCodesForPlayer7';
|
||||
case VERIFY_CODES_FOR_PLAYER8 = 'VerifyCodesForPlayer8';
|
||||
case VERIFY_CODES_FOR_PLAYER9 = 'VerifyCodesForPlayer9';
|
||||
case VERIFY_CODES_FOR_PLAYER10 = 'VerifyCodesForPlayer10';
|
||||
case VERIFICATION_PROGRESS_FOR_PLAYER1 = 'VerificationProgressForPlayer1';
|
||||
case VERIFICATION_PROGRESS_FOR_PLAYER2 = 'VerificationProgressForPlayer2';
|
||||
case VERIFICATION_PROGRESS_FOR_PLAYER3 = 'VerificationProgressForPlayer3';
|
||||
case VERIFICATION_PROGRESS_FOR_PLAYER4 = 'VerificationProgressForPlayer4';
|
||||
case VERIFICATION_PROGRESS_FOR_PLAYER5 = 'VerificationProgressForPlayer5';
|
||||
case VERIFICATION_PROGRESS_FOR_PLAYER6 = 'VerificationProgressForPlayer6';
|
||||
case VERIFICATION_PROGRESS_FOR_PLAYER7 = 'VerificationProgressForPlayer7';
|
||||
case VERIFICATION_PROGRESS_FOR_PLAYER8 = 'VerificationProgressForPlayer8';
|
||||
case VERIFICATION_PROGRESS_FOR_PLAYER9 = 'VerificationProgressForPlayer9';
|
||||
case VERIFICATION_PROGRESS_FOR_PLAYER10 = 'VerificationProgressForPlayer10';
|
||||
case EVERYONE_VERIFIED = 'EveryoneVerified';
|
||||
case SPECIAL_REPORT_CODE_DOYLE = 'SpecialReportCodeDoyle';
|
||||
case SPECIAL_REPORT_CODE_VEGA = 'SpecialReportCodeVega';
|
||||
case SPECIAL_REPORT_CODE_LENNOX = 'SpecialReportCodeLennox';
|
||||
case READY_AT_FOR_PLAYER1 = 'ReadyAtForPlayer1';
|
||||
case READY_AT_FOR_PLAYER2 = 'ReadyAtForPlayer2';
|
||||
case READY_AT_FOR_PLAYER3 = 'ReadyAtForPlayer3';
|
||||
case READY_AT_FOR_PLAYER4 = 'ReadyAtForPlayer4';
|
||||
case READY_AT_FOR_PLAYER5 = 'ReadyAtForPlayer5';
|
||||
case READY_AT_FOR_PLAYER6 = 'ReadyAtForPlayer6';
|
||||
case READY_AT_FOR_PLAYER7 = 'ReadyAtForPlayer7';
|
||||
case READY_AT_FOR_PLAYER8 = 'ReadyAtForPlayer8';
|
||||
case READY_AT_FOR_PLAYER9 = 'ReadyAtForPlayer9';
|
||||
case READY_AT_FOR_PLAYER10 = 'ReadyAtForPlayer10';
|
||||
case FEEDBACK_DIFFICULTY = 'FeedbackDifficulty';
|
||||
case FEEDBACK_ENTERTAINING = 'FeedbackEntertaining';
|
||||
case FEEDBACK_THEME = 'FeedbackTheme';
|
||||
case FEEDBACK_TEXT = 'FeedbackText';
|
||||
}
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Game\Form;
|
||||
|
||||
use App\Game\Entity\Game;
|
||||
use App\Game\Enum\GameStatus;
|
||||
use Symfony\Component\Form\AbstractType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\IntegerType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
use Symfony\Component\Validator\Constraints\NotBlank;
|
||||
use Symfony\Component\Validator\Constraints\Positive;
|
||||
|
||||
class AdminGameType extends AbstractType
|
||||
{
|
||||
public function buildForm(FormBuilderInterface $builder, array $options): void
|
||||
{
|
||||
$builder
|
||||
->add('name', TextType::class, [
|
||||
'constraints' => [new NotBlank()],
|
||||
])
|
||||
->add('numberOfPlayers', IntegerType::class, [
|
||||
'label' => 'Number of players',
|
||||
'constraints' => [new NotBlank(), new Positive()],
|
||||
])
|
||||
->add('status', ChoiceType::class, [
|
||||
'choices' => [
|
||||
'In development' => GameStatus::IN_DEVELOPMENT,
|
||||
'Locked' => GameStatus::LOCKED,
|
||||
'Open' => GameStatus::OPEN,
|
||||
],
|
||||
])
|
||||
->add('totalTime', IntegerType::class, [
|
||||
'mapped' => false,
|
||||
'required' => false,
|
||||
'label' => 'Total time (seconds)',
|
||||
'data' => $options['total_time'],
|
||||
'attr' => ['placeholder' => 'e.g. 3600 for 1 hour'],
|
||||
]);
|
||||
}
|
||||
|
||||
public function configureOptions(OptionsResolver $resolver): void
|
||||
{
|
||||
$resolver->setDefaults([
|
||||
'data_class' => Game::class,
|
||||
'total_time' => null,
|
||||
]);
|
||||
|
||||
$resolver->setAllowedTypes('total_time', ['null', 'string', 'int']);
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,8 @@ use App\Game\Repository\SessionRepository;
|
||||
use App\Tech\Entity\User;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Symfony\Component\Security\Core\User\UserInterface;
|
||||
use Symfony\Component\Mercure\HubInterface;
|
||||
use Symfony\Component\Mercure\Update;
|
||||
|
||||
final class GameDashboardService
|
||||
{
|
||||
@@ -22,6 +24,7 @@ final class GameDashboardService
|
||||
private readonly GameRepository $gameRepository,
|
||||
private readonly SessionRepository $sessionRepository,
|
||||
private readonly EntityManagerInterface $entityManager,
|
||||
private readonly HubInterface $hub,
|
||||
) {
|
||||
}
|
||||
|
||||
@@ -66,16 +69,17 @@ final class GameDashboardService
|
||||
|
||||
$player = new Player();
|
||||
$player->setUser($user);
|
||||
$player->setSession($session);
|
||||
$player->setScreen(1);
|
||||
$session->addPlayer($player);
|
||||
|
||||
$this->entityManager->persist($session);
|
||||
$this->entityManager->persist($player);
|
||||
|
||||
$this->initializePlayerSettings($player);
|
||||
|
||||
$this->entityManager->flush();
|
||||
|
||||
if (count($session->getPlayers()) === $session->getGame()->getNumberOfPlayers()) {
|
||||
$this->startSession($session);
|
||||
}
|
||||
|
||||
return $session;
|
||||
}
|
||||
|
||||
@@ -104,20 +108,22 @@ final class GameDashboardService
|
||||
}
|
||||
|
||||
$playerCount = count($session->getPlayers());
|
||||
if ($playerCount >= 3) {
|
||||
if ($playerCount >= $session->getGame()->getNumberOfPlayers()) {
|
||||
return false; // Session full
|
||||
}
|
||||
|
||||
$player = new Player();
|
||||
$player->setUser($user);
|
||||
$player->setSession($session);
|
||||
$player->setScreen($playerCount + 1);
|
||||
$session->addPlayer($player);
|
||||
|
||||
$this->entityManager->persist($player);
|
||||
$this->initializePlayerSettings($player);
|
||||
|
||||
$this->entityManager->flush();
|
||||
|
||||
if (count($session->getPlayers()) === $session->getGame()->getNumberOfPlayers()) {
|
||||
$this->startSession($session);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -127,7 +133,7 @@ final class GameDashboardService
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($session->getStatus() !== SessionStatus::CREATED || $session->getTimer() > 0) {
|
||||
if (!in_array($session->getStatus(), [SessionStatus::CREATED, SessionStatus::READY]) || $session->getTimer() > 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -143,6 +149,14 @@ final class GameDashboardService
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($session->getStatus() === SessionStatus::READY) {
|
||||
$session->setStatus(SessionStatus::CREATED);
|
||||
// Clear assignments for all remaining players since the game needs to be "started" again
|
||||
foreach ($session->getPlayers() as $player) {
|
||||
$player->setScreen(null);
|
||||
}
|
||||
}
|
||||
|
||||
// Remove player specific settings (like rights)
|
||||
foreach ($session->getSettings() as $setting) {
|
||||
if ($setting->getPlayer() === $playerToDelete) {
|
||||
@@ -170,12 +184,7 @@ final class GameDashboardService
|
||||
private function initializePlayerSettings(Player $player): void
|
||||
{
|
||||
$screen = $player->getScreen();
|
||||
$rightsSettingName = match ($screen) {
|
||||
1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
|
||||
2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
|
||||
3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$rightsSettingName = SessionSettingType::tryFrom('RightsForPlayer' . $screen);
|
||||
|
||||
if ($rightsSettingName) {
|
||||
$setting = new SessionSetting();
|
||||
@@ -186,28 +195,18 @@ final class GameDashboardService
|
||||
$this->entityManager->persist($setting);
|
||||
}
|
||||
|
||||
$pwdSettingName = match ($screen) {
|
||||
1 => SessionSettingType::PWD_FOR_PLAYER1,
|
||||
2 => SessionSettingType::PWD_FOR_PLAYER2,
|
||||
3 => SessionSettingType::PWD_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$pwdSettingName = SessionSettingType::tryFrom('PwdForPlayer' . $screen);
|
||||
|
||||
if ($pwdSettingName) {
|
||||
$setting = new SessionSetting();
|
||||
$setting->setSession($player->getSession());
|
||||
$setting->setPlayer($player);
|
||||
$setting->setName($pwdSettingName);
|
||||
$setting->setValue('home/' . $player->getUser()->getUserIdentifier());
|
||||
$setting->setValue('/var/home/' . $player->getUser()->getUsername());
|
||||
$this->entityManager->persist($setting);
|
||||
}
|
||||
|
||||
$chatTrackingSettingName = match ($screen) {
|
||||
1 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER1,
|
||||
2 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER2,
|
||||
3 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$chatTrackingSettingName = SessionSettingType::tryFrom('ChatTrackingForPlayer' . $screen);
|
||||
|
||||
if ($chatTrackingSettingName) {
|
||||
$setting = new SessionSetting();
|
||||
@@ -218,16 +217,12 @@ final class GameDashboardService
|
||||
$this->entityManager->persist($setting);
|
||||
}
|
||||
|
||||
$verifyCodesSettingName = match ($screen) {
|
||||
1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
|
||||
2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
|
||||
3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$verifyCodesSettingName = SessionSettingType::tryFrom('VerifyCodesForPlayer' . $screen);
|
||||
|
||||
if ($verifyCodesSettingName) {
|
||||
$codes = [];
|
||||
for ($i = 1; $i <= 3; $i++) {
|
||||
$numPlayers = $player->getSession()->getGame()->getNumberOfPlayers();
|
||||
for ($i = 1; $i <= $numPlayers; $i++) {
|
||||
if ($i !== $screen) {
|
||||
$codes[$i] = bin2hex(random_bytes(3)); // 6 characters code
|
||||
}
|
||||
@@ -241,12 +236,7 @@ final class GameDashboardService
|
||||
$this->entityManager->persist($setting);
|
||||
}
|
||||
|
||||
$verificationProgressSettingName = match ($screen) {
|
||||
1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
|
||||
2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
|
||||
3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$verificationProgressSettingName = SessionSettingType::tryFrom('VerificationProgressForPlayer' . $screen);
|
||||
|
||||
if ($verificationProgressSettingName) {
|
||||
$setting = new SessionSetting();
|
||||
@@ -258,6 +248,184 @@ final class GameDashboardService
|
||||
}
|
||||
}
|
||||
|
||||
public function startSession(Session $session): bool
|
||||
{
|
||||
if ($session->getStatus() !== SessionStatus::CREATED) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$players = $session->getPlayers()->toArray();
|
||||
if (count($players) < $session->getGame()->getNumberOfPlayers()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Clean up any existing assignments (e.g. if we reverted from READY to CREATED)
|
||||
foreach ($session->getSettings() as $setting) {
|
||||
if ($setting->getPlayer() !== null) {
|
||||
$session->removeSetting($setting);
|
||||
$this->entityManager->remove($setting);
|
||||
}
|
||||
}
|
||||
|
||||
// Shuffle players to assign random screens
|
||||
shuffle($players);
|
||||
|
||||
foreach ($players as $index => $player) {
|
||||
$screen = $index + 1;
|
||||
$player->setScreen($screen);
|
||||
$this->initializePlayerSettings($player);
|
||||
$this->entityManager->persist($player);
|
||||
}
|
||||
|
||||
$session->setStatus(SessionStatus::READY);
|
||||
$this->entityManager->persist($session);
|
||||
$this->entityManager->flush();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public function toggleReady(Session $session, User $user): bool
|
||||
{
|
||||
if ($session->getStatus() !== SessionStatus::READY) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$player = null;
|
||||
foreach ($session->getPlayers() as $p) {
|
||||
if ($p->getUser() === $user) {
|
||||
$player = $p;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$player) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$settingName = SessionSettingType::tryFrom('ReadyAtForPlayer' . $player->getScreen());
|
||||
if (!$settingName) {
|
||||
return false;
|
||||
}
|
||||
|
||||
/** @var \App\Game\Repository\SessionSettingRepository $settingRepo */
|
||||
$settingRepo = $this->entityManager->getRepository(SessionSetting::class);
|
||||
$setting = $settingRepo->getSetting($session, $settingName, $player);
|
||||
|
||||
if ($setting) {
|
||||
$session->removeSetting($setting);
|
||||
$this->entityManager->remove($setting);
|
||||
} else {
|
||||
$setting = new SessionSetting();
|
||||
$setting->setSession($session);
|
||||
$setting->setPlayer($player);
|
||||
$setting->setName($settingName);
|
||||
$setting->setValue((string)(new \DateTime())->getTimestamp());
|
||||
$this->entityManager->persist($setting);
|
||||
}
|
||||
|
||||
$this->checkAllPlayersReady($session);
|
||||
$this->entityManager->flush();
|
||||
|
||||
// If this toggle just made everyone ready, checkAllPlayersReady() already
|
||||
// transitioned the session out of READY and published 'all_ready' —
|
||||
// don't also publish a redundant 'player_ready'.
|
||||
if ($session->getStatus() === SessionStatus::READY) {
|
||||
try {
|
||||
$topic = '/game/hub/' . $session->getId();
|
||||
$this->hub->publish(new Update($topic, json_encode(['type' => 'player_ready', 'player' => $player->getScreen(), 'ready' => !$setting])));
|
||||
} catch (\Exception $e) {
|
||||
// Mercure might be down, but we don't want to crash the game
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public function checkAllPlayersReady(Session $session): void
|
||||
{
|
||||
if ($session->getStatus() !== SessionStatus::READY) {
|
||||
return;
|
||||
}
|
||||
|
||||
$players = $session->getPlayers();
|
||||
$numPlayers = $session->getGame()->getNumberOfPlayers();
|
||||
|
||||
if (count($players) < $numPlayers) {
|
||||
return;
|
||||
}
|
||||
|
||||
$readyPlayersCount = 0;
|
||||
$now = new \DateTime();
|
||||
$anyReset = false;
|
||||
|
||||
/** @var \App\Game\Repository\SessionSettingRepository $settingRepo */
|
||||
$settingRepo = $this->entityManager->getRepository(SessionSetting::class);
|
||||
|
||||
foreach ($players as $player) {
|
||||
$settingName = SessionSettingType::tryFrom('ReadyAtForPlayer' . $player->getScreen());
|
||||
if (!$settingName) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$setting = $settingRepo->getSetting($session, $settingName, $player);
|
||||
if ($setting) {
|
||||
$readyAtTimestamp = (int)$setting->getValue();
|
||||
// Check timeout: 1 minute = 60 seconds
|
||||
if (($now->getTimestamp() - $readyAtTimestamp) > 60) {
|
||||
$session->removeSetting($setting);
|
||||
$this->entityManager->remove($setting);
|
||||
$anyReset = true;
|
||||
} else {
|
||||
$readyPlayersCount++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($anyReset) {
|
||||
$this->entityManager->flush();
|
||||
try {
|
||||
$topic = '/game/hub/' . $session->getId();
|
||||
$this->hub->publish(new Update($topic, json_encode(['type' => 'player_ready'])));
|
||||
} catch (\Exception $e) {
|
||||
// Mercure might be down
|
||||
}
|
||||
}
|
||||
|
||||
if ($readyPlayersCount === $numPlayers) {
|
||||
$session->setStatus(SessionStatus::PLAYING);
|
||||
|
||||
// Set the end timer
|
||||
$game = $session->getGame();
|
||||
/** @var \App\Game\Repository\GameSettingRepository $gameSettingRepo */
|
||||
$gameSettingRepo = $this->entityManager->getRepository(\App\Game\Entity\GameSetting::class);
|
||||
$totalTimeSetting = $gameSettingRepo->getSetting($game, \App\Game\Enum\GameSettingType::TOTAL_TIME);
|
||||
$totalTime = $totalTimeSetting ? (int)$totalTimeSetting->getValue() : 3600; // Default to 60 minutes if not set
|
||||
|
||||
$session->setTimer((new \DateTime())->getTimestamp() + $totalTime);
|
||||
|
||||
$this->entityManager->persist($session);
|
||||
|
||||
// Clean up ready settings
|
||||
foreach ($players as $player) {
|
||||
$settingName = SessionSettingType::tryFrom('ReadyAtForPlayer' . $player->getScreen());
|
||||
if ($settingName) {
|
||||
$setting = $settingRepo->getSetting($session, $settingName, $player);
|
||||
if ($setting) {
|
||||
$session->removeSetting($setting);
|
||||
$this->entityManager->remove($setting);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
$topic = '/game/hub/' . $session->getId();
|
||||
$this->hub->publish(new Update($topic, json_encode(['type' => 'all_ready'])));
|
||||
} catch (\Exception $e) {
|
||||
// Mercure might be down, but we don't want to crash the game
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public function generateInviteCode(Session $session, UserInterface $user, bool $isAdmin): ?string
|
||||
{
|
||||
// Security check: is user part of this session?
|
||||
|
||||
@@ -21,6 +21,7 @@ class GameResponseService
|
||||
private SessionSettingRepository $sessionSettingRepository,
|
||||
private HubInterface $hub,
|
||||
private EntityManagerInterface $entityManager,
|
||||
private string $projectDir,
|
||||
) {
|
||||
}
|
||||
|
||||
@@ -44,7 +45,7 @@ class GameResponseService
|
||||
if(!$player)
|
||||
return ['error' => 'You are not in a game.'];
|
||||
|
||||
// TODO: Here i need to add a message handler to save the message in a big log.
|
||||
$this->logSessionActivity($player, 'PLAYER: ' . $message);
|
||||
|
||||
$data = [];
|
||||
|
||||
@@ -54,17 +55,46 @@ class GameResponseService
|
||||
$data = $this->checkConsoleCommando($message, $player);
|
||||
}
|
||||
|
||||
$responseLog = '';
|
||||
if (isset($data['result']) && is_array($data['result'])) {
|
||||
foreach ($data['result'] as $line) {
|
||||
if (is_array($line)) {
|
||||
$responseLog .= json_encode($line) . "\n";
|
||||
} elseif (is_string($line) || is_numeric($line)) {
|
||||
$responseLog .= (string)$line . "\n";
|
||||
}
|
||||
}
|
||||
} elseif (isset($data['error'])) {
|
||||
$responseLog = 'ERROR: ' . $data['error'];
|
||||
}
|
||||
|
||||
if ($responseLog !== '') {
|
||||
$this->logSessionActivity($player, 'SERVER: ' . trim($responseLog));
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
private function logSessionActivity(Player $player, string $content): void
|
||||
{
|
||||
$sessionId = $player->getSession()->getId();
|
||||
$username = $player->getUser()->getUsername();
|
||||
$logDir = $this->projectDir . '/var/log/sessions/' . $sessionId;
|
||||
|
||||
if (!is_dir($logDir)) {
|
||||
mkdir($logDir, 0777, true);
|
||||
}
|
||||
|
||||
$logFile = $logDir . '/' . $username . '.txt';
|
||||
$timestamp = date('Y-m-d H:i:s');
|
||||
$logMessage = sprintf("[%s] %s\n", $timestamp, $content);
|
||||
|
||||
file_put_contents($logFile, $logMessage, FILE_APPEND);
|
||||
}
|
||||
|
||||
private function getRechten(Player $player): array
|
||||
{
|
||||
$settingName = match($player->getScreen()) {
|
||||
1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
|
||||
2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
|
||||
3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$settingName = SessionSettingType::tryFrom('RightsForPlayer' . $player->getScreen());
|
||||
|
||||
if (!$settingName) {
|
||||
return [];
|
||||
@@ -138,6 +168,15 @@ class GameResponseService
|
||||
|
||||
$this->playerService->saveCurrentPwdOfPlayer($player, $newLocation);
|
||||
return ['result' => ['Path: ' . $newLocation]];
|
||||
case 'cat':
|
||||
if(!in_array('cat', $rechten))
|
||||
return ['result' => ['Unknown command']];
|
||||
|
||||
$pwd = $this->playerService->getCurrentPwdOfPlayer($player);
|
||||
|
||||
$fileContent = $this->getFileContent($player, $pwd.'/'.$messagePart[1]);
|
||||
|
||||
return ['result' => $fileContent];
|
||||
case 'pwd':
|
||||
if(!in_array('pwd', $rechten))
|
||||
return ['result' => ['Unknown command']];
|
||||
@@ -189,6 +228,7 @@ class GameResponseService
|
||||
$messages[] = ' If you want to send a message specifically to one other agent, use the id of the agent after /chat, like /chat 6 {message}';
|
||||
$messages[] = ' This will send the message only to agent with id 6.';
|
||||
$messages[] = ' USAGE: /chat {message}';
|
||||
$messages[] = ' USAGE: /chat 6 {message}';
|
||||
$messages[] = '';
|
||||
break;
|
||||
case 'help':
|
||||
@@ -268,7 +308,7 @@ class GameResponseService
|
||||
if (isset($messageParts[1]) &&
|
||||
is_numeric($messageParts[1]) &&
|
||||
$messageParts[1] >= 1 &&
|
||||
$messageParts[1] <= 3) {
|
||||
$messageParts[1] <= $player->getSession()->getGame()->getNumberOfPlayers()) {
|
||||
|
||||
$toSingle = true;
|
||||
}
|
||||
@@ -293,8 +333,12 @@ class GameResponseService
|
||||
if(is_null($activeGame))
|
||||
return false;
|
||||
|
||||
$topic = $_ENV['MERCURE_TOPIC_BASE'] . '/game/hub-' . $activeGame;
|
||||
$this->hub->publish(new Update($topic, json_encode([$sendTo, $message])));
|
||||
$topic = '/game/hub/' . $activeGame;
|
||||
try {
|
||||
$this->hub->publish(new Update($topic, json_encode([$sendTo, $message])));
|
||||
} catch (\Exception $e) {
|
||||
// Mercure might be down
|
||||
}
|
||||
|
||||
$this->updateChatTracking($player, (int)$sendTo);
|
||||
|
||||
@@ -308,12 +352,7 @@ class GameResponseService
|
||||
$screen = $player->getScreen();
|
||||
$session = $player->getSession();
|
||||
|
||||
$verifyCodesSettingName = match ($screen) {
|
||||
1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
|
||||
2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
|
||||
3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$verifyCodesSettingName = SessionSettingType::tryFrom('VerifyCodesForPlayer' . $screen);
|
||||
|
||||
if (!$verifyCodesSettingName) {
|
||||
return;
|
||||
@@ -340,10 +379,14 @@ class GameResponseService
|
||||
$this->entityManager->flush();
|
||||
|
||||
// Notify the player that their codes have changed
|
||||
$topic = $_ENV['MERCURE_TOPIC_BASE'] . '/game/hub-' . $session->getId();
|
||||
$topic = '/game/hub/' . $session->getId();
|
||||
$notification = "Security Alert: One of your verify codes was shared and has been regenerated.";
|
||||
// We send it only to this player (screen)
|
||||
$this->hub->publish(new Update($topic, json_encode([$screen, $notification])));
|
||||
try {
|
||||
$this->hub->publish(new Update($topic, json_encode([$screen, $notification])));
|
||||
} catch (\Exception $e) {
|
||||
// Mercure might be down
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -353,12 +396,7 @@ class GameResponseService
|
||||
if(in_array('verify', $rights))
|
||||
return;
|
||||
|
||||
$trackingSettingName = match ($player->getScreen()) {
|
||||
1 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER1,
|
||||
2 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER2,
|
||||
3 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$trackingSettingName = SessionSettingType::tryFrom('ChatTrackingForPlayer' . $player->getScreen());
|
||||
|
||||
if (!$trackingSettingName) {
|
||||
return;
|
||||
@@ -388,7 +426,8 @@ class GameResponseService
|
||||
{
|
||||
$screen = $player->getScreen();
|
||||
$requiredTargets = [0]; // Everyone
|
||||
for ($i = 1; $i <= 3; $i++) {
|
||||
$numPlayers = $player->getSession()->getGame()->getNumberOfPlayers();
|
||||
for ($i = 1; $i <= $numPlayers; $i++) {
|
||||
if ($i !== $screen) {
|
||||
$requiredTargets[] = $i;
|
||||
}
|
||||
@@ -402,12 +441,7 @@ class GameResponseService
|
||||
}
|
||||
|
||||
// Grant verify right
|
||||
$rightsSettingName = match ($screen) {
|
||||
1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
|
||||
2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
|
||||
3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$rightsSettingName = SessionSettingType::tryFrom('RightsForPlayer' . $screen);
|
||||
|
||||
if (!$rightsSettingName) {
|
||||
return;
|
||||
@@ -468,6 +502,30 @@ class GameResponseService
|
||||
return $randomString;
|
||||
}
|
||||
|
||||
private function generateSpecialCode(int $firstDigit, int $min, int $max): string
|
||||
{
|
||||
$code = $this->generateRandomString($min, $max);
|
||||
|
||||
// Ensure the first numeric digit is the specified $firstDigit
|
||||
$found = false;
|
||||
$codeArray = str_split($code);
|
||||
for ($i = 0; $i < count($codeArray); $i++) {
|
||||
if (ctype_digit($codeArray[$i])) {
|
||||
$codeArray[$i] = (string)$firstDigit;
|
||||
$found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
$code = implode('', $codeArray);
|
||||
|
||||
// If no digit was found (highly unlikely given the character set), prepend it
|
||||
if (!$found) {
|
||||
$code = (string)$firstDigit . substr($code, 1);
|
||||
}
|
||||
|
||||
return $code;
|
||||
}
|
||||
|
||||
private function handleVerifyMessage(string $message, Player $player) : string
|
||||
{
|
||||
$messageParts = explode(' ', $message);
|
||||
@@ -479,12 +537,7 @@ class GameResponseService
|
||||
$screen = $player->getScreen();
|
||||
$session = $player->getSession();
|
||||
|
||||
$progressSettingName = match ($screen) {
|
||||
1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
|
||||
2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
|
||||
3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$progressSettingName = SessionSettingType::tryFrom('VerificationProgressForPlayer' . $screen);
|
||||
|
||||
if (!$progressSettingName) {
|
||||
return 'Error: Invalid player screen.';
|
||||
@@ -504,12 +557,7 @@ class GameResponseService
|
||||
}
|
||||
|
||||
$otherScreen = $otherPlayer->getScreen();
|
||||
$codesSettingName = match ($otherScreen) {
|
||||
1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
|
||||
2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
|
||||
3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$codesSettingName = SessionSettingType::tryFrom('VerifyCodesForPlayer' . $otherScreen);
|
||||
|
||||
if (!$codesSettingName) {
|
||||
continue;
|
||||
@@ -553,12 +601,7 @@ class GameResponseService
|
||||
private function grantVerificationRights(Player $player): void
|
||||
{
|
||||
$screen = $player->getScreen();
|
||||
$rightsSettingName = match ($screen) {
|
||||
1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
|
||||
2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
|
||||
3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$rightsSettingName = SessionSettingType::tryFrom('RightsForPlayer' . $screen);
|
||||
|
||||
if (!$rightsSettingName) {
|
||||
return;
|
||||
@@ -584,6 +627,55 @@ class GameResponseService
|
||||
$setting->setValue(json_encode($rights));
|
||||
$this->entityManager->persist($setting);
|
||||
$this->entityManager->flush();
|
||||
|
||||
$this->checkIfAllPlayersVerified($player);
|
||||
}
|
||||
}
|
||||
|
||||
private function checkIfAllPlayersVerified(Player $player): void
|
||||
{
|
||||
$session = $player->getSession();
|
||||
$everyoneVerifiedSetting = $this->sessionSettingRepository->getSetting($session, SessionSettingType::EVERYONE_VERIFIED);
|
||||
|
||||
if ($everyoneVerifiedSetting && $everyoneVerifiedSetting->getValue() === 'true') {
|
||||
return;
|
||||
}
|
||||
|
||||
$allVerified = true;
|
||||
foreach ($session->getPlayers() as $otherPlayer) {
|
||||
$otherScreen = $otherPlayer->getScreen();
|
||||
$progressSettingName = SessionSettingType::tryFrom('VerificationProgressForPlayer' . $otherScreen);
|
||||
|
||||
if (!$progressSettingName) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$progressSetting = $this->sessionSettingRepository->getSetting($session, $progressSettingName, $otherPlayer);
|
||||
$progress = json_decode($progressSetting?->getValue() ?? '[]', true) ?? [];
|
||||
|
||||
if (count($progress) < $session->getGame()->getNumberOfPlayers() - 1) {
|
||||
$allVerified = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ($allVerified) {
|
||||
if (!$everyoneVerifiedSetting) {
|
||||
$everyoneVerifiedSetting = new SessionSetting();
|
||||
$everyoneVerifiedSetting->setSession($session);
|
||||
$everyoneVerifiedSetting->setName(SessionSettingType::EVERYONE_VERIFIED);
|
||||
}
|
||||
$everyoneVerifiedSetting->setValue('true');
|
||||
$this->entityManager->persist($everyoneVerifiedSetting);
|
||||
$this->entityManager->flush();
|
||||
|
||||
$topic = '/game/hub/' . $session->getId();
|
||||
$message = "Mainframe Help Modus: Agents Doyle, Vega and Lennox rapports have been updated with coded messages.";
|
||||
try {
|
||||
$this->hub->publish(new Update($topic, json_encode([0, $message])));
|
||||
} catch (\Exception $e) {
|
||||
// Mercure might be down
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -646,20 +738,20 @@ class GameResponseService
|
||||
$paths[] = '/etc/freak';
|
||||
$paths[] = '/etc/host';
|
||||
|
||||
$paths[] = '/home';
|
||||
$paths[] = '/var/home';
|
||||
|
||||
$playerNames = ['root', 'Luke', 'Charles', 'William', 'Peter'];
|
||||
|
||||
$players = $player->getSession()->getPlayers();
|
||||
|
||||
foreach($players as $player) {
|
||||
$playerNames[] = $player->getUser()->getUsername();
|
||||
foreach($players as $p) {
|
||||
$playerNames[] = $p->getUser()->getUsername();
|
||||
}
|
||||
|
||||
$playerNames = array_unique($playerNames);
|
||||
|
||||
foreach($playerNames as $name) {
|
||||
$paths[] = '/home/' . $name;
|
||||
$paths[] = '/var/home/' . $name;
|
||||
}
|
||||
|
||||
return $paths;
|
||||
@@ -725,12 +817,17 @@ class GameResponseService
|
||||
$files[] = '/var/rapports/017_123-88.txt';
|
||||
$files[] = '/var/rapports/093_138-24.txt';
|
||||
$files[] = '/var/rapports/001_145-93.txt';
|
||||
$files[] = '/var/rapports/011_130-62.txt';
|
||||
$files[] = '/var/rapports/index.txt';
|
||||
|
||||
if ($player === null) {
|
||||
return $files;
|
||||
}
|
||||
|
||||
$players = $player->getSession()->getPlayers();
|
||||
|
||||
foreach($players as $player) {
|
||||
$files[] = '/var/home/' . $player->getUser()->getUsername() . '/verifyCodes.txt';
|
||||
foreach($players as $p) {
|
||||
$files[] = '/var/home/' . $p->getUser()->getUsername() . '/verifyCodes.txt';
|
||||
}
|
||||
|
||||
return $files;
|
||||
@@ -744,7 +841,7 @@ class GameResponseService
|
||||
}
|
||||
|
||||
$allPaths = $this->getAllPossiblePaths($player);
|
||||
$allFiles = $this->getAllPossibleFiles();
|
||||
$allFiles = $this->getAllPossibleFiles($player);
|
||||
$deletedFiles = $this->playerService->getDeletedFilesOfSession($player);
|
||||
|
||||
$entries = [];
|
||||
@@ -779,4 +876,144 @@ class GameResponseService
|
||||
sort($entries);
|
||||
return $entries;
|
||||
}
|
||||
|
||||
public function getFileContent(Player $player, string $file) : array
|
||||
{
|
||||
$allPossibleFiles = $this->getAllPossibleFiles($player);
|
||||
if (!in_array($file, $allPossibleFiles)) {
|
||||
return ['File does not exist'];
|
||||
}
|
||||
|
||||
if (str_ends_with($file, '.sh')) {
|
||||
return ['It is not possible to read this file'];
|
||||
}
|
||||
|
||||
if (str_ends_with($file, 'verifyCodes.txt')) {
|
||||
return $this->readVerificationFile($player, $file);
|
||||
}
|
||||
|
||||
$physicalPath = $this->projectDir . '/assets/game1/filesystem' . $file;
|
||||
if (!file_exists($physicalPath)) {
|
||||
return ['File does not exist'];
|
||||
}
|
||||
|
||||
$content = file($physicalPath);
|
||||
if ($content === false) {
|
||||
return ['Error reading file'];
|
||||
}
|
||||
|
||||
$specialFiles = [
|
||||
'/var/rapports/083_25-39.txt' => [
|
||||
'setting' => SessionSettingType::SPECIAL_REPORT_CODE_DOYLE,
|
||||
'digit' => 1
|
||||
],
|
||||
'/var/rapports/019_31-11.txt' => [
|
||||
'setting' => SessionSettingType::SPECIAL_REPORT_CODE_VEGA,
|
||||
'digit' => 2
|
||||
],
|
||||
'/var/rapports/011_130-62.txt' => [
|
||||
'setting' => SessionSettingType::SPECIAL_REPORT_CODE_LENNOX,
|
||||
'digit' => 3
|
||||
],
|
||||
];
|
||||
|
||||
if (isset($specialFiles[$file])) {
|
||||
$everyoneVerifiedSetting = $this->sessionSettingRepository->getSetting($player->getSession(), SessionSettingType::EVERYONE_VERIFIED);
|
||||
if ($everyoneVerifiedSetting && $everyoneVerifiedSetting->getValue() === 'true') {
|
||||
$settingInfo = $specialFiles[$file];
|
||||
$codeSetting = $this->sessionSettingRepository->getSetting($player->getSession(), $settingInfo['setting']);
|
||||
|
||||
if (!$codeSetting) {
|
||||
$codeSetting = new SessionSetting();
|
||||
$codeSetting->setSession($player->getSession());
|
||||
$codeSetting->setName($settingInfo['setting']);
|
||||
$codeSetting->setValue($this->generateSpecialCode($settingInfo['digit'], 75, 100));
|
||||
|
||||
$this->entityManager->persist($codeSetting);
|
||||
$this->entityManager->flush();
|
||||
}
|
||||
|
||||
$specialCode = $codeSetting->getValue();
|
||||
|
||||
$newContent = [];
|
||||
foreach ($content as $line) {
|
||||
$newContent[] = $line;
|
||||
if (str_starts_with(trim($line), 'Date:')) {
|
||||
$newContent[] = $specialCode . "\n";
|
||||
}
|
||||
}
|
||||
$content = $newContent;
|
||||
}
|
||||
}
|
||||
|
||||
return $content;
|
||||
}
|
||||
|
||||
private function readVerificationFile(Player $player, string $file)
|
||||
{
|
||||
$parts = explode('/', $file);
|
||||
$ownerUsername = $parts[3] ?? null;
|
||||
|
||||
$ownerPlayer = null;
|
||||
foreach ($player->getSession()->getPlayers() as $p) {
|
||||
if ($p->getUser()->getUsername() === $ownerUsername) {
|
||||
$ownerPlayer = $p;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$ownerPlayer) {
|
||||
return 'File does not exist';
|
||||
}
|
||||
|
||||
$screen = $ownerPlayer->getScreen();
|
||||
$settingName = SessionSettingType::tryFrom('VerifyCodesForPlayer' . $screen);
|
||||
|
||||
if (!$settingName) {
|
||||
return 'Error: Invalid player screen.';
|
||||
}
|
||||
|
||||
$setting = $this->sessionSettingRepository->getSetting($player->getSession(), $settingName, $ownerPlayer);
|
||||
if (!$setting) {
|
||||
$setting = new SessionSetting();
|
||||
$setting->setSession($player->getSession());
|
||||
$setting->setPlayer($ownerPlayer);
|
||||
$setting->setName($settingName);
|
||||
}
|
||||
|
||||
$codes = json_decode($setting->getValue() ?? '[]', true) ?? [];
|
||||
|
||||
$playerNames = ['Luke', 'Charles', 'William', 'Peter'];
|
||||
foreach ($player->getSession()->getPlayers() as $p) {
|
||||
$playerNames[] = $p->getUser()->getUsername();
|
||||
}
|
||||
$playerNames = array_unique($playerNames);
|
||||
sort($playerNames);
|
||||
|
||||
$content = [];
|
||||
|
||||
$content[] = "Verification codes:";
|
||||
$content[] = "";
|
||||
|
||||
foreach ($playerNames as $name) {
|
||||
$key = null;
|
||||
foreach ($player->getSession()->getPlayers() as $p) {
|
||||
if ($p->getUser()->getUsername() === $name) {
|
||||
$key = (string)$p->getScreen();
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ($key === null) {
|
||||
$key = $name;
|
||||
}
|
||||
|
||||
if (!isset($codes[$key])) {
|
||||
$codes[$key] = bin2hex(random_bytes(3));
|
||||
}
|
||||
|
||||
$content[] = $name . ": " . $codes[$key] . "\n";
|
||||
}
|
||||
|
||||
return $content;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,12 +40,7 @@ class PlayerService
|
||||
}
|
||||
|
||||
public function getCurrentPwdOfPlayer(Player $player) : ?string {
|
||||
$settingName = match($player->getScreen()) {
|
||||
1 => SessionSettingType::PWD_FOR_PLAYER1,
|
||||
2 => SessionSettingType::PWD_FOR_PLAYER2,
|
||||
3 => SessionSettingType::PWD_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$settingName = SessionSettingType::tryFrom('PwdForPlayer' . $player->getScreen());
|
||||
|
||||
if (!$settingName) {
|
||||
return null;
|
||||
@@ -57,12 +52,7 @@ class PlayerService
|
||||
|
||||
public function saveCurrentPwdOfPlayer(Player $player, string $newLocation)
|
||||
{
|
||||
$settingName = match($player->getScreen()) {
|
||||
1 => SessionSettingType::PWD_FOR_PLAYER1,
|
||||
2 => SessionSettingType::PWD_FOR_PLAYER2,
|
||||
3 => SessionSettingType::PWD_FOR_PLAYER3,
|
||||
default => null,
|
||||
};
|
||||
$settingName = SessionSettingType::tryFrom('PwdForPlayer' . $player->getScreen());
|
||||
|
||||
if (!$settingName) {
|
||||
return;
|
||||
|
||||
@@ -31,7 +31,7 @@ class ActivationController extends AbstractController
|
||||
try {
|
||||
$emailVerifier->handleEmailConfirmation($request, $user);
|
||||
} catch (VerifyEmailExceptionInterface $exception) {
|
||||
$this->addFlash('error', $exception->getReason());
|
||||
$this->addFlash('error', $exception->getReason() . ' If the link has expired, you can <a href="' . $this->generateUrl('app_verify_resend_email') . '">request a new one here</a>.');
|
||||
|
||||
return $this->redirectToRoute('app_register');
|
||||
}
|
||||
|
||||
@@ -4,6 +4,8 @@ namespace App\Tech\Controller;
|
||||
|
||||
use App\Tech\Entity\User;
|
||||
use App\Tech\Form\RegistrationFormType;
|
||||
use App\Tech\Form\ResendVerificationEmailFormType;
|
||||
use App\Tech\Repository\UserRepository;
|
||||
use App\Tech\Service\EmailVerifier;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Symfony\Bridge\Twig\Mime\TemplatedEmail;
|
||||
@@ -39,7 +41,7 @@ class RegistrationController extends AbstractController
|
||||
// generate a signed url and email it to the user
|
||||
$emailVerifier->sendEmailConfirmation('app_verify_email', $user,
|
||||
(new TemplatedEmail())
|
||||
->from('noreply@escapepage.dev')
|
||||
->from($this->getParameter('mailer_from'))
|
||||
->to($user->getEmail())
|
||||
->subject('Please Confirm your Email')
|
||||
->htmlTemplate('tech/registration/confirmation_email.html.twig')
|
||||
@@ -54,4 +56,41 @@ class RegistrationController extends AbstractController
|
||||
'registrationForm' => $form->createView(),
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route('/verify/resend', name: 'app_verify_resend_email')]
|
||||
public function resendVerificationEmail(Request $request, UserRepository $userRepository, EmailVerifier $emailVerifier): Response
|
||||
{
|
||||
$form = $this->createForm(ResendVerificationEmailFormType::class);
|
||||
$form->handleRequest($request);
|
||||
|
||||
if ($form->isSubmitted() && $form->isValid()) {
|
||||
$email = $form->get('email')->getData();
|
||||
$user = $userRepository->findOneBy(['email' => $email]);
|
||||
|
||||
if ($user) {
|
||||
if (!$user->isVerified()) {
|
||||
$emailVerifier->sendEmailConfirmation('app_verify_email', $user,
|
||||
(new TemplatedEmail())
|
||||
->from($this->getParameter('mailer_from'))
|
||||
->to($user->getEmail())
|
||||
->subject('Please Confirm your Email')
|
||||
->htmlTemplate('tech/registration/confirmation_email.html.twig')
|
||||
);
|
||||
} else {
|
||||
$this->addFlash('info', 'This email address is already verified.');
|
||||
return $this->redirectToRoute('app_login');
|
||||
}
|
||||
}
|
||||
|
||||
// We show the same success message regardless of whether the user exists or not,
|
||||
// to avoid revealing whether an email is registered.
|
||||
$this->addFlash('success', 'If an account exists with this email, a new confirmation link has been sent.');
|
||||
|
||||
return $this->redirectToRoute('website_home');
|
||||
}
|
||||
|
||||
return $this->render('tech/registration/resend_verification_email.html.twig', [
|
||||
'resendForm' => $form->createView(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,6 +39,9 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
|
||||
#[ORM\Column(type: 'boolean')]
|
||||
private bool $isVerified = false;
|
||||
|
||||
#[ORM\Column(type: 'boolean')]
|
||||
private bool $marketingOptIn = false;
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
@@ -137,4 +140,16 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function isMarketingOptIn(): bool
|
||||
{
|
||||
return $this->marketingOptIn;
|
||||
}
|
||||
|
||||
public function setMarketingOptIn(bool $marketingOptIn): static
|
||||
{
|
||||
$this->marketingOptIn = $marketingOptIn;
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,6 +22,10 @@ class EmailLoggerListener
|
||||
|
||||
public function onMessage(MessageEvent $event): void
|
||||
{
|
||||
if ($event->isQueued()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$message = $event->getMessage();
|
||||
if (!$message instanceof TemplatedEmail) {
|
||||
return;
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Tech\Form;
|
||||
|
||||
use App\Tech\Entity\User;
|
||||
use Symfony\Component\Form\AbstractType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\EmailType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\PasswordType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
use Symfony\Component\Validator\Constraints\Email;
|
||||
use Symfony\Component\Validator\Constraints\Length;
|
||||
use Symfony\Component\Validator\Constraints\NotBlank;
|
||||
|
||||
class AdminUserType extends AbstractType
|
||||
{
|
||||
public function buildForm(FormBuilderInterface $builder, array $options): void
|
||||
{
|
||||
$builder
|
||||
->add('email', EmailType::class, [
|
||||
'constraints' => [new NotBlank(), new Email()],
|
||||
])
|
||||
->add('username', TextType::class, [
|
||||
'constraints' => [new NotBlank(), new Length(min: 2, max: 180)],
|
||||
])
|
||||
->add('plainPassword', PasswordType::class, [
|
||||
'mapped' => false,
|
||||
'required' => false,
|
||||
'label' => 'New password',
|
||||
'attr' => ['autocomplete' => 'new-password', 'placeholder' => 'Leave blank to keep current'],
|
||||
])
|
||||
->add('roles', ChoiceType::class, [
|
||||
'choices' => [
|
||||
'Player' => 'ROLE_PLAYER',
|
||||
'Admin' => 'ROLE_ADMIN',
|
||||
],
|
||||
'multiple' => true,
|
||||
'expanded' => true,
|
||||
'label' => 'Roles',
|
||||
])
|
||||
->add('isVerified', CheckboxType::class, [
|
||||
'required' => false,
|
||||
'label' => 'Email verified',
|
||||
]);
|
||||
}
|
||||
|
||||
public function configureOptions(OptionsResolver $resolver): void
|
||||
{
|
||||
$resolver->setDefaults([
|
||||
'data_class' => User::class,
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -26,15 +26,13 @@ class ChangePasswordFormType extends AbstractType
|
||||
],
|
||||
'first_options' => [
|
||||
'constraints' => [
|
||||
new NotBlank([
|
||||
'message' => 'Please enter a password',
|
||||
]),
|
||||
new Length([
|
||||
'min' => 12,
|
||||
'minMessage' => 'Your password should be at least {{ limit }} characters',
|
||||
new NotBlank(message: 'Please enter a password'),
|
||||
new Length(
|
||||
min: 12,
|
||||
minMessage: 'Your password should be at least {{ limit }} characters',
|
||||
// max length allowed by Symfony for security reasons
|
||||
'max' => 4096,
|
||||
]),
|
||||
max: 4096,
|
||||
),
|
||||
new PasswordStrength(),
|
||||
new NotCompromisedPassword(),
|
||||
],
|
||||
|
||||
@@ -3,13 +3,17 @@
|
||||
namespace App\Tech\Form;
|
||||
|
||||
use App\Tech\Entity\User;
|
||||
use Karser\Recaptcha3Bundle\Form\Recaptcha3Type;
|
||||
use Karser\Recaptcha3Bundle\Validator\Constraints\Recaptcha3;
|
||||
use Symfony\Component\Form\AbstractType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\EmailType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\PasswordType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
use Symfony\Component\Validator\Constraints\IsTrue;
|
||||
use Symfony\Component\Validator\Constraints\Length;
|
||||
use Symfony\Component\Validator\Constraints\NotBlank;
|
||||
|
||||
@@ -21,9 +25,7 @@ class RegistrationFormType extends AbstractType
|
||||
->add('email', EmailType::class)
|
||||
->add('username', TextType::class, [
|
||||
'constraints' => [
|
||||
new NotBlank([
|
||||
'message' => 'Please enter a username',
|
||||
]),
|
||||
new NotBlank(message: 'Please enter a username'),
|
||||
],
|
||||
])
|
||||
->add('plainPassword', RepeatedType::class, [
|
||||
@@ -33,17 +35,30 @@ class RegistrationFormType extends AbstractType
|
||||
'first_options' => ['label' => 'Password'],
|
||||
'second_options' => ['label' => 'Repeat Password'],
|
||||
'constraints' => [
|
||||
new NotBlank([
|
||||
'message' => 'Please enter a password',
|
||||
]),
|
||||
new Length([
|
||||
'min' => 6,
|
||||
'minMessage' => 'Your password should be at least {{ limit }} characters',
|
||||
new NotBlank(message: 'Please enter a password'),
|
||||
new Length(
|
||||
min: 6,
|
||||
minMessage: 'Your password should be at least {{ limit }} characters',
|
||||
// max length allowed by Symfony for security reasons
|
||||
'max' => 4096,
|
||||
]),
|
||||
max: 4096,
|
||||
),
|
||||
],
|
||||
])
|
||||
->add('agreeTerms', CheckboxType::class, [
|
||||
'mapped' => false,
|
||||
'label' => 'I agree to the Terms and Conditions',
|
||||
'constraints' => [
|
||||
new IsTrue(message: 'You must agree to the Terms and Conditions.'),
|
||||
],
|
||||
])
|
||||
->add('marketingOptIn', CheckboxType::class, [
|
||||
'required' => false,
|
||||
'label' => 'Keep me informed about future projects and updates',
|
||||
])
|
||||
->add('captcha', Recaptcha3Type::class, [
|
||||
'constraints' => new Recaptcha3(),
|
||||
'action_name' => 'registration',
|
||||
])
|
||||
;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
<?php
|
||||
|
||||
namespace App\Tech\Form;
|
||||
|
||||
use Symfony\Component\Form\AbstractType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\EmailType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
use Symfony\Component\Validator\Constraints\Email;
|
||||
use Symfony\Component\Validator\Constraints\NotBlank;
|
||||
|
||||
class ResendVerificationEmailFormType extends AbstractType
|
||||
{
|
||||
public function buildForm(FormBuilderInterface $builder, array $options): void
|
||||
{
|
||||
$builder
|
||||
->add('email', EmailType::class, [
|
||||
'constraints' => [
|
||||
new NotBlank([
|
||||
'message' => 'Please enter your email',
|
||||
]),
|
||||
new Email([
|
||||
'message' => 'Please enter a valid email address',
|
||||
]),
|
||||
],
|
||||
])
|
||||
;
|
||||
}
|
||||
|
||||
public function configureOptions(OptionsResolver $resolver): void
|
||||
{
|
||||
$resolver->setDefaults([]);
|
||||
}
|
||||
}
|
||||
@@ -16,9 +16,7 @@ class ResetPasswordRequestFormType extends AbstractType
|
||||
->add('email', EmailType::class, [
|
||||
'attr' => ['autocomplete' => 'email'],
|
||||
'constraints' => [
|
||||
new NotBlank([
|
||||
'message' => 'Please enter your email',
|
||||
]),
|
||||
new NotBlank(message: 'Please enter your email'),
|
||||
],
|
||||
])
|
||||
;
|
||||
|
||||
@@ -32,4 +32,16 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader
|
||||
$this->getEntityManager()->persist($user);
|
||||
$this->getEntityManager()->flush();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return User[]
|
||||
*/
|
||||
public function findByRole(string $role): array
|
||||
{
|
||||
return $this->createQueryBuilder('u')
|
||||
->andWhere('u.roles LIKE :role')
|
||||
->setParameter('role', '%"' . $role . '"%')
|
||||
->getQuery()
|
||||
->getResult();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ class EmailVerifier
|
||||
*/
|
||||
public function handleEmailConfirmation(Request $request, User $user): void
|
||||
{
|
||||
$this->verifyEmailHelper->validateEmailConfirmation($request->getUri(), (string) $user->getId(), $user->getEmail());
|
||||
$this->verifyEmailHelper->validateEmailConfirmationFromRequest($request, (string) $user->getId(), $user->getEmail());
|
||||
|
||||
$user->setIsVerified(true);
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Tech\Service;
|
||||
|
||||
use App\Tech\Entity\User;
|
||||
use Symfony\Component\Security\Core\Exception\AccountStatusException;
|
||||
use Symfony\Component\Security\Core\Exception\CustomUserMessageAuthenticationException;
|
||||
use Symfony\Component\Security\Core\User\UserCheckerInterface;
|
||||
use Symfony\Component\Security\Core\User\UserInterface;
|
||||
@@ -16,7 +17,7 @@ class UserChecker implements UserCheckerInterface
|
||||
}
|
||||
|
||||
if (!$user->isVerified()) {
|
||||
throw new CustomUserMessageAuthenticationException('Your email address is not verified.');
|
||||
throw new CustomUserMessageAuthenticationException('Your email address is not verified.', ['%resend_link%' => '/verify/resend']);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -15,4 +15,11 @@ final class HomeController extends AbstractController
|
||||
return $this->render(
|
||||
'website/home/index.html.twig');
|
||||
}
|
||||
|
||||
#[Route(path: '/briefing', name: 'website_intro')]
|
||||
public function intro(): Response
|
||||
{
|
||||
return $this->render(
|
||||
'website/home/intro.html.twig');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,6 +35,18 @@
|
||||
"migrations/.gitignore"
|
||||
]
|
||||
},
|
||||
"karser/karser-recaptcha3-bundle": {
|
||||
"version": "0.3",
|
||||
"recipe": {
|
||||
"repo": "github.com/symfony/recipes-contrib",
|
||||
"branch": "main",
|
||||
"version": "0.1",
|
||||
"ref": "c51ce07c10331d506762efe25b6f5843c1a5ea17"
|
||||
},
|
||||
"files": [
|
||||
"./config/packages/karser_recaptcha3.yaml"
|
||||
]
|
||||
},
|
||||
"phpunit/phpunit": {
|
||||
"version": "11.5",
|
||||
"recipe": {
|
||||
@@ -146,6 +158,15 @@
|
||||
"config/packages/mailer.yaml"
|
||||
]
|
||||
},
|
||||
"symfony/mailgun-mailer": {
|
||||
"version": "7.4",
|
||||
"recipe": {
|
||||
"repo": "github.com/symfony/recipes",
|
||||
"branch": "main",
|
||||
"version": "4.4",
|
||||
"ref": "808e7052971863a6b94df61807f41a71d480885b"
|
||||
}
|
||||
},
|
||||
"symfony/maker-bundle": {
|
||||
"version": "1.64",
|
||||
"recipe": {
|
||||
|
||||
@@ -5,14 +5,13 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>{% block title %}{{ 'site.name'|trans }}{% endblock %}</title>
|
||||
{% block stylesheets %}
|
||||
{{ encore_entry_link_tags('app') }}
|
||||
{{ encore_entry_link_tags('app') }}
|
||||
{% endblock %}
|
||||
</head>
|
||||
<body>
|
||||
{% block header %}
|
||||
<header>
|
||||
<nav>
|
||||
{% set pathinfo = app.request.pathinfo %}
|
||||
<a href="/">{{ 'nav.home'|trans }}</a> |
|
||||
<a href="{{ path('game_dashboard') }}">{{ 'nav.game'|trans }}</a> |
|
||||
{% if app.user %}
|
||||
@@ -23,6 +22,8 @@
|
||||
{% endif %}
|
||||
</nav>
|
||||
</header>
|
||||
{% endblock %}
|
||||
{% block main %}
|
||||
<main>
|
||||
{% for label, messages in app.flashes %}
|
||||
{% for message in messages %}
|
||||
@@ -33,9 +34,12 @@
|
||||
{% endfor %}
|
||||
{% block body %}{% endblock %}
|
||||
</main>
|
||||
{% endblock %}
|
||||
{% block footer %}
|
||||
<footer>
|
||||
<small>© {{ "now"|date("Y") }} {{ 'site.name'|trans }}</small>
|
||||
</footer>
|
||||
{% endblock %}
|
||||
{% block javascripts %}
|
||||
{{ encore_entry_script_tags('app') }}
|
||||
{% endblock %}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="{{ app.request ? app.request.locale : 'en' }}">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>{% block title %}{{ 'site.name'|trans }}{% endblock %}</title>
|
||||
</head>
|
||||
<body style="margin:0; padding:0; background-color:#f2f4f6; font-family:Arial, Helvetica, sans-serif;">
|
||||
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background-color:#f2f4f6; padding:24px 0;">
|
||||
<tr>
|
||||
<td align="center">
|
||||
<table role="presentation" width="600" cellpadding="0" cellspacing="0" style="max-width:600px; width:100%; background-color:#ffffff; border-radius:8px; overflow:hidden;">
|
||||
<tr>
|
||||
<td align="center" style="background-color:#3a7ca5; padding:24px;">
|
||||
<img src="{{ absolute_url(asset('images/logo.png')) }}" alt="{{ 'site.name'|trans }}" height="140" style="display:block; border:0;">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="padding:32px; color:#333333; font-size:15px; line-height:1.6;">
|
||||
{% block content %}{% endblock %}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="padding:16px 32px; background-color:#f2f4f6; color:#8a8f98; font-size:12px; text-align:center;">
|
||||
© {{ "now"|date("Y") }} {{ 'site.name'|trans }}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,78 @@
|
||||
{% extends 'layout/site.html.twig' %}
|
||||
|
||||
{% block main %}
|
||||
<div style="display: flex; min-height: calc(100vh - 60px);">
|
||||
|
||||
{# ── Sidebar ──────────────────────────────────────────────────────── #}
|
||||
<nav style="
|
||||
width: 220px;
|
||||
flex-shrink: 0;
|
||||
background: #1e293b;
|
||||
color: #cbd5e1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: 0;
|
||||
">
|
||||
<div style="padding: 1.25rem 1.5rem; border-bottom: 1px solid #334155;">
|
||||
<span style="font-weight: 700; font-size: 1rem; color: #f1f5f9;">Game Admin</span>
|
||||
</div>
|
||||
|
||||
<ul style="list-style: none; margin: 0; padding: 0.5rem 0; flex: 1;">
|
||||
{% set current = app.request.attributes.get('_route') %}
|
||||
|
||||
{% set navItems = [
|
||||
{ route: 'game_admin_dashboard', label: 'Dashboard', icon: '▦' },
|
||||
{ route: 'game_admin_users', label: 'Users', icon: '👤' },
|
||||
{ route: 'game_admin_games', label: 'Games', icon: '🎮' },
|
||||
{ route: 'game_admin_sessions', label: 'Sessions', icon: '▶' },
|
||||
{ route: 'game_admin_email_log', label: 'Email Log', icon: '✉' },
|
||||
] %}
|
||||
|
||||
{% for item in navItems %}
|
||||
{% set isActive = current starts with item.route %}
|
||||
<li>
|
||||
<a href="{{ path(item.route) }}" style="
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.6rem;
|
||||
padding: 0.6rem 1.5rem;
|
||||
color: {{ isActive ? '#f1f5f9' : '#94a3b8' }};
|
||||
background: {{ isActive ? '#334155' : 'transparent' }};
|
||||
text-decoration: none;
|
||||
font-size: 0.9rem;
|
||||
border-left: 3px solid {{ isActive ? '#3b82f6' : 'transparent' }};
|
||||
">
|
||||
<span>{{ item.icon }}</span>
|
||||
{{ item.label }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<div style="padding: 1rem 1.5rem; border-top: 1px solid #334155;">
|
||||
<a href="{{ path('game_dashboard') }}" style="color: #64748b; font-size: 0.8rem; text-decoration: none;">
|
||||
← Back to game
|
||||
</a>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
{# ── Content ──────────────────────────────────────────────────────── #}
|
||||
<main style="flex: 1; background: #f8fafc; padding: 2rem; overflow-x: auto;">
|
||||
{% for label, messages in app.flashes %}
|
||||
{% for message in messages %}
|
||||
<div style="
|
||||
padding: 0.75rem 1rem;
|
||||
margin-bottom: 1rem;
|
||||
border-radius: 6px;
|
||||
background: {{ label == 'success' ? '#dcfce7' : (label == 'danger' ? '#fee2e2' : '#fef9c3') }};
|
||||
color: {{ label == 'success' ? '#166534' : (label == 'danger' ? '#991b1b' : '#854d0e') }};
|
||||
border: 1px solid {{ label == 'success' ? '#86efac' : (label == 'danger' ? '#fca5a5' : '#fde047') }};
|
||||
">{{ message }}</div>
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
|
||||
{% block admin_body %}{% endblock %}
|
||||
</main>
|
||||
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,49 @@
|
||||
{% extends 'game/admin/base.html.twig' %}
|
||||
|
||||
{% block title %}Email Log — Admin{% endblock %}
|
||||
|
||||
{% block admin_body %}
|
||||
<div style="display: flex; align-items: center; justify-content: space-between; margin-bottom: 1.5rem;">
|
||||
<h1 style="margin: 0; font-size: 1.5rem; color: #0f172a;">Email Log</h1>
|
||||
<span style="color: #64748b; font-size: 0.9rem;">{{ logs|length }} entries</span>
|
||||
</div>
|
||||
|
||||
<div style="background: #fff; border-radius: 8px; box-shadow: 0 1px 3px rgba(0,0,0,.07); overflow: hidden;">
|
||||
<table style="width: 100%; border-collapse: collapse; font-size: 0.9rem;">
|
||||
<thead>
|
||||
<tr style="background: #f1f5f9; border-bottom: 1px solid #e2e8f0;">
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">ID</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">User</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Email</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Type</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Sent at</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for log in logs %}
|
||||
<tr style="border-bottom: 1px solid #f1f5f9;">
|
||||
<td style="padding: 0.75rem 1rem; color: #94a3b8;">{{ log.id }}</td>
|
||||
<td style="padding: 0.75rem 1rem; font-weight: 500; color: #0f172a;">{{ log.user.username }}</td>
|
||||
<td style="padding: 0.75rem 1rem; color: #475569;">{{ log.user.email }}</td>
|
||||
<td style="padding: 0.75rem 1rem;">
|
||||
<span style="
|
||||
display: inline-block;
|
||||
padding: 0.2rem 0.6rem;
|
||||
border-radius: 4px;
|
||||
font-size: 0.75rem;
|
||||
font-weight: 600;
|
||||
background: #dbeafe;
|
||||
color: #1e40af;
|
||||
">{{ log.emailIdentifier }}</span>
|
||||
</td>
|
||||
<td style="padding: 0.75rem 1rem; color: #475569;">{{ log.sentAt|date('Y-m-d H:i:s') }}</td>
|
||||
</tr>
|
||||
{% else %}
|
||||
<tr>
|
||||
<td colspan="5" style="padding: 2rem; text-align: center; color: #94a3b8;">No emails logged yet.</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,64 @@
|
||||
{% extends 'game/admin/base.html.twig' %}
|
||||
|
||||
{% block title %}Edit Game — Admin{% endblock %}
|
||||
|
||||
{% block admin_body %}
|
||||
<div style="margin-bottom: 1.5rem;">
|
||||
<a href="{{ path('game_admin_games') }}" style="color: #64748b; text-decoration: none; font-size: 0.9rem;">← Games</a>
|
||||
</div>
|
||||
|
||||
<h1 style="margin: 0 0 1.5rem; font-size: 1.5rem; color: #0f172a;">Edit game: {{ game.name }}</h1>
|
||||
|
||||
<div style="background: #fff; border-radius: 8px; box-shadow: 0 1px 3px rgba(0,0,0,.07); padding: 1.5rem; max-width: 500px;">
|
||||
{{ form_start(form, {attr: {style: 'display: flex; flex-direction: column; gap: 1.25rem;'}}) }}
|
||||
|
||||
<div>
|
||||
{{ form_label(form.name, null, {label_attr: {style: 'display: block; font-weight: 600; margin-bottom: 0.35rem; color: #374151; font-size: 0.875rem;'}}) }}
|
||||
{{ form_widget(form.name, {attr: {style: 'width: 100%; padding: 0.5rem 0.75rem; border: 1px solid #d1d5db; border-radius: 6px; font-size: 0.9rem; box-sizing: border-box;'}}) }}
|
||||
{{ form_errors(form.name) }}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
{{ form_label(form.numberOfPlayers, null, {label_attr: {style: 'display: block; font-weight: 600; margin-bottom: 0.35rem; color: #374151; font-size: 0.875rem;'}}) }}
|
||||
{{ form_widget(form.numberOfPlayers, {attr: {style: 'width: 100%; padding: 0.5rem 0.75rem; border: 1px solid #d1d5db; border-radius: 6px; font-size: 0.9rem; box-sizing: border-box;'}}) }}
|
||||
{{ form_errors(form.numberOfPlayers) }}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
{{ form_label(form.status, null, {label_attr: {style: 'display: block; font-weight: 600; margin-bottom: 0.35rem; color: #374151; font-size: 0.875rem;'}}) }}
|
||||
{{ form_widget(form.status, {attr: {style: 'width: 100%; padding: 0.5rem 0.75rem; border: 1px solid #d1d5db; border-radius: 6px; font-size: 0.9rem; box-sizing: border-box;'}}) }}
|
||||
{{ form_errors(form.status) }}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
{{ form_label(form.totalTime, null, {label_attr: {style: 'display: block; font-weight: 600; margin-bottom: 0.35rem; color: #374151; font-size: 0.875rem;'}}) }}
|
||||
{{ form_widget(form.totalTime, {attr: {style: 'width: 100%; padding: 0.5rem 0.75rem; border: 1px solid #d1d5db; border-radius: 6px; font-size: 0.9rem; box-sizing: border-box;'}}) }}
|
||||
<small style="color: #64748b; font-size: 0.8rem;">In seconds — e.g. 3600 = 1 hour</small>
|
||||
{{ form_errors(form.totalTime) }}
|
||||
</div>
|
||||
|
||||
<div style="display: flex; gap: 0.75rem; margin-top: 0.5rem;">
|
||||
<button type="submit" style="
|
||||
padding: 0.6rem 1.25rem;
|
||||
background: #3b82f6;
|
||||
color: #fff;
|
||||
border: none;
|
||||
border-radius: 6px;
|
||||
font-size: 0.9rem;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
">Save changes</button>
|
||||
<a href="{{ path('game_admin_games') }}" style="
|
||||
padding: 0.6rem 1.25rem;
|
||||
background: #f1f5f9;
|
||||
color: #475569;
|
||||
border-radius: 6px;
|
||||
font-size: 0.9rem;
|
||||
font-weight: 600;
|
||||
text-decoration: none;
|
||||
">Cancel</a>
|
||||
</div>
|
||||
|
||||
{{ form_end(form) }}
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,60 @@
|
||||
{% extends 'game/admin/base.html.twig' %}
|
||||
|
||||
{% block title %}Games — Admin{% endblock %}
|
||||
|
||||
{% block admin_body %}
|
||||
<div style="display: flex; align-items: center; justify-content: space-between; margin-bottom: 1.5rem;">
|
||||
<h1 style="margin: 0; font-size: 1.5rem; color: #0f172a;">Games</h1>
|
||||
<span style="color: #64748b; font-size: 0.9rem;">{{ games|length }} total</span>
|
||||
</div>
|
||||
|
||||
<div style="background: #fff; border-radius: 8px; box-shadow: 0 1px 3px rgba(0,0,0,.07); overflow: hidden;">
|
||||
<table style="width: 100%; border-collapse: collapse; font-size: 0.9rem;">
|
||||
<thead>
|
||||
<tr style="background: #f1f5f9; border-bottom: 1px solid #e2e8f0;">
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">ID</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Name</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Players</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Status</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Sessions</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for game in games %}
|
||||
{% set statusColor = {
|
||||
'inDevelopment': '#fef3c7:#92400e',
|
||||
'locked': '#fee2e2:#991b1b',
|
||||
'open': '#dcfce7:#166534',
|
||||
} %}
|
||||
{% set colors = (statusColor[game.status.value] ?? '#f1f5f9:#475569')|split(':') %}
|
||||
|
||||
<tr style="border-bottom: 1px solid #f1f5f9;">
|
||||
<td style="padding: 0.75rem 1rem; color: #94a3b8;">{{ game.id }}</td>
|
||||
<td style="padding: 0.75rem 1rem; font-weight: 500; color: #0f172a;">{{ game.name }}</td>
|
||||
<td style="padding: 0.75rem 1rem; color: #475569;">{{ game.numberOfPlayers }}</td>
|
||||
<td style="padding: 0.75rem 1rem;">
|
||||
<span style="
|
||||
display: inline-block;
|
||||
padding: 0.2rem 0.6rem;
|
||||
border-radius: 4px;
|
||||
font-size: 0.75rem;
|
||||
font-weight: 600;
|
||||
background: {{ colors[0] }};
|
||||
color: {{ colors[1] }};
|
||||
">{{ game.status.value }}</span>
|
||||
</td>
|
||||
<td style="padding: 0.75rem 1rem; color: #475569;">{{ game.sessions|length }}</td>
|
||||
<td style="padding: 0.75rem 1rem;">
|
||||
<a href="{{ path('game_admin_game_edit', {id: game.id}) }}" style="color: #3b82f6; text-decoration: none; font-size: 0.85rem;">Edit</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% else %}
|
||||
<tr>
|
||||
<td colspan="6" style="padding: 2rem; text-align: center; color: #94a3b8;">No games found.</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,90 @@
|
||||
{% extends 'game/admin/base.html.twig' %}
|
||||
|
||||
{% block title %}Admin Dashboard{% endblock %}
|
||||
|
||||
{% block admin_body %}
|
||||
<h1 style="margin: 0 0 1.5rem; font-size: 1.5rem; color: #0f172a;">Dashboard</h1>
|
||||
|
||||
<div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(160px, 1fr)); gap: 1rem; margin-bottom: 2rem;">
|
||||
{% set stats = [
|
||||
{ label: 'Total Users', value: totalUsers, color: '#3b82f6' },
|
||||
{ label: 'Players', value: totalPlayers, color: '#8b5cf6' },
|
||||
{ label: 'Admins', value: totalAdmins, color: '#f59e0b' },
|
||||
{ label: 'Games', value: totalGames, color: '#10b981' },
|
||||
{ label: 'Active Sessions', value: activeSessions, color: '#ef4444' },
|
||||
{ label: 'Total Sessions', value: totalSessions, color: '#64748b' },
|
||||
] %}
|
||||
|
||||
{% for stat in stats %}
|
||||
<div style="
|
||||
background: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 1.25rem;
|
||||
border-left: 4px solid {{ stat.color }};
|
||||
box-shadow: 0 1px 3px rgba(0,0,0,.07);
|
||||
">
|
||||
<div style="font-size: 1.75rem; font-weight: 700; color: {{ stat.color }};">{{ stat.value }}</div>
|
||||
<div style="font-size: 0.8rem; color: #64748b; margin-top: 0.25rem;">{{ stat.label }}</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
<div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); gap: 1rem;">
|
||||
<a href="{{ path('game_admin_users') }}" style="
|
||||
background: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 1.25rem;
|
||||
text-decoration: none;
|
||||
color: #1e293b;
|
||||
box-shadow: 0 1px 3px rgba(0,0,0,.07);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
font-weight: 600;
|
||||
">
|
||||
<span style="font-size: 1.5rem;">👤</span> Manage Users
|
||||
</a>
|
||||
<a href="{{ path('game_admin_games') }}" style="
|
||||
background: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 1.25rem;
|
||||
text-decoration: none;
|
||||
color: #1e293b;
|
||||
box-shadow: 0 1px 3px rgba(0,0,0,.07);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
font-weight: 600;
|
||||
">
|
||||
<span style="font-size: 1.5rem;">🎮</span> Manage Games
|
||||
</a>
|
||||
<a href="{{ path('game_admin_sessions') }}" style="
|
||||
background: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 1.25rem;
|
||||
text-decoration: none;
|
||||
color: #1e293b;
|
||||
box-shadow: 0 1px 3px rgba(0,0,0,.07);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
font-weight: 600;
|
||||
">
|
||||
<span style="font-size: 1.5rem;">▶</span> View Sessions
|
||||
</a>
|
||||
<a href="{{ path('game_admin_email_log') }}" style="
|
||||
background: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 1.25rem;
|
||||
text-decoration: none;
|
||||
color: #1e293b;
|
||||
box-shadow: 0 1px 3px rgba(0,0,0,.07);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
font-weight: 600;
|
||||
">
|
||||
<span style="font-size: 1.5rem;">✉</span> Email Log
|
||||
</a>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,49 @@
|
||||
{% extends 'base.html.twig' %}
|
||||
|
||||
{% block title %}View Session Logs - {{ session.id }}{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<h1>Session: {{ session.game.name }} (#{{ session.id }})</h1>
|
||||
<p><a href="{{ path('game_admin_dashboard') }}">Back to Dashboard</a></p>
|
||||
|
||||
<div class="tabs">
|
||||
<ul style="display: flex; list-style: none; padding: 0; border-bottom: 1px solid #ccc;">
|
||||
{% for playerLog in playersLogs %}
|
||||
<li style="margin-right: 10px;">
|
||||
<button
|
||||
onclick="openTab(event, 'player-{{ loop.index }}')"
|
||||
class="tablinks {{ loop.first ? 'active' : '' }}"
|
||||
style="padding: 10px; cursor: pointer; border: 1px solid #ccc; border-bottom: none; background: {{ loop.first ? '#eee' : '#fff' }};"
|
||||
>
|
||||
{{ playerLog.username }}
|
||||
</button>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
{% for playerLog in playersLogs %}
|
||||
<div id="player-{{ loop.index }}" class="tabcontent" style="display: {{ loop.first ? 'block' : 'none' }}; border: 1px solid #ccc; border-top: none; padding: 20px;">
|
||||
<h3>Logs for {{ playerLog.username }}</h3>
|
||||
<pre style="background: #f4f4f4; padding: 15px; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;">{{ playerLog.logs ?: 'No logs found for this player.' }}</pre>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
<script>
|
||||
function openTab(evt, playerName) {
|
||||
var i, tabcontent, tablinks;
|
||||
tabcontent = document.getElementsByClassName("tabcontent");
|
||||
for (i = 0; i < tabcontent.length; i++) {
|
||||
tabcontent[i].style.display = "none";
|
||||
}
|
||||
tablinks = document.getElementsByClassName("tablinks");
|
||||
for (i = 0; i < tablinks.length; i++) {
|
||||
tablinks[i].className = tablinks[i].className.replace(" active", "");
|
||||
tablinks[i].style.background = "#fff";
|
||||
}
|
||||
document.getElementById(playerName).style.display = "block";
|
||||
evt.currentTarget.className += " active";
|
||||
evt.currentTarget.style.background = "#eee";
|
||||
}
|
||||
</script>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,79 @@
|
||||
{% extends 'game/admin/base.html.twig' %}
|
||||
|
||||
{% block title %}Sessions — Admin{% endblock %}
|
||||
|
||||
{% block admin_body %}
|
||||
<div style="display: flex; align-items: center; justify-content: space-between; margin-bottom: 1.5rem;">
|
||||
<h1 style="margin: 0; font-size: 1.5rem; color: #0f172a;">Sessions</h1>
|
||||
<span style="color: #64748b; font-size: 0.9rem;">{{ sessions|length }} total</span>
|
||||
</div>
|
||||
|
||||
<div style="background: #fff; border-radius: 8px; box-shadow: 0 1px 3px rgba(0,0,0,.07); overflow: hidden;">
|
||||
<table style="width: 100%; border-collapse: collapse; font-size: 0.9rem;">
|
||||
<thead>
|
||||
<tr style="background: #f1f5f9; border-bottom: 1px solid #e2e8f0;">
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">ID</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Game</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Status</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Players</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Created</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for session in sessions %}
|
||||
{% set statusColors = {
|
||||
'created': '#ede9fe:#5b21b6',
|
||||
'ready': '#fef3c7:#92400e',
|
||||
'playing': '#dbeafe:#1e40af',
|
||||
'won': '#dcfce7:#166534',
|
||||
'lost': '#fee2e2:#991b1b',
|
||||
} %}
|
||||
{% set colors = (statusColors[session.status.value] ?? '#f1f5f9:#475569')|split(':') %}
|
||||
|
||||
<tr style="border-bottom: 1px solid #f1f5f9;">
|
||||
<td style="padding: 0.75rem 1rem; color: #94a3b8;">{{ session.id }}</td>
|
||||
<td style="padding: 0.75rem 1rem; font-weight: 500; color: #0f172a;">{{ session.game.name }}</td>
|
||||
<td style="padding: 0.75rem 1rem;">
|
||||
<span style="
|
||||
display: inline-block;
|
||||
padding: 0.2rem 0.6rem;
|
||||
border-radius: 4px;
|
||||
font-size: 0.75rem;
|
||||
font-weight: 600;
|
||||
background: {{ colors[0] }};
|
||||
color: {{ colors[1] }};
|
||||
">{{ session.status.value }}</span>
|
||||
</td>
|
||||
<td style="padding: 0.75rem 1rem; color: #475569;">
|
||||
{{ session.players|map(p => p.user.username)|join(', ') ?: '—' }}
|
||||
<span style="color: #94a3b8;">({{ session.players|length }}/{{ session.game.numberOfPlayers }})</span>
|
||||
</td>
|
||||
<td style="padding: 0.75rem 1rem; color: #475569;">{{ session.created|date('Y-m-d H:i') }}</td>
|
||||
<td style="padding: 0.75rem 1rem; white-space: nowrap;">
|
||||
<a href="{{ path('game_admin_view_session', {session: session.id}) }}" style="color: #3b82f6; text-decoration: none; font-size: 0.85rem; margin-right: 0.75rem;">View logs</a>
|
||||
|
||||
{% if session.status.value not in ['won', 'lost'] %}
|
||||
<form method="post" action="{{ path('game_admin_session_close', {id: session.id}) }}" style="display: inline;" onsubmit="return confirm('Force-close session #{{ session.id }}?')">
|
||||
<input type="hidden" name="_token" value="{{ csrf_token('close_session_' ~ session.id) }}">
|
||||
<button type="submit" style="
|
||||
background: none;
|
||||
border: none;
|
||||
color: #ef4444;
|
||||
cursor: pointer;
|
||||
font-size: 0.85rem;
|
||||
padding: 0;
|
||||
">Close</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% else %}
|
||||
<tr>
|
||||
<td colspan="6" style="padding: 2rem; text-align: center; color: #94a3b8;">No sessions found.</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,83 @@
|
||||
{% extends 'game/admin/base.html.twig' %}
|
||||
|
||||
{% block title %}Session #{{ session.id }} logs — Admin{% endblock %}
|
||||
|
||||
{% block admin_body %}
|
||||
<div style="margin-bottom: 1.5rem;">
|
||||
<a href="{{ path('game_admin_sessions') }}" style="color: #64748b; text-decoration: none; font-size: 0.9rem;">← Sessions</a>
|
||||
</div>
|
||||
|
||||
<h1 style="margin: 0 0 0.25rem; font-size: 1.5rem; color: #0f172a;">{{ session.game.name }} — Session #{{ session.id }}</h1>
|
||||
<p style="margin: 0 0 1.5rem; color: #64748b; font-size: 0.9rem;">{{ session.status.value }} · {{ session.players|length }} player(s) · Created {{ session.created|date('Y-m-d H:i') }}</p>
|
||||
|
||||
{% if playersLogs is empty %}
|
||||
<div style="background: #fff; border-radius: 8px; padding: 2rem; text-align: center; color: #94a3b8; box-shadow: 0 1px 3px rgba(0,0,0,.07);">
|
||||
No players in this session.
|
||||
</div>
|
||||
{% else %}
|
||||
{# Tab buttons #}
|
||||
<div style="display: flex; gap: 0; margin-bottom: 0; border-bottom: 1px solid #e2e8f0;">
|
||||
{% for playerLog in playersLogs %}
|
||||
<button
|
||||
onclick="openTab('player-{{ loop.index }}')"
|
||||
id="tab-{{ loop.index }}"
|
||||
style="
|
||||
padding: 0.6rem 1.25rem;
|
||||
border: 1px solid {{ loop.first ? '#3b82f6' : '#e2e8f0' }};
|
||||
border-bottom: {{ loop.first ? '1px solid #fff' : '1px solid #e2e8f0' }};
|
||||
background: {{ loop.first ? '#fff' : '#f8fafc' }};
|
||||
color: {{ loop.first ? '#1e40af' : '#64748b' }};
|
||||
font-size: 0.9rem;
|
||||
font-weight: {{ loop.first ? '600' : '400' }};
|
||||
cursor: pointer;
|
||||
border-radius: 6px 6px 0 0;
|
||||
margin-bottom: -1px;
|
||||
"
|
||||
>{{ playerLog.username }}</button>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
{# Tab content #}
|
||||
{% for playerLog in playersLogs %}
|
||||
<div id="player-{{ loop.index }}" style="
|
||||
display: {{ loop.first ? 'block' : 'none' }};
|
||||
background: #fff;
|
||||
border: 1px solid #e2e8f0;
|
||||
border-top: none;
|
||||
border-radius: 0 0 8px 8px;
|
||||
padding: 1.25rem;
|
||||
box-shadow: 0 1px 3px rgba(0,0,0,.07);
|
||||
">
|
||||
<pre style="
|
||||
background: #1e293b;
|
||||
color: #e2e8f0;
|
||||
padding: 1rem;
|
||||
border-radius: 6px;
|
||||
overflow-x: auto;
|
||||
white-space: pre-wrap;
|
||||
word-break: break-word;
|
||||
font-size: 0.85rem;
|
||||
line-height: 1.5;
|
||||
margin: 0;
|
||||
">{{ playerLog.logs ?: 'No logs found for this player.' }}</pre>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
<script>
|
||||
function openTab(id) {
|
||||
document.querySelectorAll('[id^="player-"]').forEach(el => el.style.display = 'none');
|
||||
document.getElementById(id).style.display = 'block';
|
||||
|
||||
const idx = id.split('-')[1];
|
||||
document.querySelectorAll('[id^="tab-"]').forEach((btn, i) => {
|
||||
const active = String(i + 1) === idx;
|
||||
btn.style.background = active ? '#fff' : '#f8fafc';
|
||||
btn.style.color = active ? '#1e40af' : '#64748b';
|
||||
btn.style.fontWeight = active ? '600' : '400';
|
||||
btn.style.borderColor = active ? '#3b82f6' : '#e2e8f0';
|
||||
btn.style.borderBottom = active ? '1px solid #fff' : '1px solid #e2e8f0';
|
||||
});
|
||||
}
|
||||
</script>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,71 @@
|
||||
{% extends 'game/admin/base.html.twig' %}
|
||||
|
||||
{% block title %}Edit User — Admin{% endblock %}
|
||||
|
||||
{% block admin_body %}
|
||||
<div style="margin-bottom: 1.5rem;">
|
||||
<a href="{{ path('game_admin_users') }}" style="color: #64748b; text-decoration: none; font-size: 0.9rem;">← Users</a>
|
||||
</div>
|
||||
|
||||
<h1 style="margin: 0 0 1.5rem; font-size: 1.5rem; color: #0f172a;">Edit user: {{ user.username }}</h1>
|
||||
|
||||
<div style="background: #fff; border-radius: 8px; box-shadow: 0 1px 3px rgba(0,0,0,.07); padding: 1.5rem; max-width: 500px;">
|
||||
{{ form_start(form, {attr: {style: 'display: flex; flex-direction: column; gap: 1.25rem;'}}) }}
|
||||
|
||||
<div>
|
||||
{{ form_label(form.email, null, {label_attr: {style: 'display: block; font-weight: 600; margin-bottom: 0.35rem; color: #374151; font-size: 0.875rem;'}}) }}
|
||||
{{ form_widget(form.email, {attr: {style: 'width: 100%; padding: 0.5rem 0.75rem; border: 1px solid #d1d5db; border-radius: 6px; font-size: 0.9rem; box-sizing: border-box;'}}) }}
|
||||
{{ form_errors(form.email) }}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
{{ form_label(form.username, null, {label_attr: {style: 'display: block; font-weight: 600; margin-bottom: 0.35rem; color: #374151; font-size: 0.875rem;'}}) }}
|
||||
{{ form_widget(form.username, {attr: {style: 'width: 100%; padding: 0.5rem 0.75rem; border: 1px solid #d1d5db; border-radius: 6px; font-size: 0.9rem; box-sizing: border-box;'}}) }}
|
||||
{{ form_errors(form.username) }}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
{{ form_label(form.plainPassword, null, {label_attr: {style: 'display: block; font-weight: 600; margin-bottom: 0.35rem; color: #374151; font-size: 0.875rem;'}}) }}
|
||||
{{ form_widget(form.plainPassword, {attr: {style: 'width: 100%; padding: 0.5rem 0.75rem; border: 1px solid #d1d5db; border-radius: 6px; font-size: 0.9rem; box-sizing: border-box;'}}) }}
|
||||
{{ form_errors(form.plainPassword) }}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
{{ form_label(form.roles, null, {label_attr: {style: 'display: block; font-weight: 600; margin-bottom: 0.5rem; color: #374151; font-size: 0.875rem;'}}) }}
|
||||
<div style="display: flex; flex-direction: column; gap: 0.4rem;">
|
||||
{{ form_widget(form.roles) }}
|
||||
</div>
|
||||
{{ form_errors(form.roles) }}
|
||||
</div>
|
||||
|
||||
<div style="display: flex; align-items: center; gap: 0.5rem;">
|
||||
{{ form_widget(form.isVerified) }}
|
||||
{{ form_label(form.isVerified, null, {label_attr: {style: 'font-weight: 600; color: #374151; font-size: 0.875rem; cursor: pointer;'}}) }}
|
||||
{{ form_errors(form.isVerified) }}
|
||||
</div>
|
||||
|
||||
<div style="display: flex; gap: 0.75rem; margin-top: 0.5rem;">
|
||||
<button type="submit" style="
|
||||
padding: 0.6rem 1.25rem;
|
||||
background: #3b82f6;
|
||||
color: #fff;
|
||||
border: none;
|
||||
border-radius: 6px;
|
||||
font-size: 0.9rem;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
">Save changes</button>
|
||||
<a href="{{ path('game_admin_users') }}" style="
|
||||
padding: 0.6rem 1.25rem;
|
||||
background: #f1f5f9;
|
||||
color: #475569;
|
||||
border-radius: 6px;
|
||||
font-size: 0.9rem;
|
||||
font-weight: 600;
|
||||
text-decoration: none;
|
||||
">Cancel</a>
|
||||
</div>
|
||||
|
||||
{{ form_end(form) }}
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,91 @@
|
||||
{% extends 'game/admin/base.html.twig' %}
|
||||
|
||||
{% block title %}Users — Admin{% endblock %}
|
||||
|
||||
{% block admin_body %}
|
||||
<div style="display: flex; align-items: center; justify-content: space-between; margin-bottom: 1.5rem;">
|
||||
<h1 style="margin: 0; font-size: 1.5rem; color: #0f172a;">Users</h1>
|
||||
<span style="color: #64748b; font-size: 0.9rem;">{{ users|length }} total · {{ marketingOptInCount }} opted in to marketing</span>
|
||||
</div>
|
||||
|
||||
<div style="background: #fff; border-radius: 8px; box-shadow: 0 1px 3px rgba(0,0,0,.07); overflow: hidden;">
|
||||
<table style="width: 100%; border-collapse: collapse; font-size: 0.9rem;">
|
||||
<thead>
|
||||
<tr style="background: #f1f5f9; border-bottom: 1px solid #e2e8f0;">
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">ID</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Username</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Email</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Roles</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Verified</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Marketing</th>
|
||||
<th style="padding: 0.75rem 1rem; text-align: left; color: #475569; font-weight: 600;">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for user in users %}
|
||||
<tr style="border-bottom: 1px solid #f1f5f9;">
|
||||
<td style="padding: 0.75rem 1rem; color: #94a3b8;">{{ user.id }}</td>
|
||||
<td style="padding: 0.75rem 1rem; font-weight: 500; color: #0f172a;">{{ user.username }}</td>
|
||||
<td style="padding: 0.75rem 1rem; color: #475569;">{{ user.email }}</td>
|
||||
<td style="padding: 0.75rem 1rem;">
|
||||
{% for role in user.roles %}
|
||||
{% if role != 'ROLE_USER' %}
|
||||
<span style="
|
||||
display: inline-block;
|
||||
padding: 0.15rem 0.5rem;
|
||||
border-radius: 4px;
|
||||
font-size: 0.75rem;
|
||||
font-weight: 600;
|
||||
background: {{ role == 'ROLE_ADMIN' ? '#fef3c7' : '#ede9fe' }};
|
||||
color: {{ role == 'ROLE_ADMIN' ? '#92400e' : '#5b21b6' }};
|
||||
margin-right: 2px;
|
||||
">{{ role }}</span>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</td>
|
||||
<td style="padding: 0.75rem 1rem;">
|
||||
{% if user.verified %}
|
||||
<span style="color: #16a34a; font-weight: 500;">✓ Yes</span>
|
||||
{% else %}
|
||||
<span style="color: #dc2626;">✗ No</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td style="padding: 0.75rem 1rem;">
|
||||
{% if user.marketingOptIn %}
|
||||
<span style="color: #16a34a; font-weight: 500;">✓ Yes</span>
|
||||
{% else %}
|
||||
<span style="color: #dc2626;">✗ No</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td style="padding: 0.75rem 1rem;">
|
||||
<a href="{{ path('game_admin_user_edit', {id: user.id}) }}" style="
|
||||
color: #3b82f6;
|
||||
text-decoration: none;
|
||||
font-size: 0.85rem;
|
||||
margin-right: 0.75rem;
|
||||
">Edit</a>
|
||||
|
||||
{% if user != app.user %}
|
||||
<form method="post" action="{{ path('game_admin_user_delete', {id: user.id}) }}" style="display: inline;" onsubmit="return confirm('Delete user {{ user.username }}?')">
|
||||
<input type="hidden" name="_token" value="{{ csrf_token('delete_user_' ~ user.id) }}">
|
||||
<button type="submit" style="
|
||||
background: none;
|
||||
border: none;
|
||||
color: #ef4444;
|
||||
cursor: pointer;
|
||||
font-size: 0.85rem;
|
||||
padding: 0;
|
||||
">Delete</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% else %}
|
||||
<tr>
|
||||
<td colspan="7" style="padding: 2rem; text-align: center; color: #94a3b8;">No users found.</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -1,38 +1,57 @@
|
||||
{% extends 'base.html.twig' %}
|
||||
{% extends 'layout/site.html.twig' %}
|
||||
|
||||
{% block title %}Game Dashboard{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<h1>Game Dashboard</h1>
|
||||
<div class="d-flex justify-content-between align-items-center mb-4">
|
||||
<h1 class="mb-0">Game Dashboard</h1>
|
||||
{% if is_granted('ROLE_ADMIN') %}
|
||||
<a href="{{ path('game_admin_dashboard') }}" class="btn btn-outline-secondary">Go to Game Admin Dashboard</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<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 %}
|
||||
<div class="row g-4 mb-4">
|
||||
<div class="col-md-6">
|
||||
<div class="card h-100">
|
||||
<div class="card-header bg-secondary text-white">Create New Session</div>
|
||||
<div class="card-body">
|
||||
{% if availableGames is not empty %}
|
||||
<form method="post">
|
||||
<select name="game_id" class="form-select mb-3">
|
||||
{% 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" class="btn btn-primary">Create Session</button>
|
||||
</form>
|
||||
{% else %}
|
||||
<p class="text-muted mb-0">No games available to start.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="card h-100">
|
||||
<div class="card-header bg-secondary text-white">Join Session</div>
|
||||
<div class="card-body">
|
||||
<form method="post" class="d-flex gap-2">
|
||||
<input type="text" name="invite_code" class="form-control" placeholder="Enter Invite Code" required>
|
||||
<button type="submit" name="join_session" class="btn btn-primary text-nowrap">Join Session</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h2>Join Session</h2>
|
||||
<form method="post">
|
||||
<input type="text" name="invite_code" placeholder="Enter Invite Code" required>
|
||||
<button type="submit" name="join_session">Join Session</button>
|
||||
</form>
|
||||
|
||||
<h2>Your Sessions</h2>
|
||||
<h2 class="h4">Your Sessions</h2>
|
||||
{% if sessions is not empty %}
|
||||
<table>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped align-middle">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
@@ -48,7 +67,7 @@
|
||||
<tr>
|
||||
<td>{{ session.id }}</td>
|
||||
<td>{{ session.game.name }}</td>
|
||||
<td>{{ session.status.value }}</td>
|
||||
<td><span class="badge bg-info text-dark">{{ session.status.value }}</span></td>
|
||||
<td>{{ session.created|date('Y-m-d H:i') }}</td>
|
||||
<td>
|
||||
{% set inviteCode = '' %}
|
||||
@@ -61,26 +80,35 @@
|
||||
{% if inviteCode %}
|
||||
<code>{{ inviteCode }}</code>
|
||||
{% else %}
|
||||
<form method="post" style="display:inline;">
|
||||
<form method="post" class="d-inline">
|
||||
<input type="hidden" name="session_id" value="{{ session.id }}">
|
||||
<button type="submit" name="create_invite">Generate Invite</button>
|
||||
<button type="submit" name="create_invite" class="btn btn-sm btn-outline-secondary">Generate Invite</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<a href="{{ path('game', {session: session.id}) }}">Enter Game</a>
|
||||
{% if session.status.value == 'created' and session.timer == 0 %}
|
||||
<form method="post" style="display:inline;">
|
||||
<input type="hidden" name="session_id" value="{{ session.id }}">
|
||||
<button type="submit" name="leave_session" onclick="return confirm('Are you sure you want to leave this session?')">Leave Session</button>
|
||||
</form>
|
||||
<a href="{{ path('game', {session: session.id}) }}" class="btn btn-sm btn-primary">Enter Game</a>
|
||||
{% if session.status.value == 'created' %}
|
||||
{% if session.players|length >= session.game.numberOfPlayers %}
|
||||
<form method="post" class="d-inline">
|
||||
<input type="hidden" name="session_id" value="{{ session.id }}">
|
||||
<button type="submit" name="start_session" class="btn btn-sm btn-success">Start Session</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
{% if session.timer == 0 %}
|
||||
<form method="post" class="d-inline">
|
||||
<input type="hidden" name="session_id" value="{{ session.id }}">
|
||||
<button type="submit" name="leave_session" class="btn btn-sm btn-outline-danger" onclick="return confirm('Are you sure you want to leave this session?')">Leave Session</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% else %}
|
||||
<p>You are not part of any sessions.</p>
|
||||
<p class="text-muted">You are not part of any sessions.</p>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
@@ -15,14 +15,17 @@
|
||||
<div id="game-container">
|
||||
<div id="mercure-config"
|
||||
data-mercure-public-url="{{ mercure_public_url|e('html_attr') }}"
|
||||
data-topic="{{ (mercure_topic_base ~ '/game/hub-' ~ session.id)|e('html_attr') }}"
|
||||
data-topic="/game/hub/{{ session.id|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-check-finished-url="{{ path('game_api_check_finished', {session: session.id})|e('html_attr') }}"
|
||||
data-lost-url="{{ path('game_lost', {session: session.id})|e('html_attr') }}"
|
||||
data-screen="{{ screen|e('html_attr') }}"
|
||||
style="display:none">
|
||||
</div>
|
||||
|
||||
<div id="game-timer">
|
||||
00:30:00
|
||||
<div id="game-timer" data-end-time="{{ session.timer }}">
|
||||
--:--:--
|
||||
</div>
|
||||
<div id="message-container">
|
||||
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
{% extends 'layout/site.html.twig' %}
|
||||
|
||||
{% block title %}Game Lost - {{ session.game.name }}{% endblock %}
|
||||
|
||||
{% block stylesheets %}
|
||||
{{ parent() }}
|
||||
<style>
|
||||
.site-main {
|
||||
background-color: #1a1a1a;
|
||||
color: #e0e0e0;
|
||||
}
|
||||
.card {
|
||||
background-color: #2d2d2d;
|
||||
border-color: #444;
|
||||
color: #e0e0e0;
|
||||
}
|
||||
.form-label {
|
||||
font-weight: bold;
|
||||
}
|
||||
.story-container {
|
||||
font-style: italic;
|
||||
border-left: 4px solid #dc3545;
|
||||
padding-left: 20px;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
.donation-section {
|
||||
background-color: #333;
|
||||
padding: 20px;
|
||||
border-radius: 8px;
|
||||
margin-bottom: 30px;
|
||||
text-align: center;
|
||||
}
|
||||
.form-range::-webkit-slider-runnable-track {
|
||||
background-color: #444;
|
||||
}
|
||||
.form-range::-moz-range-track {
|
||||
background-color: #444;
|
||||
}
|
||||
.form-range::-webkit-slider-thumb {
|
||||
background-color: #dc3545;
|
||||
}
|
||||
.form-range::-moz-range-thumb {
|
||||
background-color: #dc3545;
|
||||
}
|
||||
</style>
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-8">
|
||||
<div class="card shadow-lg">
|
||||
<div class="card-header bg-danger text-white">
|
||||
<h3 class="card-title mb-0">Game Over - Time's Up!</h3>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<h4>{{ session.game.name }}</h4>
|
||||
<hr>
|
||||
|
||||
<div class="story-container">
|
||||
<p>
|
||||
The screens flickered one last time before going completely dark. The hum of the servers ceased, replaced by an eerie silence.
|
||||
The server seems to have shut itself down before the AI virus could complete its task in decoding the undercover agents.
|
||||
</p>
|
||||
<p>
|
||||
In the days after some people are arrested for sabotaging the agency, but in the end nobody is convicted for the actions.
|
||||
Lets hope the agents which were undercover are safe and the information needed is still saved to put the other criminals behind bars.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="donation-section">
|
||||
<h5>Support the Developer</h5>
|
||||
<p>If you enjoyed the experience (even if you lost!), please consider a small donation to help me create more games.</p>
|
||||
<a href="https://www.paypal.com/donate?hosted_button_id=X9X8KB6R6GMRU" target="_blank" class="btn btn-primary">
|
||||
<i class="bi bi-paypal"></i> Donate via PayPal
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="feedback-form mt-4">
|
||||
<h5>Feedback</h5>
|
||||
<form method="post">
|
||||
<div class="mb-3">
|
||||
<label for="difficulty" class="form-label">How would you rate the difficulty? (<span id="difficulty-val">5</span>/10)</label>
|
||||
<input type="range" class="form-range" min="1" max="10" step="1" id="difficulty" name="difficulty" value="5" oninput="document.getElementById('difficulty-val').innerText = this.value">
|
||||
<div class="d-flex justify-content-between mt-1">
|
||||
<small class="text-muted">Absolutely not</small>
|
||||
-
|
||||
<small class="text-muted">Absolutely</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="entertaining" class="form-label">How entertaining was it? (<span id="entertaining-val">5</span>/10)</label>
|
||||
<input type="range" class="form-range" min="1" max="10" step="1" id="entertaining" name="entertaining" value="5" oninput="document.getElementById('entertaining-val').innerText = this.value">
|
||||
<div class="d-flex justify-content-between mt-1">
|
||||
<small class="text-muted">Absolutely not</small>
|
||||
-
|
||||
<small class="text-muted">Absolutely</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="theme" class="form-label">How was the theme? (<span id="theme-val">5</span>/10)</label>
|
||||
<input type="range" class="form-range" min="1" max="10" step="1" id="theme" name="theme" value="5" oninput="document.getElementById('theme-val').innerText = this.value">
|
||||
<div class="d-flex justify-content-between mt-1">
|
||||
<small class="text-muted">Absolutely not</small>
|
||||
-
|
||||
<small class="text-muted">Absolutely</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="feedback" class="form-label">Additional Feedback</label>
|
||||
<textarea class="form-control" id="feedback" name="feedback" rows="4" placeholder="Tell us more about your experience..."></textarea>
|
||||
</div>
|
||||
|
||||
<div class="d-grid gap-2">
|
||||
<button type="submit" class="btn btn-success">Submit Feedback & Return to Dashboard</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,133 @@
|
||||
{% extends 'layout/site.html.twig' %}
|
||||
|
||||
{% block title %}Waiting for players - {{ session.game.name }}{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-8">
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-header bg-primary text-white">
|
||||
<h3 class="card-title mb-0">Waiting for all players to be ready</h3>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<h4>{{ session.game.name }}</h4>
|
||||
<p>Welcome to the game! Please wait for all players to join and signal they are ready to start.</p>
|
||||
|
||||
<div class="game-info">
|
||||
Please keep the following things in mind:
|
||||
<ul>
|
||||
<li>This game is best played in full screen mode. For windows, press F11. For Mac, press Cmd+Ctrl+F.</li>
|
||||
<li>There is no need to reload the page. There is even a chance this could break the game.</li>
|
||||
<li>If your internet connection is lost, you can get back in the game after internet has been fixed.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="alert alert-info">
|
||||
<strong>Game Information:</strong>
|
||||
<ul class="mb-0">
|
||||
<li>Number of players: {{ session.game.numberOfPlayers }}</li>
|
||||
<li>Current players: {{ session.players|length }} / {{ session.game.numberOfPlayers }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="mt-4">
|
||||
<h5>Players status:</h5>
|
||||
<ul class="list-group">
|
||||
{% for player in session.players %}
|
||||
<li class="list-group-item d-flex justify-content-between align-items-center">
|
||||
{{ player.user.username }}
|
||||
{% set playerReady = false %}
|
||||
{% set settingName = 'ReadyAtForPlayer' ~ player.screen %}
|
||||
{% for setting in session.settings %}
|
||||
{% if setting.name.value == settingName and setting.player == player %}
|
||||
{% set playerReady = true %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
{% if playerReady %}
|
||||
<span class="badge bg-success">Ready</span>
|
||||
{% else %}
|
||||
<span class="badge bg-secondary">Not ready</span>
|
||||
{% endif %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
|
||||
<form method="post" class="mt-4">
|
||||
<div class="form-check form-switch mb-3">
|
||||
<input class="form-check-input" type="checkbox" id="toggle_ready" name="toggle_ready" onchange="this.form.submit()" {{ isReady ? 'checked' : '' }}>
|
||||
<label class="form-check-label" for="toggle_ready">
|
||||
<strong>I am ready to start!</strong>
|
||||
</label>
|
||||
</div>
|
||||
<p class="text-muted small">
|
||||
Note: If all players are not ready within 1 minute of you checking this, your status will be reset automatically.
|
||||
</p>
|
||||
</form>
|
||||
|
||||
<div class="mt-3">
|
||||
<a href="{{ path('game_dashboard') }}" class="btn btn-outline-secondary">Back to Dashboard</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="mercure-config"
|
||||
data-mercure-public-url="{{ mercure_public_url|e('html_attr') }}"
|
||||
data-topic="/game/hub/{{ session.id|e('html_attr') }}"
|
||||
data-ready-at="{{ readyAt|e('html_attr') }}"
|
||||
style="display:none">
|
||||
</div>
|
||||
|
||||
<script>
|
||||
const config = document.getElementById('mercure-config');
|
||||
const publicUrl = config.dataset.mercurePublicUrl;
|
||||
const topic = config.dataset.topic;
|
||||
const readyAt = config.dataset.readyAt;
|
||||
|
||||
let reloading = false;
|
||||
const reloadOnce = (eventSource) => {
|
||||
if (reloading) {
|
||||
return;
|
||||
}
|
||||
reloading = true;
|
||||
if (eventSource) {
|
||||
eventSource.close();
|
||||
}
|
||||
window.location.reload();
|
||||
};
|
||||
|
||||
if (publicUrl && topic) {
|
||||
const url = new URL(publicUrl);
|
||||
url.searchParams.append('topic', topic);
|
||||
|
||||
const eventSource = new EventSource(url);
|
||||
eventSource.onmessage = event => {
|
||||
const data = JSON.parse(event.data);
|
||||
if (data.type === 'all_ready' || data.type === 'player_ready') {
|
||||
reloadOnce(eventSource);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
// Client-side timeout for ready status
|
||||
if (readyAt) {
|
||||
const timeoutMs = 61000; // 61 seconds (slightly more than server-side 60s)
|
||||
const now = Date.now();
|
||||
const readyAtMs = readyAt * 1000;
|
||||
const timeElapsed = now - readyAtMs;
|
||||
const timeLeft = timeoutMs - timeElapsed;
|
||||
|
||||
if (timeLeft > 0) {
|
||||
setTimeout(() => reloadOnce(), timeLeft);
|
||||
} else {
|
||||
// Already timed out, reload to sync with server
|
||||
reloadOnce();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,12 @@
|
||||
{% extends 'layout/site.html.twig' %}
|
||||
|
||||
{% block body %}
|
||||
<div class="auth-card">
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-body p-4 p-md-5">
|
||||
<h1 class="h3 mb-4 text-center">{{ block('title') }}</h1>
|
||||
{% block auth_body %}{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,69 @@
|
||||
{% extends 'base.html.twig' %}
|
||||
|
||||
{% block header %}
|
||||
<header class="site-header">
|
||||
<nav class="navbar navbar-expand-lg navbar-dark">
|
||||
<div class="container">
|
||||
<a class="navbar-brand" href="{{ path('website_home') }}">
|
||||
<img src="{{ asset('images/logo.png') }}" alt="{{ 'site.name'|trans }}">
|
||||
{{ 'site.name'|trans }}
|
||||
</a>
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#siteNav"
|
||||
aria-controls="siteNav" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse" id="siteNav">
|
||||
<ul class="navbar-nav ms-auto align-items-lg-center gap-lg-2">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ path('website_home') }}">{{ 'nav.home'|trans }}</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ path('game_dashboard') }}">{{ 'nav.game'|trans }}</a>
|
||||
</li>
|
||||
{% if app.user %}
|
||||
{% if is_granted('ROLE_ADMIN') %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ path('game_admin_dashboard') }}">{{ 'nav.admin'|trans }}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ path('app_logout') }}">{{ 'nav.logout'|trans }}</a>
|
||||
</li>
|
||||
{% else %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ path('app_register') }}">{{ 'nav.register'|trans }}</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="btn btn-sm btn-outline-light ms-lg-2" href="{{ path('app_login') }}">{{ 'nav.login'|trans }}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</header>
|
||||
{% endblock %}
|
||||
|
||||
{% block main %}
|
||||
<main class="site-main">
|
||||
<div class="container py-4">
|
||||
{% for label, messages in app.flashes %}
|
||||
{% for message in messages %}
|
||||
<div class="alert alert-{{ label }} alert-dismissible fade show" role="alert">
|
||||
{{ message }}
|
||||
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
{% block body %}{% endblock %}
|
||||
</div>
|
||||
</main>
|
||||
{% endblock %}
|
||||
|
||||
{% block footer %}
|
||||
<footer class="site-footer py-4">
|
||||
<div class="container text-center small">
|
||||
© {{ "now"|date("Y") }} {{ 'site.name'|trans }}
|
||||
</div>
|
||||
</footer>
|
||||
{% endblock %}
|
||||
@@ -1,11 +1,34 @@
|
||||
<h1>Hi! Please confirm your email!</h1>
|
||||
{% extends 'emails/layout.html.twig' %}
|
||||
|
||||
<p>
|
||||
Please confirm your email address by clicking the following link: <br><br>
|
||||
<a href="{{ signedUrl }}">Confirm my Email</a>.
|
||||
This link will expire in {{ expiresAtMessageKey|trans(expiresAtMessageData, 'VerifyEmailBundle') }}.
|
||||
</p>
|
||||
{% block title %}Confirm your email{% endblock %}
|
||||
|
||||
<p>
|
||||
Cheers!
|
||||
</p>
|
||||
{% block content %}
|
||||
<h1 style="margin:0 0 16px; font-size:20px; color:#222222;">Hi! Please confirm your email</h1>
|
||||
|
||||
<p style="margin:0 0 24px;">
|
||||
Thanks for signing up. Please confirm your email address by clicking the button below.
|
||||
This link will expire in {{ expiresAtMessageKey|trans(expiresAtMessageData, 'VerifyEmailBundle') }}.
|
||||
</p>
|
||||
|
||||
<table role="presentation" cellpadding="0" cellspacing="0" style="margin:0 0 24px;">
|
||||
<tr>
|
||||
<td style="border-radius:4px; background-color:#3a7ca5;">
|
||||
<a href="{{ signedUrl }}" style="display:inline-block; padding:12px 24px; color:#ffffff; text-decoration:none; font-weight:bold;">
|
||||
Confirm my email
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<p style="margin:0 0 24px;">
|
||||
If the button doesn't work, copy and paste this link into your browser:<br>
|
||||
<a href="{{ signedUrl }}" style="color:#3a7ca5; word-break:break-all;">{{ signedUrl }}</a>
|
||||
</p>
|
||||
|
||||
<p style="margin:0 0 8px;">
|
||||
If the link has expired or doesn't work, you can
|
||||
<a href="{{ url('app_verify_resend_email') }}" style="color:#3a7ca5;">request a new one</a>.
|
||||
</p>
|
||||
|
||||
<p style="margin:24px 0 0;">Cheers!</p>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,17 +1,24 @@
|
||||
{% extends 'base.html.twig' %}
|
||||
{% extends 'layout/auth.html.twig' %}
|
||||
|
||||
{% block title %}Register{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<h1>Register</h1>
|
||||
|
||||
{% block auth_body %}
|
||||
{{ form_errors(registrationForm) }}
|
||||
|
||||
{{ form_start(registrationForm) }}
|
||||
{{ form_row(registrationForm.email) }}
|
||||
{{ form_row(registrationForm.username) }}
|
||||
{{ form_row(registrationForm.plainPassword) }}
|
||||
{{ form_row(registrationForm.agreeTerms) }}
|
||||
{{ form_row(registrationForm.marketingOptIn) }}
|
||||
{{ form_row(registrationForm.captcha) }}
|
||||
|
||||
<button type="submit" class="btn">Register</button>
|
||||
<div class="d-grid mt-3">
|
||||
<button type="submit" class="btn btn-primary">Register</button>
|
||||
</div>
|
||||
{{ form_end(registrationForm) }}
|
||||
|
||||
<div class="mt-3 text-center">
|
||||
<a href="{{ path('app_login') }}">Already have an account? Log in</a>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
{% extends 'layout/auth.html.twig' %}
|
||||
|
||||
{% block title %}Resend verification email{% endblock %}
|
||||
|
||||
{% block auth_body %}
|
||||
<p class="text-muted">Enter your email address and we will send you a new link to verify your account.</p>
|
||||
|
||||
{{ form_errors(resendForm) }}
|
||||
|
||||
{{ form_start(resendForm) }}
|
||||
{{ form_row(resendForm.email) }}
|
||||
|
||||
<div class="d-grid mt-3">
|
||||
<button type="submit" class="btn btn-primary">Resend email</button>
|
||||
</div>
|
||||
{{ form_end(resendForm) }}
|
||||
{% endblock %}
|
||||
@@ -1,11 +1,11 @@
|
||||
{% extends 'base.html.twig' %}
|
||||
{% extends 'layout/auth.html.twig' %}
|
||||
|
||||
{% block title %}Password Reset Email Sent{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
{% block auth_body %}
|
||||
<p>
|
||||
If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password.
|
||||
This link will expire in {{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}.
|
||||
</p>
|
||||
<p>If you don't receive an email please check your spam folder or <a href="{{ path('app_forgot_password_request') }}">try again</a>.</p>
|
||||
<p class="mb-0">If you don't receive an email please check your spam folder or <a href="{{ path('app_forgot_password_request') }}">try again</a>.</p>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,9 +1,31 @@
|
||||
<h1>Hi!</h1>
|
||||
{% extends 'emails/layout.html.twig' %}
|
||||
|
||||
<p>To reset your password, please visit the following link</p>
|
||||
{% block title %}Reset your password{% endblock %}
|
||||
|
||||
<a href="{{ url('app_reset_password', {token: resetToken.token}) }}">{{ url('app_reset_password', {token: resetToken.token}) }}</a>
|
||||
{% block content %}
|
||||
<h1 style="margin:0 0 16px; font-size:20px; color:#222222;">Hi!</h1>
|
||||
|
||||
<p>This link will expire in {{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}.</p>
|
||||
<p style="margin:0 0 24px;">
|
||||
We received a request to reset your password. Click the button below to choose a new one.
|
||||
This link will expire in {{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}.
|
||||
</p>
|
||||
|
||||
<p>Cheers!</p>
|
||||
<table role="presentation" cellpadding="0" cellspacing="0" style="margin:0 0 24px;">
|
||||
<tr>
|
||||
<td style="border-radius:4px; background-color:#3a7ca5;">
|
||||
<a href="{{ url('app_reset_password', {token: resetToken.token}) }}" style="display:inline-block; padding:12px 24px; color:#ffffff; text-decoration:none; font-weight:bold;">
|
||||
Reset my password
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<p style="margin:0 0 24px;">
|
||||
If the button doesn't work, copy and paste this link into your browser:<br>
|
||||
<a href="{{ url('app_reset_password', {token: resetToken.token}) }}" style="color:#3a7ca5; word-break:break-all;">{{ url('app_reset_password', {token: resetToken.token}) }}</a>
|
||||
</p>
|
||||
|
||||
<p style="margin:0 0 8px;">If you didn't request a password reset, you can safely ignore this email.</p>
|
||||
|
||||
<p style="margin:24px 0 0;">Cheers!</p>
|
||||
{% endblock %}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user