Skip to content

fix(tutorial): show Reset after loading a solved lesson URL #1682

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
brenelz wants to merge 1 commit into
base: v2-rebuild
Choose a base branch
from
Open

fix(tutorial): show Reset after loading a solved lesson URL #1682

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions src/routes/(_)tutorial/[[id]].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
Errored,
For,
Loading,
onSettled,
Show,
untrack,
} from "solid-js";
Expand Down Expand Up @@ -115,6 +116,12 @@ export default function Tutorial() {
// Old solidjs.com lesson ids render their new lesson; the host redirects them.
const id = () => canonicalTutorialId(params.id || firstTutorialId);
const solved = () => new URLSearchParams(location.search).has("solved");
// The page is prerendered without the query, so the button follows it only after hydration.
const [hydrated, setHydrated] = createSignal(false);
onSettled(() => {
setHydrated(true);
});
const showSolved = () => hydrated() && solved();
const index = () =>
tutorialDirectory.findIndex((entry) => entry.internalName === id());
const entryAt = (i: number) => {
Expand Down Expand Up @@ -186,9 +193,9 @@ export default function Tutorial() {
>
<a
class="rounded-lg bg-blue-600 px-3 py-1.5 font-semibold text-white hover:bg-blue-700"
href={`/tutorial/${id()}${solved() ? "" : "?solved"}`}
href={`/tutorial/${id()}${showSolved() ? "" : "?solved"}`}
>
{solved() ? "Reset" : "Solve"}
{showSolved() ? "Reset" : "Solve"}
</a>
<div class="flex gap-4">
<Show when={previous()}>
Expand Down
Loading