From 33880b3842037a26715d6ffcacbcdc1cc7da8a13 Mon Sep 17 00:00:00 2001 From: Miodec Date: Mon, 10 Nov 2025 14:02:41 +0100 Subject: [PATCH 01/21] chore: fix typo --- frontend/static/languages/indonesian_1k.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/static/languages/indonesian_1k.json b/frontend/static/languages/indonesian_1k.json index f9c0d8bc662d..5ccf30d842a9 100644 --- a/frontend/static/languages/indonesian_1k.json +++ b/frontend/static/languages/indonesian_1k.json @@ -443,7 +443,7 @@ "lebih", "lelah", "lelaki", - "lembab", + "lembap", "lembar", "lembaran", "lembur", From 8aa1f51c2cc2dd51dfcc3d034e6ce4aa1b69f316 Mon Sep 17 00:00:00 2001 From: Miodec Date: Wed, 12 Nov 2025 11:52:23 +0100 Subject: [PATCH 02/21] fix: wpm sometimes goes negative in zen mode kind of a band aid fix but its ok closes #7099 --- frontend/src/ts/test/test-stats.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/frontend/src/ts/test/test-stats.ts b/frontend/src/ts/test/test-stats.ts index 5246d2ebf609..3ca8ae18a7f2 100644 --- a/frontend/src/ts/test/test-stats.ts +++ b/frontend/src/ts/test/test-stats.ts @@ -138,11 +138,18 @@ export function setInvalid(): void { } export function calculateTestSeconds(now?: number): number { - if (now === undefined) { - return (end - start) / 1000; - } else { - return (now - start) / 1000; + let duration = (end - start) / 1000; + + if (now !== undefined) { + duration = (now - start) / 1000; + } + + if (Config.mode === "zen" && duration < 0) { + duration = 0; + console.log("Zen mode with negative duration detected, setting to 0"); } + + return duration; } export function calculateWpmAndRaw( From 9cb19e3ea9e9630fb657f31a6f04ca0c6eacbaa0 Mon Sep 17 00:00:00 2001 From: connermcnicholas <38020254+conner-mcnicholas@users.noreply.github.com> Date: Wed, 12 Nov 2025 03:11:00 -0800 Subject: [PATCH 03/21] feat(theme): added pale_nimbus (@conner-mcnicholas) (#7055) # Description Created a new theme "pale_nimbus" per instructions. ## Screenshots #### ------Normal Test------ test #### ------Flipped Test------ flip #### ------Colorful Test------ colorful #### ------Flipped and Colorful Test------ flip_colorful #### ------Settings------ menu #### ------Stats------ stats --- frontend/src/ts/constants/themes.ts | 6 ++++++ frontend/static/themes/pale_nimbus.css | 12 ++++++++++++ packages/schemas/src/themes.ts | 1 + 3 files changed, 19 insertions(+) create mode 100644 frontend/static/themes/pale_nimbus.css diff --git a/frontend/src/ts/constants/themes.ts b/frontend/src/ts/constants/themes.ts index 65ff67be00df..dd74af172235 100644 --- a/frontend/src/ts/constants/themes.ts +++ b/frontend/src/ts/constants/themes.ts @@ -1114,6 +1114,12 @@ export const themes: Record> = { subColor: "#5b578e", textColor: "#f4e0c9", }, + pale_nimbus: { + bgColor: "#433e4c", + mainColor: "#94ffc2", + subColor: "#ffaca3", + textColor: "#feffdb", + }, }; export const ThemesList: Theme[] = Object.keys(themes) diff --git a/frontend/static/themes/pale_nimbus.css b/frontend/static/themes/pale_nimbus.css new file mode 100644 index 000000000000..ec639f07ee5c --- /dev/null +++ b/frontend/static/themes/pale_nimbus.css @@ -0,0 +1,12 @@ +:root { + --bg-color: #433e4c; + --main-color: #94ffc2; + --caret-color: #9efffd; + --sub-color: #ffaca3; + --sub-alt-color: #694f5e; + --text-color: #feffdb; + --error-color: #ff5c5c; + --error-extra-color: #ff0000; + --colorful-error-color: #ff3874; + --colorful-error-extra-color: #c2386f; +} diff --git a/packages/schemas/src/themes.ts b/packages/schemas/src/themes.ts index c7c8c548ad4a..e31f7724bcd0 100644 --- a/packages/schemas/src/themes.ts +++ b/packages/schemas/src/themes.ts @@ -187,6 +187,7 @@ export const ThemeNameSchema = z.enum( "watermelon", "wavez", "witch_girl", + "pale_nimbus", ], { errorMap: customEnumErrorHandler("Must be a known theme"), From 12e3d65f96c6c8af5a57a3e901193969209f1004 Mon Sep 17 00:00:00 2001 From: Pratham Tandale Date: Wed, 12 Nov 2025 16:41:50 +0530 Subject: [PATCH 04/21] impr(quotes): add English quotes from The Time Traveler's Wife: Novel by Audrey Niffenegger (@prathampt) (#7048) ### Description Added four English quotes from The Time Traveler's Wife: Novel by Audrey Niffenegger ### Checks - [x] Adding quotes? No translation added for the English language quote. - [x] Make sure to include your GitHub username prefixed with @ inside parentheses at the end of the PR title. - [x] Do not include content that contains any libelous or otherwise unlawful, abusive, or obscene text. - [x] Ensure that your contribution meets JSON standards (no trailing comma at the end of a list) - [x] Verify quotes added aren't duplicates of any already present - [x] Verify the length property is correct (length of the text in characters) - [x] Verify the id property is incremented correctly - [x] Please do not add extremely short quotes (less than 60 characters) - [x] Remember to name your pull request properly. For example, if you are adding new quotes for the language French, your pull request should be named impr(quotes): add French quotes. --- frontend/static/quotes/english.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/frontend/static/quotes/english.json b/frontend/static/quotes/english.json index c30ad20ef602..aabb7aaca106 100644 --- a/frontend/static/quotes/english.json +++ b/frontend/static/quotes/english.json @@ -39039,6 +39039,30 @@ "source": "In Search of Lost Time", "id": 7719, "length": 1559 + }, + { + "text": "Love the world and yourself in it, move through it as though it offers no resistance, as though the world is your natural element.", + "source": "The Time Traveler's Wife: Novel by Audrey Niffenegger", + "id": 7720, + "length": 130 + }, + { + "text": "Time is priceless, but it’s free. You can't own it, you can use it. You can spend it. But you can't keep it. Once you've lost it you can never get it back.", + "source": "The Time Traveler's Wife: Novel by Audrey Niffenegger", + "id": 7721, + "length": 155 + }, + { + "text": "Don't you think it's better to be extremely happy for a short while, even if you lose it, than to be just okay for your whole life?", + "source": "The Time Traveler's Wife: Novel by Audrey Niffenegger", + "id": 7722, + "length": 131 + }, + { + "text": "Home sweet home. No place like home. Take me home, country roads. Home is where the heart is. But my heart is here. So I must be home.", + "source": "The Time Traveler's Wife: Novel by Audrey Niffenegger", + "id": 7723, + "length": 134 } ] } From c76f8dc6646089577f43743e2e64240bbef2dce0 Mon Sep 17 00:00:00 2001 From: Aman Pal <82009045+AmanDevelops@users.noreply.github.com> Date: Wed, 12 Nov 2025 17:00:04 +0530 Subject: [PATCH 05/21] fix: add input validation for new filter preset modal (@amandevelops) (#7073) ### Description Added input validation for `New filter preset` modal in frontend and display appropriate indicators in realtime #### Updated UI Screenshot From 2025-11-03 02-08-40 Screenshot From 2025-11-03 02-08-26 ### Checks - [ ] Adding quotes? - [ ] Make sure to include translations for the quotes in the description (or another comment) so we can verify their content. - [ ] Adding a language? - Make sure to follow the [languages documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/LANGUAGES.md) - [ ] Add language to `packages/schemas/src/languages.ts` - [ ] Add language to exactly one group in `frontend/src/ts/constants/languages.ts` - [ ] Add language json file to `frontend/static/languages` - [ ] Adding a theme? - Make sure to follow the [themes documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/THEMES.md) - [ ] Add theme to `packages/schemas/src/themes.ts` - [ ] Add theme to `frontend/src/ts/constants/themes.ts` - [ ] Add theme css file to `frontend/static/themes` - [ ] Add some screenshot of the theme, especially with different test settings (colorful, flip colors) to your pull request - [ ] Adding a layout? - [ ] Make sure to follow the [layouts documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/LAYOUTS.md) - [ ] Add layout to `packages/schemas/src/layouts.ts` - [ ] Add layout json file to `frontend/static/layouts` - [ ] Adding a font? - Make sure to follow the [themes documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/FONTS.md) - [ ] Add font file to `frontend/static/webfonts` - [ ] Add font to `packages/schemas/src/fonts.ts` - [ ] Add font to `frontend/src/ts/constants/fonts.ts` - [X] Check if any open issues are related to this PR; if so, be sure to tag them below. - [X] Make sure the PR title follows the Conventional Commits standard. (https://www.conventionalcommits.org for more info) - [X] Make sure to include your GitHub username prefixed with @ inside parentheses at the end of the PR title. Closes #7063 --- frontend/src/html/popups.html | 8 --- frontend/src/styles/popups.scss | 6 -- .../src/ts/elements/account/result-filters.ts | 11 ++-- frontend/src/ts/modals/new-filter-preset.ts | 64 +++++++++---------- 4 files changed, 34 insertions(+), 55 deletions(-) diff --git a/frontend/src/html/popups.html b/frontend/src/html/popups.html index 631f5f44194f..2b51f5751973 100644 --- a/frontend/src/html/popups.html +++ b/frontend/src/html/popups.html @@ -1276,14 +1276,6 @@ - -