t1246: ask to log in at startup, with Play as Guest for the session
Logged-out players see a prompt immediately after the session check. Log in uses the existing auth.php menu flow; Play as Guest continues to the main menu. The choice is stored in sessionStorage so it does not reappear in the same tab, including after an auth callback, but does on a fresh start. A logged-in player never sees the prompt.
@@ -8,10 +8,15 @@ Live (na de eerste deploy): https://projects.timfalken.com/meteors/
8
8
9
9
## Spelen
10
10
11
1. Open `build/index.html` (lokaal of live). Het hoofdmenu (t1201) heeft
12
**Spelen** (grote knop: rondes tegen lokale bots, voorheen “Offline
13
Strijd”), **Overleven** (eindeloos alleen, voorheen “Spelen”) en
14
**Online spelen**. Hieronder de regels van het veld zelf.
11
1. Open `build/index.html` (lokaal of live). Ben je niet ingelogd, dan
12
vraagt het spel meteen of je wilt inloggen (via
13
[auth.timfalken.com](https://auth.timfalken.com)), met daaronder
14
**Speel als gast**. Een ingelogde speler ziet die vraag niet. Kies je
15
voor gast, dan blijft die keuze bewaard in deze tab (niet over een
16
nieuwe sessie). Het hoofdmenu (t1201) heeft **Spelen** (grote knop:
17
rondes tegen lokale bots, voorheen “Offline Strijd”), **Overleven**
18
(eindeloos alleen, voorheen “Spelen”) en **Online spelen**. Hieronder
19
de regels van het veld zelf.
15
20
2. Elke seconde valt er een blokje van één van vijf kleuren in een willekeurige kolom.
16
21
3. In een stilliggende kolom sleep je blokjes verticaal; ze wisselen om met de blokjes waar je langs gaat.
17
22
4. Drie of meer blokjes van dezelfde kleur op een rij (horizontaal of verticaal) worden donkergrijs, krijgen een vlam en springen omhoog. Alles wat erop stond, vliegt mee.
@@ -8,10 +8,15 @@ Live (na de eerste deploy): https://projects.timfalken.com/meteors/8
8
9
## Spelen9
## Spelen10
10
11
1. Open `build/index.html` (lokaal of live). Het hoofdmenu (t1201) heeft11
1. Open `build/index.html` (lokaal of live). Ben je niet ingelogd, dan12
**Spelen** (grote knop: rondes tegen lokale bots, voorheen “Offline12
vraagt het spel meteen of je wilt inloggen (via13
Strijd”), **Overleven** (eindeloos alleen, voorheen “Spelen”) en13
[auth.timfalken.com](https://auth.timfalken.com)), met daaronder14
**Online spelen**. Hieronder de regels van het veld zelf.14
**Speel als gast**. Een ingelogde speler ziet die vraag niet. Kies je15
voor gast, dan blijft die keuze bewaard in deze tab (niet over een16
nieuwe sessie). Het hoofdmenu (t1201) heeft **Spelen** (grote knop:17
rondes tegen lokale bots, voorheen “Offline Strijd”), **Overleven**18
(eindeloos alleen, voorheen “Spelen”) en **Online spelen**. Hieronder19
de regels van het veld zelf.15
2. Elke seconde valt er een blokje van één van vijf kleuren in een willekeurige kolom.20
2. Elke seconde valt er een blokje van één van vijf kleuren in een willekeurige kolom.16
3. In een stilliggende kolom sleep je blokjes verticaal; ze wisselen om met de blokjes waar je langs gaat.21
3. In een stilliggende kolom sleep je blokjes verticaal; ze wisselen om met de blokjes waar je langs gaat.17
4. Drie of meer blokjes van dezelfde kleur op een rij (horizontaal of verticaal) worden donkergrijs, krijgen een vlam en springen omhoog. Alles wat erop stond, vliegt mee.22
4. Drie of meer blokjes van dezelfde kleur op een rij (horizontaal of verticaal) worden donkergrijs, krijgen een vlam en springen omhoog. Alles wat erop stond, vliegt mee.@@ -1029,6 +1029,9 @@ var I18N_CATALOG = {
1029
1029
"menu.lastScore": "Last score:",
1030
1030
"menu.hint": "Drag blocks vertically to swap them. Pull a block above its column to launch it upward. Blocks that leave the field score points.",
1031
1031
"menu.login": "Log in",
1032
"loginPrompt.title": "Log in?",
1033
"loginPrompt.body": "Log in to save your points and play online.",
1034
"loginPrompt.guest": "Play as Guest",
1032
1035
"menu.localTest": "local test:",
1033
1036
"menu.loggedInAs": "Logged in as",
1034
1037
"menu.total": "Total:",
@@ -1319,6 +1322,9 @@ var I18N_CATALOG = {
1319
1322
"menu.lastScore": "Laatste score:",
1320
1323
"menu.hint": "Sleep blokjes verticaal om ze te wisselen. Trek een blokje boven zijn kolom om het omhoog te duwen. Blokjes die het veld verlaten, leveren punten op.",
1321
1324
"menu.login": "Inloggen",
1325
"loginPrompt.title": "Inloggen?",
1326
"loginPrompt.body": "Log in om je punten te bewaren en online te spelen.",
1327
"loginPrompt.guest": "Speel als gast",
1322
1328
"menu.localTest": "lokale test:",
1323
1329
"menu.loggedInAs": "Ingelogd als",
1324
1330
"menu.total": "Totaal:",
@@ -1609,6 +1615,9 @@ var I18N_CATALOG = {
1609
1615
"menu.lastScore": "Letzter Punktestand:",
1610
1616
"menu.hint": "Ziehe Blöcke senkrecht, um sie zu tauschen. Ziehe einen Block über seine Spalte, um ihn nach oben zu schießen. Blöcke, die das Feld verlassen, bringen Punkte.",
1611
1617
"menu.login": "Anmelden",
1618
"loginPrompt.title": "Anmelden?",
1619
"loginPrompt.body": "Melde dich an, um deine Punkte zu speichern und online zu spielen.",
1620
"loginPrompt.guest": "Als Gast spielen",
1612
1621
"menu.localTest": "lokaler Test:",
1613
1622
"menu.loggedInAs": "Angemeldet als",
1614
1623
"menu.total": "Gesamt:",
@@ -1899,6 +1908,9 @@ var I18N_CATALOG = {
1899
1908
"menu.lastScore": "Dernier score :",
1900
1909
"menu.hint": "Fais glisser les blocs verticalement pour les échanger. Tire un bloc au-dessus de sa colonne pour le lancer. Les blocs qui quittent le terrain rapportent des points.",
1901
1910
"menu.login": "Connexion",
1911
"loginPrompt.title": "Se connecter ?",
1912
"loginPrompt.body": "Connecte-toi pour enregistrer tes points et jouer en ligne.",
1913
"loginPrompt.guest": "Jouer en invité",
1902
1914
"menu.localTest": "test local :",
1903
1915
"menu.loggedInAs": "Connecté en tant que",
1904
1916
"menu.total": "Total :",
@@ -2189,6 +2201,9 @@ var I18N_CATALOG = {
2189
2201
"menu.lastScore": "前回のスコア:",
2190
2202
"menu.hint": "ブロックを縦にドラッグして入れ替えます。列の上まで引っ張ると打ち上げられます。フィールドを出たブロックが得点になります。",
2191
2203
"menu.login": "ログイン",
2204
"loginPrompt.title": "ログインしますか?",
2205
"loginPrompt.body": "ログインするとポイントが保存され、オンラインで遊べます。",
2206
"loginPrompt.guest": "ゲストとして遊ぶ",
2192
2207
"menu.localTest": "ローカルテスト:",
2193
2208
"menu.loggedInAs": "ログイン中:",
2194
2209
"menu.total": "合計:",
@@ -2479,6 +2494,9 @@ var I18N_CATALOG = {
2479
2494
"menu.lastScore": "上次得分:",
2480
2495
"menu.hint": "上下拖动方块来交换位置。把方块拉到其所在列的上方即可发射。离开场地的方块会得分。",
2481
2496
"menu.login": "登录",
2497
"loginPrompt.title": "要登录吗?",
2498
"loginPrompt.body": "登录后可保存分数并在线游玩。",
2499
"loginPrompt.guest": "以游客身份游玩",
2482
2500
"menu.localTest": "本地测试:",
2483
2501
"menu.loggedInAs": "已登录:",
2484
2502
"menu.total": "总分:",
@@ -2769,6 +2787,9 @@ var I18N_CATALOG = {
2769
2787
"menu.lastScore": "이전 점수:",
2770
2788
"menu.hint": "블록을 세로로 끌어 자리를 바꿉니다. 열 위로 끌어올리면 발사됩니다. 필드를 벗어난 블록이 점수가 됩니다.",
2771
2789
"menu.login": "로그인",
2790
"loginPrompt.title": "로그인할까요?",
2791
"loginPrompt.body": "로그인하면 점수가 저장되고 온라인으로 플레이할 수 있습니다.",
2792
"loginPrompt.guest": "게스트로 플레이",
2772
2793
"menu.localTest": "로컬 테스트:",
2773
2794
"menu.loggedInAs": "로그인:",
2774
2795
"menu.total": "합계:",
@@ -3059,6 +3080,9 @@ var I18N_CATALOG = {
3059
3080
"menu.lastScore": "Ostatni wynik:",
3060
3081
"menu.hint": "Przeciągaj klocki pionowo, aby je zamieniać. Pociągnij klocek ponad jego kolumnę, aby go wystrzelić. Klocki, które opuszczą pole, dają punkty.",
3061
3082
"menu.login": "Zaloguj się",
3083
"loginPrompt.title": "Zalogować się?",
3084
"loginPrompt.body": "Zaloguj się, aby zapisać punkty i grać online.",
3085
"loginPrompt.guest": "Graj jako gość",
3062
3086
"menu.localTest": "test lokalny:",
3063
3087
"menu.loggedInAs": "Zalogowano jako",
3064
3088
"menu.total": "Suma:",
@@ -3349,6 +3373,9 @@ var I18N_CATALOG = {
3349
3373
"menu.lastScore": "Последний счёт:",
3350
3374
"menu.hint": "Перетаскивай блоки вертикально, чтобы менять их местами. Потяни блок выше его столбца, чтобы запустить его вверх. Блоки, покинувшие поле, дают очки.",
3351
3375
"menu.login": "Войти",
3376
"loginPrompt.title": "Войти?",
3377
"loginPrompt.body": "Войди, чтобы сохранять очки и играть онлайн.",
3378
"loginPrompt.guest": "Играть как гость",
3352
3379
"menu.localTest": "локальный тест:",
3353
3380
"menu.loggedInAs": "Вы вошли как",
3354
3381
"menu.total": "Всего:",
@@ -3639,6 +3666,9 @@ var I18N_CATALOG = {
3639
3666
"menu.lastScore": "Última puntuación:",
3640
3667
"menu.hint": "Arrastra los bloques en vertical para intercambiarlos. Tira de un bloque por encima de su columna para lanzarlo. Los bloques que salen del campo dan puntos.",
3641
3668
"menu.login": "Iniciar sesión",
3669
"loginPrompt.title": "¿Iniciar sesión?",
3670
"loginPrompt.body": "Inicia sesión para guardar tus puntos y jugar en línea.",
3671
"loginPrompt.guest": "Jugar como invitado",
3642
3672
"menu.localTest": "prueba local:",
3643
3673
"menu.loggedInAs": "Sesión iniciada como",
3644
3674
"menu.total": "Total:",
@@ -13480,6 +13510,118 @@ else if (typeof globalThis !== 'undefined')
13480
13510
* /workspace/meteors/src/designer.js
13481
13511
*/
13482
13512
13513
/*
13514
* Start File:
13515
* /workspace/meteors/src/loginPrompt.js
13516
*/
13517
'use strict';
13518
13519
/**
13520
* Startup login prompt (t1246). A logged-out player is asked to log in
13521
* or play as guest. The guest / "already asked" choice lives in
13522
* sessionStorage so it survives a return to the menu in the same tab,
13523
* but a fresh start (new tab or closed tab) asks again.
13524
*/
13525
13526
var LoginPrompt = {
13527
STORAGE_KEY: 'meteors-login-prompt'
13528
};
13529
13530
LoginPrompt._storage = function (storage)
13531
{
13532
if (storage !== undefined)
13533
{ return storage; }
13534
try
13535
{
13536
if (typeof sessionStorage !== 'undefined')
13537
{ return sessionStorage; }
13538
}
13539
catch (e) { /* private mode / disabled storage */ }
13540
return null;
13541
};
13542
13543
LoginPrompt.remembered = function (storage)
13544
{
13545
var store = this._storage(storage);
13546
if (!store)
13547
{ return false; }
13548
try
13549
{ return store.getItem(this.STORAGE_KEY) === '1'; }
13550
catch (e)
13551
{ return false; }
13552
};
13553
13554
LoginPrompt.remember = function (storage)
13555
{
13556
var store = this._storage(storage);
13557
if (!store)
13558
{ return false; }
13559
try
13560
{
13561
store.setItem(this.STORAGE_KEY, '1');
13562
return true;
13563
}
13564
catch (e)
13565
{ return false; }
13566
};
13567
13568
/**
13569
* True when this page load is a return from the auth flow, so the
13570
* prompt must not reappear (successful login is already covered by
13571
* `me`; this also covers a cancelled or failed attempt).
13572
*
13573
* `search` is location.search; `referrer` is document.referrer.
13574
*/
13575
LoginPrompt.isAuthReturn = function (search, referrer)
13576
{
13577
search = search == null ? '' : String(search);
13578
referrer = referrer == null ? '' : String(referrer);
13579
try
13580
{
13581
var q = search.charAt(0) === '?' ? search.slice(1) : search;
13582
var params = new URLSearchParams(q);
13583
if (params.get('online') === '1')
13584
{ return true; }
13585
if (params.get('auth'))
13586
{ return true; }
13587
}
13588
catch (e) { /* URLSearchParams missing or bad input */ }
13589
var r = referrer.toLowerCase();
13590
if (r.indexOf('callback.php') !== -1)
13591
{ return true; }
13592
if (r.indexOf('auth.timfalken.com') !== -1)
13593
{ return true; }
13594
return false;
13595
};
13596
13597
/**
13598
* Whether the startup prompt should be shown.
13599
* `opts.me` — current user (truthy when logged in).
13600
* `opts.remembered` — session already chose guest or started login.
13601
* `opts.fromAuthReturn` — this load comes from the auth callback / return URL.
13602
*/
13603
LoginPrompt.shouldShow = function (opts)
13604
{
13605
opts = opts || {};
13606
if (opts.me)
13607
{ return false; }
13608
if (opts.remembered)
13609
{ return false; }
13610
if (opts.fromAuthReturn)
13611
{ return false; }
13612
return true;
13613
};
13614
13615
if (typeof module !== 'undefined' && module.exports)
13616
{ module.exports = LoginPrompt; }
13617
else if (typeof globalThis !== 'undefined')
13618
{ globalThis.LoginPrompt = LoginPrompt; }
13619
13620
/*
13621
* End File:
13622
* /workspace/meteors/src/loginPrompt.js
13623
*/
13624
13483
13625
/*
13484
13626
* Start File:
13485
13627
* /workspace/meteors/src/main.js
@@ -13615,6 +13757,7 @@ window.onload = function ()
13615
13757
restoreSelectedPlanet();
13616
13758
if (typeof Designer !== 'undefined' && Designer.bind)
13617
13759
{ Designer.bind(); }
13760
bindLoginPrompt();
13618
13761
if (typeof Online !== 'undefined' && Online.refresh)
13619
13762
{
13620
13763
Online.refresh().then(function ()
@@ -13624,10 +13767,14 @@ window.onload = function ()
13624
13767
restoreSelectedPlanet();
13625
13768
renderPlanetGrid('planet-grid', false);
13626
13769
renderPlanetGrid('lobby-planet-grid', true);
13770
maybeShowLoginPrompt();
13627
13771
});
13628
13772
}
13629
13773
else
13630
{ refreshMenuAccount(); }
13774
{
13775
refreshMenuAccount();
13776
maybeShowLoginPrompt();
13777
}
13631
13778
};
13632
13779
13633
13780
/**
@@ -16019,6 +16166,83 @@ function bindPlanetSelect ()
16019
16166
}
16020
16167
16021
16168
16169
/** t1246: ask a logged-out player to log in, or continue as guest. */
16170
function bindLoginPrompt ()
16171
{
16172
if (typeof LoginPrompt !== 'undefined' && LoginPrompt.isAuthReturn)
16173
{
16174
var search = (window.location && window.location.search) || '';
16175
var referrer = (typeof document !== 'undefined' && document.referrer) || '';
16176
if (LoginPrompt.isAuthReturn(search, referrer))
16177
{ LoginPrompt.remember(); }
16178
}
16179
var guest = document.getElementById('btn-play-guest');
16180
if (guest)
16181
{ guest.addEventListener('click', playAsGuest); }
16182
var login = document.getElementById('btn-login-prompt');
16183
if (login)
16184
{
16185
login.addEventListener('click', function ()
16186
{
16187
if (typeof LoginPrompt !== 'undefined')
16188
{ LoginPrompt.remember(); }
16189
});
16190
}
16191
var local = document.getElementById('login-prompt-local');
16192
if (local)
16193
{
16194
local.addEventListener('click', function (e)
16195
{
16196
var a = e.target && e.target.closest ? e.target.closest('a') : null;
16197
if (a && typeof LoginPrompt !== 'undefined')
16198
{ LoginPrompt.remember(); }
16199
});
16200
}
16201
}
16202
16203
function maybeShowLoginPrompt ()
16204
{
16205
var me = (typeof Online !== 'undefined') ? Online.me : null;
16206
var remembered = (typeof LoginPrompt !== 'undefined') && LoginPrompt.remembered();
16207
var fromAuth = (typeof LoginPrompt !== 'undefined') && LoginPrompt.isAuthReturn(
16208
(window.location && window.location.search) || '',
16209
(typeof document !== 'undefined' && document.referrer) || ''
16210
);
16211
var show = (typeof LoginPrompt === 'undefined')
16212
? (!me && !remembered && !fromAuth)
16213
: LoginPrompt.shouldShow({ me: me, remembered: remembered, fromAuthReturn: fromAuth });
16214
if (show)
16215
{ showLoginPrompt(); }
16216
else
16217
{ hideLoginPrompt(); }
16218
app.loginPromptReady = true;
16219
}
16220
16221
function showLoginPrompt ()
16222
{
16223
var el = document.getElementById('login-prompt');
16224
if (!el)
16225
{ return; }
16226
el.hidden = false;
16227
var login = document.getElementById('btn-login-prompt');
16228
if (login && login.focus)
16229
{ login.focus(); }
16230
}
16231
16232
function hideLoginPrompt ()
16233
{
16234
var el = document.getElementById('login-prompt');
16235
if (el)
16236
{ el.hidden = true; }
16237
}
16238
16239
function playAsGuest ()
16240
{
16241
if (typeof LoginPrompt !== 'undefined')
16242
{ LoginPrompt.remember(); }
16243
hideLoginPrompt();
16244
}
16245
16022
16246
function refreshMenuAccount ()
16023
16247
{
16024
16248
var guest = document.getElementById('menu-guest');
@@ -16052,6 +16276,9 @@ function refreshMenuAccount ()
16052
16276
}
16053
16277
if (localLogin)
16054
16278
{ localLogin.hidden = !(typeof Online !== 'undefined' && Online.local); }
16279
var promptLocal = document.getElementById('login-prompt-local');
16280
if (promptLocal)
16281
{ promptLocal.hidden = !(typeof Online !== 'undefined' && Online.local); }
16055
16282
}
16056
16283
16057
16284
/* ---------- t1193 in-game menu (Spelen / Offline Strijd) ----------- */
@@ -1029,6 +1029,9 @@ var I18N_CATALOG = {1029
"menu.lastScore": "Last score:",1029
"menu.lastScore": "Last score:",1030
"menu.hint": "Drag blocks vertically to swap them. Pull a block above its column to launch it upward. Blocks that leave the field score points.",1030
"menu.hint": "Drag blocks vertically to swap them. Pull a block above its column to launch it upward. Blocks that leave the field score points.",1031
"menu.login": "Log in",1031
"menu.login": "Log in",1032
"loginPrompt.title": "Log in?",1033
"loginPrompt.body": "Log in to save your points and play online.",1034
"loginPrompt.guest": "Play as Guest",1032
"menu.localTest": "local test:",1035
"menu.localTest": "local test:",1033
"menu.loggedInAs": "Logged in as",1036
"menu.loggedInAs": "Logged in as",1034
"menu.total": "Total:",1037
"menu.total": "Total:",@@ -1319,6 +1322,9 @@ var I18N_CATALOG = {1319
"menu.lastScore": "Laatste score:",1322
"menu.lastScore": "Laatste score:",1320
"menu.hint": "Sleep blokjes verticaal om ze te wisselen. Trek een blokje boven zijn kolom om het omhoog te duwen. Blokjes die het veld verlaten, leveren punten op.",1323
"menu.hint": "Sleep blokjes verticaal om ze te wisselen. Trek een blokje boven zijn kolom om het omhoog te duwen. Blokjes die het veld verlaten, leveren punten op.",1321
"menu.login": "Inloggen",1324
"menu.login": "Inloggen",1325
"loginPrompt.title": "Inloggen?",1326
"loginPrompt.body": "Log in om je punten te bewaren en online te spelen.",1327
"loginPrompt.guest": "Speel als gast",1322
"menu.localTest": "lokale test:",1328
"menu.localTest": "lokale test:",1323
"menu.loggedInAs": "Ingelogd als",1329
"menu.loggedInAs": "Ingelogd als",1324
"menu.total": "Totaal:",1330
"menu.total": "Totaal:",@@ -1609,6 +1615,9 @@ var I18N_CATALOG = {1609
"menu.lastScore": "Letzter Punktestand:",1615
"menu.lastScore": "Letzter Punktestand:",1610
"menu.hint": "Ziehe Blöcke senkrecht, um sie zu tauschen. Ziehe einen Block über seine Spalte, um ihn nach oben zu schießen. Blöcke, die das Feld verlassen, bringen Punkte.",1616
"menu.hint": "Ziehe Blöcke senkrecht, um sie zu tauschen. Ziehe einen Block über seine Spalte, um ihn nach oben zu schießen. Blöcke, die das Feld verlassen, bringen Punkte.",1611
"menu.login": "Anmelden",1617
"menu.login": "Anmelden",1618
"loginPrompt.title": "Anmelden?",1619
"loginPrompt.body": "Melde dich an, um deine Punkte zu speichern und online zu spielen.",1620
"loginPrompt.guest": "Als Gast spielen",1612
"menu.localTest": "lokaler Test:",1621
"menu.localTest": "lokaler Test:",1613
"menu.loggedInAs": "Angemeldet als",1622
"menu.loggedInAs": "Angemeldet als",1614
"menu.total": "Gesamt:",1623
"menu.total": "Gesamt:",@@ -1899,6 +1908,9 @@ var I18N_CATALOG = {1899
"menu.lastScore": "Dernier score :",1908
"menu.lastScore": "Dernier score :",1900
"menu.hint": "Fais glisser les blocs verticalement pour les échanger. Tire un bloc au-dessus de sa colonne pour le lancer. Les blocs qui quittent le terrain rapportent des points.",1909
"menu.hint": "Fais glisser les blocs verticalement pour les échanger. Tire un bloc au-dessus de sa colonne pour le lancer. Les blocs qui quittent le terrain rapportent des points.",1901
"menu.login": "Connexion",1910
"menu.login": "Connexion",1911
"loginPrompt.title": "Se connecter ?",1912
"loginPrompt.body": "Connecte-toi pour enregistrer tes points et jouer en ligne.",1913
"loginPrompt.guest": "Jouer en invité",1902
"menu.localTest": "test local :",1914
"menu.localTest": "test local :",1903
"menu.loggedInAs": "Connecté en tant que",1915
"menu.loggedInAs": "Connecté en tant que",1904
"menu.total": "Total :",1916
"menu.total": "Total :",@@ -2189,6 +2201,9 @@ var I18N_CATALOG = {2189
"menu.lastScore": "前回のスコア:",2201
"menu.lastScore": "前回のスコア:",2190
"menu.hint": "ブロックを縦にドラッグして入れ替えます。列の上まで引っ張ると打ち上げられます。フィールドを出たブロックが得点になります。",2202
"menu.hint": "ブロックを縦にドラッグして入れ替えます。列の上まで引っ張ると打ち上げられます。フィールドを出たブロックが得点になります。",2191
"menu.login": "ログイン",2203
"menu.login": "ログイン",2204
"loginPrompt.title": "ログインしますか?",2205
"loginPrompt.body": "ログインするとポイントが保存され、オンラインで遊べます。",2206
"loginPrompt.guest": "ゲストとして遊ぶ",2192
"menu.localTest": "ローカルテスト:",2207
"menu.localTest": "ローカルテスト:",2193
"menu.loggedInAs": "ログイン中:",2208
"menu.loggedInAs": "ログイン中:",2194
"menu.total": "合計:",2209
"menu.total": "合計:",@@ -2479,6 +2494,9 @@ var I18N_CATALOG = {2479
"menu.lastScore": "上次得分:",2494
"menu.lastScore": "上次得分:",2480
"menu.hint": "上下拖动方块来交换位置。把方块拉到其所在列的上方即可发射。离开场地的方块会得分。",2495
"menu.hint": "上下拖动方块来交换位置。把方块拉到其所在列的上方即可发射。离开场地的方块会得分。",2481
"menu.login": "登录",2496
"menu.login": "登录",2497
"loginPrompt.title": "要登录吗?",2498
"loginPrompt.body": "登录后可保存分数并在线游玩。",2499
"loginPrompt.guest": "以游客身份游玩",2482
"menu.localTest": "本地测试:",2500
"menu.localTest": "本地测试:",2483
"menu.loggedInAs": "已登录:",2501
"menu.loggedInAs": "已登录:",2484
"menu.total": "总分:",2502
"menu.total": "总分:",@@ -2769,6 +2787,9 @@ var I18N_CATALOG = {2769
"menu.lastScore": "이전 점수:",2787
"menu.lastScore": "이전 점수:",2770
"menu.hint": "블록을 세로로 끌어 자리를 바꿉니다. 열 위로 끌어올리면 발사됩니다. 필드를 벗어난 블록이 점수가 됩니다.",2788
"menu.hint": "블록을 세로로 끌어 자리를 바꿉니다. 열 위로 끌어올리면 발사됩니다. 필드를 벗어난 블록이 점수가 됩니다.",2771
"menu.login": "로그인",2789
"menu.login": "로그인",2790
"loginPrompt.title": "로그인할까요?",2791
"loginPrompt.body": "로그인하면 점수가 저장되고 온라인으로 플레이할 수 있습니다.",2792
"loginPrompt.guest": "게스트로 플레이",2772
"menu.localTest": "로컬 테스트:",2793
"menu.localTest": "로컬 테스트:",2773
"menu.loggedInAs": "로그인:",2794
"menu.loggedInAs": "로그인:",2774
"menu.total": "합계:",2795
"menu.total": "합계:",@@ -3059,6 +3080,9 @@ var I18N_CATALOG = {3059
"menu.lastScore": "Ostatni wynik:",3080
"menu.lastScore": "Ostatni wynik:",3060
"menu.hint": "Przeciągaj klocki pionowo, aby je zamieniać. Pociągnij klocek ponad jego kolumnę, aby go wystrzelić. Klocki, które opuszczą pole, dają punkty.",3081
"menu.hint": "Przeciągaj klocki pionowo, aby je zamieniać. Pociągnij klocek ponad jego kolumnę, aby go wystrzelić. Klocki, które opuszczą pole, dają punkty.",3061
"menu.login": "Zaloguj się",3082
"menu.login": "Zaloguj się",3083
"loginPrompt.title": "Zalogować się?",3084
"loginPrompt.body": "Zaloguj się, aby zapisać punkty i grać online.",3085
"loginPrompt.guest": "Graj jako gość",3062
"menu.localTest": "test lokalny:",3086
"menu.localTest": "test lokalny:",3063
"menu.loggedInAs": "Zalogowano jako",3087
"menu.loggedInAs": "Zalogowano jako",3064
"menu.total": "Suma:",3088
"menu.total": "Suma:",@@ -3349,6 +3373,9 @@ var I18N_CATALOG = {3349
"menu.lastScore": "Последний счёт:",3373
"menu.lastScore": "Последний счёт:",3350
"menu.hint": "Перетаскивай блоки вертикально, чтобы менять их местами. Потяни блок выше его столбца, чтобы запустить его вверх. Блоки, покинувшие поле, дают очки.",3374
"menu.hint": "Перетаскивай блоки вертикально, чтобы менять их местами. Потяни блок выше его столбца, чтобы запустить его вверх. Блоки, покинувшие поле, дают очки.",3351
"menu.login": "Войти",3375
"menu.login": "Войти",3376
"loginPrompt.title": "Войти?",3377
"loginPrompt.body": "Войди, чтобы сохранять очки и играть онлайн.",3378
"loginPrompt.guest": "Играть как гость",3352
"menu.localTest": "локальный тест:",3379
"menu.localTest": "локальный тест:",3353
"menu.loggedInAs": "Вы вошли как",3380
"menu.loggedInAs": "Вы вошли как",3354
"menu.total": "Всего:",3381
"menu.total": "Всего:",@@ -3639,6 +3666,9 @@ var I18N_CATALOG = {3639
"menu.lastScore": "Última puntuación:",3666
"menu.lastScore": "Última puntuación:",3640
"menu.hint": "Arrastra los bloques en vertical para intercambiarlos. Tira de un bloque por encima de su columna para lanzarlo. Los bloques que salen del campo dan puntos.",3667
"menu.hint": "Arrastra los bloques en vertical para intercambiarlos. Tira de un bloque por encima de su columna para lanzarlo. Los bloques que salen del campo dan puntos.",3641
"menu.login": "Iniciar sesión",3668
"menu.login": "Iniciar sesión",3669
"loginPrompt.title": "¿Iniciar sesión?",3670
"loginPrompt.body": "Inicia sesión para guardar tus puntos y jugar en línea.",3671
"loginPrompt.guest": "Jugar como invitado",3642
"menu.localTest": "prueba local:",3672
"menu.localTest": "prueba local:",3643
"menu.loggedInAs": "Sesión iniciada como",3673
"menu.loggedInAs": "Sesión iniciada como",3644
"menu.total": "Total:",3674
"menu.total": "Total:",@@ -13480,6 +13510,118 @@ else if (typeof globalThis !== 'undefined')13480
* /workspace/meteors/src/designer.js13510
* /workspace/meteors/src/designer.js13481
*/ 13511
*/ 13482
13512
13513
/*13514
* Start File:13515
* /workspace/meteors/src/loginPrompt.js13516
*/ 13517
'use strict';13518
13519
/**13520
* Startup login prompt (t1246). A logged-out player is asked to log in13521
* or play as guest. The guest / "already asked" choice lives in13522
* sessionStorage so it survives a return to the menu in the same tab,13523
* but a fresh start (new tab or closed tab) asks again.13524
*/13525
13526
var LoginPrompt = {13527
STORAGE_KEY: 'meteors-login-prompt'13528
};13529
13530
LoginPrompt._storage = function (storage)13531
{13532
if (storage !== undefined)13533
{ return storage; }13534
try13535
{13536
if (typeof sessionStorage !== 'undefined')13537
{ return sessionStorage; }13538
}13539
catch (e) { /* private mode / disabled storage */ }13540
return null;13541
};13542
13543
LoginPrompt.remembered = function (storage)13544
{13545
var store = this._storage(storage);13546
if (!store)13547
{ return false; }13548
try13549
{ return store.getItem(this.STORAGE_KEY) === '1'; }13550
catch (e)13551
{ return false; }13552
};13553
13554
LoginPrompt.remember = function (storage)13555
{13556
var store = this._storage(storage);13557
if (!store)13558
{ return false; }13559
try13560
{13561
store.setItem(this.STORAGE_KEY, '1');13562
return true;13563
}13564
catch (e)13565
{ return false; }13566
};13567
13568
/**13569
* True when this page load is a return from the auth flow, so the13570
* prompt must not reappear (successful login is already covered by13571
* `me`; this also covers a cancelled or failed attempt).13572
*13573
* `search` is location.search; `referrer` is document.referrer.13574
*/13575
LoginPrompt.isAuthReturn = function (search, referrer)13576
{13577
search = search == null ? '' : String(search);13578
referrer = referrer == null ? '' : String(referrer);13579
try13580
{13581
var q = search.charAt(0) === '?' ? search.slice(1) : search;13582
var params = new URLSearchParams(q);13583
if (params.get('online') === '1')13584
{ return true; }13585
if (params.get('auth'))13586
{ return true; }13587
}13588
catch (e) { /* URLSearchParams missing or bad input */ }13589
var r = referrer.toLowerCase();13590
if (r.indexOf('callback.php') !== -1)13591
{ return true; }13592
if (r.indexOf('auth.timfalken.com') !== -1)13593
{ return true; }13594
return false;13595
};13596
13597
/**13598
* Whether the startup prompt should be shown.13599
* `opts.me` — current user (truthy when logged in).13600
* `opts.remembered` — session already chose guest or started login.13601
* `opts.fromAuthReturn` — this load comes from the auth callback / return URL.13602
*/13603
LoginPrompt.shouldShow = function (opts)13604
{13605
opts = opts || {};13606
if (opts.me)13607
{ return false; }13608
if (opts.remembered)13609
{ return false; }13610
if (opts.fromAuthReturn)13611
{ return false; }13612
return true;13613
};13614
13615
if (typeof module !== 'undefined' && module.exports)13616
{ module.exports = LoginPrompt; }13617
else if (typeof globalThis !== 'undefined')13618
{ globalThis.LoginPrompt = LoginPrompt; }13619
13620
/*13621
* End File:13622
* /workspace/meteors/src/loginPrompt.js13623
*/ 13624
13483
/*13625
/*13484
* Start File:13626
* Start File:13485
* /workspace/meteors/src/main.js13627
* /workspace/meteors/src/main.js@@ -13615,6 +13757,7 @@ window.onload = function ()13615
restoreSelectedPlanet();13757
restoreSelectedPlanet();13616
if (typeof Designer !== 'undefined' && Designer.bind)13758
if (typeof Designer !== 'undefined' && Designer.bind)13617
{ Designer.bind(); }13759
{ Designer.bind(); }13760
bindLoginPrompt();13618
if (typeof Online !== 'undefined' && Online.refresh)13761
if (typeof Online !== 'undefined' && Online.refresh)13619
{13762
{13620
Online.refresh().then(function ()13763
Online.refresh().then(function ()@@ -13624,10 +13767,14 @@ window.onload = function ()13624
restoreSelectedPlanet();13767
restoreSelectedPlanet();13625
renderPlanetGrid('planet-grid', false);13768
renderPlanetGrid('planet-grid', false);13626
renderPlanetGrid('lobby-planet-grid', true);13769
renderPlanetGrid('lobby-planet-grid', true);13770
maybeShowLoginPrompt();13627
});13771
});13628
}13772
}13629
else13773
else13630
{ refreshMenuAccount(); }13774
{13775
refreshMenuAccount();13776
maybeShowLoginPrompt();13777
}13631
};13778
};13632
13779
13633
/**13780
/**@@ -16019,6 +16166,83 @@ function bindPlanetSelect ()16019
}16166
}16020
16167
16021
16168
16169
/** t1246: ask a logged-out player to log in, or continue as guest. */16170
function bindLoginPrompt ()16171
{16172
if (typeof LoginPrompt !== 'undefined' && LoginPrompt.isAuthReturn)16173
{16174
var search = (window.location && window.location.search) || '';16175
var referrer = (typeof document !== 'undefined' && document.referrer) || '';16176
if (LoginPrompt.isAuthReturn(search, referrer))16177
{ LoginPrompt.remember(); }16178
}16179
var guest = document.getElementById('btn-play-guest');16180
if (guest)16181
{ guest.addEventListener('click', playAsGuest); }16182
var login = document.getElementById('btn-login-prompt');16183
if (login)16184
{16185
login.addEventListener('click', function ()16186
{16187
if (typeof LoginPrompt !== 'undefined')16188
{ LoginPrompt.remember(); }16189
});16190
}16191
var local = document.getElementById('login-prompt-local');16192
if (local)16193
{16194
local.addEventListener('click', function (e)16195
{16196
var a = e.target && e.target.closest ? e.target.closest('a') : null;16197
if (a && typeof LoginPrompt !== 'undefined')16198
{ LoginPrompt.remember(); }16199
});16200
}16201
}16202
16203
function maybeShowLoginPrompt ()16204
{16205
var me = (typeof Online !== 'undefined') ? Online.me : null;16206
var remembered = (typeof LoginPrompt !== 'undefined') && LoginPrompt.remembered();16207
var fromAuth = (typeof LoginPrompt !== 'undefined') && LoginPrompt.isAuthReturn(16208
(window.location && window.location.search) || '',16209
(typeof document !== 'undefined' && document.referrer) || ''16210
);16211
var show = (typeof LoginPrompt === 'undefined')16212
? (!me && !remembered && !fromAuth)16213
: LoginPrompt.shouldShow({ me: me, remembered: remembered, fromAuthReturn: fromAuth });16214
if (show)16215
{ showLoginPrompt(); }16216
else16217
{ hideLoginPrompt(); }16218
app.loginPromptReady = true;16219
}16220
16221
function showLoginPrompt ()16222
{16223
var el = document.getElementById('login-prompt');16224
if (!el)16225
{ return; }16226
el.hidden = false;16227
var login = document.getElementById('btn-login-prompt');16228
if (login && login.focus)16229
{ login.focus(); }16230
}16231
16232
function hideLoginPrompt ()16233
{16234
var el = document.getElementById('login-prompt');16235
if (el)16236
{ el.hidden = true; }16237
}16238
16239
function playAsGuest ()16240
{16241
if (typeof LoginPrompt !== 'undefined')16242
{ LoginPrompt.remember(); }16243
hideLoginPrompt();16244
}16245
16022
function refreshMenuAccount ()16246
function refreshMenuAccount ()16023
{16247
{16024
var guest = document.getElementById('menu-guest');16248
var guest = document.getElementById('menu-guest');@@ -16052,6 +16276,9 @@ function refreshMenuAccount ()16052
}16276
}16053
if (localLogin)16277
if (localLogin)16054
{ localLogin.hidden = !(typeof Online !== 'undefined' && Online.local); }16278
{ localLogin.hidden = !(typeof Online !== 'undefined' && Online.local); }16279
var promptLocal = document.getElementById('login-prompt-local');16280
if (promptLocal)16281
{ promptLocal.hidden = !(typeof Online !== 'undefined' && Online.local); }16055
}16282
}16056
16283
16057
/* ---------- t1193 in-game menu (Spelen / Offline Strijd) ----------- */16284
/* ---------- t1193 in-game menu (Spelen / Offline Strijd) ----------- */@@ -47,6 +47,20 @@
47
47
</div>
48
48
</div>
49
49
50
<div id="login-prompt" class="screen overlay" role="dialog" aria-modal="true" aria-labelledby="login-prompt-title" hidden>
51
<h2 id="login-prompt-title" data-i18n="loginPrompt.title">Log in?</h2>
52
<p class="tagline" data-i18n="loginPrompt.body">Log in to save your points and play online.</p>
53
<div class="game-menu-buttons">
54
<a id="btn-login-prompt" class="button btn-primary-ish" href="auth.php" data-i18n="menu.login">Log in</a>
55
<button type="button" id="btn-play-guest" class="btn-secondary" data-i18n="loginPrompt.guest">Play as Guest</button>
56
<p id="login-prompt-local" class="hint" hidden>
57
<span data-i18n="menu.localTest">local test:</span>
58
<a href="auth.php?test=1">test_user_1</a> ·
59
<a href="auth.php?test=2">test_user_2</a>
60
</p>
61
</div>
62
</div>
63
50
64
<div id="planet-select" class="screen" hidden>
51
65
<h1 data-i18n="planet.title">Choose a field</h1>
52
66
<p id="planet-mode" class="planet-mode"></p>
@@ -47,6 +47,20 @@47
</div>47
</div>48
</div>48
</div>49
49
50
<div id="login-prompt" class="screen overlay" role="dialog" aria-modal="true" aria-labelledby="login-prompt-title" hidden>51
<h2 id="login-prompt-title" data-i18n="loginPrompt.title">Log in?</h2>52
<p class="tagline" data-i18n="loginPrompt.body">Log in to save your points and play online.</p>53
<div class="game-menu-buttons">54
<a id="btn-login-prompt" class="button btn-primary-ish" href="auth.php" data-i18n="menu.login">Log in</a>55
<button type="button" id="btn-play-guest" class="btn-secondary" data-i18n="loginPrompt.guest">Play as Guest</button>56
<p id="login-prompt-local" class="hint" hidden>57
<span data-i18n="menu.localTest">local test:</span>58
<a href="auth.php?test=1">test_user_1</a> ·59
<a href="auth.php?test=2">test_user_2</a>60
</p>61
</div>62
</div>63
50
<div id="planet-select" class="screen" hidden>64
<div id="planet-select" class="screen" hidden>51
<h1 data-i18n="planet.title">Choose a field</h1>65
<h1 data-i18n="planet.title">Choose a field</h1>52
<p id="planet-mode" class="planet-mode"></p>66
<p id="planet-mode" class="planet-mode"></p>@@ -46,7 +46,7 @@ html, body {
46
46
text-align: center;
47
47
}
48
48
49
.screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #flights-back[hidden], #planet-select[hidden], #offline-result[hidden], #game-menu[hidden], #btn-game-menu[hidden], #offline-hud[hidden], #chain-indicator[hidden], #designer[hidden], #designer-edit[hidden], #reward[hidden] { display: none !important; }
49
.screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #flights-back[hidden], #planet-select[hidden], #offline-result[hidden], #game-menu[hidden], #btn-game-menu[hidden], #offline-hud[hidden], #chain-indicator[hidden], #designer[hidden], #designer-edit[hidden], #reward[hidden], #login-prompt[hidden] { display: none !important; }
50
50
51
51
h1 {
52
52
font-size: clamp(48px, 14vw, 96px);
@@ -1155,3 +1155,56 @@ html[lang="ja"], html[lang="zh-Hans"], html[lang="ko"] {
1155
1155
white-space: nowrap;
1156
1156
}
1157
1157
#minis.placed .mini-canvas { margin: 0 auto; }
1158
1159
/* t1246: startup login / play-as-guest prompt. */
1160
#login-prompt {
1161
z-index: 70;
1162
}
1163
#login-prompt h2 {
1164
color: #ffe27a;
1165
}
1166
#login-prompt .tagline {
1167
margin-bottom: 20px;
1168
}
1169
#btn-login-prompt {
1170
margin-top: 0;
1171
padding: 14px 48px;
1172
font-size: clamp(20px, 5vw, 28px);
1173
font-weight: 700;
1174
letter-spacing: 0.08em;
1175
text-transform: uppercase;
1176
color: #1a1020;
1177
background: linear-gradient(180deg, #ffe27a, #f0c53a 40%, #e89a20);
1178
border: 0;
1179
border-radius: 999px;
1180
min-height: 52px;
1181
min-width: min(80vw, 300px);
1182
box-shadow:
1183
0 0 0 3px rgba(255, 220, 120, 0.25),
1184
0 8px 24px rgba(240, 197, 58, 0.45);
1185
touch-action: manipulation;
1186
}
1187
#btn-login-prompt:is(:hover, :focus-visible) {
1188
color: #1a1020;
1189
border-color: transparent;
1190
transform: translateY(-1px);
1191
box-shadow:
1192
0 0 0 3px rgba(255, 220, 120, 0.4),
1193
0 10px 28px rgba(240, 197, 58, 0.6);
1194
}
1195
#btn-login-prompt:active { transform: translateY(1px); }
1196
#btn-play-guest {
1197
min-width: min(80vw, 300px);
1198
min-height: 48px;
1199
touch-action: manipulation;
1200
}
1201
#login-prompt-local {
1202
margin-top: 20px;
1203
}
1204
#login-prompt-local a { color: #ffe27a; }
1205
#login-prompt-local a:hover { color: #fff; }
1206
@media (max-height: 520px) {
1207
#login-prompt .tagline { margin-bottom: 12px; }
1208
#btn-login-prompt { padding: 10px 36px; }
1209
}
1210
@@ -46,7 +46,7 @@ html, body {46
text-align: center;46
text-align: center;47
}47
}48
48
49
.screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #flights-back[hidden], #planet-select[hidden], #offline-result[hidden], #game-menu[hidden], #btn-game-menu[hidden], #offline-hud[hidden], #chain-indicator[hidden], #designer[hidden], #designer-edit[hidden], #reward[hidden] { display: none !important; }49
.screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #flights-back[hidden], #planet-select[hidden], #offline-result[hidden], #game-menu[hidden], #btn-game-menu[hidden], #offline-hud[hidden], #chain-indicator[hidden], #designer[hidden], #designer-edit[hidden], #reward[hidden], #login-prompt[hidden] { display: none !important; }50
50
51
h1 {51
h1 {52
font-size: clamp(48px, 14vw, 96px);52
font-size: clamp(48px, 14vw, 96px);@@ -1155,3 +1155,56 @@ html[lang="ja"], html[lang="zh-Hans"], html[lang="ko"] {1155
white-space: nowrap;1155
white-space: nowrap;1156
}1156
}1157
#minis.placed .mini-canvas { margin: 0 auto; }1157
#minis.placed .mini-canvas { margin: 0 auto; }1158
1159
/* t1246: startup login / play-as-guest prompt. */1160
#login-prompt {1161
z-index: 70;1162
}1163
#login-prompt h2 {1164
color: #ffe27a;1165
}1166
#login-prompt .tagline {1167
margin-bottom: 20px;1168
}1169
#btn-login-prompt {1170
margin-top: 0;1171
padding: 14px 48px;1172
font-size: clamp(20px, 5vw, 28px);1173
font-weight: 700;1174
letter-spacing: 0.08em;1175
text-transform: uppercase;1176
color: #1a1020;1177
background: linear-gradient(180deg, #ffe27a, #f0c53a 40%, #e89a20);1178
border: 0;1179
border-radius: 999px;1180
min-height: 52px;1181
min-width: min(80vw, 300px);1182
box-shadow:1183
0 0 0 3px rgba(255, 220, 120, 0.25),1184
0 8px 24px rgba(240, 197, 58, 0.45);1185
touch-action: manipulation;1186
}1187
#btn-login-prompt:is(:hover, :focus-visible) {1188
color: #1a1020;1189
border-color: transparent;1190
transform: translateY(-1px);1191
box-shadow:1192
0 0 0 3px rgba(255, 220, 120, 0.4),1193
0 10px 28px rgba(240, 197, 58, 0.6);1194
}1195
#btn-login-prompt:active { transform: translateY(1px); }1196
#btn-play-guest {1197
min-width: min(80vw, 300px);1198
min-height: 48px;1199
touch-action: manipulation;1200
}1201
#login-prompt-local {1202
margin-top: 20px;1203
}1204
#login-prompt-local a { color: #ffe27a; }1205
#login-prompt-local a:hover { color: #fff; }1206
@media (max-height: 520px) {1207
#login-prompt .tagline { margin-bottom: 12px; }1208
#btn-login-prompt { padding: 10px 36px; }1209
}1210
@@ -1359,3 +1359,32 @@ opnieuw bepaald, dus een tegenstander die uitvalt schuift pas dan naar
1359
1359
achteren.
1360
1360
1361
1361
Brede schermen (zij-layout) zijn ongewijzigd.
1362
1363
1364
## t1246 — Inlogvraag bij de start
1365
1366
Als je het spel opent en niet bent ingelogd, verschijnt meteen een
1367
overlay: **Inloggen?** met de gewone inlogknop (naar `auth.php`,
1368
dezelfde flow als de menulink, dus na succes terug naar het hoofdmenu)
1369
en daaronder **Speel als gast**. Een ingelogde speler ziet deze vraag
1370
nooit. De overlay gebruikt de bestaande i18n en de stijl van het
1371
pauzemenu, op desktop en mobiel.
1372
1373
**Sessiekeuze.** “Speel als gast” (en ook het aanklikken van Inloggen)
1374
wordt onthouden in `sessionStorage` onder de sleutel
1375
`meteors-login-prompt`. Daardoor komt de vraag niet terug als je in
1376
dezelfde tab naar het menu terugkeert of de pagina herlaadt, maar wel
1377
bij een verse start (nieuw tabblad of de tab sluiten). `localStorage`
1378
zou de keuze permanent maken; dat is niet de bedoeling.
1379
1380
**Terugkomst van de auth-callback.** Na een geslaagde login is
1381
`Online.me` gezet, dus de vraag verschijnt niet. Om te voorkomen dat de
1382
vraag wél terugkomt na een afgebroken of mislukte login (of na
1383
`?online=1` / `?auth=unconfigured`), wordt de sessievlag ook gezet
1384
zodra je op Inloggen klikt, en bij het laden als de URL of de
1385
`document.referrer` op een terugkomst van auth wijst
1386
(`callback.php`, auth.timfalken.com, `?online=1`, `?auth=`). Aan
1387
auth.timfalken.com is niets veranderd.
1388
1389
Tests: `test/login-prompt.test.js`; Playwright
1390
`test/t1246-login-prompt-playwright.py URL TAG`.
@@ -1359,3 +1359,32 @@ opnieuw bepaald, dus een tegenstander die uitvalt schuift pas dan naar1359
achteren.1359
achteren.1360
1360
1361
Brede schermen (zij-layout) zijn ongewijzigd.1361
Brede schermen (zij-layout) zijn ongewijzigd.1362
1363
1364
## t1246 — Inlogvraag bij de start1365
1366
Als je het spel opent en niet bent ingelogd, verschijnt meteen een1367
overlay: **Inloggen?** met de gewone inlogknop (naar `auth.php`,1368
dezelfde flow als de menulink, dus na succes terug naar het hoofdmenu)1369
en daaronder **Speel als gast**. Een ingelogde speler ziet deze vraag1370
nooit. De overlay gebruikt de bestaande i18n en de stijl van het1371
pauzemenu, op desktop en mobiel.1372
1373
**Sessiekeuze.** “Speel als gast” (en ook het aanklikken van Inloggen)1374
wordt onthouden in `sessionStorage` onder de sleutel1375
`meteors-login-prompt`. Daardoor komt de vraag niet terug als je in1376
dezelfde tab naar het menu terugkeert of de pagina herlaadt, maar wel1377
bij een verse start (nieuw tabblad of de tab sluiten). `localStorage`1378
zou de keuze permanent maken; dat is niet de bedoeling.1379
1380
**Terugkomst van de auth-callback.** Na een geslaagde login is1381
`Online.me` gezet, dus de vraag verschijnt niet. Om te voorkomen dat de1382
vraag wél terugkomt na een afgebroken of mislukte login (of na1383
`?online=1` / `?auth=unconfigured`), wordt de sessievlag ook gezet1384
zodra je op Inloggen klikt, en bij het laden als de URL of de1385
`document.referrer` op een terugkomst van auth wijst1386
(`callback.php`, auth.timfalken.com, `?online=1`, `?auth=`). Aan1387
auth.timfalken.com is niets veranderd.1388
1389
Tests: `test/login-prompt.test.js`; Playwright1390
`test/t1246-login-prompt-playwright.py URL TAG`.@@ -7,6 +7,9 @@
7
7
"menu.lastScore": "Last score:",
8
8
"menu.hint": "Drag blocks vertically to swap them. Pull a block above its column to launch it upward. Blocks that leave the field score points.",
9
9
"menu.login": "Log in",
10
"loginPrompt.title": "Log in?",
11
"loginPrompt.body": "Log in to save your points and play online.",
12
"loginPrompt.guest": "Play as Guest",
10
13
"menu.localTest": "local test:",
11
14
"menu.loggedInAs": "Logged in as",
12
15
"menu.total": "Total:",
@@ -297,6 +300,9 @@
297
300
"menu.lastScore": "Laatste score:",
298
301
"menu.hint": "Sleep blokjes verticaal om ze te wisselen. Trek een blokje boven zijn kolom om het omhoog te duwen. Blokjes die het veld verlaten, leveren punten op.",
299
302
"menu.login": "Inloggen",
303
"loginPrompt.title": "Inloggen?",
304
"loginPrompt.body": "Log in om je punten te bewaren en online te spelen.",
305
"loginPrompt.guest": "Speel als gast",
300
306
"menu.localTest": "lokale test:",
301
307
"menu.loggedInAs": "Ingelogd als",
302
308
"menu.total": "Totaal:",
@@ -587,6 +593,9 @@
587
593
"menu.lastScore": "Letzter Punktestand:",
588
594
"menu.hint": "Ziehe Blöcke senkrecht, um sie zu tauschen. Ziehe einen Block über seine Spalte, um ihn nach oben zu schießen. Blöcke, die das Feld verlassen, bringen Punkte.",
589
595
"menu.login": "Anmelden",
596
"loginPrompt.title": "Anmelden?",
597
"loginPrompt.body": "Melde dich an, um deine Punkte zu speichern und online zu spielen.",
598
"loginPrompt.guest": "Als Gast spielen",
590
599
"menu.localTest": "lokaler Test:",
591
600
"menu.loggedInAs": "Angemeldet als",
592
601
"menu.total": "Gesamt:",
@@ -877,6 +886,9 @@
877
886
"menu.lastScore": "Dernier score :",
878
887
"menu.hint": "Fais glisser les blocs verticalement pour les échanger. Tire un bloc au-dessus de sa colonne pour le lancer. Les blocs qui quittent le terrain rapportent des points.",
879
888
"menu.login": "Connexion",
889
"loginPrompt.title": "Se connecter ?",
890
"loginPrompt.body": "Connecte-toi pour enregistrer tes points et jouer en ligne.",
891
"loginPrompt.guest": "Jouer en invité",
880
892
"menu.localTest": "test local :",
881
893
"menu.loggedInAs": "Connecté en tant que",
882
894
"menu.total": "Total :",
@@ -1167,6 +1179,9 @@
1167
1179
"menu.lastScore": "前回のスコア:",
1168
1180
"menu.hint": "ブロックを縦にドラッグして入れ替えます。列の上まで引っ張ると打ち上げられます。フィールドを出たブロックが得点になります。",
1169
1181
"menu.login": "ログイン",
1182
"loginPrompt.title": "ログインしますか?",
1183
"loginPrompt.body": "ログインするとポイントが保存され、オンラインで遊べます。",
1184
"loginPrompt.guest": "ゲストとして遊ぶ",
1170
1185
"menu.localTest": "ローカルテスト:",
1171
1186
"menu.loggedInAs": "ログイン中:",
1172
1187
"menu.total": "合計:",
@@ -1457,6 +1472,9 @@
1457
1472
"menu.lastScore": "上次得分:",
1458
1473
"menu.hint": "上下拖动方块来交换位置。把方块拉到其所在列的上方即可发射。离开场地的方块会得分。",
1459
1474
"menu.login": "登录",
1475
"loginPrompt.title": "要登录吗?",
1476
"loginPrompt.body": "登录后可保存分数并在线游玩。",
1477
"loginPrompt.guest": "以游客身份游玩",
1460
1478
"menu.localTest": "本地测试:",
1461
1479
"menu.loggedInAs": "已登录:",
1462
1480
"menu.total": "总分:",
@@ -1747,6 +1765,9 @@
1747
1765
"menu.lastScore": "이전 점수:",
1748
1766
"menu.hint": "블록을 세로로 끌어 자리를 바꿉니다. 열 위로 끌어올리면 발사됩니다. 필드를 벗어난 블록이 점수가 됩니다.",
1749
1767
"menu.login": "로그인",
1768
"loginPrompt.title": "로그인할까요?",
1769
"loginPrompt.body": "로그인하면 점수가 저장되고 온라인으로 플레이할 수 있습니다.",
1770
"loginPrompt.guest": "게스트로 플레이",
1750
1771
"menu.localTest": "로컬 테스트:",
1751
1772
"menu.loggedInAs": "로그인:",
1752
1773
"menu.total": "합계:",
@@ -2037,6 +2058,9 @@
2037
2058
"menu.lastScore": "Ostatni wynik:",
2038
2059
"menu.hint": "Przeciągaj klocki pionowo, aby je zamieniać. Pociągnij klocek ponad jego kolumnę, aby go wystrzelić. Klocki, które opuszczą pole, dają punkty.",
2039
2060
"menu.login": "Zaloguj się",
2061
"loginPrompt.title": "Zalogować się?",
2062
"loginPrompt.body": "Zaloguj się, aby zapisać punkty i grać online.",
2063
"loginPrompt.guest": "Graj jako gość",
2040
2064
"menu.localTest": "test lokalny:",
2041
2065
"menu.loggedInAs": "Zalogowano jako",
2042
2066
"menu.total": "Suma:",
@@ -2327,6 +2351,9 @@
2327
2351
"menu.lastScore": "Последний счёт:",
2328
2352
"menu.hint": "Перетаскивай блоки вертикально, чтобы менять их местами. Потяни блок выше его столбца, чтобы запустить его вверх. Блоки, покинувшие поле, дают очки.",
2329
2353
"menu.login": "Войти",
2354
"loginPrompt.title": "Войти?",
2355
"loginPrompt.body": "Войди, чтобы сохранять очки и играть онлайн.",
2356
"loginPrompt.guest": "Играть как гость",
2330
2357
"menu.localTest": "локальный тест:",
2331
2358
"menu.loggedInAs": "Вы вошли как",
2332
2359
"menu.total": "Всего:",
@@ -2617,6 +2644,9 @@
2617
2644
"menu.lastScore": "Última puntuación:",
2618
2645
"menu.hint": "Arrastra los bloques en vertical para intercambiarlos. Tira de un bloque por encima de su columna para lanzarlo. Los bloques que salen del campo dan puntos.",
2619
2646
"menu.login": "Iniciar sesión",
2647
"loginPrompt.title": "¿Iniciar sesión?",
2648
"loginPrompt.body": "Inicia sesión para guardar tus puntos y jugar en línea.",
2649
"loginPrompt.guest": "Jugar como invitado",
2620
2650
"menu.localTest": "prueba local:",
2621
2651
"menu.loggedInAs": "Sesión iniciada como",
2622
2652
"menu.total": "Total:",
@@ -7,6 +7,9 @@7
"menu.lastScore": "Last score:",7
"menu.lastScore": "Last score:",8
"menu.hint": "Drag blocks vertically to swap them. Pull a block above its column to launch it upward. Blocks that leave the field score points.",8
"menu.hint": "Drag blocks vertically to swap them. Pull a block above its column to launch it upward. Blocks that leave the field score points.",9
"menu.login": "Log in",9
"menu.login": "Log in",10
"loginPrompt.title": "Log in?",11
"loginPrompt.body": "Log in to save your points and play online.",12
"loginPrompt.guest": "Play as Guest",10
"menu.localTest": "local test:",13
"menu.localTest": "local test:",11
"menu.loggedInAs": "Logged in as",14
"menu.loggedInAs": "Logged in as",12
"menu.total": "Total:",15
"menu.total": "Total:",@@ -297,6 +300,9 @@297
"menu.lastScore": "Laatste score:",300
"menu.lastScore": "Laatste score:",298
"menu.hint": "Sleep blokjes verticaal om ze te wisselen. Trek een blokje boven zijn kolom om het omhoog te duwen. Blokjes die het veld verlaten, leveren punten op.",301
"menu.hint": "Sleep blokjes verticaal om ze te wisselen. Trek een blokje boven zijn kolom om het omhoog te duwen. Blokjes die het veld verlaten, leveren punten op.",299
"menu.login": "Inloggen",302
"menu.login": "Inloggen",303
"loginPrompt.title": "Inloggen?",304
"loginPrompt.body": "Log in om je punten te bewaren en online te spelen.",305
"loginPrompt.guest": "Speel als gast",300
"menu.localTest": "lokale test:",306
"menu.localTest": "lokale test:",301
"menu.loggedInAs": "Ingelogd als",307
"menu.loggedInAs": "Ingelogd als",302
"menu.total": "Totaal:",308
"menu.total": "Totaal:",@@ -587,6 +593,9 @@587
"menu.lastScore": "Letzter Punktestand:",593
"menu.lastScore": "Letzter Punktestand:",588
"menu.hint": "Ziehe Blöcke senkrecht, um sie zu tauschen. Ziehe einen Block über seine Spalte, um ihn nach oben zu schießen. Blöcke, die das Feld verlassen, bringen Punkte.",594
"menu.hint": "Ziehe Blöcke senkrecht, um sie zu tauschen. Ziehe einen Block über seine Spalte, um ihn nach oben zu schießen. Blöcke, die das Feld verlassen, bringen Punkte.",589
"menu.login": "Anmelden",595
"menu.login": "Anmelden",596
"loginPrompt.title": "Anmelden?",597
"loginPrompt.body": "Melde dich an, um deine Punkte zu speichern und online zu spielen.",598
"loginPrompt.guest": "Als Gast spielen",590
"menu.localTest": "lokaler Test:",599
"menu.localTest": "lokaler Test:",591
"menu.loggedInAs": "Angemeldet als",600
"menu.loggedInAs": "Angemeldet als",592
"menu.total": "Gesamt:",601
"menu.total": "Gesamt:",@@ -877,6 +886,9 @@877
"menu.lastScore": "Dernier score :",886
"menu.lastScore": "Dernier score :",878
"menu.hint": "Fais glisser les blocs verticalement pour les échanger. Tire un bloc au-dessus de sa colonne pour le lancer. Les blocs qui quittent le terrain rapportent des points.",887
"menu.hint": "Fais glisser les blocs verticalement pour les échanger. Tire un bloc au-dessus de sa colonne pour le lancer. Les blocs qui quittent le terrain rapportent des points.",879
"menu.login": "Connexion",888
"menu.login": "Connexion",889
"loginPrompt.title": "Se connecter ?",890
"loginPrompt.body": "Connecte-toi pour enregistrer tes points et jouer en ligne.",891
"loginPrompt.guest": "Jouer en invité",880
"menu.localTest": "test local :",892
"menu.localTest": "test local :",881
"menu.loggedInAs": "Connecté en tant que",893
"menu.loggedInAs": "Connecté en tant que",882
"menu.total": "Total :",894
"menu.total": "Total :",@@ -1167,6 +1179,9 @@1167
"menu.lastScore": "前回のスコア:",1179
"menu.lastScore": "前回のスコア:",1168
"menu.hint": "ブロックを縦にドラッグして入れ替えます。列の上まで引っ張ると打ち上げられます。フィールドを出たブロックが得点になります。",1180
"menu.hint": "ブロックを縦にドラッグして入れ替えます。列の上まで引っ張ると打ち上げられます。フィールドを出たブロックが得点になります。",1169
"menu.login": "ログイン",1181
"menu.login": "ログイン",1182
"loginPrompt.title": "ログインしますか?",1183
"loginPrompt.body": "ログインするとポイントが保存され、オンラインで遊べます。",1184
"loginPrompt.guest": "ゲストとして遊ぶ",1170
"menu.localTest": "ローカルテスト:",1185
"menu.localTest": "ローカルテスト:",1171
"menu.loggedInAs": "ログイン中:",1186
"menu.loggedInAs": "ログイン中:",1172
"menu.total": "合計:",1187
"menu.total": "合計:",@@ -1457,6 +1472,9 @@1457
"menu.lastScore": "上次得分:",1472
"menu.lastScore": "上次得分:",1458
"menu.hint": "上下拖动方块来交换位置。把方块拉到其所在列的上方即可发射。离开场地的方块会得分。",1473
"menu.hint": "上下拖动方块来交换位置。把方块拉到其所在列的上方即可发射。离开场地的方块会得分。",1459
"menu.login": "登录",1474
"menu.login": "登录",1475
"loginPrompt.title": "要登录吗?",1476
"loginPrompt.body": "登录后可保存分数并在线游玩。",1477
"loginPrompt.guest": "以游客身份游玩",1460
"menu.localTest": "本地测试:",1478
"menu.localTest": "本地测试:",1461
"menu.loggedInAs": "已登录:",1479
"menu.loggedInAs": "已登录:",1462
"menu.total": "总分:",1480
"menu.total": "总分:",@@ -1747,6 +1765,9 @@1747
"menu.lastScore": "이전 점수:",1765
"menu.lastScore": "이전 점수:",1748
"menu.hint": "블록을 세로로 끌어 자리를 바꿉니다. 열 위로 끌어올리면 발사됩니다. 필드를 벗어난 블록이 점수가 됩니다.",1766
"menu.hint": "블록을 세로로 끌어 자리를 바꿉니다. 열 위로 끌어올리면 발사됩니다. 필드를 벗어난 블록이 점수가 됩니다.",1749
"menu.login": "로그인",1767
"menu.login": "로그인",1768
"loginPrompt.title": "로그인할까요?",1769
"loginPrompt.body": "로그인하면 점수가 저장되고 온라인으로 플레이할 수 있습니다.",1770
"loginPrompt.guest": "게스트로 플레이",1750
"menu.localTest": "로컬 테스트:",1771
"menu.localTest": "로컬 테스트:",1751
"menu.loggedInAs": "로그인:",1772
"menu.loggedInAs": "로그인:",1752
"menu.total": "합계:",1773
"menu.total": "합계:",@@ -2037,6 +2058,9 @@2037
"menu.lastScore": "Ostatni wynik:",2058
"menu.lastScore": "Ostatni wynik:",2038
"menu.hint": "Przeciągaj klocki pionowo, aby je zamieniać. Pociągnij klocek ponad jego kolumnę, aby go wystrzelić. Klocki, które opuszczą pole, dają punkty.",2059
"menu.hint": "Przeciągaj klocki pionowo, aby je zamieniać. Pociągnij klocek ponad jego kolumnę, aby go wystrzelić. Klocki, które opuszczą pole, dają punkty.",2039
"menu.login": "Zaloguj się",2060
"menu.login": "Zaloguj się",2061
"loginPrompt.title": "Zalogować się?",2062
"loginPrompt.body": "Zaloguj się, aby zapisać punkty i grać online.",2063
"loginPrompt.guest": "Graj jako gość",2040
"menu.localTest": "test lokalny:",2064
"menu.localTest": "test lokalny:",2041
"menu.loggedInAs": "Zalogowano jako",2065
"menu.loggedInAs": "Zalogowano jako",2042
"menu.total": "Suma:",2066
"menu.total": "Suma:",@@ -2327,6 +2351,9 @@2327
"menu.lastScore": "Последний счёт:",2351
"menu.lastScore": "Последний счёт:",2328
"menu.hint": "Перетаскивай блоки вертикально, чтобы менять их местами. Потяни блок выше его столбца, чтобы запустить его вверх. Блоки, покинувшие поле, дают очки.",2352
"menu.hint": "Перетаскивай блоки вертикально, чтобы менять их местами. Потяни блок выше его столбца, чтобы запустить его вверх. Блоки, покинувшие поле, дают очки.",2329
"menu.login": "Войти",2353
"menu.login": "Войти",2354
"loginPrompt.title": "Войти?",2355
"loginPrompt.body": "Войди, чтобы сохранять очки и играть онлайн.",2356
"loginPrompt.guest": "Играть как гость",2330
"menu.localTest": "локальный тест:",2357
"menu.localTest": "локальный тест:",2331
"menu.loggedInAs": "Вы вошли как",2358
"menu.loggedInAs": "Вы вошли как",2332
"menu.total": "Всего:",2359
"menu.total": "Всего:",@@ -2617,6 +2644,9 @@2617
"menu.lastScore": "Última puntuación:",2644
"menu.lastScore": "Última puntuación:",2618
"menu.hint": "Arrastra los bloques en vertical para intercambiarlos. Tira de un bloque por encima de su columna para lanzarlo. Los bloques que salen del campo dan puntos.",2645
"menu.hint": "Arrastra los bloques en vertical para intercambiarlos. Tira de un bloque por encima de su columna para lanzarlo. Los bloques que salen del campo dan puntos.",2619
"menu.login": "Iniciar sesión",2646
"menu.login": "Iniciar sesión",2647
"loginPrompt.title": "¿Iniciar sesión?",2648
"loginPrompt.body": "Inicia sesión para guardar tus puntos y jugar en línea.",2649
"loginPrompt.guest": "Jugar como invitado",2620
"menu.localTest": "prueba local:",2650
"menu.localTest": "prueba local:",2621
"menu.loggedInAs": "Sesión iniciada como",2651
"menu.loggedInAs": "Sesión iniciada como",2622
"menu.total": "Total:",2652
"menu.total": "Total:",@@ -26,6 +26,7 @@ FILES=(
26
26
"$SRC_DIR/offline.js"
27
27
"$SRC_DIR/reward.js"
28
28
"$SRC_DIR/designer.js"
29
"$SRC_DIR/loginPrompt.js"
29
30
"$SRC_DIR/main.js"
30
31
)
31
32
@@ -26,6 +26,7 @@ FILES=(26
"$SRC_DIR/offline.js"26
"$SRC_DIR/offline.js"27
"$SRC_DIR/reward.js"27
"$SRC_DIR/reward.js"28
"$SRC_DIR/designer.js"28
"$SRC_DIR/designer.js"29
"$SRC_DIR/loginPrompt.js"29
"$SRC_DIR/main.js"30
"$SRC_DIR/main.js"30
)31
)31
32
@@ -0,0 +1,102 @@
1
'use strict';
2
3
/**
4
* Startup login prompt (t1246). A logged-out player is asked to log in
5
* or play as guest. The guest / "already asked" choice lives in
6
* sessionStorage so it survives a return to the menu in the same tab,
7
* but a fresh start (new tab or closed tab) asks again.
8
*/
9
10
var LoginPrompt = {
11
STORAGE_KEY: 'meteors-login-prompt'
12
};
13
14
LoginPrompt._storage = function (storage)
15
{
16
if (storage !== undefined)
17
{ return storage; }
18
try
19
{
20
if (typeof sessionStorage !== 'undefined')
21
{ return sessionStorage; }
22
}
23
catch (e) { /* private mode / disabled storage */ }
24
return null;
25
};
26
27
LoginPrompt.remembered = function (storage)
28
{
29
var store = this._storage(storage);
30
if (!store)
31
{ return false; }
32
try
33
{ return store.getItem(this.STORAGE_KEY) === '1'; }
34
catch (e)
35
{ return false; }
36
};
37
38
LoginPrompt.remember = function (storage)
39
{
40
var store = this._storage(storage);
41
if (!store)
42
{ return false; }
43
try
44
{
45
store.setItem(this.STORAGE_KEY, '1');
46
return true;
47
}
48
catch (e)
49
{ return false; }
50
};
51
52
/**
53
* True when this page load is a return from the auth flow, so the
54
* prompt must not reappear (successful login is already covered by
55
* `me`; this also covers a cancelled or failed attempt).
56
*
57
* `search` is location.search; `referrer` is document.referrer.
58
*/
59
LoginPrompt.isAuthReturn = function (search, referrer)
60
{
61
search = search == null ? '' : String(search);
62
referrer = referrer == null ? '' : String(referrer);
63
try
64
{
65
var q = search.charAt(0) === '?' ? search.slice(1) : search;
66
var params = new URLSearchParams(q);
67
if (params.get('online') === '1')
68
{ return true; }
69
if (params.get('auth'))
70
{ return true; }
71
}
72
catch (e) { /* URLSearchParams missing or bad input */ }
73
var r = referrer.toLowerCase();
74
if (r.indexOf('callback.php') !== -1)
75
{ return true; }
76
if (r.indexOf('auth.timfalken.com') !== -1)
77
{ return true; }
78
return false;
79
};
80
81
/**
82
* Whether the startup prompt should be shown.
83
* `opts.me` — current user (truthy when logged in).
84
* `opts.remembered` — session already chose guest or started login.
85
* `opts.fromAuthReturn` — this load comes from the auth callback / return URL.
86
*/
87
LoginPrompt.shouldShow = function (opts)
88
{
89
opts = opts || {};
90
if (opts.me)
91
{ return false; }
92
if (opts.remembered)
93
{ return false; }
94
if (opts.fromAuthReturn)
95
{ return false; }
96
return true;
97
};
98
99
if (typeof module !== 'undefined' && module.exports)
100
{ module.exports = LoginPrompt; }
101
else if (typeof globalThis !== 'undefined')
102
{ globalThis.LoginPrompt = LoginPrompt; }
@@ -0,0 +1,102 @@1
'use strict';2
3
/**4
* Startup login prompt (t1246). A logged-out player is asked to log in5
* or play as guest. The guest / "already asked" choice lives in6
* sessionStorage so it survives a return to the menu in the same tab,7
* but a fresh start (new tab or closed tab) asks again.8
*/9
10
var LoginPrompt = {11
STORAGE_KEY: 'meteors-login-prompt'12
};13
14
LoginPrompt._storage = function (storage)15
{16
if (storage !== undefined)17
{ return storage; }18
try19
{20
if (typeof sessionStorage !== 'undefined')21
{ return sessionStorage; }22
}23
catch (e) { /* private mode / disabled storage */ }24
return null;25
};26
27
LoginPrompt.remembered = function (storage)28
{29
var store = this._storage(storage);30
if (!store)31
{ return false; }32
try33
{ return store.getItem(this.STORAGE_KEY) === '1'; }34
catch (e)35
{ return false; }36
};37
38
LoginPrompt.remember = function (storage)39
{40
var store = this._storage(storage);41
if (!store)42
{ return false; }43
try44
{45
store.setItem(this.STORAGE_KEY, '1');46
return true;47
}48
catch (e)49
{ return false; }50
};51
52
/**53
* True when this page load is a return from the auth flow, so the54
* prompt must not reappear (successful login is already covered by55
* `me`; this also covers a cancelled or failed attempt).56
*57
* `search` is location.search; `referrer` is document.referrer.58
*/59
LoginPrompt.isAuthReturn = function (search, referrer)60
{61
search = search == null ? '' : String(search);62
referrer = referrer == null ? '' : String(referrer);63
try64
{65
var q = search.charAt(0) === '?' ? search.slice(1) : search;66
var params = new URLSearchParams(q);67
if (params.get('online') === '1')68
{ return true; }69
if (params.get('auth'))70
{ return true; }71
}72
catch (e) { /* URLSearchParams missing or bad input */ }73
var r = referrer.toLowerCase();74
if (r.indexOf('callback.php') !== -1)75
{ return true; }76
if (r.indexOf('auth.timfalken.com') !== -1)77
{ return true; }78
return false;79
};80
81
/**82
* Whether the startup prompt should be shown.83
* `opts.me` — current user (truthy when logged in).84
* `opts.remembered` — session already chose guest or started login.85
* `opts.fromAuthReturn` — this load comes from the auth callback / return URL.86
*/87
LoginPrompt.shouldShow = function (opts)88
{89
opts = opts || {};90
if (opts.me)91
{ return false; }92
if (opts.remembered)93
{ return false; }94
if (opts.fromAuthReturn)95
{ return false; }96
return true;97
};98
99
if (typeof module !== 'undefined' && module.exports)100
{ module.exports = LoginPrompt; }101
else if (typeof globalThis !== 'undefined')102
{ globalThis.LoginPrompt = LoginPrompt; }@@ -129,6 +129,7 @@ window.onload = function ()
129
129
restoreSelectedPlanet();
130
130
if (typeof Designer !== 'undefined' && Designer.bind)
131
131
{ Designer.bind(); }
132
bindLoginPrompt();
132
133
if (typeof Online !== 'undefined' && Online.refresh)
133
134
{
134
135
Online.refresh().then(function ()
@@ -138,10 +139,14 @@ window.onload = function ()
138
139
restoreSelectedPlanet();
139
140
renderPlanetGrid('planet-grid', false);
140
141
renderPlanetGrid('lobby-planet-grid', true);
142
maybeShowLoginPrompt();
141
143
});
142
144
}
143
145
else
144
{ refreshMenuAccount(); }
146
{
147
refreshMenuAccount();
148
maybeShowLoginPrompt();
149
}
145
150
};
146
151
147
152
/**
@@ -2533,6 +2538,83 @@ function bindPlanetSelect ()
2533
2538
}
2534
2539
2535
2540
2541
/** t1246: ask a logged-out player to log in, or continue as guest. */
2542
function bindLoginPrompt ()
2543
{
2544
if (typeof LoginPrompt !== 'undefined' && LoginPrompt.isAuthReturn)
2545
{
2546
var search = (window.location && window.location.search) || '';
2547
var referrer = (typeof document !== 'undefined' && document.referrer) || '';
2548
if (LoginPrompt.isAuthReturn(search, referrer))
2549
{ LoginPrompt.remember(); }
2550
}
2551
var guest = document.getElementById('btn-play-guest');
2552
if (guest)
2553
{ guest.addEventListener('click', playAsGuest); }
2554
var login = document.getElementById('btn-login-prompt');
2555
if (login)
2556
{
2557
login.addEventListener('click', function ()
2558
{
2559
if (typeof LoginPrompt !== 'undefined')
2560
{ LoginPrompt.remember(); }
2561
});
2562
}
2563
var local = document.getElementById('login-prompt-local');
2564
if (local)
2565
{
2566
local.addEventListener('click', function (e)
2567
{
2568
var a = e.target && e.target.closest ? e.target.closest('a') : null;
2569
if (a && typeof LoginPrompt !== 'undefined')
2570
{ LoginPrompt.remember(); }
2571
});
2572
}
2573
}
2574
2575
function maybeShowLoginPrompt ()
2576
{
2577
var me = (typeof Online !== 'undefined') ? Online.me : null;
2578
var remembered = (typeof LoginPrompt !== 'undefined') && LoginPrompt.remembered();
2579
var fromAuth = (typeof LoginPrompt !== 'undefined') && LoginPrompt.isAuthReturn(
2580
(window.location && window.location.search) || '',
2581
(typeof document !== 'undefined' && document.referrer) || ''
2582
);
2583
var show = (typeof LoginPrompt === 'undefined')
2584
? (!me && !remembered && !fromAuth)
2585
: LoginPrompt.shouldShow({ me: me, remembered: remembered, fromAuthReturn: fromAuth });
2586
if (show)
2587
{ showLoginPrompt(); }
2588
else
2589
{ hideLoginPrompt(); }
2590
app.loginPromptReady = true;
2591
}
2592
2593
function showLoginPrompt ()
2594
{
2595
var el = document.getElementById('login-prompt');
2596
if (!el)
2597
{ return; }
2598
el.hidden = false;
2599
var login = document.getElementById('btn-login-prompt');
2600
if (login && login.focus)
2601
{ login.focus(); }
2602
}
2603
2604
function hideLoginPrompt ()
2605
{
2606
var el = document.getElementById('login-prompt');
2607
if (el)
2608
{ el.hidden = true; }
2609
}
2610
2611
function playAsGuest ()
2612
{
2613
if (typeof LoginPrompt !== 'undefined')
2614
{ LoginPrompt.remember(); }
2615
hideLoginPrompt();
2616
}
2617
2536
2618
function refreshMenuAccount ()
2537
2619
{
2538
2620
var guest = document.getElementById('menu-guest');
@@ -2566,6 +2648,9 @@ function refreshMenuAccount ()
2566
2648
}
2567
2649
if (localLogin)
2568
2650
{ localLogin.hidden = !(typeof Online !== 'undefined' && Online.local); }
2651
var promptLocal = document.getElementById('login-prompt-local');
2652
if (promptLocal)
2653
{ promptLocal.hidden = !(typeof Online !== 'undefined' && Online.local); }
2569
2654
}
2570
2655
2571
2656
/* ---------- t1193 in-game menu (Spelen / Offline Strijd) ----------- */
@@ -129,6 +129,7 @@ window.onload = function ()129
restoreSelectedPlanet();129
restoreSelectedPlanet();130
if (typeof Designer !== 'undefined' && Designer.bind)130
if (typeof Designer !== 'undefined' && Designer.bind)131
{ Designer.bind(); }131
{ Designer.bind(); }132
bindLoginPrompt();132
if (typeof Online !== 'undefined' && Online.refresh)133
if (typeof Online !== 'undefined' && Online.refresh)133
{134
{134
Online.refresh().then(function ()135
Online.refresh().then(function ()@@ -138,10 +139,14 @@ window.onload = function ()138
restoreSelectedPlanet();139
restoreSelectedPlanet();139
renderPlanetGrid('planet-grid', false);140
renderPlanetGrid('planet-grid', false);140
renderPlanetGrid('lobby-planet-grid', true);141
renderPlanetGrid('lobby-planet-grid', true);142
maybeShowLoginPrompt();141
});143
});142
}144
}143
else145
else144
{ refreshMenuAccount(); }146
{147
refreshMenuAccount();148
maybeShowLoginPrompt();149
}145
};150
};146
151
147
/**152
/**@@ -2533,6 +2538,83 @@ function bindPlanetSelect ()2533
}2538
}2534
2539
2535
2540
2541
/** t1246: ask a logged-out player to log in, or continue as guest. */2542
function bindLoginPrompt ()2543
{2544
if (typeof LoginPrompt !== 'undefined' && LoginPrompt.isAuthReturn)2545
{2546
var search = (window.location && window.location.search) || '';2547
var referrer = (typeof document !== 'undefined' && document.referrer) || '';2548
if (LoginPrompt.isAuthReturn(search, referrer))2549
{ LoginPrompt.remember(); }2550
}2551
var guest = document.getElementById('btn-play-guest');2552
if (guest)2553
{ guest.addEventListener('click', playAsGuest); }2554
var login = document.getElementById('btn-login-prompt');2555
if (login)2556
{2557
login.addEventListener('click', function ()2558
{2559
if (typeof LoginPrompt !== 'undefined')2560
{ LoginPrompt.remember(); }2561
});2562
}2563
var local = document.getElementById('login-prompt-local');2564
if (local)2565
{2566
local.addEventListener('click', function (e)2567
{2568
var a = e.target && e.target.closest ? e.target.closest('a') : null;2569
if (a && typeof LoginPrompt !== 'undefined')2570
{ LoginPrompt.remember(); }2571
});2572
}2573
}2574
2575
function maybeShowLoginPrompt ()2576
{2577
var me = (typeof Online !== 'undefined') ? Online.me : null;2578
var remembered = (typeof LoginPrompt !== 'undefined') && LoginPrompt.remembered();2579
var fromAuth = (typeof LoginPrompt !== 'undefined') && LoginPrompt.isAuthReturn(2580
(window.location && window.location.search) || '',2581
(typeof document !== 'undefined' && document.referrer) || ''2582
);2583
var show = (typeof LoginPrompt === 'undefined')2584
? (!me && !remembered && !fromAuth)2585
: LoginPrompt.shouldShow({ me: me, remembered: remembered, fromAuthReturn: fromAuth });2586
if (show)2587
{ showLoginPrompt(); }2588
else2589
{ hideLoginPrompt(); }2590
app.loginPromptReady = true;2591
}2592
2593
function showLoginPrompt ()2594
{2595
var el = document.getElementById('login-prompt');2596
if (!el)2597
{ return; }2598
el.hidden = false;2599
var login = document.getElementById('btn-login-prompt');2600
if (login && login.focus)2601
{ login.focus(); }2602
}2603
2604
function hideLoginPrompt ()2605
{2606
var el = document.getElementById('login-prompt');2607
if (el)2608
{ el.hidden = true; }2609
}2610
2611
function playAsGuest ()2612
{2613
if (typeof LoginPrompt !== 'undefined')2614
{ LoginPrompt.remember(); }2615
hideLoginPrompt();2616
}2617
2536
function refreshMenuAccount ()2618
function refreshMenuAccount ()2537
{2619
{2538
var guest = document.getElementById('menu-guest');2620
var guest = document.getElementById('menu-guest');@@ -2566,6 +2648,9 @@ function refreshMenuAccount ()2566
}2648
}2567
if (localLogin)2649
if (localLogin)2568
{ localLogin.hidden = !(typeof Online !== 'undefined' && Online.local); }2650
{ localLogin.hidden = !(typeof Online !== 'undefined' && Online.local); }2651
var promptLocal = document.getElementById('login-prompt-local');2652
if (promptLocal)2653
{ promptLocal.hidden = !(typeof Online !== 'undefined' && Online.local); }2569
}2654
}2570
2655
2571
/* ---------- t1193 in-game menu (Spelen / Offline Strijd) ----------- */2656
/* ---------- t1193 in-game menu (Spelen / Offline Strijd) ----------- */@@ -0,0 +1,142 @@
1
'use strict';
2
3
const { describe, it } = require('node:test');
4
const assert = require('node:assert/strict');
5
const fs = require('fs');
6
const path = require('path');
7
const LoginPrompt = require('../src/loginPrompt.js');
8
const catalog = require('../server/lib/i18n.json');
9
10
const root = path.join(__dirname, '..');
11
const html = fs.readFileSync(path.join(root, 'build/index.html'), 'utf8');
12
const css = fs.readFileSync(path.join(root, 'build/style.css'), 'utf8');
13
const main = fs.readFileSync(path.join(root, 'src/main.js'), 'utf8');
14
const buildSh = fs.readFileSync(path.join(root, 'src/build.sh'), 'utf8');
15
16
function memoryStore (initial)
17
{
18
const data = Object.assign({}, initial || {});
19
return {
20
getItem (k) { return Object.prototype.hasOwnProperty.call(data, k) ? data[k] : null; },
21
setItem (k, v) { data[k] = String(v); },
22
_data: data
23
};
24
}
25
26
describe('LoginPrompt decision (t1246)', () =>
27
{
28
it('shows the prompt only when logged out, not remembered, not an auth return', () =>
29
{
30
assert.equal(LoginPrompt.shouldShow({}), true);
31
assert.equal(LoginPrompt.shouldShow({ me: null }), true);
32
assert.equal(LoginPrompt.shouldShow({ me: { id: 'u1', name: 'Tim' } }), false);
33
assert.equal(LoginPrompt.shouldShow({ remembered: true }), false);
34
assert.equal(LoginPrompt.shouldShow({ fromAuthReturn: true }), false);
35
assert.equal(LoginPrompt.shouldShow({
36
me: { id: 'u1' }, remembered: true, fromAuthReturn: true
37
}), false);
38
});
39
40
it('stores the session choice in the given storage under a stable key', () =>
41
{
42
const store = memoryStore();
43
assert.equal(LoginPrompt.STORAGE_KEY, 'meteors-login-prompt');
44
assert.equal(LoginPrompt.remembered(store), false);
45
assert.equal(LoginPrompt.remember(store), true);
46
assert.equal(store.getItem(LoginPrompt.STORAGE_KEY), '1');
47
assert.equal(LoginPrompt.remembered(store), true);
48
assert.equal(LoginPrompt.remembered(memoryStore()), false);
49
});
50
51
it('treats a missing or throwing storage as not remembered', () =>
52
{
53
assert.equal(LoginPrompt.remembered(null), false);
54
assert.equal(LoginPrompt.remember(null), false);
55
const boom = {
56
getItem () { throw new Error('blocked'); },
57
setItem () { throw new Error('blocked'); }
58
};
59
assert.equal(LoginPrompt.remembered(boom), false);
60
assert.equal(LoginPrompt.remember(boom), false);
61
});
62
63
it('detects a return from the auth callback or login URL', () =>
64
{
65
assert.equal(LoginPrompt.isAuthReturn('', ''), false);
66
assert.equal(LoginPrompt.isAuthReturn('?debug=1', ''), false);
67
assert.equal(LoginPrompt.isAuthReturn('?online=1', ''), true);
68
assert.equal(LoginPrompt.isAuthReturn('online=1', ''), true);
69
assert.equal(LoginPrompt.isAuthReturn('?foo=1&online=1', ''), true);
70
assert.equal(LoginPrompt.isAuthReturn('?auth=unconfigured', ''), true);
71
assert.equal(LoginPrompt.isAuthReturn('', 'https://projects.timfalken.com/meteors/callback.php'), true);
72
assert.equal(LoginPrompt.isAuthReturn('', 'https://auth.timfalken.com/oauth/authorize?client_id=x'), true);
73
assert.equal(LoginPrompt.isAuthReturn('', 'https://projects.timfalken.com/meteors/index.html'), false);
74
});
75
});
76
77
describe('LoginPrompt wiring (t1246)', () =>
78
{
79
it('is included in the game build before main.js', () =>
80
{
81
assert.match(buildSh, /loginPrompt\.js/);
82
const order = buildSh.indexOf('loginPrompt.js');
83
const mainAt = buildSh.indexOf('main.js');
84
assert.ok(order >= 0 && mainAt > order, 'loginPrompt.js is concatenated before main.js');
85
});
86
87
it('has a startup dialog with Log in and Play as Guest, in the game style', () =>
88
{
89
assert.match(html, /id="login-prompt"[^>]*role="dialog"/);
90
assert.match(html, /id="login-prompt"[^>]*aria-modal="true"/);
91
assert.match(html, /id="login-prompt"[^>]*hidden/);
92
assert.match(html, /id="login-prompt-title"[^>]*data-i18n="loginPrompt\.title"/);
93
assert.match(html, /data-i18n="loginPrompt\.body"/);
94
assert.match(html, /id="btn-login-prompt"[^>]*href="auth\.php"/);
95
assert.match(html, /id="btn-login-prompt"[^>]*data-i18n="menu\.login"/);
96
assert.match(html, /id="btn-play-guest"[^>]*data-i18n="loginPrompt\.guest"/);
97
assert.match(html, /id="login-prompt-local"/);
98
// Must be in the hidden-override list, otherwise .screen { display:flex } wins.
99
assert.match(css, /#login-prompt\[hidden\]/);
100
assert.match(css, /#login-prompt\s*\{[^}]*z-index:\s*[5-9]\d/);
101
});
102
103
it('uses the existing login URL (menu, not the online-panel return) and remembers the session choice', () =>
104
{
105
assert.match(main, /function maybeShowLoginPrompt/);
106
assert.match(main, /function bindLoginPrompt/);
107
assert.match(main, /LoginPrompt\.remember\(/);
108
assert.match(main, /LoginPrompt\.shouldShow\(/);
109
assert.match(main, /LoginPrompt\.isAuthReturn\(/);
110
assert.match(main, /btn-play-guest/);
111
assert.match(main, /btn-login-prompt/);
112
assert.doesNotMatch(main, /btn-login-prompt[\s\S]{0,400}return=online/);
113
// After Online.refresh, and also when Online is missing.
114
assert.match(main, /Online\.refresh\(\)\.then\([\s\S]*?maybeShowLoginPrompt\(\)/);
115
assert.match(main, /else\s*\n\s*\{\s*\n\s*refreshMenuAccount\(\);\s*\n\s*maybeShowLoginPrompt\(\);/);
116
});
117
118
it('translates the prompt in every language', () =>
119
{
120
const wantTitle = {
121
en: 'Log in?', nl: 'Inloggen?', de: 'Anmelden?', fr: 'Se connecter ?',
122
es: '¿Iniciar sesión?', pl: 'Zalogować się?', ru: 'Войти?'
123
};
124
const wantGuest = {
125
en: 'Play as Guest', nl: 'Speel als gast', de: 'Als Gast spielen',
126
fr: 'Jouer en invité', es: 'Jugar como invitado', pl: 'Graj jako gość',
127
ru: 'Играть как гость'
128
};
129
for (const loc of catalog.localeIds)
130
{
131
const L = catalog.locales[loc];
132
assert.ok(L['loginPrompt.title'], loc + ' title');
133
assert.ok(L['loginPrompt.body'], loc + ' body');
134
assert.ok(L['loginPrompt.guest'], loc + ' guest');
135
if (wantTitle[loc])
136
{ assert.equal(L['loginPrompt.title'], wantTitle[loc]); }
137
if (wantGuest[loc])
138
{ assert.equal(L['loginPrompt.guest'], wantGuest[loc]); }
139
assert.notEqual(L['loginPrompt.guest'], L['menu.login'], loc);
140
}
141
});
142
});
@@ -0,0 +1,142 @@1
'use strict';2
3
const { describe, it } = require('node:test');4
const assert = require('node:assert/strict');5
const fs = require('fs');6
const path = require('path');7
const LoginPrompt = require('../src/loginPrompt.js');8
const catalog = require('../server/lib/i18n.json');9
10
const root = path.join(__dirname, '..');11
const html = fs.readFileSync(path.join(root, 'build/index.html'), 'utf8');12
const css = fs.readFileSync(path.join(root, 'build/style.css'), 'utf8');13
const main = fs.readFileSync(path.join(root, 'src/main.js'), 'utf8');14
const buildSh = fs.readFileSync(path.join(root, 'src/build.sh'), 'utf8');15
16
function memoryStore (initial)17
{18
const data = Object.assign({}, initial || {});19
return {20
getItem (k) { return Object.prototype.hasOwnProperty.call(data, k) ? data[k] : null; },21
setItem (k, v) { data[k] = String(v); },22
_data: data23
};24
}25
26
describe('LoginPrompt decision (t1246)', () =>27
{28
it('shows the prompt only when logged out, not remembered, not an auth return', () =>29
{30
assert.equal(LoginPrompt.shouldShow({}), true);31
assert.equal(LoginPrompt.shouldShow({ me: null }), true);32
assert.equal(LoginPrompt.shouldShow({ me: { id: 'u1', name: 'Tim' } }), false);33
assert.equal(LoginPrompt.shouldShow({ remembered: true }), false);34
assert.equal(LoginPrompt.shouldShow({ fromAuthReturn: true }), false);35
assert.equal(LoginPrompt.shouldShow({36
me: { id: 'u1' }, remembered: true, fromAuthReturn: true37
}), false);38
});39
40
it('stores the session choice in the given storage under a stable key', () =>41
{42
const store = memoryStore();43
assert.equal(LoginPrompt.STORAGE_KEY, 'meteors-login-prompt');44
assert.equal(LoginPrompt.remembered(store), false);45
assert.equal(LoginPrompt.remember(store), true);46
assert.equal(store.getItem(LoginPrompt.STORAGE_KEY), '1');47
assert.equal(LoginPrompt.remembered(store), true);48
assert.equal(LoginPrompt.remembered(memoryStore()), false);49
});50
51
it('treats a missing or throwing storage as not remembered', () =>52
{53
assert.equal(LoginPrompt.remembered(null), false);54
assert.equal(LoginPrompt.remember(null), false);55
const boom = {56
getItem () { throw new Error('blocked'); },57
setItem () { throw new Error('blocked'); }58
};59
assert.equal(LoginPrompt.remembered(boom), false);60
assert.equal(LoginPrompt.remember(boom), false);61
});62
63
it('detects a return from the auth callback or login URL', () =>64
{65
assert.equal(LoginPrompt.isAuthReturn('', ''), false);66
assert.equal(LoginPrompt.isAuthReturn('?debug=1', ''), false);67
assert.equal(LoginPrompt.isAuthReturn('?online=1', ''), true);68
assert.equal(LoginPrompt.isAuthReturn('online=1', ''), true);69
assert.equal(LoginPrompt.isAuthReturn('?foo=1&online=1', ''), true);70
assert.equal(LoginPrompt.isAuthReturn('?auth=unconfigured', ''), true);71
assert.equal(LoginPrompt.isAuthReturn('', 'https://projects.timfalken.com/meteors/callback.php'), true);72
assert.equal(LoginPrompt.isAuthReturn('', 'https://auth.timfalken.com/oauth/authorize?client_id=x'), true);73
assert.equal(LoginPrompt.isAuthReturn('', 'https://projects.timfalken.com/meteors/index.html'), false);74
});75
});76
77
describe('LoginPrompt wiring (t1246)', () =>78
{79
it('is included in the game build before main.js', () =>80
{81
assert.match(buildSh, /loginPrompt\.js/);82
const order = buildSh.indexOf('loginPrompt.js');83
const mainAt = buildSh.indexOf('main.js');84
assert.ok(order >= 0 && mainAt > order, 'loginPrompt.js is concatenated before main.js');85
});86
87
it('has a startup dialog with Log in and Play as Guest, in the game style', () =>88
{89
assert.match(html, /id="login-prompt"[^>]*role="dialog"/);90
assert.match(html, /id="login-prompt"[^>]*aria-modal="true"/);91
assert.match(html, /id="login-prompt"[^>]*hidden/);92
assert.match(html, /id="login-prompt-title"[^>]*data-i18n="loginPrompt\.title"/);93
assert.match(html, /data-i18n="loginPrompt\.body"/);94
assert.match(html, /id="btn-login-prompt"[^>]*href="auth\.php"/);95
assert.match(html, /id="btn-login-prompt"[^>]*data-i18n="menu\.login"/);96
assert.match(html, /id="btn-play-guest"[^>]*data-i18n="loginPrompt\.guest"/);97
assert.match(html, /id="login-prompt-local"/);98
// Must be in the hidden-override list, otherwise .screen { display:flex } wins.99
assert.match(css, /#login-prompt\[hidden\]/);100
assert.match(css, /#login-prompt\s*\{[^}]*z-index:\s*[5-9]\d/);101
});102
103
it('uses the existing login URL (menu, not the online-panel return) and remembers the session choice', () =>104
{105
assert.match(main, /function maybeShowLoginPrompt/);106
assert.match(main, /function bindLoginPrompt/);107
assert.match(main, /LoginPrompt\.remember\(/);108
assert.match(main, /LoginPrompt\.shouldShow\(/);109
assert.match(main, /LoginPrompt\.isAuthReturn\(/);110
assert.match(main, /btn-play-guest/);111
assert.match(main, /btn-login-prompt/);112
assert.doesNotMatch(main, /btn-login-prompt[\s\S]{0,400}return=online/);113
// After Online.refresh, and also when Online is missing.114
assert.match(main, /Online\.refresh\(\)\.then\([\s\S]*?maybeShowLoginPrompt\(\)/);115
assert.match(main, /else\s*\n\s*\{\s*\n\s*refreshMenuAccount\(\);\s*\n\s*maybeShowLoginPrompt\(\);/);116
});117
118
it('translates the prompt in every language', () =>119
{120
const wantTitle = {121
en: 'Log in?', nl: 'Inloggen?', de: 'Anmelden?', fr: 'Se connecter ?',122
es: '¿Iniciar sesión?', pl: 'Zalogować się?', ru: 'Войти?'123
};124
const wantGuest = {125
en: 'Play as Guest', nl: 'Speel als gast', de: 'Als Gast spielen',126
fr: 'Jouer en invité', es: 'Jugar como invitado', pl: 'Graj jako gość',127
ru: 'Играть как гость'128
};129
for (const loc of catalog.localeIds)130
{131
const L = catalog.locales[loc];132
assert.ok(L['loginPrompt.title'], loc + ' title');133
assert.ok(L['loginPrompt.body'], loc + ' body');134
assert.ok(L['loginPrompt.guest'], loc + ' guest');135
if (wantTitle[loc])136
{ assert.equal(L['loginPrompt.title'], wantTitle[loc]); }137
if (wantGuest[loc])138
{ assert.equal(L['loginPrompt.guest'], wantGuest[loc]); }139
assert.notEqual(L['loginPrompt.guest'], L['menu.login'], loc);140
}141
});142
});@@ -0,0 +1,144 @@
1
#!/usr/bin/env python3
2
"""t1246: startup login prompt with Play as Guest.
3
4
Usage: python3 test/t1246-login-prompt-playwright.py URL TAG
5
Logged-out checks run against the live site too. With a local PHP
6
server (auth.php?test=1) the logged-in path is also checked.
7
"""
8
import sys
9
from pathlib import Path
10
from playwright.sync_api import sync_playwright
11
12
URL = sys.argv[1] if len(sys.argv) > 1 else "https://projects.timfalken.com/meteors/"
13
if not URL.endswith("/"):
14
URL += "/"
15
TAG = sys.argv[2] if len(sys.argv) > 2 else "live"
16
LOCAL = "127.0.0.1" in URL or "localhost" in URL
17
SHOTS = Path("/workspace/meteors-shots")
18
SHOTS.mkdir(parents=True, exist_ok=True)
19
fails = []
20
21
def check(c, m):
22
print(("OK " if c else "FAIL ") + m)
23
if not c:
24
fails.append(m)
25
26
def shot(page, name):
27
page.screenshot(path=str(SHOTS / f"t1246-{TAG}-{name}.png"))
28
29
def wait_ready(page):
30
page.wait_for_function("() => window.app && app.loginPromptReady === true", timeout=20000)
31
32
def prompt_visible(page):
33
return page.evaluate("() => { const e = document.getElementById('login-prompt'); return !!e && !e.hidden; }")
34
35
def logged_out(br, name, vp, mobile):
36
ctx = br.new_context(viewport=vp, is_mobile=mobile, has_touch=mobile, device_scale_factor=2 if mobile else 1)
37
page = ctx.new_page()
38
errs = []
39
page.on("pageerror", lambda e: errs.append(str(e)))
40
page.goto(URL + "index.html", wait_until="networkidle")
41
wait_ready(page)
42
check(prompt_visible(page), f"{name}: prompt visible for a logged-out player")
43
title = page.locator("#login-prompt-title").inner_text().strip()
44
guest = page.locator("#btn-play-guest").inner_text().strip()
45
login_href = page.locator("#btn-login-prompt").get_attribute("href")
46
check(title.lower() in ("log in?", "inloggen?"), f"{name}: title is a login question ({title!r})")
47
check(guest.lower() in ("play as guest", "speel als gast"), f"{name}: guest button {guest!r}")
48
check(login_href == "auth.php", f"{name}: Log in uses auth.php (menu return), got {login_href!r}")
49
box = page.locator("#login-prompt").bounding_box()
50
btn = page.locator("#btn-login-prompt").bounding_box()
51
guest_box = page.locator("#btn-play-guest").bounding_box()
52
if box and btn and guest_box:
53
check(btn["y"] < guest_box["y"], f"{name}: Play as Guest sits under Log in")
54
check(guest_box["height"] >= 40 and btn["height"] >= 40, f"{name}: touch targets tall enough ({btn['height']:.0f}/{guest_box['height']:.0f})")
55
check(btn["x"] + btn["width"] <= vp["width"] + 1 and btn["x"] >= -1, f"{name}: Log in fits the viewport")
56
check(guest_box["x"] + guest_box["width"] <= vp["width"] + 1, f"{name}: guest button fits the viewport")
57
shot(page, f"{name}-prompt-en")
58
59
# Language follows the existing picker / I18n.
60
page.evaluate("() => I18n.setLocale('nl')")
61
page.wait_for_timeout(200)
62
check(page.locator("#login-prompt-title").inner_text().strip() == "Inloggen?", f"{name}: Dutch title")
63
check(page.locator("#btn-play-guest").inner_text().strip() == "Speel als gast", f"{name}: Dutch guest button")
64
login_nl = page.locator("#btn-login-prompt").inner_text().strip()
65
check(login_nl.lower() == "inloggen", f"{name}: Dutch login button ({login_nl!r})")
66
shot(page, f"{name}-prompt-nl")
67
page.evaluate("() => I18n.setLocale('en')")
68
page.wait_for_timeout(200)
69
70
# Clicking Log in remembers the session choice before leaving.
71
page.evaluate("() => { window.__loginNav = null; document.getElementById('btn-login-prompt').addEventListener('click', (e) => { e.preventDefault(); window.__loginNav = document.getElementById('btn-login-prompt').getAttribute('href'); }, { once: true }); }")
72
if mobile:
73
page.locator("#btn-login-prompt").tap()
74
else:
75
page.locator("#btn-login-prompt").click()
76
remembered = page.evaluate("() => sessionStorage.getItem('meteors-login-prompt')")
77
nav = page.evaluate("() => window.__loginNav")
78
check(remembered == "1", f"{name}: clicking Log in stores the session flag ({remembered!r})")
79
check(nav == "auth.php", f"{name}: Log in would go to auth.php ({nav!r})")
80
81
# Play as Guest closes the prompt and shows the main menu.
82
# Flag is already set from the login click; guest just hides it.
83
if mobile:
84
page.locator("#btn-play-guest").tap()
85
else:
86
page.locator("#btn-play-guest").click()
87
page.wait_for_function("() => { const e = document.getElementById('login-prompt'); return !e || e.hidden; }", timeout=3000)
88
check(not prompt_visible(page), f"{name}: prompt hidden after Play as Guest")
89
check(page.evaluate("() => !document.getElementById('menu').hidden && app.mode === 'menu'"), f"{name}: main menu visible after guest")
90
shot(page, f"{name}-menu-guest")
91
92
# Same session (reload): do not ask again.
93
page.reload(wait_until="networkidle")
94
wait_ready(page)
95
check(not prompt_visible(page), f"{name}: reload in the same tab does not show the prompt again")
96
check(page.evaluate("() => !document.getElementById('menu').hidden"), f"{name}: menu still visible after reload")
97
98
# Returning from the auth callback URL must not show the prompt.
99
page.goto(URL + "index.html?online=1", wait_until="networkidle")
100
wait_ready(page)
101
check(not prompt_visible(page), f"{name}: ?online=1 (auth return) does not show the prompt")
102
check("online=1" not in page.url, f"{name}: ?online=1 still stripped from the address")
103
104
check(not errs, f"{name}: no page errors {errs[:2]}")
105
ctx.close()
106
107
# Fresh session (new context) asks again.
108
ctx2 = br.new_context(viewport=vp, is_mobile=mobile, has_touch=mobile, device_scale_factor=2 if mobile else 1)
109
page2 = ctx2.new_page()
110
page2.goto(URL + "index.html", wait_until="networkidle")
111
wait_ready(page2)
112
check(prompt_visible(page2), f"{name}: a fresh session shows the prompt again")
113
shot(page2, f"{name}-fresh-session")
114
ctx2.close()
115
116
def logged_in(br, name, vp, mobile):
117
ctx = br.new_context(viewport=vp, is_mobile=mobile, has_touch=mobile, device_scale_factor=2 if mobile else 1)
118
page = ctx.new_page()
119
errs = []
120
page.on("pageerror", lambda e: errs.append(str(e)))
121
page.goto(URL + "auth.php?test=1&next=index.html", wait_until="domcontentloaded")
122
page.goto(URL + "index.html", wait_until="networkidle")
123
page.wait_for_function("() => typeof Online !== 'undefined' && Online.me", timeout=15000)
124
wait_ready(page)
125
check(not prompt_visible(page), f"{name}: logged-in player never sees the prompt")
126
check(page.evaluate("() => !document.getElementById('menu').hidden"), f"{name}: logged-in player lands on the main menu")
127
name_txt = page.locator("#menu-name").inner_text().strip()
128
check("test_user_1" in name_txt, f"{name}: menu shows the logged-in name ({name_txt!r})")
129
shot(page, f"{name}-logged-in")
130
check(not errs, f"{name}: logged-in no page errors {errs[:2]}")
131
ctx.close()
132
133
with sync_playwright() as pw:
134
br = pw.chromium.launch(args=["--use-gl=angle", "--use-angle=swiftshader"])
135
for name, vp, mobile in (("desktop", {"width": 1280, "height": 800}, False), ("mobile", {"width": 390, "height": 844}, True)):
136
logged_out(br, name, vp, mobile)
137
if LOCAL:
138
logged_in(br, name, vp, mobile)
139
br.close()
140
141
print("ALL OK" if not fails else f"{len(fails)} FAIL")
142
for f in fails:
143
print(" -", f)
144
sys.exit(1 if fails else 0)
@@ -0,0 +1,144 @@1
#!/usr/bin/env python32
"""t1246: startup login prompt with Play as Guest.3
4
Usage: python3 test/t1246-login-prompt-playwright.py URL TAG5
Logged-out checks run against the live site too. With a local PHP6
server (auth.php?test=1) the logged-in path is also checked.7
"""8
import sys9
from pathlib import Path10
from playwright.sync_api import sync_playwright11
12
URL = sys.argv[1] if len(sys.argv) > 1 else "https://projects.timfalken.com/meteors/"13
if not URL.endswith("/"):14
URL += "/"15
TAG = sys.argv[2] if len(sys.argv) > 2 else "live"16
LOCAL = "127.0.0.1" in URL or "localhost" in URL17
SHOTS = Path("/workspace/meteors-shots")18
SHOTS.mkdir(parents=True, exist_ok=True)19
fails = []20
21
def check(c, m):22
print(("OK " if c else "FAIL ") + m)23
if not c:24
fails.append(m)25
26
def shot(page, name):27
page.screenshot(path=str(SHOTS / f"t1246-{TAG}-{name}.png"))28
29
def wait_ready(page):30
page.wait_for_function("() => window.app && app.loginPromptReady === true", timeout=20000)31
32
def prompt_visible(page):33
return page.evaluate("() => { const e = document.getElementById('login-prompt'); return !!e && !e.hidden; }")34
35
def logged_out(br, name, vp, mobile):36
ctx = br.new_context(viewport=vp, is_mobile=mobile, has_touch=mobile, device_scale_factor=2 if mobile else 1)37
page = ctx.new_page()38
errs = []39
page.on("pageerror", lambda e: errs.append(str(e)))40
page.goto(URL + "index.html", wait_until="networkidle")41
wait_ready(page)42
check(prompt_visible(page), f"{name}: prompt visible for a logged-out player")43
title = page.locator("#login-prompt-title").inner_text().strip()44
guest = page.locator("#btn-play-guest").inner_text().strip()45
login_href = page.locator("#btn-login-prompt").get_attribute("href")46
check(title.lower() in ("log in?", "inloggen?"), f"{name}: title is a login question ({title!r})")47
check(guest.lower() in ("play as guest", "speel als gast"), f"{name}: guest button {guest!r}")48
check(login_href == "auth.php", f"{name}: Log in uses auth.php (menu return), got {login_href!r}")49
box = page.locator("#login-prompt").bounding_box()50
btn = page.locator("#btn-login-prompt").bounding_box()51
guest_box = page.locator("#btn-play-guest").bounding_box()52
if box and btn and guest_box:53
check(btn["y"] < guest_box["y"], f"{name}: Play as Guest sits under Log in")54
check(guest_box["height"] >= 40 and btn["height"] >= 40, f"{name}: touch targets tall enough ({btn['height']:.0f}/{guest_box['height']:.0f})")55
check(btn["x"] + btn["width"] <= vp["width"] + 1 and btn["x"] >= -1, f"{name}: Log in fits the viewport")56
check(guest_box["x"] + guest_box["width"] <= vp["width"] + 1, f"{name}: guest button fits the viewport")57
shot(page, f"{name}-prompt-en")58
59
# Language follows the existing picker / I18n.60
page.evaluate("() => I18n.setLocale('nl')")61
page.wait_for_timeout(200)62
check(page.locator("#login-prompt-title").inner_text().strip() == "Inloggen?", f"{name}: Dutch title")63
check(page.locator("#btn-play-guest").inner_text().strip() == "Speel als gast", f"{name}: Dutch guest button")64
login_nl = page.locator("#btn-login-prompt").inner_text().strip()65
check(login_nl.lower() == "inloggen", f"{name}: Dutch login button ({login_nl!r})")66
shot(page, f"{name}-prompt-nl")67
page.evaluate("() => I18n.setLocale('en')")68
page.wait_for_timeout(200)69
70
# Clicking Log in remembers the session choice before leaving.71
page.evaluate("() => { window.__loginNav = null; document.getElementById('btn-login-prompt').addEventListener('click', (e) => { e.preventDefault(); window.__loginNav = document.getElementById('btn-login-prompt').getAttribute('href'); }, { once: true }); }")72
if mobile:73
page.locator("#btn-login-prompt").tap()74
else:75
page.locator("#btn-login-prompt").click()76
remembered = page.evaluate("() => sessionStorage.getItem('meteors-login-prompt')")77
nav = page.evaluate("() => window.__loginNav")78
check(remembered == "1", f"{name}: clicking Log in stores the session flag ({remembered!r})")79
check(nav == "auth.php", f"{name}: Log in would go to auth.php ({nav!r})")80
81
# Play as Guest closes the prompt and shows the main menu.82
# Flag is already set from the login click; guest just hides it.83
if mobile:84
page.locator("#btn-play-guest").tap()85
else:86
page.locator("#btn-play-guest").click()87
page.wait_for_function("() => { const e = document.getElementById('login-prompt'); return !e || e.hidden; }", timeout=3000)88
check(not prompt_visible(page), f"{name}: prompt hidden after Play as Guest")89
check(page.evaluate("() => !document.getElementById('menu').hidden && app.mode === 'menu'"), f"{name}: main menu visible after guest")90
shot(page, f"{name}-menu-guest")91
92
# Same session (reload): do not ask again.93
page.reload(wait_until="networkidle")94
wait_ready(page)95
check(not prompt_visible(page), f"{name}: reload in the same tab does not show the prompt again")96
check(page.evaluate("() => !document.getElementById('menu').hidden"), f"{name}: menu still visible after reload")97
98
# Returning from the auth callback URL must not show the prompt.99
page.goto(URL + "index.html?online=1", wait_until="networkidle")100
wait_ready(page)101
check(not prompt_visible(page), f"{name}: ?online=1 (auth return) does not show the prompt")102
check("online=1" not in page.url, f"{name}: ?online=1 still stripped from the address")103
104
check(not errs, f"{name}: no page errors {errs[:2]}")105
ctx.close()106
107
# Fresh session (new context) asks again.108
ctx2 = br.new_context(viewport=vp, is_mobile=mobile, has_touch=mobile, device_scale_factor=2 if mobile else 1)109
page2 = ctx2.new_page()110
page2.goto(URL + "index.html", wait_until="networkidle")111
wait_ready(page2)112
check(prompt_visible(page2), f"{name}: a fresh session shows the prompt again")113
shot(page2, f"{name}-fresh-session")114
ctx2.close()115
116
def logged_in(br, name, vp, mobile):117
ctx = br.new_context(viewport=vp, is_mobile=mobile, has_touch=mobile, device_scale_factor=2 if mobile else 1)118
page = ctx.new_page()119
errs = []120
page.on("pageerror", lambda e: errs.append(str(e)))121
page.goto(URL + "auth.php?test=1&next=index.html", wait_until="domcontentloaded")122
page.goto(URL + "index.html", wait_until="networkidle")123
page.wait_for_function("() => typeof Online !== 'undefined' && Online.me", timeout=15000)124
wait_ready(page)125
check(not prompt_visible(page), f"{name}: logged-in player never sees the prompt")126
check(page.evaluate("() => !document.getElementById('menu').hidden"), f"{name}: logged-in player lands on the main menu")127
name_txt = page.locator("#menu-name").inner_text().strip()128
check("test_user_1" in name_txt, f"{name}: menu shows the logged-in name ({name_txt!r})")129
shot(page, f"{name}-logged-in")130
check(not errs, f"{name}: logged-in no page errors {errs[:2]}")131
ctx.close()132
133
with sync_playwright() as pw:134
br = pw.chromium.launch(args=["--use-gl=angle", "--use-angle=swiftshader"])135
for name, vp, mobile in (("desktop", {"width": 1280, "height": 800}, False), ("mobile", {"width": 390, "height": 844}, True)):136
logged_out(br, name, vp, mobile)137
if LOCAL:138
logged_in(br, name, vp, mobile)139
br.close()140
141
print("ALL OK" if not fails else f"{len(fails)} FAIL")142
for f in fails:143
print(" -", f)144
sys.exit(1 if fails else 0)