вывод картинок в результатах заявок

This commit is contained in:
Tamara 2024-02-16 03:11:28 +03:00 committed by skeris
parent 56b4580762
commit 017311721d
3 changed files with 35 additions and 7 deletions

@ -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

@ -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 = ({
</Typography>
</Box>
)}
{address && (
<Box sx={{ display: "flex", alignItems: "center", gap: "13px" }}>
<AddressIcon color={"#9A9AAF"} />
<Typography sx={{ fontSize: "18px", color: "#4D4D4D" }}>
{address}
</Typography>
</Box>
)}
</Box>
{!isTablet && isNew && (
@ -430,6 +441,7 @@ export const CardAnswer = ({
</Typography>
</Box>
{questionsResultState.map((res) => {
console.log(questionsResultState, "что за результат тут");
return (
<Box
sx={{
@ -446,16 +458,28 @@ export const CardAnswer = ({
wordBreak: "break-word",
}}
>
{res.description || "нет заголовка"}
{res.description}
</Typography>
<Typography sx={{ fontSize: "18px", wordBreak: "break-word" }}>
{res.title || "нет текста"}
{res.title}
</Typography>
<img
src={res.content.back}
style={{ width: "40px", height: "40px" }}
alt={"хороший результат"}
/>
{res.content.useImage &&
res.content.back &&
res.content.back !== " " && (
<img
src={res.content.back}
style={{ width: "40px", height: "40px" }}
alt={""}
/>
)}
{!res.content.useImage &&
res.content.back &&
res.content.back !== " " && (
<video
src={res.content.back}
style={{ width: "40px", height: "40px" }}
></video>
)}
</Box>
);
})}

@ -335,6 +335,8 @@ export const QuizAnswersPage: FC = () => {
<CardAnswer
name={result.content.name}
email={result.content.email}
phone={result.content.phone}
address={result.content.address}
isNew={result.new}
idResult={result.id}
dayResult={dayResult}