Draw the bracket as a real tree with connectors; fit-to-screen and list views for phones
Matches are positioned per round with SVG connector lines between feeder and next match, winners in bold, live matches tagged with their court, empty slots labelled with what fills them (W R1.4, L R2.1), and the viewer's team highlighted along its path. Double elimination renders winners, losers and finals trees. Narrow screens default to a scaled fit-to-width view; a round-by-round list is also available. Seed script gains --stage=bracket|double. Release 0.3.0. Co-Authored-By: Claude Fable 5.1 <[email protected]> Claude-Session: https://claude.ai/code/session_01MB7nCCAscYsb3zzkT6LHZi
This commit is contained in:
+98
-7
@@ -30,6 +30,7 @@
|
||||
if (!s.pools.length && !s.bracket.length) parts.push(renderRoster());
|
||||
if (s.withdrawn.length && !display) parts.push(`<p class="muted small">Withdrawn: ${s.withdrawn.map(t => esc(t.name)).join(', ')}</p>`);
|
||||
app.innerHTML = parts.join('');
|
||||
fitBracket();
|
||||
notifyMine();
|
||||
}
|
||||
|
||||
@@ -77,17 +78,107 @@
|
||||
</div>`).join('')}</section>`;
|
||||
}
|
||||
|
||||
// ---- bracket: a real tree with connector lines, plus a list view for small screens ----
|
||||
// default: full tree on wide screens, scaled-to-fit on phones; the viewer's choice is remembered
|
||||
let bracketView = window.innerWidth < 700 ? 'fit' : 'tree';
|
||||
try { bracketView = localStorage.getItem('courtside.bracketView') || bracketView; } catch {}
|
||||
const BOX_W = 176, BOX_H = 58, COL_GAP = 44, ROW_GAP = 14;
|
||||
|
||||
function renderBracket() {
|
||||
const groups = [['bracket', 'Bracket'], ['losers', 'Losers bracket'], ['final', 'Finals']];
|
||||
return `<section class="card bracketwrap"><h2>${state.bracket.some(m => m.stage === 'losers') ? 'Double elimination' : 'Bracket'}</h2>${groups.map(([stage, title]) => {
|
||||
const ms = state.bracket.filter(m => m.stage === stage && !(m.conditional && m.status !== 'final' && !m.a));
|
||||
const isDouble = state.bracket.some(m => m.stage === 'losers');
|
||||
const toggle = display ? '' : `<div class="bviews" role="tablist">${[['tree', 'Bracket'], ['fit', 'Fit to screen'], ['list', 'List']].map(([v, l]) => `<button type="button" class="small ${bracketView === v ? 'cur' : ''}" data-bview="${v}">${l}</button>`).join('')}</div>`;
|
||||
const stages = [['bracket', isDouble ? 'Winners bracket' : 'Bracket'], ['losers', 'Losers bracket'], ['final', 'Finals']];
|
||||
const body = stages.map(([stage, title]) => {
|
||||
const ms = state.bracket.filter(m => m.stage === stage && !(m.conditional && !m.a));
|
||||
if (!ms.length) return '';
|
||||
const rounds = [...new Set(ms.map(m => m.round))].sort((a, b) => a - b);
|
||||
return `<div class="bstage"><h3>${title}</h3><div class="bracket">${rounds.map(r => `<div class="round"><div class="rlbl">${roundName(stage, r, rounds.length, ms)}</div>${ms.filter(m => m.round === r).map(m => `<div class="bm ${m.status} ${isMine(m) ? 'mine' : ''}">${m.label ? `<div class="mlbl">${esc(m.label)}</div>` : ''}<div class="${m.winner && m.winner === m.a?.id ? 'won' : ''}">${name(m.a)}<span class="mono">${m.sets[0] ? m.sets.map(s => s[0]).join(' ') : ''}</span></div><div class="${m.winner && m.winner === m.b?.id ? 'won' : ''}">${name(m.b)}<span class="mono">${m.sets[0] ? m.sets.map(s => s[1]).join(' ') : ''}</span></div>${m.status === 'live' ? `<div class="mlbl live">Court ${m.court}${m.live ? ` · ${m.live[0]}–${m.live[1]}` : ''}</div>` : m.status === 'forfeit' ? '<div class="mlbl">forfeit</div>' : ''}</div>`).join('')}</div>`).join('')}</div></div>`;
|
||||
}).join('')}</section>`;
|
||||
return `<div class="bstage">${isDouble ? `<h3>${title}</h3>` : ''}${bracketView === 'list' ? bracketList(stage, ms) : bracketTree(stage, ms)}</div>`;
|
||||
}).join('');
|
||||
return `<section class="card bracketwrap ${bracketView === 'fit' ? 'fit' : ''}"><div class="bhead"><h2>${isDouble ? 'Double elimination' : 'Bracket'}</h2>${toggle}</div>${body}${bracketView === 'tree' && !display ? '<p class="muted small bhint">Swipe sideways to see later rounds.</p>' : ''}</section>`;
|
||||
}
|
||||
|
||||
function bracketTree(stage, ms) {
|
||||
const third = ms.find(m => m.label === '3rd place');
|
||||
const tree = ms.filter(m => m !== third);
|
||||
const rounds = [...new Set(tree.map(m => m.round))].sort((a, b) => a - b);
|
||||
const pos = new Map();
|
||||
const feedersOf = m => tree.filter(f => f.feeds === m.id);
|
||||
rounds.forEach((r, ri) => {
|
||||
const inRound = tree.filter(m => m.round === r).sort((a, b) => (a.slot ?? 0) - (b.slot ?? 0));
|
||||
const x = ri * (BOX_W + COL_GAP);
|
||||
let cursor = 0;
|
||||
inRound.forEach(m => {
|
||||
const fs = feedersOf(m).map(f => pos.get(f.id)).filter(Boolean);
|
||||
let y;
|
||||
if (fs.length) y = fs.reduce((a, p) => a + p.y, 0) / fs.length;
|
||||
else y = cursor;
|
||||
y = Math.max(y, cursor);
|
||||
pos.set(m.id, { x, y });
|
||||
cursor = y + BOX_H + ROW_GAP;
|
||||
});
|
||||
});
|
||||
let height = Math.max(...[...pos.values()].map(p => p.y)) + BOX_H;
|
||||
let width = rounds.length * (BOX_W + COL_GAP) - COL_GAP;
|
||||
if (third) { const f = pos.get(tree.find(m => m.round === rounds.at(-1))?.id) ?? { x: 0, y: 0 }; pos.set(third.id, { x: f.x, y: height + ROW_GAP * 2 }); height += ROW_GAP * 2 + BOX_H; }
|
||||
const paths = tree.filter(m => m.feeds && pos.has(m.feeds)).map(m => {
|
||||
const a = pos.get(m.id), b = pos.get(m.feeds);
|
||||
const x1 = a.x + BOX_W, y1 = a.y + BOX_H / 2, x2 = b.x, y2 = b.y + BOX_H / 2, xm = x1 + COL_GAP / 2;
|
||||
const hot = m.winner && isMineId(m.winner);
|
||||
return `<path d="M${x1} ${y1} H${xm} V${y2} H${x2}" class="${m.winner ? 'decided' : ''} ${hot ? 'mine' : ''}"/>`;
|
||||
}).join('');
|
||||
const boxes = [...pos.entries()].map(([id, p]) => matchBox(ms.find(m => m.id === id), p)).join('');
|
||||
const labels = rounds.map((r, ri) => `<div class="rlbl" style="left:${ri * (BOX_W + COL_GAP)}px;width:${BOX_W}px">${roundName(stage, r, rounds.length, tree)}</div>`).join('');
|
||||
return `<div class="btree-scroll"><div class="btree" style="width:${width}px;height:${height + 22}px"><div class="rlbls">${labels}</div><div class="bcanvas" style="top:22px"><svg width="${width}" height="${height}" aria-hidden="true">${paths}</svg>${boxes}</div></div></div>`;
|
||||
}
|
||||
|
||||
function matchBox(m, p) {
|
||||
const row = (t, side) => {
|
||||
const won = m.winner && t && m.winner === t.id;
|
||||
const pts = m.sets[0] ? m.sets.map(s => s[side]).join(' ') : (m.live && m.status === 'live' ? m.live[side] : '');
|
||||
return `<div class="brow ${won ? 'won' : ''} ${t && isMineId(t.id) ? 'mine' : ''}"><span class="bn">${t ? esc(t.name) : `<span class="tbd">${feedLabel(m, side)}</span>`}</span><span class="bs mono">${pts}</span></div>`;
|
||||
};
|
||||
const tag = m.status === 'live' ? `<span class="btag live">Court ${m.court}</span>` : m.status === 'on_deck' ? `<span class="btag">On deck${m.court ? ` · C${m.court}` : ''}</span>` : m.status === 'forfeit' ? '<span class="btag">Forfeit</span>' : m.label ? `<span class="btag">${esc(m.label)}</span>` : '';
|
||||
return `<div class="bm ${m.status} ${isMine(m) ? 'mine' : ''}" style="left:${p.x}px;top:${p.y}px;width:${BOX_W}px;height:${BOX_H}px">${row(m.a, 0)}${row(m.b, 1)}${tag}</div>`;
|
||||
}
|
||||
|
||||
function feedLabel(m, side) {
|
||||
// what fills this slot later: winner/loser of which match
|
||||
const wantSide = side === 0 ? 'A' : 'B';
|
||||
const w = state.bracket.find(f => f.feeds === m.id && f.feedsSide === wantSide);
|
||||
if (w) return `W ${shortRef(w)}`;
|
||||
const l = state.bracket.find(f => f.loserFeeds === m.id && f.loserFeedsSide === wantSide);
|
||||
if (l) return `L ${shortRef(l)}`;
|
||||
return 'TBD';
|
||||
}
|
||||
const shortRef = m => m.stage === 'losers' ? `LB${m.round}.${m.slot}` : m.stage === 'final' ? 'final' : `R${m.round}.${m.slot}`;
|
||||
|
||||
function bracketList(stage, ms) {
|
||||
const rounds = [...new Set(ms.map(m => m.round))].sort((a, b) => a - b);
|
||||
return rounds.map(r => `<div class="blist"><div class="rlbl">${roundName(stage, r, rounds.length, ms)}</div>${ms.filter(m => m.round === r).map(m => `<div class="bm list ${m.status} ${isMine(m) ? 'mine' : ''}">${['a', 'b'].map((k, i) => { const t = m[k]; const won = m.winner && t && m.winner === t.id; return `<div class="brow ${won ? 'won' : ''} ${t && isMineId(t.id) ? 'mine' : ''}"><span class="bn">${t ? esc(t.name) : `<span class="tbd">${feedLabel(m, i)}</span>`}</span><span class="bs mono">${m.sets[0] ? m.sets.map(s => s[i]).join(' ') : (m.live && m.status === 'live' ? m.live[i] : '')}</span></div>`; }).join('')}${m.status === 'live' ? `<span class="btag live">Court ${m.court}</span>` : m.status === 'on_deck' ? `<span class="btag">On deck${m.court ? ` · C${m.court}` : ''}</span>` : m.status === 'forfeit' ? '<span class="btag">Forfeit</span>' : m.label ? `<span class="btag">${esc(m.label)}</span>` : ''}</div>`).join('')}</div>`).join('');
|
||||
}
|
||||
const isMineId = id => myTeam && id === myTeam;
|
||||
|
||||
function fitBracket() {
|
||||
if (bracketView !== 'fit') return;
|
||||
document.querySelectorAll('.btree-scroll').forEach(sc => {
|
||||
const tree = sc.firstElementChild;
|
||||
const w = parseFloat(tree.style.width), h = parseFloat(tree.style.height);
|
||||
const scale = Math.min(1, (sc.clientWidth - 2) / w);
|
||||
tree.style.transform = `scale(${scale})`;
|
||||
tree.style.transformOrigin = '0 0';
|
||||
sc.style.height = `${h * scale}px`;
|
||||
});
|
||||
}
|
||||
document.addEventListener('click', e => {
|
||||
const b = e.target.closest('[data-bview]');
|
||||
if (!b) return;
|
||||
bracketView = b.dataset.bview;
|
||||
try { localStorage.setItem('courtside.bracketView', bracketView); } catch {}
|
||||
render();
|
||||
});
|
||||
window.addEventListener('resize', fitBracket);
|
||||
|
||||
function roundName(stage, r, total, ms) {
|
||||
if (stage === 'final') return r === 1 ? 'Grand final' : 'Reset';
|
||||
if (stage === 'final') return r === 1 ? 'Grand final' : 'Bracket reset';
|
||||
if (stage === 'losers') return `LB round ${r}`;
|
||||
const left = total - r;
|
||||
const inRound = ms.filter(m => m.round === r && m.label !== '3rd place').length;
|
||||
|
||||
Reference in New Issue
Block a user