From 6cf1f06d0df1d004a4dee5b49da4761e9d588732 Mon Sep 17 00:00:00 2001 From: Miodec Date: Mon, 21 Feb 2022 13:56:25 +0100 Subject: [PATCH] temporairly accepting both strings and numbers --- backend/api/schemas/config-schema.js | 10 +++++----- frontend/src/scripts/config.ts | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/backend/api/schemas/config-schema.js b/backend/api/schemas/config-schema.js index 77c8be580..c205da607 100644 --- a/backend/api/schemas/config-schema.js +++ b/backend/api/schemas/config-schema.js @@ -34,7 +34,10 @@ const CONFIG_SCHEMA = joi.object({ mode: joi.string().valid("time", "words", "quote", "zen", "custom"), quoteLength: joi.array().items(joi.number()), language: joi.string(), - fontSize: joi.string().valid("1", "125", "15", "2", "3", "4"), + fontSize: joi.alternatives().try( + joi.number().valid(1, 125, 15, 2, 3, 4), //todo remove after a week + joi.string().valid("1", "125", "15", "2", "3", "4") + ), freedomMode: joi.boolean(), difficulty: joi.string().valid("normal", "expert", "master"), blindMode: joi.boolean(), @@ -45,10 +48,7 @@ const CONFIG_SCHEMA = joi.object({ layout: joi.string(), funbox: joi.string(), confidenceMode: joi.string().valid("off", "on", "max"), - indicateTypos: joi.alternatives().try( - joi.boolean(), //todo remove - joi.string().valid("off", "below", "replace") - ), + indicateTypos: joi.string().valid("off", "below", "replace"), timerStyle: joi.string().valid("bar", "text", "mini"), colorfulMode: joi.boolean(), randomTheme: joi.string().valid("off", "on", "fav", "light", "dark"), diff --git a/frontend/src/scripts/config.ts b/frontend/src/scripts/config.ts index ec2c395a8..2e79554bd 100644 --- a/frontend/src/scripts/config.ts +++ b/frontend/src/scripts/config.ts @@ -1557,6 +1557,7 @@ export function setFontSize( fontSize: MonkeyTypes.FontSize, nosave?: boolean ): void { + fontSize = fontSize.toString() as MonkeyTypes.FontSize; //todo remove after around a week if (!isConfigValueValid(fontSize, [["1", "125", "15", "2", "3", "4"]])) return invalid("font size", fontSize);