Skip to content

Commit c786538

Browse files
fehmerMiodecCopilot
authored
refactor: solid leaderboards (@fehmer, @Miodec) (#7485)
Co-authored-by: Jack <jack@monkeytype.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
1 parent 8d5db5e commit c786538

45 files changed

Lines changed: 2027 additions & 2402 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

frontend/__tests__/components/common/AsyncContent.spec.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@ describe("AsyncContent", () => {
4747
});
4848

4949
it("renders on resolve", async () => {
50-
renderWithQuery({ result: "Test Data" });
50+
const { container } = renderWithQuery({ result: "Test Data" });
5151

5252
await waitFor(() => {
5353
expect(screen.getByTestId("content")).toHaveTextContent("Test Data");
5454
});
55+
const preloader = container.querySelector(".preloader");
56+
expect(preloader).not.toBeInTheDocument();
5557
});
5658

5759
it("renders default error message on fail", async () => {
@@ -205,14 +207,19 @@ describe("AsyncContent", () => {
205207
});
206208

207209
it("renders on resolve", async () => {
208-
renderWithQuery({ first: "First Data", second: "Second Data" });
210+
const { container } = renderWithQuery({
211+
first: "First Data",
212+
second: "Second Data",
213+
});
209214

210215
await waitFor(() => {
211216
expect(screen.getByTestId("first")).toHaveTextContent("First Data");
212217
});
213218
await waitFor(() => {
214219
expect(screen.getByTestId("second")).toHaveTextContent("Second Data");
215220
});
221+
const preloader = container.querySelector(".preloader");
222+
expect(preloader).not.toBeInTheDocument();
216223
});
217224

218225
it("renders default error message on fail", async () => {

frontend/__tests__/components/ui/table/DataTable.spec.tsx

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ type Person = {
3030

3131
const columns = [
3232
{
33+
id: "name",
3334
accessorKey: "name",
3435
header: "Name",
3536
cell: (info: any) => info.getValue(),
36-
meta: { breakpoint: "xxs" },
37+
meta: { maxBreakpoint: "sm" },
3738
},
3839
{
40+
id: "age",
3941
accessorKey: "age",
4042
header: "Age",
4143
cell: (info: any) => info.getValue(),
@@ -144,8 +146,13 @@ describe("DataTable", () => {
144146
});
145147

146148
render(() => <DataTable id="breakpoints" columns={columns} data={data} />);
147-
148-
expect(screen.getByText("Name")).toBeInTheDocument();
149-
expect(screen.queryByText("Age")).not.toBeInTheDocument();
149+
const nameHeader = screen.getByRole("button", {
150+
name: "Name",
151+
}).parentElement;
152+
const ageHeader = screen.getByRole("button", { name: "Age" }).parentElement;
153+
154+
expect(nameHeader).not.toHaveClass("hidden");
155+
expect(nameHeader).toHaveClass("sm:hidden");
156+
expect(ageHeader).toHaveClass("hidden sm:table-cell");
150157
});
151158
});

frontend/src/html/pages/leaderboards.html

Lines changed: 0 additions & 262 deletions
This file was deleted.

frontend/src/index.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
<load src="html/pages/404.html" />
5252
<load src="html/pages/account-settings.html" />
5353
<load src="html/pages/friends.html" />
54-
<load src="html/pages/leaderboards.html" />
54+
<div class="page pageLeaderboards hidden" id="pageLeaderboards">
55+
<mount data-component="leaderboardpage"></mount>
56+
</div>
5557
</main>
5658
<mount data-component="footer"></mount>
5759
<div

frontend/src/styles/index.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
@layer custom-styles {
1919
@import "buttons", "404", "ads", "account", "animations", "caret",
2020
"commandline", "core", "fonts", "inputs", "keymap", "login", "monkey",
21-
"popups", "scroll", "settings", "account-settings", "leaderboards", "test",
22-
"loading", "friends", "media-queries";
21+
"popups", "scroll", "settings", "account-settings", "test", "loading",
22+
"friends", "media-queries";
2323

2424
.chartCanvas {
2525
width: 100% !important;

0 commit comments

Comments
 (0)