Skip to content

[pull] master from monkeytypegame:master #727

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

Merged
pull merged 2 commits into from
Dec 14, 2025
Merged

[pull] master from monkeytypegame:master #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38f3fc2
refactor: Remove JQuery from account-settings (@Leonabcd123, @fehmer)…
Leonabcd123 Dec 14, 2025
fd8001c
fix(custom-text): Reset long custom text progress to start of word (@…
Leonabcd123 Dec 14, 2025
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
10 changes: 3 additions & 7 deletions frontend/src/ts/elements/account-button.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,11 @@ export function update(): void {
accountButtonAndMenuEl
.qs(".menu .items .goToProfile")
?.setAttribute("href", `/profile/${name}`);
void Misc.swapElements(
loginButtonEl.native,
accountButtonAndMenuEl.native,
250,
);
void Misc.swapElements(loginButtonEl, accountButtonAndMenuEl, 250);
} else {
void Misc.swapElements(
accountButtonAndMenuEl.native,
loginButtonEl.native,
accountButtonAndMenuEl,
loginButtonEl,
250,
async () => {
updateName("");
Expand Down
17 changes: 5 additions & 12 deletions frontend/src/ts/elements/settings/theme-picker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import * as ActivePage from "../../states/active-page";
import { CustomThemeColors, ThemeName } from "@monkeytype/schemas/configs";
import { captureException } from "../../sentry";
import { ThemesListSorted } from "../../constants/themes";
import { qs } from "../../utils/dom";

function updateActiveButton(): void {
let activeThemeName: string = Config.theme;
Expand Down Expand Up @@ -310,22 +311,14 @@ export function updateActiveTab(): void {

if (Config.customTheme) {
void Misc.swapElements(
document.querySelector(
'.pageSettings [tabContent="preset"]',
) as HTMLElement,
document.querySelector(
'.pageSettings [tabContent="custom"]',
) as HTMLElement,
qs('.pageSettings [tabContent="preset"]'),
qs('.pageSettings [tabContent="custom"]'),
250,
);
} else {
void Misc.swapElements(
document.querySelector(
'.pageSettings [tabContent="custom"]',
) as HTMLElement,
document.querySelector(
'.pageSettings [tabContent="preset"]',
) as HTMLElement,
qs('.pageSettings [tabContent="custom"]'),
qs('.pageSettings [tabContent="preset"]'),
250,
);
}
Expand Down
140 changes: 68 additions & 72 deletions frontend/src/ts/pages/account-settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import * as BlockedUserTable from "../elements/account-settings/blocked-user-tab
import * as Notifications from "../elements/notifications";
import { z } from "zod";
import * as AuthEvent from "../observables/auth-event";
import { qsr } from "../utils/dom";
import { qs, qsr, onDocumentReady } from "../utils/dom";

const pageElement = $(".page.pageAccountSettings");
const pageElement = qsr(".page.pageAccountSettings");

const StateSchema = z.object({
tab: z.enum([
Expand All @@ -34,9 +34,9 @@ const state: State = {
};

function updateAuthenticationSections(): void {
pageElement.find(".section.passwordAuthSettings button").addClass("hidden");
pageElement.find(".section.googleAuthSettings button").addClass("hidden");
pageElement.find(".section.githubAuthSettings button").addClass("hidden");
pageElement.qs(".section.passwordAuthSettings button")?.addClass("hidden");
pageElement.qs(".section.googleAuthSettings button")?.addClass("hidden");
pageElement.qs(".section.githubAuthSettings button")?.addClass("hidden");

const user = getAuthenticatedUser();
if (user === null) return;
Expand All @@ -53,134 +53,128 @@ function updateAuthenticationSections(): void {

if (passwordProvider) {
pageElement
.find(".section.passwordAuthSettings #emailPasswordAuth")
.removeClass("hidden");
.qs(".section.passwordAuthSettings #emailPasswordAuth")
?.removeClass("hidden");
pageElement
.find(".section.passwordAuthSettings #passPasswordAuth")
.removeClass("hidden");
.qs(".section.passwordAuthSettings #passPasswordAuth")
?.removeClass("hidden");
if (googleProvider || githubProvider) {
pageElement
.find(".section.passwordAuthSettings #removePasswordAuth")
.removeClass("hidden");
.qs(".section.passwordAuthSettings #removePasswordAuth")
?.removeClass("hidden");
}
} else {
pageElement
.find(".section.passwordAuthSettings #addPasswordAuth")
.removeClass("hidden");
.qs(".section.passwordAuthSettings #addPasswordAuth")
?.removeClass("hidden");
}

if (googleProvider) {
pageElement
.find(".section.googleAuthSettings #removeGoogleAuth")
.removeClass("hidden");
.qs(".section.googleAuthSettings #removeGoogleAuth")
?.removeClass("hidden");
if (passwordProvider || githubProvider) {
pageElement
.find(".section.googleAuthSettings #removeGoogleAuth")
.removeClass("disabled");
.qs(".section.googleAuthSettings #removeGoogleAuth")
?.removeClass("disabled");
} else {
pageElement
.find(".section.googleAuthSettings #removeGoogleAuth")
.addClass("disabled");
.qs(".section.googleAuthSettings #removeGoogleAuth")
?.addClass("disabled");
}
} else {
pageElement
.find(".section.googleAuthSettings #addGoogleAuth")
.removeClass("hidden");
.qs(".section.googleAuthSettings #addGoogleAuth")
?.removeClass("hidden");
}
if (githubProvider) {
pageElement
.find(".section.githubAuthSettings #removeGithubAuth")
.removeClass("hidden");
.qs(".section.githubAuthSettings #removeGithubAuth")
?.removeClass("hidden");
if (passwordProvider || googleProvider) {
pageElement
.find(".section.githubAuthSettings #removeGithubAuth")
.removeClass("disabled");
.qs(".section.githubAuthSettings #removeGithubAuth")
?.removeClass("disabled");
} else {
pageElement
.find(".section.githubAuthSettings #removeGithubAuth")
.addClass("disabled");
.qs(".section.githubAuthSettings #removeGithubAuth")
?.addClass("disabled");
}
} else {
pageElement
.find(".section.githubAuthSettings #addGithubAuth")
.removeClass("hidden");
.qs(".section.githubAuthSettings #addGithubAuth")
?.removeClass("hidden");
}
}

function updateIntegrationSections(): void {
//no code and no discord
if (!isAuthenticated()) {
pageElement.find(".section.discordIntegration").addClass("hidden");
pageElement.qs(".section.discordIntegration")?.addClass("hidden");
} else {
if (!getSnapshot()) return;
pageElement.find(".section.discordIntegration").removeClass("hidden");
pageElement.qs(".section.discordIntegration")?.removeClass("hidden");

if (getSnapshot()?.discordId === undefined) {
//show button
pageElement
.find(".section.discordIntegration .buttons")
.removeClass("hidden");
pageElement.find(".section.discordIntegration .info").addClass("hidden");
.qs(".section.discordIntegration .buttons")
?.removeClass("hidden");
pageElement.qs(".section.discordIntegration .info")?.addClass("hidden");
} else {
pageElement
.find(".section.discordIntegration .buttons")
.addClass("hidden");
.qs(".section.discordIntegration .buttons")
?.addClass("hidden");
pageElement
.find(".section.discordIntegration .info")
.removeClass("hidden");
.qs(".section.discordIntegration .info")
?.removeClass("hidden");
}
}
}

function updateTabs(): void {
void swapElements(
pageElement.find(".tab.active")[0] as HTMLElement,
pageElement.find(`.tab[data-tab="${state.tab}"]`)[0] as HTMLElement,
pageElement.qs(".tab.active"),
pageElement.qs(`.tab[data-tab="${state.tab}"]`),
250,
async () => {
//
},
async () => {
pageElement.find(".tab").removeClass("active");
pageElement.find(`.tab[data-tab="${state.tab}"]`).addClass("active");
pageElement.qs(".tab")?.removeClass("active");
pageElement.qs(`.tab[data-tab="${state.tab}"]`)?.addClass("active");
},
);
pageElement.find("button").removeClass("active");
pageElement.find(`button[data-tab="${state.tab}"]`).addClass("active");
pageElement.qs("button")?.removeClass("active");
pageElement.qs(`button[data-tab="${state.tab}"]`)?.addClass("active");
}

function updateAccountSections(): void {
pageElement.qs(".section.optOutOfLeaderboards .optedOut")?.addClass("hidden");
pageElement
.find(".section.optOutOfLeaderboards .optedOut")
.addClass("hidden");
.qs(".section.optOutOfLeaderboards .buttons")
?.removeClass("hidden");
pageElement.qs(".section.setStreakHourOffset .info")?.addClass("hidden");
pageElement
.find(".section.optOutOfLeaderboards .buttons")
.removeClass("hidden");
pageElement.find(".section.setStreakHourOffset .info").addClass("hidden");
pageElement
.find(".section.setStreakHourOffset .buttons")
.removeClass("hidden");
.qs(".section.setStreakHourOffset .buttons")
?.removeClass("hidden");

const snapshot = getSnapshot();
if (snapshot?.lbOptOut === true) {
pageElement
.find(".section.optOutOfLeaderboards .optedOut")
.removeClass("hidden");
.qs(".section.optOutOfLeaderboards .optedOut")
?.removeClass("hidden");
pageElement
.find(".section.optOutOfLeaderboards .buttons")
.addClass("hidden");
.qs(".section.optOutOfLeaderboards .buttons")
?.addClass("hidden");
}
if (snapshot?.streakHourOffset !== undefined) {
pageElement
.find(".section.setStreakHourOffset .info")
.removeClass("hidden");
pageElement.qs(".section.setStreakHourOffset .info")?.removeClass("hidden");
const sign = snapshot?.streakHourOffset > 0 ? "+" : "";
pageElement
.find(".section.setStreakHourOffset .info span")
.text(sign + snapshot?.streakHourOffset);
pageElement
.find(".section.setStreakHourOffset .buttons")
.addClass("hidden");
.qs(".section.setStreakHourOffset .info span")
?.setText(sign + snapshot?.streakHourOffset);
pageElement.qs(".section.setStreakHourOffset .buttons")?.addClass("hidden");
}
}

Expand All @@ -195,15 +189,17 @@ export function updateUI(): void {
page.setUrlParams(state);
}

$(".page.pageAccountSettings").on("click", ".tabs button", (event) => {
state.tab = $(event.target).data("tab") as State["tab"];
qs(".page.pageAccountSettings")?.onChild("click", ".tabs button", (event) => {
state.tab = (event.target as HTMLElement).getAttribute(
"data-tab",
) as State["tab"];
updateTabs();
page.setUrlParams(state);
});

$(
qs(
".page.pageAccountSettings .section.discordIntegration .getLinkAndGoToOauth",
).on("click", () => {
)?.on("click", () => {
Loader.show();
void Ape.users.getDiscordOAuth().then((response) => {
if (response.status === 200) {
Expand All @@ -217,7 +213,7 @@ $(
});
});

$(".page.pageAccountSettings #setStreakHourOffset").on("click", () => {
qs(".page.pageAccountSettings #setStreakHourOffset")?.on("click", () => {
StreakHourOffsetModal.show();
});

Expand All @@ -230,7 +226,7 @@ AuthEvent.subscribe((event) => {
export const page = new PageWithUrlParams({
id: "accountSettings",
display: "Account Settings",
element: qsr(".page.pageAccountSettings"),
element: pageElement,
path: "/account-settings",
urlParamsSchema: UrlParameterSchema,
afterHide: async (): Promise<void> => {
Expand All @@ -241,11 +237,11 @@ export const page = new PageWithUrlParams({
state.tab = options.urlParams.tab;
}
Skeleton.append("pageAccountSettings", "main");
pageElement.find(`.tab[data-tab="${state.tab}"]`).addClass("active");
pageElement.qs(`.tab[data-tab="${state.tab}"]`)?.addClass("active");
updateUI();
},
});

$(() => {
onDocumentReady(() => {
Skeleton.save("pageAccountSettings");
});
11 changes: 10 additions & 1 deletion frontend/src/ts/test/test-logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,16 @@ export async function finish(difficultyFailed = false): Promise<void> {
) {
// They bailed out

const historyLength = TestInput.input.getHistory()?.length;
const history = TestInput.input.getHistory();
let historyLength = history?.length;
const wordIndex = historyLength - 1;

const lastWordInputLength = history[wordIndex]?.length ?? 0;

if (lastWordInputLength < TestWords.words.get(wordIndex).length) {
historyLength--;
}

const newProgress =
CustomText.getCustomTextLongProgress(customTextName) + historyLength;
CustomText.setCustomTextLongProgress(customTextName, newProgress);
Expand Down
Loading
Loading