Skip to content

[pull] master from monkeytypegame:master #844

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 3 commits into from
Mar 24, 2026
Merged

[pull] master from monkeytypegame:master #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a049d2
chore: bump oxc version
Miodec Mar 24, 2026
e7cd1a0
chore: bump typescript version
Miodec Mar 24, 2026
4d936d7
refactor: solid test config (@miodec) (#7701)
Miodec Mar 24, 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
6 changes: 3 additions & 3 deletions backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@
"@vitest/coverage-v8": "4.0.15",
"concurrently": "8.2.2",
"openapi3-ts": "2.0.2",
"oxlint": "1.50.0",
"oxlint-tsgolint": "0.14.2",
"oxlint": "1.57.0",
"oxlint-tsgolint": "0.17.3",
"readline-sync": "1.4.10",
"supertest": "7.1.4",
"testcontainers": "11.11.0",
"tsx": "4.21.0",
"typescript": "6.0.0-beta",
"typescript": "6.0.2",
"vitest": "4.1.0",
"yaml": "2.8.2"
},
Expand Down
9 changes: 0 additions & 9 deletions frontend/__tests__/components/ui/form/InputField.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,6 @@ function makeField(name: string, value = "") {
}

describe("InputField", () => {
it("renders input with field name as id", () => {
const field = makeField("email");
render(() => <InputField field={() => field} />);

const input = screen.getByRole("textbox");
expect(input).toHaveAttribute("id", "email");
expect(input).toHaveAttribute("name", "email");
});

it("uses field name as default placeholder", () => {
const field = makeField("username");
render(() => <InputField field={() => field} />);
Expand Down
8 changes: 4 additions & 4 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,16 @@
"madge": "8.0.0",
"magic-string": "0.30.17",
"normalize.css": "8.0.1",
"oxlint": "1.50.0",
"oxlint-tsgolint": "0.14.2",
"oxlint": "1.57.0",
"oxlint-tsgolint": "0.17.3",
"postcss": "8.5.8",
"sass": "1.70.0",
"solid-devtools": "0.34.5",
"solid-js": "1.9.10",
"subset-font": "2.3.0",
"tailwindcss": "4.1.18",
"tsx": "4.21.0",
"typescript": "6.0.0-beta",
"typescript": "6.0.2",
"unplugin-inject-preload": "3.0.0",
"vite": "8.0.1",
"vite-bundle-visualizer": "1.2.1",
Expand All @@ -126,7 +126,7 @@
},
"lint-staged": {
"*": [
"oxfmt --no-error-on-unmatched-pattern"
"oxfmt --no-error-on-unmatched-pattern -c ../.oxfmtrc.json"
],
"*.{ts,js,tsx}": [
"oxlint --type-aware --type-check"
Expand Down
104 changes: 1 addition & 103 deletions frontend/src/html/pages/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,108 +1,6 @@
<div class="page pageTest full-width content-grid hidden" data-nosnippet>
<div id="testConfig" class="full-width">
<div class="row">
<div class="puncAndNum">
<button class="textButton punctuationMode">
<i class="fas fa-fw fa-at"></i>
punctuation
</button>
<button class="textButton numbersMode">
<i class="fas fa-fw fa-hashtag"></i>
numbers
</button>
</div>

<div class="spacer leftSpacer"></div>

<div class="mode">
<button class="textButton" mode="time">
<i class="fas fa-fw fa-clock"></i>
time
</button>
<button class="textButton" mode="words">
<i class="fas fa-fw fa-font"></i>
words
</button>
<button class="textButton" mode="quote">
<i class="fas fa-fw fa-quote-left"></i>
quote
</button>
<button class="textButton" mode="zen">
<i class="fas fa-fw fa-mountain"></i>
zen
</button>
<button class="textButton" mode="custom">
<i class="fas fa-fw fa-wrench"></i>
custom
</button>
</div>

<div class="spacer rightSpacer"></div>

<div class="time">
<button class="textButton" timeConfig="15"><span>15</span></button>
<button class="textButton" timeConfig="30"><span>30</span></button>
<button class="textButton" timeConfig="60"><span>60</span></button>
<button class="textButton" timeConfig="120"><span>120</span></button>
<button class="textButton" timeConfig="custom">
<i class="fas fa-fw fa-tools"></i>
</button>
</div>

<div class="wordCount">
<button class="textButton" wordCount="10"><span>10</span></button>
<button class="textButton" wordCount="25"><span>25</span></button>
<button class="textButton" wordCount="50"><span>50</span></button>
<button class="textButton" wordCount="100"><span>100</span></button>
<button class="textButton" wordCount="custom">
<i class="fas fa-fw fa-tools"></i>
</button>
</div>

<div class="quoteLength">
<button class="textButton" quotelength="all">all</button>
<button class="textButton" quotelength="0">short</button>
<button class="textButton" quotelength="1">medium</button>
<button class="textButton" quotelength="2">long</button>
<button class="textButton" quotelength="3">thicc</button>
<button class="textButton favorite hidden" quotelength="-3">
<i class="fas fa-heart"></i>
</button>
<button class="textButton" quotelength="-2">
<i class="fas fa-search"></i>
</button>
</div>

<div class="zen">
<div
class="textButton"
style="
width: 0;
padding-left: 0;
padding-right: 0;
margin-left: 0;
margin-right: 0;
"
>

</div>
</div>

<div class="customText">
<button class="textButton">change</button>
</div>
</div>
<button class="shareButton textButton">
<i class="fas fa-fw fa-share"></i>
</button>
</div>
<mount data-component="testconfig"></mount>

<div id="mobileTestConfigButton">
<button>
<i class="fas fa-fw fa-cog"></i>
Test settings
</button>
</div>
<div id="testInitFailed" class="content-grid hidden">
<div class="message">
<div class="text">
Expand Down
144 changes: 0 additions & 144 deletions frontend/src/html/popups.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,108 +131,6 @@
</div>
</dialog>

<dialog id="shareTestSettingsModal" class="modalWrapper hidden">
<!-- <div id="shareTestSettingsPopup"> -->
<div class="modal">
<div class="title">Share test settings</div>
<label class="checkboxWithSub mode">
<input type="checkbox" setting="mode" />
<div>Mode</div>
<div class="sub">Time, Words, Quote, Zen, Custom</div>
</label>
<label class="checkboxWithSub mode2 subgroup hidden">
<input type="checkbox" setting="mode2" />
<div>Mode2</div>
<div class="sub">Test seconds, Test words, Quote Id</div>
</label>
<label class="checkbox customText subgroup hidden">
<input type="checkbox" setting="customText" />
Custom text
<span></span>
</label>
<label class="checkbox punctuation">
<input type="checkbox" setting="punctuation" />
Punctuation
<span></span>
</label>
<label class="checkbox numbers">
<input type="checkbox" setting="numbers" />
Numbers
<span></span>
</label>
<label class="checkbox language">
<input type="checkbox" setting="language" />
Language
<span></span>
</label>
<label class="checkbox difficulty">
<input type="checkbox" setting="difficulty" />
Difficulty
<span></span>
</label>
<label class="checkbox funbox">
<input type="checkbox" setting="funbox" />
Funbox
<span></span>
</label>
<textarea
class="url"
placeholder="url"
value="monkeytype.com"
readonly
></textarea>
<div class="tooLongWarning hidden">
<i class="fas fa-fw fa-exclamation-triangle"></i>
<span>The URL is over 2000 characters long - it might not work</span>
</div>
<!-- </div> -->
</div>
</dialog>

<dialog id="mobileTestConfigModal" class="modalWrapper hidden">
<div class="modal">
<div class="group">
<button class="punctuation">punctuation</button>
<button class="numbers">numbers</button>
</div>
<div class="group modeGroup">
<button data-mode="time">time</button>
<button class="active" data-mode="words">words</button>
<button data-mode="quote">quote</button>
<button data-mode="zen">zen</button>
<button data-mode="custom">custom</button>
</div>
<div class="group timeGroup">
<button data-time="15">15</button>
<button class="button active" data-time="30">30</button>
<button data-time="60">60</button>
<button data-time="120">120</button>
<button data-time="custom">custom</button>
</div>
<div class="group wordsGroup hidden">
<button data-words="10">10</button>
<button data-words="25">25</button>
<button data-words="50">50</button>
<button data-words="100">100</button>
<button data-words="custom">custom</button>
</div>
<div class="group quoteGroup hidden">
<button data-quoteLength="all">all</button>
<button data-quoteLength="0">short</button>
<button data-quoteLength="1">medium</button>
<button data-quoteLength="2">long</button>
<button data-quoteLength="3">thicc</button>
<button id="quote-search-button" data-quoteLength="-2">search</button>
</div>
<div class="group customGroup hidden">
<button class="customChange">change</button>
</div>
<div class="group">
<button class="shareButton">share</button>
</div>
</div>
</dialog>

<div id="videoAdPopupWrapper" class="popupWrapper hidden">
<div id="videoAdPopup">
<div class="preloader">
Expand Down Expand Up @@ -332,48 +230,6 @@
<button>continue</button>
</form>
</dialog>
<dialog id="customWordAmountModal" class="modalWrapper hidden">
<form class="modal">
<div class="title">Custom word amount</div>
<input type="number" value="1" min="0" max="10000" />
<div class="tip">
You can start an infinite test by inputting 0. Then, to stop the test, use
the Bail Out feature (
<kbd>esc</kbd>
or
<kbd>ctrl/cmd</kbd>
+
<kbd>shift</kbd>
+
<kbd>p</kbd>
> Bail Out)
</div>
<button>ok</button>
</form>
</dialog>
<dialog id="customTestDurationModal" class="modalWrapper hidden">
<form class="modal">
<div class="title">Test duration</div>
<div class="preview"></div>
<input value="1" title="test duration" min="0" />
<div class="tip">
You can use "h" for hours and "m" for minutes, for example "1h30m".
<br />
<br />
You can start an infinite test by inputting 0. Then, to stop the test, use
the Bail Out feature (
<kbd>esc</kbd>
or
<kbd>ctrl/cmd</kbd>
+
<kbd>shift</kbd>
+
<kbd>p</kbd>
> Bail Out)
</div>
<button>ok</button>
</form>
</dialog>
<dialog id="userReportModal" class="modalWrapper hidden">
<div class="modal">
<div class="title">Report a user</div>
Expand Down
9 changes: 0 additions & 9 deletions frontend/src/styles/loading.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,3 @@
}
}
}

body.loading {
header nav,
footer,
#testConfig {
pointer-events: none;
user-select: none;
}
}
4 changes: 0 additions & 4 deletions frontend/src/styles/media-queries-blue.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
.content-grid {
--content-max-width: 640px;
}
#testConfig {
font-size: 0.65rem;
--horizontalPadding: 0.55em;
}
#testModesNotice {
font-size: 0.8rem;
}
Expand Down
4 changes: 0 additions & 4 deletions frontend/src/styles/media-queries-green.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
.content-grid {
--content-max-width: 768px;
}
#testConfig {
font-size: 0.7rem;
--horizontalPadding: 0.6em;
}
.pageAccountSettings .main {
gap: 2rem;
.right .tab .section {
Expand Down
6 changes: 0 additions & 6 deletions frontend/src/styles/media-queries-purple.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@
#liveStatsTextBottom {
font-size: 12vw;
}
#testConfig {
display: none;
}
#mobileTestConfigButton {
display: block;
}
#result .wrapper {
.stats {
grid-template-columns: 1fr;
Expand Down
Loading
Loading