From 8a19d41dc4f14574416833df4b91f3f4f5d73283 Mon Sep 17 00:00:00 2001 From: Nastya Date: Fri, 5 Jul 2024 19:30:02 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20=D0=BE?= =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D1=82=D1=8B=20=D0=BE=D1=82=D0=B4=D0=B0=D1=91?= =?UTF-8?q?=D1=82=20=D0=BD=D0=B5=D0=B4=D0=BE=D1=81=D1=82=D0=B0=D1=8E=D1=89?= =?UTF-8?q?=D1=83=D1=8E=20=D1=81=D1=83=D0=BC=D0=BC=D1=83,=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B0=20=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D1=80=D1=8B=D1=85=20=D1=81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B8=20=D0=BA=D0=B0?= =?UTF-8?q?=D1=80=D1=82=D0=B8=D0=BD=D0=BE=D0=BA=20=D0=B2=20=D1=81=D1=82?= =?UTF-8?q?=D1=80=20=D0=B7=D0=B0=D1=8F=D0=B2=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/QuizAnswersPage/CardAnswer.tsx | 26 +++++++++++++++++++----- src/pages/Tariffs/Tariffs.tsx | 13 +++++++----- src/utils/parse-error.ts | 6 +++--- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/pages/QuizAnswersPage/CardAnswer.tsx b/src/pages/QuizAnswersPage/CardAnswer.tsx index 533a1645..154062d6 100644 --- a/src/pages/QuizAnswersPage/CardAnswer.tsx +++ b/src/pages/QuizAnswersPage/CardAnswer.tsx @@ -15,6 +15,7 @@ import AddressIcon from "@icons/ContactFormIcon/AddressIcon"; import { DeleteModal } from "./DeleteModal"; import type { AnyTypedQuizQuestion } from "@frontend/squzanswerer"; +import { useCurrentQuiz } from "@/stores/quizes/hooks"; interface CardAnswerProps { isNew: boolean; @@ -47,6 +48,7 @@ export const CardAnswer: FC = ({ const [questionsResultState, setQuestionsResultState] = useState([]); const { editQuizId } = useQuizStore(); const { questions } = useQuestionsStore(); + const quiz = useCurrentQuiz(); const openResults = async () => { setIsOpen(!isOpen); if (!isOpen) { @@ -295,6 +297,8 @@ export const CardAnswer: FC = ({ }} > {resultsAnswer.map((answer, id) => { + console.log(answer) + console.log(answer.content) let titleQuestion; let typeOuestion; let typeQuestionFile; @@ -316,6 +320,7 @@ export const CardAnswer: FC = ({ alignItems: "center", gap: "13px", }} + onClick={(e) => e.stopPropagation()} > {id + 1}. {titleQuestion}. @@ -323,7 +328,7 @@ export const CardAnswer: FC = ({ {typeOuestion === "file" && ( = ({ > {typeQuestionFile === "video" && ( )} {typeQuestionFile === "picture" && ( @@ -352,10 +357,10 @@ export const CardAnswer: FC = ({ ')[0]} + src={timewebContent(quiz?.qid, answer.content)} /> - {answer.content.split("<")[0]} + {/* {answer.content.split("<")[0]} */} )} {!(typeOuestion === "file" || typeOuestion === "images" || typeOuestion === "varimg") && ( @@ -428,3 +433,14 @@ export const CardAnswer: FC = ({ ); }; + +function timewebContent(editQuizId: string, content: string) { + if (content.includes(" + return content.split("<")[1].split('src="')[1].split('"/>')[0] + } + //Новая версия: контент просто записан с указанием расширения файла + let contentId = content.includes(".") ? content.split(".")[0] : content + return `https://s3.timeweb.cloud/3c580be9-cf31f296-d055-49cf-b39e-30c7959dc17b/squizanswers/${editQuizId}/${contentId}` +} \ No newline at end of file diff --git a/src/pages/Tariffs/Tariffs.tsx b/src/pages/Tariffs/Tariffs.tsx index 08d30060..2b729a38 100644 --- a/src/pages/Tariffs/Tariffs.tsx +++ b/src/pages/Tariffs/Tariffs.tsx @@ -137,12 +137,15 @@ function TariffPage() { if (payError || !data) { //если денег не хватило - if (payError?.includes("insufficient funds")) { + if (payError?.includes("insufficient funds") || payError?.includes("Payment Required")) { let cashDif = Number(payError.split(":")[1]); + console.log(payError) + console.log(cashDif) var link = document.createElement("a"); link.href = `https://${isTestServer ? "s" : ""}hub.pena.digital/quizpayment?action=squizpay&dif=${cashDif}&data=${token}&userid=${userId}`; document.body.appendChild(link); - link.click(); + console.log(link) + // link.click(); return; } @@ -388,14 +391,14 @@ export const Tariffs = withErrorBoundary(TariffPage, { const LoadingPage = () => ( - {"Подождите, пожалуйста, идёт загрузка :)"} + {"Подождите, пожалуйста, идёт загрузка"} ); @@ -433,7 +436,7 @@ const outCart = (cart: string[]) => { return; } - let saveCart = JSON.parse(localStorage.getItem("saveCart") || "[]"); + let saveCart = JSON.parse(localStorage.getItem("saveCart") || "[]") || []; saveCart = saveCart.push(id); localStorage.setItem("saveCart", JSON.stringify(saveCart)); }); diff --git a/src/utils/parse-error.ts b/src/utils/parse-error.ts index 57592fb8..ff52ee29 100644 --- a/src/utils/parse-error.ts +++ b/src/utils/parse-error.ts @@ -32,9 +32,9 @@ export const parseAxiosError = (nativeError: unknown): [string, number?] => { const serverError = error.response.data as ServerError; let SEMessage; - if (error.response.statusText) { - return [error.response.statusText]; - } + // if (error.response.statusText) { + // return [error.response.statusText]; + // } if ("statusCode" in serverError) { SEMessage = serverError?.message.toLowerCase() || "";