diff --git a/Dockerfile b/Dockerfile index 9a55e554..f65152a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,8 @@ RUN apk update && rm -rf /var/cache/apk/* WORKDIR /usr/app COPY . . +RUN yarn config set '//penahub.gitlab.yandexcloud.net/api/v4/projects/43/packages/npm/:_authToken' "glpat-JL_7wSM1QpW7xGfd-oWX" +RUN npm config set //penahub.gitlab.yandexcloud.net/api/v4/projects/43/packages/npm/:_authToken=glpat-JL_7wSM1QpW7xGfd-oWX RUN yarn install --ignore-scripts --non-interactive --frozen-lockfile && yarn cache clean RUN yarn build diff --git a/src/pages/QuizAnswersPage/CardAnswer.tsx b/src/pages/QuizAnswersPage/CardAnswer.tsx index 2a91d7cf..f646cfce 100644 --- a/src/pages/QuizAnswersPage/CardAnswer.tsx +++ b/src/pages/QuizAnswersPage/CardAnswer.tsx @@ -22,6 +22,7 @@ import { deleteResult, obsolescenceResult } from "@root/results/actions"; import { resultApi } from "@api/result"; import { useQuizStore } from "@root/quizes/store"; import { useQuestionsStore } from "@root/questions/store"; +import AddressIcon from "@icons/ContactFormIcon/AddressIcon"; interface Props { isNew: boolean; @@ -32,6 +33,7 @@ interface Props { name?: string; phone?: string; email?: string; + address?: string; onLossNew?: (id: string) => void; } @@ -39,6 +41,7 @@ export const CardAnswer = ({ name, phone, email, + address, isNew = true, idResult, timeResult, @@ -194,6 +197,14 @@ export const CardAnswer = ({ )} + {address && ( + + + + {address} + + + )} {!isTablet && isNew && ( @@ -430,6 +441,7 @@ export const CardAnswer = ({ {questionsResultState.map((res) => { + console.log(questionsResultState, "что за результат тут"); return ( - {res.description || "нет заголовка"} + {res.description} - {res.title || "нет текста"} + {res.title} - {"хороший + {res.content.useImage && + res.content.back && + res.content.back !== " " && ( + {""} + )} + {!res.content.useImage && + res.content.back && + res.content.back !== " " && ( + + )} ); })} diff --git a/src/pages/QuizAnswersPage/QuizAnswersPage.tsx b/src/pages/QuizAnswersPage/QuizAnswersPage.tsx index 02bf93a1..fd558026 100644 --- a/src/pages/QuizAnswersPage/QuizAnswersPage.tsx +++ b/src/pages/QuizAnswersPage/QuizAnswersPage.tsx @@ -335,6 +335,8 @@ export const QuizAnswersPage: FC = () => {