Skip to content

Commit 5d169e9

Browse files
Leonabcd123fehmer
andauthored
refactor: remove JQuery from pages directory (@Leonabcd123) (monkeytypegame#7237)
- [x] 404 - [x] about - [x] account-settings - [x] account - [x] friends - [x] leaderboards - [x] loading - [x] login - [x] page - [x] profile-search - [x] profile - [x] settings - [x] test Before merging make sure to load every changed page to check for the qsa notification. --------- Co-authored-by: Christian Fehmer <[email protected]>
1 parent fd177c9 commit 5d169e9

File tree

10 files changed

+551
-471
lines changed

10 files changed

+551
-471
lines changed

frontend/src/ts/pages/about.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import * as Skeleton from "../utils/skeleton";
1010
import { TypingStats, SpeedHistogram } from "@monkeytype/schemas/public";
1111
import { getNumberWithMagnitude, numberWithSpaces } from "../utils/numbers";
1212
import { tryCatch } from "@monkeytype/util/trycatch";
13-
import { qsr } from "../utils/dom";
13+
import { qs, qsr, onWindowLoad } from "../utils/dom";
1414

1515
function reset(): void {
16-
$(".pageAbout .contributors").empty();
17-
$(".pageAbout .supporters").empty();
16+
qs(".pageAbout .contributors")?.empty();
17+
qs(".pageAbout .supporters")?.empty();
1818

1919
ChartController.globalSpeedHistogram.getDataset("count").data = [];
2020
void ChartController.globalSpeedHistogram.updateColors();
@@ -43,11 +43,11 @@ function updateStatsAndHistogram(): void {
4343
end: secondsRounded * 1000,
4444
});
4545

46-
$(".pageAbout #totalTimeTypingStat .val").text(
46+
qs(".pageAbout #totalTimeTypingStat .val")?.setText(
4747
timeTypingDuration.years?.toString() ?? "",
4848
);
49-
$(".pageAbout #totalTimeTypingStat .valSmall").text("years");
50-
$(".pageAbout #totalTimeTypingStat").attr(
49+
qs(".pageAbout #totalTimeTypingStat .valSmall")?.setText("years");
50+
qs(".pageAbout #totalTimeTypingStat")?.setAttribute(
5151
"aria-label",
5252
numberWithSpaces(Math.round(secondsRounded / 3600)) + " hours",
5353
);
@@ -56,15 +56,15 @@ function updateStatsAndHistogram(): void {
5656
typingStatsResponseData.testsStarted,
5757
);
5858

59-
$(".pageAbout #totalStartedTestsStat .val").text(
59+
qs(".pageAbout #totalStartedTestsStat .val")?.setText(
6060
startedWithMagnitude.rounded < 10
61-
? startedWithMagnitude.roundedTo2
62-
: startedWithMagnitude.rounded,
61+
? startedWithMagnitude.roundedTo2.toString()
62+
: startedWithMagnitude.rounded.toString(),
6363
);
64-
$(".pageAbout #totalStartedTestsStat .valSmall").text(
64+
qs(".pageAbout #totalStartedTestsStat .valSmall")?.setText(
6565
startedWithMagnitude.orderOfMagnitude,
6666
);
67-
$(".pageAbout #totalStartedTestsStat").attr(
67+
qs(".pageAbout #totalStartedTestsStat")?.setAttribute(
6868
"aria-label",
6969
numberWithSpaces(typingStatsResponseData.testsStarted) + " tests",
7070
);
@@ -73,15 +73,15 @@ function updateStatsAndHistogram(): void {
7373
typingStatsResponseData.testsCompleted,
7474
);
7575

76-
$(".pageAbout #totalCompletedTestsStat .val").text(
76+
qs(".pageAbout #totalCompletedTestsStat .val")?.setText(
7777
completedWIthMagnitude.rounded < 10
78-
? completedWIthMagnitude.roundedTo2
79-
: completedWIthMagnitude.rounded,
78+
? completedWIthMagnitude.roundedTo2.toString()
79+
: completedWIthMagnitude.rounded.toString(),
8080
);
81-
$(".pageAbout #totalCompletedTestsStat .valSmall").text(
81+
qs(".pageAbout #totalCompletedTestsStat .valSmall")?.setText(
8282
completedWIthMagnitude.orderOfMagnitude,
8383
);
84-
$(".pageAbout #totalCompletedTestsStat").attr(
84+
qs(".pageAbout #totalCompletedTestsStat")?.setAttribute(
8585
"aria-label",
8686
numberWithSpaces(typingStatsResponseData.testsCompleted) + " tests",
8787
);
@@ -212,6 +212,6 @@ export const page = new Page({
212212
},
213213
});
214214

215-
$(() => {
215+
onWindowLoad(() => {
216216
Skeleton.save("pageAbout");
217217
});

0 commit comments

Comments
 (0)