Compare commits
30 Commits
7696b6005b
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1a1c494ade | ||
| d9b2c5ee22 | |||
| 57c5f4e054 | |||
| 3c0ca7843f | |||
| a135746e37 | |||
| 56ecfaad54 | |||
| 1ad1d96cb2 | |||
| 1a2dc295e1 | |||
| 9d34d648d8 | |||
| 7e52e1768b | |||
| 3dc9bdcc21 | |||
| 22c4d28b42 | |||
| b5031c4f71 | |||
| b9d3b6115a | |||
| a9ccb42008 | |||
| 20f0122f59 | |||
| 548a7e29f0 | |||
| a01b584d10 | |||
| 191d66e6d4 | |||
| 462979e6f7 | |||
| e318a2c058 | |||
| c9795f816c | |||
| 01cd50abf7 | |||
| 9c9a95206d | |||
| ed46de26b3 | |||
| b69c442c90 | |||
| cddbdfaae8 | |||
| c00db744c5 | |||
| b76bcbffb2 | |||
| 67bd8d9e77 |
31
.replit
Normal file
31
.replit
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
modules = ["bun-1.3"]
|
||||||
|
[agent]
|
||||||
|
expertMode = true
|
||||||
|
|
||||||
|
[workflows]
|
||||||
|
runButton = "Project"
|
||||||
|
|
||||||
|
[[workflows.workflow]]
|
||||||
|
name = "Project"
|
||||||
|
mode = "parallel"
|
||||||
|
author = "agent"
|
||||||
|
|
||||||
|
[[workflows.workflow.tasks]]
|
||||||
|
task = "workflow.run"
|
||||||
|
args = "Start application"
|
||||||
|
|
||||||
|
[[workflows.workflow]]
|
||||||
|
name = "Start application"
|
||||||
|
author = "agent"
|
||||||
|
|
||||||
|
[[workflows.workflow.tasks]]
|
||||||
|
task = "shell.exec"
|
||||||
|
args = "PORT=5000 bun --hot run src/server.ts"
|
||||||
|
waitForPort = 5000
|
||||||
|
|
||||||
|
[workflows.workflow.metadata]
|
||||||
|
outputType = "webview"
|
||||||
|
|
||||||
|
[[ports]]
|
||||||
|
localPort = 5000
|
||||||
|
externalPort = 80
|
||||||
@@ -50,16 +50,12 @@
|
|||||||
<div class="land-card">
|
<div class="land-card">
|
||||||
<div class="land-card-icon">⬜</div>
|
<div class="land-card-icon">⬜</div>
|
||||||
<h2>// JOIN A SESSION</h2>
|
<h2>// JOIN A SESSION</h2>
|
||||||
<p>Enter a room code and your name to join an existing session.</p>
|
<p>Enter a room code to join an existing session. You'll be assigned a numeric ID.</p>
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<label>ROOM CODE</label>
|
<label>ROOM CODE</label>
|
||||||
<input id="ji-code" maxlength="8" placeholder="XXXXXX" style="letter-spacing:5px;text-transform:uppercase;font-size:20px;"
|
<input id="ji-code" maxlength="8" placeholder="XXXXXX" style="letter-spacing:5px;text-transform:uppercase;font-size:20px;"
|
||||||
oninput="this.value=this.value.toUpperCase()" />
|
oninput="this.value=this.value.toUpperCase()" />
|
||||||
</div>
|
</div>
|
||||||
<div class="field">
|
|
||||||
<label>YOUR NAME</label>
|
|
||||||
<input id="ji-name" maxlength="24" placeholder="Enter name…" />
|
|
||||||
</div>
|
|
||||||
<button class="btn btn-g btn-full" onclick="joinRoom()">JOIN ROOM →</button>
|
<button class="btn btn-g btn-full" onclick="joinRoom()">JOIN ROOM →</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -181,16 +177,21 @@
|
|||||||
onclick="this.select()" />
|
onclick="this.select()" />
|
||||||
<span class="side-hint">SEC</span>
|
<span class="side-hint">SEC</span>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="tog-row">
|
||||||
|
<div class="lbl">LINK TIMER</div>
|
||||||
|
<label class="tog">
|
||||||
|
<input type="checkbox" id="timer-tog" onchange="toggleTimerFromSwitch()" /><span class="tog-track"></span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- BUZZER CONTROLS -->
|
<!-- BUZZER CONTROLS -->
|
||||||
<div class="side-sec">
|
<div class="side-sec">
|
||||||
<div class="side-label">BUZZER CONTROLS</div>
|
<div class="side-label">ROUND CONTROL</div>
|
||||||
<div class="side-btn-group">
|
<div class="side-btn-group">
|
||||||
<button class="btn btn-g btn-full" onclick="ws_send({type:'open_round'})">▶ OPEN ROUND</button>
|
<button class="btn btn-g btn-full" id="mod-round-btn" onclick="toggleRound()">▶ OPEN ROUND</button>
|
||||||
<button class="btn btn-ghost btn-full" onclick="ws_send({type:'close_round'})">■ CLOSE ROUND</button>
|
<button class="btn btn-ghost btn-full" id="mod-resume-btn" style="display:none;" onclick="resumeRound()">▶ RESUME ROUND</button>
|
||||||
<button class="btn btn-yellow btn-full" onclick="ws_send({type:'reset_buzzer'})">↺ RESET BUZZER</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -231,7 +232,7 @@
|
|||||||
<div id="tab-buzzer">
|
<div id="tab-buzzer">
|
||||||
<div class="panel">
|
<div class="panel">
|
||||||
<div class="panel-title">BUZZ ORDER</div>
|
<div class="panel-title">BUZZ ORDER</div>
|
||||||
<div class="empty" id="mod-bz-empty">No buzzes — open a round to begin.</div>
|
<div class="empty" id="mod-bz-empty">No buzzes</div>
|
||||||
<div class="buzz-list" id="mod-bz-list"></div>
|
<div class="buzz-list" id="mod-bz-list"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -331,14 +332,8 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="buzz-wrap">
|
<div class="buzz-wrap">
|
||||||
<div class="buzz-ripple" id="buzz-ripple" style="display:none;">
|
|
||||||
<div class="buzz-ring"></div>
|
|
||||||
<div class="buzz-ring"></div>
|
|
||||||
<div class="buzz-ring"></div>
|
|
||||||
</div>
|
|
||||||
<button id="buzz-btn" class="s-closed" disabled onclick="doBuzz()">BUZZ</button>
|
<button id="buzz-btn" class="s-closed" disabled onclick="doBuzz()">BUZZ</button>
|
||||||
<div class="buzz-status" id="buzz-status">WAITING FOR ROUND</div>
|
<div class="buzz-status" id="buzz-status">WAITING FOR ROUND</div>
|
||||||
<div class="spacebar-hint" id="spacebar-hint">SPACEBAR TO BUZZ</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="p-panel">
|
<div class="p-panel">
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ let playerTimerRemaining=0,playerTimerInterval=null;
|
|||||||
const saveMod=(id,s)=>localStorage.setItem('mod',JSON.stringify({id,s}));
|
const saveMod=(id,s)=>localStorage.setItem('mod',JSON.stringify({id,s}));
|
||||||
const loadMod=()=>{try{return JSON.parse(localStorage.getItem('mod')||'null');}catch{return null;}};
|
const loadMod=()=>{try{return JSON.parse(localStorage.getItem('mod')||'null');}catch{return null;}};
|
||||||
const clearMod=()=>{localStorage.removeItem('mod');document.getElementById('rejoin-bar').style.display='none';};
|
const clearMod=()=>{localStorage.removeItem('mod');document.getElementById('rejoin-bar').style.display='none';};
|
||||||
const savePlay=(rid,pid,name)=>localStorage.setItem('play',JSON.stringify({rid,pid,name}));
|
const savePlay=(rid,pid)=>localStorage.setItem('play',JSON.stringify({rid,pid}));
|
||||||
const loadPlay=()=>{try{return JSON.parse(localStorage.getItem('play')||'null');}catch{return null;}};
|
const loadPlay=()=>{try{return JSON.parse(localStorage.getItem('play')||'null');}catch{return null;}};
|
||||||
|
|
||||||
// ══════════════════════════════════════════════════════
|
// ══════════════════════════════════════════════════════
|
||||||
@@ -68,34 +68,42 @@ function handle(msg){
|
|||||||
break;
|
break;
|
||||||
case 'joined':
|
case 'joined':
|
||||||
myId=msg.playerId;room=msg.room;role='player';
|
myId=msg.playerId;room=msg.room;role='player';
|
||||||
savePlay(room.id,myId,document.getElementById('ji-name').value||loadPlay()?.name||'');
|
savePlay(room.id,myId);
|
||||||
showScr('s-player');renderPlayer();
|
showScr('s-player');renderPlayer();
|
||||||
break;
|
break;
|
||||||
case 'room_update':
|
case 'room_update':
|
||||||
room=msg.room;
|
room=msg.room;
|
||||||
if(role==='mod')renderMod();else renderPlayer();
|
if(role==='mod'){renderMod();renderRoundButtons();}else renderPlayer();
|
||||||
break;
|
break;
|
||||||
case 'settings_updated':
|
case 'settings_updated':
|
||||||
room=msg.room;
|
room=msg.room;
|
||||||
if(role==='mod'){renderMod();renderModSettings();}else renderPlayer();
|
if(role==='mod'){renderMod();renderRoundButtons();renderModSettings();}else renderPlayer();
|
||||||
|
break;
|
||||||
|
case 'new_round':
|
||||||
|
toast('NEW ROUND STARTED','ok');
|
||||||
break;
|
break;
|
||||||
case 'round_open':
|
case 'round_open':
|
||||||
room=msg.room;
|
room=msg.room;
|
||||||
if(role==='mod')renderMod();
|
if(role==='mod'){renderMod();renderRoundButtons();}
|
||||||
else{renderPlayerBuzzer();startPlayerTimer();toast('ROUND OPEN','ok');}
|
else{renderPlayerBuzzer();startPlayerTimer();}
|
||||||
|
// If timer is enabled and this is a fresh open, load the timer
|
||||||
|
if(room.settings.timerSeconds>0 && modTimerRemaining===0 && !modTimerRunning){
|
||||||
|
modTimerRemaining=room.settings.timerSeconds;
|
||||||
|
renderModTimerDisplay();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case 'round_closed':
|
case 'round_closed':
|
||||||
room=msg.room;
|
room=msg.room;
|
||||||
if(role==='mod')renderMod();
|
if(role==='mod'){renderMod();renderRoundButtons();toast('ROUND CLOSED','warn');}
|
||||||
else{renderPlayerBuzzer();stopPlayerTimer();toast('ROUND CLOSED','warn');}
|
else{renderPlayerBuzzer();stopPlayerTimer();}
|
||||||
break;
|
break;
|
||||||
case 'buzzer_reset':
|
case 'buzzer_reset':
|
||||||
room=msg.room;
|
room=msg.room;
|
||||||
if(role==='mod')renderMod();else renderPlayerBuzzer();
|
if(role==='mod'){renderMod();renderRoundButtons();}else renderPlayerBuzzer();
|
||||||
break;
|
break;
|
||||||
case 'buzz_event':
|
case 'buzz_event':
|
||||||
room=msg.room;
|
room=msg.room;
|
||||||
if(role==='mod')renderModBuzz(msg);else{renderPlayerBuzzer();addFeed(msg);}
|
if(role==='mod'){renderMod();renderRoundButtons();}else{renderPlayerBuzzer();addFeed(msg);}
|
||||||
break;
|
break;
|
||||||
case 'buzz_rejected':
|
case 'buzz_rejected':
|
||||||
toast(msg.reason,'warn');break;
|
toast(msg.reason,'warn');break;
|
||||||
@@ -171,10 +179,8 @@ function setConn(on){
|
|||||||
function goSetup(){renderSetupTeamNames();showScr('s-setup');}
|
function goSetup(){renderSetupTeamNames();showScr('s-setup');}
|
||||||
function joinRoom(){
|
function joinRoom(){
|
||||||
const code=document.getElementById('ji-code').value.trim().toUpperCase();
|
const code=document.getElementById('ji-code').value.trim().toUpperCase();
|
||||||
const name=document.getElementById('ji-name').value.trim();
|
|
||||||
if(!code){toast('Enter room code','err');return;}
|
if(!code){toast('Enter room code','err');return;}
|
||||||
if(!name){toast('Enter your name','err');return;}
|
connect(()=>ws_send({type:'join_room',roomId:code}));
|
||||||
connect(()=>ws_send({type:'join_room',roomId:code,playerName:name}));
|
|
||||||
}
|
}
|
||||||
function openRejoin(){
|
function openRejoin(){
|
||||||
const m=loadMod();if(!m)return;
|
const m=loadMod();if(!m)return;
|
||||||
@@ -274,7 +280,6 @@ function createRoom(){
|
|||||||
// MOD TIMER
|
// MOD TIMER
|
||||||
// ══════════════════════════════════════════════════════
|
// ══════════════════════════════════════════════════════
|
||||||
function fmtTime(s){return Math.floor(s/60)+':'+(s%60<10?'0':'')+(s%60);}
|
function fmtTime(s){return Math.floor(s/60)+':'+(s%60<10?'0':'')+(s%60);}
|
||||||
|
|
||||||
function modTimerLoad(){
|
function modTimerLoad(){
|
||||||
modTimerRemaining=Math.max(5,parseInt(document.getElementById('mod-timer-set').value)||30);
|
modTimerRemaining=Math.max(5,parseInt(document.getElementById('mod-timer-set').value)||30);
|
||||||
modTimerRunning=false;
|
modTimerRunning=false;
|
||||||
@@ -317,6 +322,41 @@ function modTimerToggle(){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function toggleTimer(){
|
||||||
|
modTimerToggle();
|
||||||
|
}
|
||||||
|
|
||||||
|
function modTimerToggle(){
|
||||||
|
if(modTimerRunning){
|
||||||
|
clearInterval(modTimerInterval);modTimerRunning=false;
|
||||||
|
document.getElementById('btn-timer-ss').textContent='START';
|
||||||
|
broadcastTimerToPlayers(modTimerRemaining,false);
|
||||||
|
} else {
|
||||||
|
if(modTimerRemaining<=0)modTimerLoad();
|
||||||
|
modTimerRunning=true;
|
||||||
|
document.getElementById('btn-timer-ss').textContent='PAUSE';
|
||||||
|
broadcastTimerToPlayers(modTimerRemaining,true);
|
||||||
|
modTimerInterval=setInterval(()=>{
|
||||||
|
modTimerRemaining--;
|
||||||
|
renderModTimerDisplay();
|
||||||
|
broadcastTimerToPlayers(modTimerRemaining,true);
|
||||||
|
if(modTimerRemaining<=0){
|
||||||
|
clearInterval(modTimerInterval);modTimerRunning=false;
|
||||||
|
document.getElementById('btn-timer-ss').textContent='START';
|
||||||
|
ws_send({type:'close_round'});
|
||||||
|
toast('TIME UP — round closed','warn');
|
||||||
|
if(typeof gsap!=='undefined'){
|
||||||
|
gsap.to('#mod-timer-disp',{scale:1.08,duration:0.1,yoyo:true,repeat:3,ease:'power2.inOut'});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleTimerFromSwitch(){
|
||||||
|
modTimerToggle();
|
||||||
|
}
|
||||||
|
|
||||||
function renderModTimerDisplay(){
|
function renderModTimerDisplay(){
|
||||||
const el=document.getElementById('mod-timer-disp');
|
const el=document.getElementById('mod-timer-disp');
|
||||||
const s=modTimerRemaining;
|
const s=modTimerRemaining;
|
||||||
@@ -324,6 +364,23 @@ function renderModTimerDisplay(){
|
|||||||
el.className='timer-digits'+(s<=5?' danger':s<=10?' warn':'');
|
el.className='timer-digits'+(s<=5?' danger':s<=10?' warn':'');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function modTimerLoad(){
|
||||||
|
const sec=parseInt(document.getElementById('mod-timer-set').value)||30;
|
||||||
|
modTimerRemaining=sec;
|
||||||
|
modTimerRunning=false;
|
||||||
|
clearInterval(modTimerInterval);
|
||||||
|
document.getElementById('btn-timer-ss').textContent='START';
|
||||||
|
renderModTimerDisplay();
|
||||||
|
}
|
||||||
|
|
||||||
|
function modTimerReset(){
|
||||||
|
clearInterval(modTimerInterval);
|
||||||
|
modTimerRunning=false;
|
||||||
|
modTimerRemaining=Math.max(5,parseInt(document.getElementById('mod-timer-set').value)||30);
|
||||||
|
renderModTimerDisplay();
|
||||||
|
broadcastTimerToPlayers(modTimerRemaining,false);
|
||||||
|
}
|
||||||
|
|
||||||
function broadcastTimerToPlayers(sec,running){
|
function broadcastTimerToPlayers(sec,running){
|
||||||
try{
|
try{
|
||||||
const bc=new BroadcastChannel('buzzer_timer');
|
const bc=new BroadcastChannel('buzzer_timer');
|
||||||
@@ -332,6 +389,78 @@ function broadcastTimerToPlayers(sec,running){
|
|||||||
}catch{}
|
}catch{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ══════════════════════════════════════════════════════
|
||||||
|
// MOD ROUND CONTROL
|
||||||
|
// ══════════════════════════════════════════════════════
|
||||||
|
function toggleRound(){
|
||||||
|
if(room.buzzerState.roundOpen){
|
||||||
|
ws_send({type:'close_round'});
|
||||||
|
// If linked (toggle ON) and timer running, pause it
|
||||||
|
if(document.getElementById('timer-tog').checked && modTimerRunning){
|
||||||
|
modTimerToggle();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ws_send({type:'open_round'});
|
||||||
|
// If linked (toggle ON) and timer stopped, reset and start it
|
||||||
|
if(document.getElementById('timer-tog').checked && !modTimerRunning){
|
||||||
|
modTimerLoad();
|
||||||
|
modTimerRunning=true;
|
||||||
|
document.getElementById('btn-timer-ss').textContent='PAUSE';
|
||||||
|
modTimerInterval=setInterval(()=>{
|
||||||
|
modTimerRemaining--;
|
||||||
|
renderModTimerDisplay();
|
||||||
|
broadcastTimerToPlayers(modTimerRemaining,true);
|
||||||
|
if(modTimerRemaining<=0){
|
||||||
|
clearInterval(modTimerInterval);modTimerRunning=false;
|
||||||
|
document.getElementById('btn-timer-ss').textContent='START';
|
||||||
|
ws_send({type:'close_round'});
|
||||||
|
toast('TIME UP — round closed','warn');
|
||||||
|
}
|
||||||
|
},1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function resumeRound(){
|
||||||
|
ws_send({type:'resume_round'});
|
||||||
|
// If linked (toggle ON) and timer stopped, resume it (preserve current value)
|
||||||
|
if(document.getElementById('timer-tog').checked && !modTimerRunning){
|
||||||
|
modTimerRunning=true;
|
||||||
|
document.getElementById('btn-timer-ss').textContent='PAUSE';
|
||||||
|
broadcastTimerToPlayers(modTimerRemaining,true);
|
||||||
|
modTimerInterval=setInterval(()=>{
|
||||||
|
modTimerRemaining--;
|
||||||
|
renderModTimerDisplay();
|
||||||
|
broadcastTimerToPlayers(modTimerRemaining,true);
|
||||||
|
if(modTimerRemaining<=0){
|
||||||
|
clearInterval(modTimerInterval);modTimerRunning=false;
|
||||||
|
document.getElementById('btn-timer-ss').textContent='START';
|
||||||
|
ws_send({type:'close_round'});
|
||||||
|
toast('TIME UP — round closed','warn');
|
||||||
|
}
|
||||||
|
},1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ══════════════════════════════════════════════════════
|
||||||
|
// TIMER
|
||||||
|
// ══════════════════════════════════════════════════════
|
||||||
|
|
||||||
|
function renderRoundButtons(){
|
||||||
|
const btn=document.getElementById('mod-round-btn');
|
||||||
|
const resumeBtn=document.getElementById('mod-resume-btn');
|
||||||
|
|
||||||
|
if(room.buzzerState.roundOpen){
|
||||||
|
btn.innerHTML='■ PAUSE ROUND';
|
||||||
|
btn.className='btn btn-red btn-full';
|
||||||
|
resumeBtn.style.display='none';
|
||||||
|
} else {
|
||||||
|
btn.innerHTML='▶ OPEN ROUND';
|
||||||
|
btn.className='btn btn-g btn-full';
|
||||||
|
resumeBtn.style.display='block';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ══════════════════════════════════════════════════════
|
// ══════════════════════════════════════════════════════
|
||||||
// MOD RENDER
|
// MOD RENDER
|
||||||
// ══════════════════════════════════════════════════════
|
// ══════════════════════════════════════════════════════
|
||||||
@@ -353,6 +482,7 @@ function renderMod(){
|
|||||||
renderModBuzz(null);
|
renderModBuzz(null);
|
||||||
renderModPlayerList();
|
renderModPlayerList();
|
||||||
renderModTeams();
|
renderModTeams();
|
||||||
|
renderRoundButtons();
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderModBuzz(evt){
|
function renderModBuzz(evt){
|
||||||
@@ -374,7 +504,7 @@ function renderModBuzz(evt){
|
|||||||
div.innerHTML=`
|
div.innerHTML=`
|
||||||
<div class="bz-rank ${idx===0?'first':''}">${idx+1}</div>
|
<div class="bz-rank ${idx===0?'first':''}">${idx+1}</div>
|
||||||
<div class="bz-info">
|
<div class="bz-info">
|
||||||
<div class="bz-name">${esc(p.name)}</div>
|
<div class="bz-name">${pid}</div>
|
||||||
${teamName?`<div class="bz-team" style="color:${color}">${esc(teamName)}</div>`:''}
|
${teamName?`<div class="bz-team" style="color:${color}">${esc(teamName)}</div>`:''}
|
||||||
${ms?`<div class="bz-ms">${ms} after first</div>`:''}
|
${ms?`<div class="bz-ms">${ms} after first</div>`:''}
|
||||||
</div>
|
</div>
|
||||||
@@ -411,7 +541,7 @@ function renderModPlayerList(){
|
|||||||
row.className='pl-row'+(p.isConnected?'':' offline');
|
row.className='pl-row'+(p.isConnected?'':' offline');
|
||||||
row.innerHTML=`
|
row.innerHTML=`
|
||||||
<div class="pl-info" style="flex:1;min-width:0;">
|
<div class="pl-info" style="flex:1;min-width:0;">
|
||||||
<div class="pl-name">${esc(p.name)} ${p.isConnected?'':`<span class="tag tag-red" style="font-size:9px;padding:2px 6px;">OFFLINE</span>`}</div>
|
<div class="pl-name">${p.id} ${p.isConnected?'':`<span class="tag tag-red" style="font-size:9px;padding:2px 6px;">OFFLINE</span>`}</div>
|
||||||
${teamName?`<div class="pl-meta" style="color:${color}">${esc(teamName)}</div>`:'<div class="pl-meta">No team</div>'}
|
${teamName?`<div class="pl-meta" style="color:${color}">${esc(teamName)}</div>`:'<div class="pl-meta">No team</div>'}
|
||||||
${teamSel}
|
${teamSel}
|
||||||
</div>
|
</div>
|
||||||
@@ -437,7 +567,7 @@ function renderModTeams(){
|
|||||||
card.innerHTML=`
|
card.innerHTML=`
|
||||||
<div class="tc-n" style="color:${color}">${esc(name)}</div>
|
<div class="tc-n" style="color:${color}">${esc(name)}</div>
|
||||||
<div class="tc-c" style="color:${color}">${members.length}</div>
|
<div class="tc-c" style="color:${color}">${members.length}</div>
|
||||||
<div class="tc-m">${members.map(p=>esc(p.name)).join('<br>')||'—'}</div>
|
<div class="tc-m">${members.map(p=>p.id).join('<br>')||'—'}</div>
|
||||||
`;
|
`;
|
||||||
grid.appendChild(card);
|
grid.appendChild(card);
|
||||||
if(typeof gsap!=='undefined'){
|
if(typeof gsap!=='undefined'){
|
||||||
@@ -455,6 +585,8 @@ function renderModSettings(){
|
|||||||
document.getElementById('ls-numteams').value=s.numTeams;
|
document.getElementById('ls-numteams').value=s.numTeams;
|
||||||
segActivate('ls-seg-mode',s.mode);
|
segActivate('ls-seg-mode',s.mode);
|
||||||
renderLiveTeamNames();
|
renderLiveTeamNames();
|
||||||
|
renderRoundButtons();
|
||||||
|
renderModTimerDisplay();
|
||||||
}
|
}
|
||||||
|
|
||||||
function segActivate(groupId,val){
|
function segActivate(groupId,val){
|
||||||
@@ -527,7 +659,7 @@ function renderPlayer(){
|
|||||||
if(!room)return;
|
if(!room)return;
|
||||||
document.getElementById('p-code').textContent=room.id;
|
document.getElementById('p-code').textContent=room.id;
|
||||||
const me=room.players.find(p=>p.id===myId);
|
const me=room.players.find(p=>p.id===myId);
|
||||||
document.getElementById('p-namelbl').textContent=me?.name??'';
|
document.getElementById('p-namelbl').textContent=me?.id||'';
|
||||||
renderTeamPicker();
|
renderTeamPicker();
|
||||||
renderPlayerBuzzer();
|
renderPlayerBuzzer();
|
||||||
renderRoster();
|
renderRoster();
|
||||||
@@ -550,21 +682,20 @@ function renderTeamPicker(){
|
|||||||
btn.className='team-btn'+(isMine?' mine':'');
|
btn.className='team-btn'+(isMine?' mine':'');
|
||||||
btn.style.borderColor=isMine?color:'var(--border2)';
|
btn.style.borderColor=isMine?color:'var(--border2)';
|
||||||
btn.style.color=isMine?color:'var(--text)';
|
btn.style.color=isMine?color:'var(--text)';
|
||||||
btn.innerHTML=`<div>${esc(s.teamNames[i]??greekName(i))}</div><div class="tb-count">${members.length} player${members.length!==1?'s':''}</div>`;
|
btn.style.padding='16px';
|
||||||
|
btn.style.fontSize='20px';
|
||||||
|
btn.style.fontWeight='600';
|
||||||
|
btn.style.cursor='pointer';
|
||||||
|
btn.innerHTML=`<div style="font-size:24px;">${esc(s.teamNames[i]??greekName(i))}</div><div style="font-size:14px;color:var(--dim);margin-top:4px;">${members.length} player${members.length!==1?'s':''}</div>`;
|
||||||
btn.onclick=()=>ws_send({type:'pick_team',teamIndex:i});
|
btn.onclick=()=>ws_send({type:'pick_team',teamIndex:i});
|
||||||
grid.appendChild(btn);
|
grid.appendChild(btn);
|
||||||
if(typeof gsap!=='undefined'){
|
|
||||||
gsap.fromTo(btn,{opacity:0,y:10},{opacity:1,y:0,duration:0.3,ease:'power2.out',delay:i*0.04});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let _lastBuzzState='';
|
|
||||||
function renderPlayerBuzzer(){
|
function renderPlayerBuzzer(){
|
||||||
if(!room)return;
|
if(!room)return;
|
||||||
const btn=document.getElementById('buzz-btn');
|
const btn=document.getElementById('buzz-btn');
|
||||||
const sts=document.getElementById('buzz-status');
|
const sts=document.getElementById('buzz-status');
|
||||||
const ripple=document.getElementById('buzz-ripple');
|
|
||||||
const bz=room.buzzerState;
|
const bz=room.buzzerState;
|
||||||
const already=bz.buzzOrder.includes(myId);
|
const already=bz.buzzOrder.includes(myId);
|
||||||
const isFirst=bz.buzzOrder[0]===myId;
|
const isFirst=bz.buzzOrder[0]===myId;
|
||||||
@@ -574,49 +705,33 @@ function renderPlayerBuzzer(){
|
|||||||
if(!bz.roundOpen){
|
if(!bz.roundOpen){
|
||||||
newState='closed';
|
newState='closed';
|
||||||
btn.className='s-closed';btn.disabled=true;sts.textContent='WAITING FOR ROUND';
|
btn.className='s-closed';btn.disabled=true;sts.textContent='WAITING FOR ROUND';
|
||||||
ripple.style.display='none';
|
|
||||||
if(hint)hint.classList.remove('visible');
|
if(hint)hint.classList.remove('visible');
|
||||||
} else if(isFirst){
|
} else if(isFirst){
|
||||||
newState='first';
|
newState='first';
|
||||||
btn.className='s-first';btn.disabled=false;sts.textContent='YOU BUZZED FIRST!';
|
btn.className='s-first';btn.disabled=false;sts.textContent='YOU BUZZED FIRST!';
|
||||||
ripple.style.display='flex';
|
|
||||||
if(hint)hint.classList.remove('visible');
|
if(hint)hint.classList.remove('visible');
|
||||||
} else if(already){
|
} else if(already){
|
||||||
const pos=bz.buzzOrder.indexOf(myId)+1;
|
const pos=bz.buzzOrder.indexOf(myId)+1;
|
||||||
newState='buzzed';
|
newState='buzzed';
|
||||||
btn.className='s-buzzed';btn.disabled=true;sts.textContent='BUZZED — #'+pos+' IN ORDER';
|
btn.className='s-buzzed';btn.disabled=true;sts.textContent='BUZZED — #'+pos+' IN ORDER';
|
||||||
ripple.style.display='none';
|
|
||||||
if(hint)hint.classList.remove('visible');
|
if(hint)hint.classList.remove('visible');
|
||||||
} else if(room.settings.buzzerLockout&&bz.buzzOrder.length>0){
|
} else if(room.settings.buzzerLockout&&bz.buzzOrder.length>0){
|
||||||
newState='locked';
|
newState='locked';
|
||||||
btn.className='s-locked';btn.disabled=true;sts.textContent='BUZZER LOCKED OUT';
|
btn.className='s-locked';btn.disabled=true;sts.textContent='BUZZER LOCKED OUT';
|
||||||
ripple.style.display='none';
|
|
||||||
if(hint)hint.classList.remove('visible');
|
if(hint)hint.classList.remove('visible');
|
||||||
} else {
|
} else {
|
||||||
newState='open';
|
newState='open';
|
||||||
btn.className='s-open';btn.disabled=false;sts.textContent='ROUND OPEN — BUZZ!';
|
btn.className='s-open';btn.disabled=false;sts.textContent='ROUND OPEN — BUZZ!';
|
||||||
ripple.style.display='flex';
|
|
||||||
if(hint)hint.classList.add('visible');
|
if(hint)hint.classList.add('visible');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Animate state transitions
|
|
||||||
if(newState!==_lastBuzzState && typeof gsap!=='undefined'){
|
|
||||||
if(newState==='first'){
|
|
||||||
gsap.fromTo(btn,{scale:0.88},{scale:1,duration:0.5,ease:'back.out(2.5)'});
|
|
||||||
gsap.fromTo(sts,{opacity:0,y:6},{opacity:1,y:0,duration:0.4,ease:'power2.out'});
|
|
||||||
} else if(newState==='open' && _lastBuzzState==='closed'){
|
|
||||||
gsap.fromTo(btn,{scale:0.95},{scale:1,duration:0.4,ease:'back.out(1.5)'});
|
|
||||||
} else if(newState==='closed'){
|
|
||||||
gsap.to(btn,{scale:0.97,duration:0.15,yoyo:true,repeat:1,ease:'power2.inOut'});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_lastBuzzState=newState;
|
_lastBuzzState=newState;
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderRoster(){
|
function renderRoster(){
|
||||||
if(!room)return;
|
if(!room)return;
|
||||||
const el=document.getElementById('p-roster');
|
const el=document.getElementById('p-roster');
|
||||||
if(room.players.length===0){el.innerHTML='<div style="font-size:13px;color:var(--dim);padding:12px;letter-spacing:1px;">No players yet.</div>';return;}
|
if(room.players.length===0){el.innerHTML='<div style="font-size:18px;color:var(--dim);padding:20px;">No players yet.</div>';return;}
|
||||||
el.innerHTML='';
|
el.innerHTML='';
|
||||||
room.players.forEach(p=>{
|
room.players.forEach(p=>{
|
||||||
const isMe=p.id===myId;
|
const isMe=p.id===myId;
|
||||||
@@ -625,9 +740,9 @@ function renderRoster(){
|
|||||||
const row=document.createElement('div');
|
const row=document.createElement('div');
|
||||||
row.className='roster-row'+(isMe?' roster-me':'');
|
row.className='roster-row'+(isMe?' roster-me':'');
|
||||||
row.innerHTML=`
|
row.innerHTML=`
|
||||||
<div class="roster-dot" style="background:${p.isConnected?(isMe?'var(--g)':color):'var(--border2)'}"></div>
|
<div class="roster-dot" style="width:16px;height:16px;border-radius:50%;background:${p.isConnected?(isMe?'var(--g)':color):'var(--border2)'}"></div>
|
||||||
<div style="flex:1">${esc(p.name)}${isMe?' <span style="font-size:11px;color:var(--dim);letter-spacing:1px;">(YOU)</span>':''}</div>
|
<div style="font-size:20px;font-weight:700;">#${p.id}</div>
|
||||||
${teamName?`<div style="font-size:12px;color:${color};letter-spacing:0.5px;">${esc(teamName)}</div>`:''}
|
${teamName?`<div style="font-size:14px;color:${color};margin-top:2px;">${esc(teamName)}</div>`:''}
|
||||||
`;
|
`;
|
||||||
el.appendChild(row);
|
el.appendChild(row);
|
||||||
});
|
});
|
||||||
@@ -641,26 +756,13 @@ function addFeed(evt){
|
|||||||
const div=document.createElement('div');
|
const div=document.createElement('div');
|
||||||
div.className='feed-entry'+(isFirst?' first':'');
|
div.className='feed-entry'+(isFirst?' first':'');
|
||||||
div.style.borderLeftColor=isFirst?'var(--yellow)':color;
|
div.style.borderLeftColor=isFirst?'var(--yellow)':color;
|
||||||
div.innerHTML=`<strong>${esc(evt.playerName)}</strong>${teamStr} buzzed${isFirst?' <span style="color:var(--yellow);font-weight:700;"> — FIRST!</span>':''}`;
|
div.innerHTML=`<strong>#${evt.playerId}</strong>${teamStr} buzzed${isFirst?' <span style="color:var(--yellow);font-weight:700;"> — FIRST!</span>':''}`;
|
||||||
feed.prepend(div);
|
feed.prepend(div);
|
||||||
if(typeof gsap!=='undefined'){
|
|
||||||
gsap.fromTo(div,
|
|
||||||
{opacity:0,x:-20,borderLeftWidth:'3px'},
|
|
||||||
{opacity:1,x:0,duration:0.38,ease:'power3.out'}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
while(feed.children.length>30)feed.removeChild(feed.lastChild);
|
while(feed.children.length>30)feed.removeChild(feed.lastChild);
|
||||||
}
|
}
|
||||||
|
|
||||||
function doBuzz(){
|
function doBuzz(){
|
||||||
ws_send({type:'buzz'});
|
ws_send({type:'buzz'});
|
||||||
// Immediate haptic-like feedback
|
|
||||||
if(typeof gsap!=='undefined'){
|
|
||||||
const btn=document.getElementById('buzz-btn');
|
|
||||||
gsap.to(btn,{scale:0.91,duration:0.08,ease:'power2.in',onComplete:()=>{
|
|
||||||
gsap.to(btn,{scale:1,duration:0.25,ease:'back.out(2.5)'});
|
|
||||||
}});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ══════════════════════════════════════════════════════
|
// ══════════════════════════════════════════════════════
|
||||||
|
|||||||
@@ -65,16 +65,19 @@ export function handleMessage(ws: WS, raw: string) {
|
|||||||
if (!room) { er(ws, "Room not found"); return; }
|
if (!room) { er(ws, "Room not found"); return; }
|
||||||
if (room.locked) { er(ws, "Room is locked"); return; }
|
if (room.locked) { er(ws, "Room is locked"); return; }
|
||||||
|
|
||||||
const name = sanitize(msg.playerName ?? "Player", 24) || "Player";
|
// Calculate numeric ID based on join order
|
||||||
const existingId = sanitize(msg.playerId ?? "", 12);
|
const joinCount = room.players.size + 1;
|
||||||
|
const playerId = joinCount.toString();
|
||||||
|
const name = sanitize(msg.playerName ?? "", 24) || ""; // Keep name for compatibility but don't use it
|
||||||
|
|
||||||
let player: Player | undefined;
|
let player: Player | undefined;
|
||||||
|
|
||||||
if (existingId && room.players.has(existingId)) {
|
if (playerId && room.players.has(playerId)) {
|
||||||
player = room.players.get(existingId)!;
|
player = room.players.get(playerId)!;
|
||||||
player.ws = ws; player.isConnected = true; player.name = name;
|
player.ws = ws; player.isConnected = true; player.name = name;
|
||||||
} else {
|
} else {
|
||||||
player = { id: genId(), name, teamIndex: null, ws, isConnected: true };
|
player = { id: playerId, name, teamIndex: null, ws, isConnected: true };
|
||||||
room.players.set(player.id, player);
|
room.players.set(playerId, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
wsToPlayer.set(ws, { roomId: room.id, playerId: player.id });
|
wsToPlayer.set(ws, { roomId: room.id, playerId: player.id });
|
||||||
@@ -132,6 +135,15 @@ export function handleMessage(ws: WS, raw: string) {
|
|||||||
room.buzzerState = freshBuzzer();
|
room.buzzerState = freshBuzzer();
|
||||||
room.buzzerState.roundOpen = true;
|
room.buzzerState.roundOpen = true;
|
||||||
broadcast(room, { type: "round_open", room: publicRoom(room) });
|
broadcast(room, { type: "round_open", room: publicRoom(room) });
|
||||||
|
// Send new_round notification to all players (with toast)
|
||||||
|
const d = JSON.stringify({ type: "new_round" });
|
||||||
|
for (const p of room.players.values()) if (p.ws && p.isConnected) try { p.ws.send(d); } catch {}
|
||||||
|
if (room.modWs) try { room.modWs.send(d); } catch {}
|
||||||
|
break;
|
||||||
|
case "resume_round":
|
||||||
|
// Open round WITHOUT clearing existing buzzes (for accidental close recovery)
|
||||||
|
room.buzzerState.roundOpen = true;
|
||||||
|
broadcast(room, { type: "round_open", room: publicRoom(room) });
|
||||||
break;
|
break;
|
||||||
case "close_round":
|
case "close_round":
|
||||||
room.buzzerState.roundOpen = false;
|
room.buzzerState.roundOpen = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user