diff --git a/package.json b/package.json index 18f2b750..6da058e8 100755 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "@emotion/react": "^11.10.5", "@emotion/styled": "^11.10.5", "@frontend/kitui": "^1.0.86", - "@frontend/squzanswerer": "^1.0.60", + "@frontend/squzanswerer": "^1.0.61", "@mui/icons-material": "^5.10.14", "@mui/material": "^5.10.14", "@mui/x-charts": "^6.19.5", diff --git a/src/pages/DesignPage/DesignFilling.tsx b/src/pages/DesignPage/DesignFilling.tsx index c6cbfd42..867097f4 100644 --- a/src/pages/DesignPage/DesignFilling.tsx +++ b/src/pages/DesignPage/DesignFilling.tsx @@ -99,7 +99,10 @@ export const DesignFilling = ({ const theme = useTheme(); const isMobile = useMediaQuery(theme.breakpoints.down(830)); const heightBar = heightSidebar + 51 + 88 + 36; - + + const CONST_QUIZ_THEME = quiz?.config.theme !== undefined && quiz?.config.theme === "crutch_FurnitureABC" ? "" : quiz?.config.theme || ""; +console.log("CONST_QUIZ_THEME") +console.log(CONST_QUIZ_THEME) return ( updateQuiz(quiz?.id, (quiz) => { @@ -155,7 +158,7 @@ export const DesignFilling = ({ /> updateQuiz(quiz?.id, (quiz) => { diff --git a/src/ui_kit/QuizPreview/QuizPreview.tsx b/src/ui_kit/QuizPreview/QuizPreview.tsx index 9c71aa8f..72afc993 100644 --- a/src/ui_kit/QuizPreview/QuizPreview.tsx +++ b/src/ui_kit/QuizPreview/QuizPreview.tsx @@ -55,8 +55,9 @@ export default function QuizPreview() { [isPreviewShown] ); + const CONST_QUIZ_THEME = quiz?.config.theme !== undefined && quiz?.config.theme === "crutch_FurnitureABC" ? "" : quiz?.config.theme || ""; return ( - + { [isPreviewShown], ); + const CONST_QUIZ_THEME = quiz?.config.theme !== undefined && quiz?.config.theme === "crutch_FurnitureABC" ? "" : quiz?.config.theme || ""; return ( { const serverError = error.response.data as ServerError; let SEMessage; - if(error.response.status === 409) { + const status = error.response.status; + if(status === 409 || status === 401 || status === 404) { const serverErrorMessage = error.response.data.message const translatedMessage = translateMessage[serverErrorMessage.toLowerCase() || ""] return [translatedMessage || "", serverError.statusCode]; diff --git a/yarn.lock b/yarn.lock index 7fb4b261..cfa9c20a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1521,10 +1521,10 @@ immer "^10.0.2" reconnecting-eventsource "^1.6.2" -"@frontend/squzanswerer@^1.0.60": - version "1.0.60" - resolved "https://penahub.gitlab.yandexcloud.net/api/v4/projects/43/packages/npm/@frontend/squzanswerer/-/@frontend/squzanswerer-1.0.60.tgz#b8609b5274d10123f7585b1731945b884fee71d4" - integrity sha1-uGCbUnTRASP3WFsXMZRbiE/ucdQ= +"@frontend/squzanswerer@^1.0.61": + version "1.0.61" + resolved "https://penahub.gitlab.yandexcloud.net/api/v4/projects/43/packages/npm/@frontend/squzanswerer/-/@frontend/squzanswerer-1.0.61.tgz#28d55161617d0b7846f41f74b5cb61bc7f710e7d" + integrity sha1-KNVRYWF9C3hG9B90tcthvH9xDn0= dependencies: bowser "1.9.4" country-flag-emoji-polyfill "^0.1.8"