diff --git a/README.md b/README.md index 0e52fed331b0..4c6ec06ae274 100644 --- a/README.md +++ b/README.md @@ -27,17 +27,17 @@ Monkeytype is a minimalistic and customizable [typing test](https://www.monkeyty # Features -- minimalistic design, with optional advertisements and focus mode while typing -- type what you see, see what you type -- live errors, wpm, and accuracy displays -- a variety of test lengths and languages -- punctuation and numbers modes -- quotes -- themes -- smooth caret -- account system -- challenges and just-for-fun test modifiers -- and much more +- Minimalistic design, with optional advertisements and focus mode while typing +- Type what you see, see what you type +- Live errors, wpm, and accuracy displays +- A variety of test lengths and languages +- Punctuation and numbers modes +- Quotes +- Themes +- Smooth caret +- Account system +- Challenges and just-for-fun test modifiers +- And much more # Discord bot diff --git a/backend/package.json b/backend/package.json index 9173e3623bbf..3ac144e0fb15 100644 --- a/backend/package.json +++ b/backend/package.json @@ -31,7 +31,7 @@ "bcrypt": "5.1.1", "bullmq": "1.91.1", "chalk": "4.1.2", - "cors": "2.8.5", + "cors": "2.8.6", "cron": "2.3.0", "date-fns": "3.6.0", "dotenv": "16.4.5", @@ -62,7 +62,7 @@ "@monkeytype/typescript-config": "workspace:*", "@redocly/cli": "2.24.1", "@types/bcrypt": "5.0.2", - "@types/cors": "2.8.12", + "@types/cors": "2.8.19", "@types/cron": "1.7.3", "@types/express": "5.0.3", "@types/ioredis": "4.28.10", diff --git a/backend/src/api/controllers/dev.ts b/backend/src/api/controllers/dev.ts index f020d0e0f7d0..e16572f441ce 100644 --- a/backend/src/api/controllers/dev.ts +++ b/backend/src/api/controllers/dev.ts @@ -285,7 +285,7 @@ async function updateUser(uid: string): Promise { } //update testActivity - await updateTestActicity(uid); + await updateTestActivity(uid); } //update the user @@ -317,7 +317,7 @@ function createArray(size: number, builder: () => T): T[] { return new Array(size).fill(0).map(() => builder()); } -async function updateTestActicity(uid: string): Promise { +async function updateTestActivity(uid: string): Promise { await ResultDal.getResultCollection() .aggregate( [ diff --git a/frontend/src/styles/media-queries-blue.scss b/frontend/src/styles/media-queries-blue.scss index b5b06f5b9747..4b6f11b520c9 100644 --- a/frontend/src/styles/media-queries-blue.scss +++ b/frontend/src/styles/media-queries-blue.scss @@ -39,6 +39,22 @@ } } + .pageAccountSettings { + .main { + grid-template-columns: 1fr; + grid-template-rows: auto auto; + .tabs { + padding: 0; + display: grid; + grid-auto-flow: row; + button { + justify-content: center; + padding: 1em 0.5em; + } + } + } + } + .pageFriends { .content .friends table, .content .pendingRequests table { diff --git a/frontend/src/ts/collections/custom-themes.ts b/frontend/src/ts/collections/custom-themes.ts index 59d8adcfa200..70bc23792f76 100644 --- a/frontend/src/ts/collections/custom-themes.ts +++ b/frontend/src/ts/collections/custom-themes.ts @@ -180,7 +180,7 @@ export const __nonReactive = { }; /** - * On prod the collection gets cleaned up after a while. + * The collection gets cleaned up after a while. * Keeping a query active fixes that. Remove when removing __nonReactive */ // oxlint-disable-next-line typescript/no-explicit-any diff --git a/frontend/src/ts/collections/presets.ts b/frontend/src/ts/collections/presets.ts index 0ee591a0065f..379d24368fcc 100644 --- a/frontend/src/ts/collections/presets.ts +++ b/frontend/src/ts/collections/presets.ts @@ -205,7 +205,7 @@ export const __nonReactive = { }; /** - * On prod the collection gets cleaned up after a while. + * The collection gets cleaned up after a while. * Keeping a query active fixes that. Remove when removing __nonReactive */ const _keepAlive = usePresetsLiveQuery(); diff --git a/frontend/src/ts/collections/results.ts b/frontend/src/ts/collections/results.ts index fcccd916ac3c..beb1b7e8cf4b 100644 --- a/frontend/src/ts/collections/results.ts +++ b/frontend/src/ts/collections/results.ts @@ -691,7 +691,7 @@ export const __nonReactive = { }; /** - * On prod the collection gets cleaned up after a while. + * The collection gets cleaned up after a while. * Keeping a query active fixes that. Remove when removing __nonReactive */ // oxlint-disable-next-line typescript/no-explicit-any diff --git a/frontend/src/ts/collections/tags.ts b/frontend/src/ts/collections/tags.ts index 83dcfe9ecab5..5f4b788a377b 100644 --- a/frontend/src/ts/collections/tags.ts +++ b/frontend/src/ts/collections/tags.ts @@ -555,7 +555,7 @@ export const __nonReactive = { }; /** - * On prod the collection gets cleaned up after a while. + * The collection gets cleaned up after a while. * Keeping a query active fixes that. Remove when removing __nonReactive */ const _keepAlive = useTagsLiveQuery(); diff --git a/frontend/src/ts/components/pages/settings/Settings.tsx b/frontend/src/ts/components/pages/settings/Settings.tsx index 60b77f96cb5d..99b4f006ea9f 100644 --- a/frontend/src/ts/components/pages/settings/Settings.tsx +++ b/frontend/src/ts/components/pages/settings/Settings.tsx @@ -265,7 +265,7 @@ function AccountSettingsNotice(): JSXElement { }); return ( -
+
Account settings have moved. You can now access them by hovering over @@ -275,7 +275,7 @@ function AccountSettingsNotice(): JSXElement {