Skip to content

[#30] Richer session mix + instant next round #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
javaisbetterthanpython wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[#30] Richer session mix + instant next round #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7adede8
[#30] Richer session mix + instant next round
cincrement Jun 9, 2026
7714806
Update issue queue: #30 in review (PR #40).
cincrement Jun 9, 2026
14cc0e2
[#30] Fix worker race that hung round generation
cincrement Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/ISSUE_QUEUE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Updated by the orchestrator. Status: `open` | `in-progress` | `in-review` | `don

| Priority | Issue | Title | Status | Depends on | PR |
|----------|-------|-------|--------|------------|-----|
| 1 | [#30](https://github.com/javaisbetterthanpython/jumbled-doubles-enhanced/issues/30) | Richer session mix + instant next round | open | — | — |
| 1 | [#30](https://github.com/javaisbetterthanpython/jumbled-doubles-enhanced/issues/30) | Richer session mix + instant next round | in-review | — | [#40](https://github.com/javaisbetterthanpython/jumbled-doubles-enhanced/pull/40) |
| 2 | [#31](https://github.com/javaisbetterthanpython/jumbled-doubles-enhanced/issues/31) | Edit player names (in-game + setup) | done | — | [#37](https://github.com/javaisbetterthanpython/jumbled-doubles-enhanced/pull/37) |
| 3 | [#32](https://github.com/javaisbetterthanpython/jumbled-doubles-enhanced/issues/32) | Recent matchup spacing — formal guarantee | open | #30 | — |
| 4 | [#33](https://github.com/javaisbetterthanpython/jumbled-doubles-enhanced/issues/33) | Skill groups — foundation (data model + UI) | open | — | — |
Expand Down
4 changes: 3 additions & 1 deletion pages/new.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { PairLinkIcon } from "../src/PlayerBadge";
import {
newGame,
useShufflerDispatch,
useShufflerPregen,
useShufflerState,
useShufflerWorker,
} from "../src/useShuffler";
Expand Down Expand Up @@ -70,6 +71,7 @@ function renameInPairs(
function NewGame() {
const router = useRouter();
const state = useShufflerState();
const pregen = useShufflerPregen();
const { playersById } = state;
const dispatch = useShufflerDispatch();
const worker = useShufflerWorker();
Expand Down Expand Up @@ -173,7 +175,7 @@ function NewGame() {
courts: courtCount,
courtNames: customizeCourtNames ? courtNames : [],
fixedPairs,
});
}, pregen);
router.push("/rounds");
};

Expand Down
17 changes: 13 additions & 4 deletions pages/rounds.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import {
editCourts,
editPlayers,
newRound,
usePregenerateNextRound,
useShufflerDispatch,
useShufflerPregen,
useShufflerState,
useShufflerWorker,
} from "../src/useShuffler";
Expand All @@ -30,6 +32,8 @@ export default function Rounds() {
const state = useShufflerState();
const dispatch = useShufflerDispatch();
const worker = useShufflerWorker();
const pregen = useShufflerPregen();
usePregenerateNextRound();

const [sitoutModal, setSitoutModal] = useState(false);
const [playersModal, setPlayersModal] = useState(false);
Expand Down Expand Up @@ -109,7 +113,7 @@ export default function Rounds() {
await newRound(dispatch, state, worker, {
regenerate: true,
volunteerSitouts,
});
}, pregen);
setSitoutModal(false);
}}
/>
Expand All @@ -121,7 +125,7 @@ export default function Rounds() {
newPlayers,
fixedPairs,
regenerate,
});
}, pregen);
setPlayersModal(false);
}}
/>
Expand All @@ -132,7 +136,7 @@ export default function Rounds() {
await editCourts(dispatch, state, worker, {
regenerate,
courts,
});
}, pregen);
setCourtsModal(false);
}}
/>
Expand Down Expand Up @@ -177,6 +181,11 @@ export default function Rounds() {
{state.generating && !round ? (
<p className="text-center text-lg my-8">Jumbling the next round…</p>
) : null}
{round?.repeatNote ? (
<p className="text-sm text-neutral-500 text-center mb-4">
{round.repeatNote}
</p>
) : null}
<div className="flex gap-4 items-stretch justify-center flex-wrap">
{/* Sitting out */}{" "}
<div className="basis-full sm:basis-64 md:basis-64 xl:basis-64">
Expand Down Expand Up @@ -278,7 +287,7 @@ export default function Rounds() {
onPress={async () => {
await newRound(dispatch, state, worker, {
volunteerSitouts: [],
});
}, pregen);
}}
className="bg-gradient-to-l from-blue-600 to-pink-600 text-white"
>
Expand Down
Loading