From 81ad85cb035fad39cac717dd5775b3af5f2e73bd Mon Sep 17 00:00:00 2001 From: Frederic Jung Date: Thu, 29 Oct 2026 21:36:44 +0100 Subject: [PATCH] The NOC tab shows no numbers: a red dot only while something is broken; drop five unused labels --- site/i18n/de.js | 5 ----- site/i18n/es.js | 5 ----- site/i18n/fr.js | 5 ----- site/i18n/it.js | 5 ----- site/i18n/pt.js | 5 ----- src/game/93-ui/20-phone.js | 4 ++-- src/game/93-ui/40-hud-and-panels.js | 4 ++-- src/i18n/en.js | 5 ----- src/styles/20-drawers.css | 2 ++ src/styles/60-phone.css | 1 + tests/game.test.js | 12 +++++++----- 11 files changed, 14 insertions(+), 39 deletions(-) diff --git a/site/i18n/de.js b/site/i18n/de.js index c05ddcb..6405f07 100644 --- a/site/i18n/de.js +++ b/site/i18n/de.js @@ -1796,11 +1796,8 @@ "fiber_modals.your_pop_needs_a_fabric_port":"Dein POP · braucht dort einen Fabric-Port", "game_and_settings.delete_and_start_over":"Löschen und neu anfangen", "game_and_settings.export_save_download_a_file":"Spielstand exportieren Datei herunterladen", -"game_and_settings.import_a_save_from_a_file":"Spielstand importieren aus einer Datei", "game_and_settings.import_failed_that_save_is_damaged":"Import fehlgeschlagen.
Dieser Spielstand ist beschädigt und konnte nicht geladen werden. Dein aktuelles Spiel ist unberührt.", "game_and_settings.name_and_everything_it_owns_will":"{name} und alles, was dazugehört, wird gelöscht. Das lässt sich nicht rückgängig machen.", -"game_and_settings.scenarios_amp_weekly_challenge":"Szenarien & Wochen-Challenge", -"game_and_settings.share_your_network_image_card":"Dein Netz teilen Bildkarte", "game_and_settings.start_a_new_network":"Ein neues Netz starten?", "game_and_settings.welcome_back_name_imported_and_saved":"Willkommen zurück, {name}.
Importiert und auf diesem Gerät gespeichert.", "game_and_settings.your_game_saves_itself_every_few":"Dein Spiel speichert sich alle paar Sekunden auf diesem Gerät.", @@ -2016,7 +2013,6 @@ "hud_and_panels.n_message_waiting_for_an_answer":{"one":"{n} Nachricht wartet auf eine Antwort.","other":"{n} Nachrichten warten auf eine Antwort."}, "hud_and_panels.n_more_networks":{"one":"+{n} weiteres Netz","other":"+{n} weitere Netze"}, "hud_and_panels.n_networks_d_days_left":"{n} Netze · noch {d} Tage", -"hud_and_panels.n_new_notification":{"one":"{n} neue Benachrichtigung","other":"{n} neue Benachrichtigungen"}, "hud_and_panels.n_rules_live":"{n} Regeln aktiv", "hud_and_panels.n_session_is_down_on_its":{"one":"{n} Session ist wegen ihres Max-Prefix-Limits down.","other":"{n} Sessions sind wegen ihres Max-Prefix-Limits down."}, "hud_and_panels.n_small_networks":"{n} kleine Netze", @@ -3521,7 +3517,6 @@ "slots.this_window_stopped_saving_so_it":"In einem anderen Fenster wurde eine neuere Version gespeichert, also speichert dieses nicht mehr, statt sie zu überschreiben.", "slots.two_windows_one_network":"Zwei Fenster, ein Netz", "slots.your_networks":"Deine Netze", -"slots.your_networks_switch_or_start_another":"Deine Netze wechseln oder ein neues starten", "slots.your_other_networks_share_this_browser":"Deine anderen Netze teilen sich den Speicher dieses Browsers. Exportiere die, die du behalten willst, und lösche sie dann hier, um Platz zu schaffen.", "sold_out.a_hyperscaler_bought_every_wave_of":"Ein Hyperscaler hat letzte Woche jede Wave dieser Größe auf dieser Route gekauft.", "sold_out.not_big_enough_yet_list":"Noch nicht groß genug: {list}", diff --git a/site/i18n/es.js b/site/i18n/es.js index c4dd964..49db76a 100644 --- a/site/i18n/es.js +++ b/site/i18n/es.js @@ -1794,11 +1794,8 @@ "fiber_modals.your_pop_needs_a_fabric_port":"Tu POP · necesita un puerto de fabric allí", "game_and_settings.delete_and_start_over":"Borrar y empezar de nuevo", "game_and_settings.export_save_download_a_file":"Exportar partida descargar un archivo", -"game_and_settings.import_a_save_from_a_file":"Importar una partida desde un archivo", "game_and_settings.import_failed_that_save_is_damaged":"Falló la importación.
Esa partida está dañada y no se pudo cargar. Tu partida actual sigue intacta.", "game_and_settings.name_and_everything_it_owns_will":"{name} y todo lo que posee se borrarán. No se puede deshacer.", -"game_and_settings.scenarios_amp_weekly_challenge":"Escenarios y desafío semanal", -"game_and_settings.share_your_network_image_card":"Comparte tu red tarjeta de imagen", "game_and_settings.start_a_new_network":"¿Empezar una red nueva?", "game_and_settings.welcome_back_name_imported_and_saved":"Bienvenido de nuevo, {name}.
Importada y guardada en este dispositivo.", "game_and_settings.your_game_saves_itself_every_few":"Tu partida se guarda sola cada pocos segundos en este dispositivo.", @@ -2014,7 +2011,6 @@ "hud_and_panels.n_message_waiting_for_an_answer":{"one":"{n} mensaje esperando respuesta.","other":"{n} mensajes esperando respuesta."}, "hud_and_panels.n_more_networks":{"one":"+{n} red más","other":"+{n} redes más"}, "hud_and_panels.n_networks_d_days_left":"{n} redes · quedan {d} días", -"hud_and_panels.n_new_notification":{"one":"{n} notificación nueva","other":"{n} notificaciones nuevas"}, "hud_and_panels.n_rules_live":"{n} reglas activas", "hud_and_panels.n_session_is_down_on_its":{"one":"{n} sesión está caída por su límite de max-prefix.","other":"{n} sesiones están caídas por su límite de max-prefix."}, "hud_and_panels.n_small_networks":"{n} redes pequeñas", @@ -3519,7 +3515,6 @@ "slots.this_window_stopped_saving_so_it":"Se guardó una versión más nueva en otra ventana, así que esta dejó de guardar en vez de sobrescribirla.", "slots.two_windows_one_network":"Dos ventanas, una red", "slots.your_networks":"Tus redes", -"slots.your_networks_switch_or_start_another":"Tus redes cambia o empieza otra", "slots.your_other_networks_share_this_browser":"Tus otras redes comparten el almacenamiento de este navegador. Exporta las que quieras conservar y bórralas aquí para hacer sitio.", "sold_out.a_hyperscaler_bought_every_wave_of":"Un hiperescalador compró la semana pasada todas las ondas de ese tamaño en esta ruta.", "sold_out.not_big_enough_yet_list":"Aún no es lo bastante grande: {list}", diff --git a/site/i18n/fr.js b/site/i18n/fr.js index c6c08b6..cc5ee06 100644 --- a/site/i18n/fr.js +++ b/site/i18n/fr.js @@ -1794,11 +1794,8 @@ "fiber_modals.your_pop_needs_a_fabric_port":"Ton POP · il y faut un port fabric", "game_and_settings.delete_and_start_over":"Supprimer et recommencer", "game_and_settings.export_save_download_a_file":"Exporter la sauvegarde télécharger un fichier", -"game_and_settings.import_a_save_from_a_file":"Importer une sauvegarde depuis un fichier", "game_and_settings.import_failed_that_save_is_damaged":"Échec de l’import.
Cette sauvegarde est endommagée et n’a pas pu être chargée. Ta partie en cours est intacte.", "game_and_settings.name_and_everything_it_owns_will":"{name} et tout ce qu’il possède seront supprimés. Impossible de revenir en arrière.", -"game_and_settings.scenarios_amp_weekly_challenge":"Scénarios & défi de la semaine", -"game_and_settings.share_your_network_image_card":"Partager ton réseau carte image", "game_and_settings.start_a_new_network":"Créer un nouveau réseau ?", "game_and_settings.welcome_back_name_imported_and_saved":"Bon retour, {name}.
Partie importée et sauvegardée sur cet appareil.", "game_and_settings.your_game_saves_itself_every_few":"Ta partie se sauvegarde toute seule sur cet appareil, toutes les quelques secondes.", @@ -2014,7 +2011,6 @@ "hud_and_panels.n_message_waiting_for_an_answer":{"one":"{n} message attend une réponse.","other":"{n} messages attendent une réponse."}, "hud_and_panels.n_more_networks":{"one":"+{n} autre réseau","other":"+{n} autres réseaux"}, "hud_and_panels.n_networks_d_days_left":"{n} réseaux · {d} j restants", -"hud_and_panels.n_new_notification":{"one":"{n} nouvelle notification","other":"{n} nouvelles notifications"}, "hud_and_panels.n_rules_live":"{n} règles actives", "hud_and_panels.n_session_is_down_on_its":{"one":"{n} session est coupée par sa limite max-prefix.","other":"{n} sessions sont coupées par leur limite max-prefix."}, "hud_and_panels.n_small_networks":"{n} petits réseaux", @@ -3519,7 +3515,6 @@ "slots.this_window_stopped_saving_so_it":"Une version plus récente a été sauvegardée dans une autre fenêtre, alors celle-ci a arrêté de sauvegarder au lieu de l'écraser.", "slots.two_windows_one_network":"Deux fenêtres, un réseau", "slots.your_networks":"Tes réseaux", -"slots.your_networks_switch_or_start_another":"Tes réseaux changer, ou en lancer un autre", "slots.your_other_networks_share_this_browser":"Tes autres réseaux partagent le stockage de ce navigateur. Exporte ceux que tu veux garder, puis supprime-les ici pour faire de la place.", "sold_out.a_hyperscaler_bought_every_wave_of":"Un hyperscaler a acheté la semaine dernière toutes les ondes de cette taille sur cette route.", "sold_out.not_big_enough_yet_list":"Pas encore assez gros : {list}", diff --git a/site/i18n/it.js b/site/i18n/it.js index f27837c..dd1886c 100644 --- a/site/i18n/it.js +++ b/site/i18n/it.js @@ -1794,11 +1794,8 @@ "fiber_modals.your_pop_needs_a_fabric_port":"Il tuo POP · serve una porta fabric lì", "game_and_settings.delete_and_start_over":"Cancella e ricomincia", "game_and_settings.export_save_download_a_file":"Esporta salvataggio scarica un file", -"game_and_settings.import_a_save_from_a_file":"Importa un salvataggio da un file", "game_and_settings.import_failed_that_save_is_damaged":"Importazione fallita.
Quel salvataggio è danneggiato e non si può caricare. La partita in corso non è stata toccata.", "game_and_settings.name_and_everything_it_owns_will":"{name} e tutto ciò che possiede verranno cancellati. Non si torna indietro.", -"game_and_settings.scenarios_amp_weekly_challenge":"Scenari e sfida settimanale", -"game_and_settings.share_your_network_image_card":"Condividi la tua rete come immagine", "game_and_settings.start_a_new_network":"Vuoi creare una nuova rete?", "game_and_settings.welcome_back_name_imported_and_saved":"Bentornato, {name}.
Importato e salvato su questo dispositivo.", "game_and_settings.your_game_saves_itself_every_few":"La partita si salva da sola ogni pochi secondi su questo dispositivo.", @@ -2014,7 +2011,6 @@ "hud_and_panels.n_message_waiting_for_an_answer":{"one":"{n} messaggio aspetta una risposta.","other":"{n} messaggi aspettano una risposta."}, "hud_and_panels.n_more_networks":{"one":"+{n} altra rete","other":"+{n} altre reti"}, "hud_and_panels.n_networks_d_days_left":"{n} reti · {d} giorni rimasti", -"hud_and_panels.n_new_notification":{"one":"{n} nuova notifica","other":"{n} nuove notifiche"}, "hud_and_panels.n_rules_live":"{n} regole attive", "hud_and_panels.n_session_is_down_on_its":{"one":"{n} sessione è giù per il limite max-prefix.","other":"{n} sessioni sono giù per il limite max-prefix."}, "hud_and_panels.n_small_networks":"{n} piccole reti", @@ -3519,7 +3515,6 @@ "slots.this_window_stopped_saving_so_it":"In un'altra finestra è stata salvata una versione più recente, quindi questa ha smesso di salvare invece di sovrascriverla.", "slots.two_windows_one_network":"Due finestre, una rete", "slots.your_networks":"Le tue reti", -"slots.your_networks_switch_or_start_another":"Le tue reti cambia o iniziane un'altra", "slots.your_other_networks_share_this_browser":"Le tue altre reti condividono lo spazio di questo browser. Esporta quelle che vuoi tenere, poi eliminale qui per fare posto.", "sold_out.a_hyperscaler_bought_every_wave_of":"Un hyperscaler ha comprato la settimana scorsa ogni onda di questa misura su questa tratta.", "sold_out.not_big_enough_yet_list":"Non sei ancora abbastanza grande: {list}", diff --git a/site/i18n/pt.js b/site/i18n/pt.js index d665af3..ffba098 100644 --- a/site/i18n/pt.js +++ b/site/i18n/pt.js @@ -1794,11 +1794,8 @@ "fiber_modals.your_pop_needs_a_fabric_port":"Seu POP · precisa de uma porta de fabric lá", "game_and_settings.delete_and_start_over":"Apagar e recomeçar", "game_and_settings.export_save_download_a_file":"Exportar save baixar um arquivo", -"game_and_settings.import_a_save_from_a_file":"Importar um save de um arquivo", "game_and_settings.import_failed_that_save_is_damaged":"Falha na importação.
Esse save está corrompido e não pôde ser carregado. Seu jogo atual não foi mexido.", "game_and_settings.name_and_everything_it_owns_will":"{name} e tudo o que ela possui serão apagados. Não dá para desfazer.", -"game_and_settings.scenarios_amp_weekly_challenge":"Cenários & desafio semanal", -"game_and_settings.share_your_network_image_card":"Compartilhar sua rede card de imagem", "game_and_settings.start_a_new_network":"Começar uma nova rede?", "game_and_settings.welcome_back_name_imported_and_saved":"Bem-vindo de volta, {name}.
Importado e salvo neste dispositivo.", "game_and_settings.your_game_saves_itself_every_few":"Seu jogo se salva sozinho a cada poucos segundos neste dispositivo.", @@ -2014,7 +2011,6 @@ "hud_and_panels.n_message_waiting_for_an_answer":{"one":"{n} mensagem esperando resposta.","other":"{n} mensagens esperando resposta."}, "hud_and_panels.n_more_networks":{"one":"+{n} rede a mais","other":"+{n} redes a mais"}, "hud_and_panels.n_networks_d_days_left":"{n} redes · faltam {d} dias", -"hud_and_panels.n_new_notification":{"one":"{n} notificação nova","other":"{n} notificações novas"}, "hud_and_panels.n_rules_live":"{n} regras ativas", "hud_and_panels.n_session_is_down_on_its":{"one":"{n} sessão está fora pelo limite de max-prefix.","other":"{n} sessões estão fora pelo limite de max-prefix."}, "hud_and_panels.n_small_networks":"{n} redes pequenas", @@ -3519,7 +3515,6 @@ "slots.this_window_stopped_saving_so_it":"Uma versão mais nova foi salva em outra janela, então esta parou de salvar em vez de sobrescrevê-la.", "slots.two_windows_one_network":"Duas janelas, uma rede", "slots.your_networks":"Suas redes", -"slots.your_networks_switch_or_start_another":"Suas redes trocar ou começar outra", "slots.your_other_networks_share_this_browser":"Suas outras redes dividem o armazenamento deste navegador. Exporte as que quiser manter e apague-as aqui para abrir espaço.", "sold_out.a_hyperscaler_bought_every_wave_of":"Um hyperscaler comprou semana passada todas as ondas desse tamanho nesta rota.", "sold_out.not_big_enough_yet_list":"Você ainda não é grande o bastante: {list}", diff --git a/src/game/93-ui/20-phone.js b/src/game/93-ui/20-phone.js index f1b6d32..3b7339b 100644 --- a/src/game/93-ui/20-phone.js +++ b/src/game/93-ui/20-phone.js @@ -3,10 +3,10 @@ const isPhone=()=>innerWidth<=760||(innerHeight<=500&&matchMedia('(pointer:coars const SPEEDS=[0.5,1,2,4,8]; function renderTabbar(){const tb=$('tabbar');if(!tb||(pressing&&UI.ticking))return;if(!isPhone()||!S||!UI.started||pzOn()){tb.hidden=true;document.body.classList.toggle('sheet-open',pzOn()&&isPhone()&&!!UI.sel);return;}tb.hidden=false; const open=UI.leftOpen&&!UI.sel,cur=UI.left||'goals',ndone=GOALS.filter(g=>S.done[g.id]!==undefined).length; - const tab=(k,ic,l,cnt,red)=>``; + const tab=(k,ic,l,cnt,red)=>``; const h=(rule('clock')?``+ ``:'')+ - (()=>{const P=scnProg();return tab('goals','🎯',tr('common.goals'),P&&!S.scn.done&&!S.scn.failed?`${Math.round(P.f*100)}%`:`${ndone}/${GOALS.length}`);})()+(()=>{const u=custStats().unhappy;return u?tab('deals','💼',tr('common.deals'),u,true):tab('deals','💼',tr('common.deals'),S.offers.length||'');})()+tab('noc','🚨','NOC',S.inc.length||(UI.left==='noc'&&UI.leftOpen?'':logUnread())||'',S.inc.length>0)+tab('nets','🌐',tr('common.networks'),ibxOpen()||'',ibxUrgent()>0); + (()=>{const P=scnProg();return tab('goals','🎯',tr('common.goals'),P&&!S.scn.done&&!S.scn.failed?`${Math.round(P.f*100)}%`:`${ndone}/${GOALS.length}`);})()+(()=>{const u=custStats().unhappy;return u?tab('deals','💼',tr('common.deals'),u,true):tab('deals','💼',tr('common.deals'),S.offers.length||'');})()+tab('noc','🚨','NOC',S.inc.length?' ':'',true)+tab('nets','🌐',tr('common.networks'),ibxOpen()||'',ibxUrgent()>0); if(h!==UI._tb){UI._tb=h;tb.innerHTML=h;} document.body.classList.toggle('sheet-open',!!(UI.sel||UI.leftOpen));} function haptic(ms){if(UI.muted)return;try{navigator.vibrate&&navigator.vibrate(ms||12);}catch(e){}} diff --git a/src/game/93-ui/40-hud-and-panels.js b/src/game/93-ui/40-hud-and-panels.js index c2be442..7a32ef7 100644 --- a/src/game/93-ui/40-hud-and-panels.js +++ b/src/game/93-ui/40-hud-and-panels.js @@ -20,7 +20,7 @@ function renderHUD(){ $('hDate').textContent=dateStr(S.day); {const bo=(S.loanOffers||[]).length,hb=$('hBank');hb.hidden=!bo;hb.textContent=bo;} {const st=custStats(),hc=$('hCust');hc.hidden=!st.n;if(st.n){$('hCustVal').innerHTML=`${st.avg>=80?'😀':st.avg>=60?'🙂':st.avg>=30?'😟':'😡'} ${Math.round(st.avg)}%${st.unhappy?` ${st.unhappy}`:''}`;hc.classList.toggle('hot',st.furious>0);}} - const n=S.inc.length;$('hNoc').classList.toggle('hot',n>0);{const u=UI.left==='noc'&&UI.leftOpen?0:logUnread(),b=$('hNocNew');if(b){b.hidden=!u;b.textContent=u>99?'99+':String(u);b.title=trn('hud_and_panels.n_new_notification',u);}}$('hNocVal').textContent=n?trn('hud_and_panels.n_incident',n):tr('common.all_quiet'); + const n=S.inc.length;$('hNoc').classList.toggle('hot',n>0);{const b=$('hNocNew');if(b)b.hidden=true;}$('hNocVal').textContent=n?trn('hud_and_panels.n_incident',n):tr('common.all_quiet'); if(!window.__TUBES_TEST__)fitHud(); renderTabbar(); } @@ -31,7 +31,7 @@ function renderLeft(){checkLayer(); renderTabbar(); if(!S||pzOn()){L.hidden=true;return;}L.hidden=false; const ndone=GOALS.filter(g=>S.done[g.id]!==undefined).length; - const tabs=[['goals',`${tr('common.goals')}${ndone}/${GOALS.length}`],['deals',`${tr('common.deals')}${S.offers.length?`${S.offers.length}`:''}`],['noc',`NOC${S.inc.length?`${S.inc.length}`:''}`],['nets',`${tr('common.networks')}${ibxOpen()?`${ibxOpen()}`:''}`]]; + const tabs=[['goals',`${tr('common.goals')}${ndone}/${GOALS.length}`],['deals',`${tr('common.deals')}${S.offers.length?`${S.offers.length}`:''}`],['noc',`NOC${S.inc.length?``:''}`],['nets',`${tr('common.networks')}${ibxOpen()?`${ibxOpen()}`:''}`]]; $('leftTabs').innerHTML=tabs.map(([k,l])=>``).join('')+(innerWidth<760?``:''); let h=''; if(UI.left==='goals'){ diff --git a/src/i18n/en.js b/src/i18n/en.js index d273e23..5c158d7 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -1795,11 +1795,8 @@ "fiber_modals.your_pop_needs_a_fabric_port":"Your POP · needs a fabric port there", "game_and_settings.delete_and_start_over":"Delete and start over", "game_and_settings.export_save_download_a_file":"Export save download a file", -"game_and_settings.import_a_save_from_a_file":"Import a save from a file", "game_and_settings.import_failed_that_save_is_damaged":"Import failed.
That save is damaged and could not be loaded. Your current game is untouched.", "game_and_settings.name_and_everything_it_owns_will":"{name} and everything it owns will be deleted. This cannot be undone.", -"game_and_settings.scenarios_amp_weekly_challenge":"Scenarios & weekly challenge", -"game_and_settings.share_your_network_image_card":"Share your network image card", "game_and_settings.start_a_new_network":"Start a new network?", "game_and_settings.welcome_back_name_imported_and_saved":"Welcome back, {name}.
Imported and saved on this device.", "game_and_settings.your_game_saves_itself_every_few":"Your game saves itself every few seconds on this device.", @@ -2015,7 +2012,6 @@ "hud_and_panels.n_message_waiting_for_an_answer":{"one":"{n} message waiting for an answer.","other":"{n} messages waiting for an answer."}, "hud_and_panels.n_more_networks":{"one":"+{n} more network","other":"+{n} more networks"}, "hud_and_panels.n_networks_d_days_left":"{n} networks · {d} days left", -"hud_and_panels.n_new_notification":{"one":"{n} new notification","other":"{n} new notifications"}, "hud_and_panels.n_rules_live":"{n} rules live", "hud_and_panels.n_session_is_down_on_its":{"one":"{n} session is down on its max-prefix limit.","other":"{n} sessions are down on their max-prefix limit."}, "hud_and_panels.n_small_networks":"{n} small networks", @@ -3520,7 +3516,6 @@ "slots.this_window_stopped_saving_so_it":"A newer version was saved in another window, so this one stopped saving instead of overwriting it.", "slots.two_windows_one_network":"Two windows, one network", "slots.your_networks":"Your networks", -"slots.your_networks_switch_or_start_another":"Your networks switch, or start another", "slots.your_other_networks_share_this_browser":"Your other networks share this browser's storage. Export the ones you want to keep, then delete them here to make room.", "sold_out.a_hyperscaler_bought_every_wave_of":"A hyperscaler bought every wave of that size on this route last week.", "sold_out.not_big_enough_yet_list":"Not big enough yet: {list}", diff --git a/src/styles/20-drawers.css b/src/styles/20-drawers.css index bd9b547..5f510ec 100644 --- a/src/styles/20-drawers.css +++ b/src/styles/20-drawers.css @@ -83,3 +83,5 @@ section h3{font-size:17px;margin-bottom:6px;display:flex;align-items:center;gap: .inc .nm{font-weight:900} .inc .meta{font-size:12px;color:var(--ink2);margin-top:2px;line-height:1.35} +/* The NOC tab only says whether something is broken, never how many notifications wait (2.0). */ +.cnt.dot{min-width:0;width:9px;height:9px;padding:0;border-radius:50%;vertical-align:middle} diff --git a/src/styles/60-phone.css b/src/styles/60-phone.css index 6bccadf..39cbe7f 100644 --- a/src/styles/60-phone.css +++ b/src/styles/60-phone.css @@ -35,6 +35,7 @@ button,.chip,.b,a{touch-action:manipulation;-webkit-tap-highlight-color:transpar #tabbar button.play.paused{background:#FFE3F0} #tabbar .cnt{position:absolute;top:2px;right:calc(50% - 22px);min-width:16px;height:16px;padding:0 4px;border-radius:8px;background:var(--me);color:#fff;font-size:10px;line-height:16px;box-sizing:border-box} #tabbar .cnt.red{background:var(--bad)} + #tabbar .cnt.dot{min-width:0;width:10px;height:10px;padding:0;top:6px;right:calc(50% - 16px)} #left,#panel{top:auto !important;left:0 !important;right:0 !important;width:auto !important;bottom:var(--tabbar) !important;max-height:min(62%,calc(100% - var(--tabbar) - 70px)) !important;border-radius:20px 20px 0 0 !important;border-bottom:0 !important;box-shadow:0 -3px 0 var(--ink) !important;transition:max-height .22s ease,transform .22s ease;z-index:7} #left.full,#panel.full{max-height:calc(100% - var(--tabbar) - 56px - env(safe-area-inset-top,0px)) !important} #left.closed{display:none} diff --git a/tests/game.test.js b/tests/game.test.js index 13e085a..6f5d817 100644 --- a/tests/game.test.js +++ b/tests/game.test.js @@ -483,14 +483,13 @@ test('notifications: the NOC keeps the last ten minutes, folds repeats and opens assert.equal(ev("S.log.length"), 6, 'a minute later it starts a new line'); // the NOC shows them right after the incidents, with Open where there is something to open assert.equal(ev("logUnread()"), 6); - ev("renderHUD()"); assert.equal(doc.getElementById('hNocNew').hidden, false); assert.equal(doc.getElementById('hNocNew').textContent, '6'); + ev("renderHUD()"); assert.equal(doc.getElementById('hNocNew').hidden, true, 'no unread count on the NOC button (2.0)'); ev("UI.left='noc';UI.leftOpen=true;UI.sel=null;renderLeft();renderHUD()"); const body = doc.getElementById('leftBody').textContent; assert.match(body, /Notifications\s*last 10 minutes/); assert.ok(body.indexOf('Notifications') < body.indexOf('DDoS scrubbing'), 'near the top, not at the bottom'); assert.match(body, /×5/); assert.match(body, /just now/); assert.equal(doc.querySelectorAll('#leftBody [data-act=logOpen]').length, 2, 'Open only where it leads somewhere (2 of the 5 shown)'); - assert.equal(doc.getElementById('hNocNew').hidden, true, 'read once the NOC is open'); assert.equal(ev("logUnread()"), 0); ev("ACT.logAll()"); assert.equal(doc.querySelectorAll('#leftBody .note').length, 6); assert.equal(doc.querySelectorAll('#leftBody [data-act=logOpen]').length, 3); // Open goes there @@ -506,12 +505,15 @@ test('notifications: the NOC keeps the last ten minutes, folds repeats and opens ev("S.log.push({t:'old',k:'weird',o:{a:'city',v:'atlantis'},n:'many'},{t:5},{t:'x',o:{a:'tab',v:'evil'}},{t:'y',o:{a:'link',v:'l1'},at:'soon'});S=sanitize(S)"); const tail = JSON.parse(ev("JSON.stringify(S.log.slice(-3))")); assert.deepEqual(tail.map(e => [e.t, e.k, e.o, e.n, e.at]), [['old', '', null, 1, 0], ['x', '', null, 1, 0], ['y', '', { a: 'link', v: 'l1' }, 1, 0]]); - // phones: the NOC tab carries the count + // phones: the NOC tab shows no numbers, only a red dot while something is broken ev("__tick(1000);toast('Router crashed
Your router in London is rebooting.','bad');UI.left='goals';UI.leftOpen=false"); dom.window.innerWidth = 360; ev("renderAll&&renderAll()"); const nocTab = [...doc.querySelectorAll('#tabbar [data-act=phoneTab]')].find(b => JSON.parse(b.dataset.args).t === 'noc'); - assert.equal(nocTab.querySelector('.cnt').textContent, '1', 'one unread notification on the NOC tab'); - assert.equal(nocTab.querySelector('.cnt').classList.contains('red'), false, 'not red: red is for incidents'); + assert.equal(nocTab.querySelector('.cnt'), null, 'no number for unread notifications on the NOC tab'); + ev("S.inc.push({id:'x1',type:'crash',city:'lon',msg:'',until:S.day+3});renderAll()"); + const nocTab2 = [...doc.querySelectorAll('#tabbar [data-act=phoneTab]')].find(b => JSON.parse(b.dataset.args).t === 'noc'); + assert.ok(nocTab2.querySelector('.cnt.dot.red'), 'a live incident shows a red dot'); + assert.equal(nocTab2.querySelector('.cnt').textContent, '', 'and no number'); assert.deepEqual(errors, []); });