Skip to content

[pull] master from monkeytypegame:master #766

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 4 commits into from
Jan 14, 2026
Merged

[pull] master from monkeytypegame:master #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c31dd1e
fix: correct streak offset validation to allow .5 decrements (@Chaita…
Chaitanya-Keyal Jan 14, 2026
a795b9d
refactor: convert about page to a component (@fehmer, @miodec) (#7350)
fehmer Jan 14, 2026
d2fd5c0
refactor: restructure the components folder
Miodec Jan 14, 2026
e04d6e8
fix: incorrect path
Miodec Jan 14, 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 frontend/__tests__/components/AnimatedModal.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, it, expect, vi, beforeEach } from "vitest";
import { render } from "@solidjs/testing-library";
import { AnimatedModal } from "../../src/ts/components/AnimatedModal";
import { AnimatedModal } from "../../src/ts/components/common/AnimatedModal";

describe("AnimatedModal", () => {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion frontend/__tests__/components/AsyncContent.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect } from "vitest";
import { render, screen, waitFor } from "@solidjs/testing-library";
import { createResource, Resource } from "solid-js";
import AsyncContent from "../../src/ts/components/AsyncContent";
import AsyncContent from "../../src/ts/components/common/AsyncContent";

describe("AsyncContent", () => {
function renderWithResource<T>(
Expand Down
2 changes: 1 addition & 1 deletion frontend/__tests__/components/Button.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, it, expect, vi, afterEach } from "vitest";
import { render, cleanup } from "@solidjs/testing-library";
import { Button } from "../../src/ts/components/Button";
import { Button } from "../../src/ts/components/common/Button";

describe("Button component", () => {
afterEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion frontend/__tests__/components/ScrollToTop.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect, vi, beforeEach } from "vitest";
import { render } from "@solidjs/testing-library";
import { userEvent } from "@testing-library/user-event";
import { ScrollToTop } from "../../src/ts/components/ScrollToTop";
import { ScrollToTop } from "../../src/ts/components/layout/footer/ScrollToTop";
import * as CoreSignals from "../../src/ts/signals/core";

describe("ScrollToTop", () => {
Expand Down
322 changes: 0 additions & 322 deletions frontend/src/html/pages/about.html
View file
Open in desktop

This file was deleted.

7 changes: 6 additions & 1 deletion frontend/src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@
<div id="ad-vertical-right"></div>
</div>
<load src="html/pages/loading.html" />
<load src="html/pages/about.html" />
<div
class="page pageAbout hidden full-width content-grid"
id="pageAbout"
>
<AboutPage />
</div>
<load src="html/pages/settings.html" />
<load src="html/pages/login.html" />
<load src="html/pages/account.html" />
Expand Down
Loading
Loading