result page refactoring completed

This commit is contained in:
aleksandr-raw 2024-05-08 17:53:57 +04:00
parent 9fbd5b8eec
commit afb641c382

@ -1,50 +1,50 @@
import { Box, Button, Link, Typography, useTheme } from "@mui/material";
import {Box, Button, Link, Typography, useTheme} from "@mui/material";
import { NameplateLogo } from "@icons/NameplateLogo";
import {NameplateLogo} from "@icons/NameplateLogo";
import YoutubeEmbedIframe from "./tools/YoutubeEmbedIframe";
import { useQuizData } from "@contexts/QuizDataContext";
import { quizThemes } from "@utils/themes/Publication/themePublication";
import { useRootContainerSize } from "../../contexts/RootContainerWidthContext";
import type { QuizQuestionResult } from "../../model/questionTypes/result";
import { useQuizViewStore } from "@/stores/quizView";
import { DESIGN_LIST } from "@/utils/designList";
import { useEffect } from "react";
import {useQuizData} from "@contexts/QuizDataContext";
import {quizThemes} from "@utils/themes/Publication/themePublication";
import {useRootContainerSize} from "../../contexts/RootContainerWidthContext";
import type {QuizQuestionResult} from "../../model/questionTypes/result";
import {useQuizViewStore} from "@/stores/quizView";
import {DESIGN_LIST} from "@/utils/designList";
import {useEffect} from "react";
type ResultFormProps = {
resultQuestion: QuizQuestionResult;
};
export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
export const ResultForm = ({resultQuestion}: ResultFormProps) => {
const theme = useTheme();
const isMobile = useRootContainerSize() < 650;
const isTablet = useRootContainerSize() < 1000;
const { settings, show_badge, quizId } = useQuizData();
const isTablet = useRootContainerSize() < 1100;
const {settings, show_badge, quizId} = useQuizData();
const setCurrentQuizStep = useQuizViewStore(
(state) => state.setCurrentQuizStep
(state) => state.setCurrentQuizStep,
);
const spec = settings.cfg.spec;
useEffect(() => {
//@ts-ignore
let YM = window?.ym;
const YM = window?.ym;
//@ts-ignore
let VP = window?._tmr;
const VP = window?._tmr;
if (YM !== undefined && settings.cfg.yandexMetricNumber !== undefined) {
YM(
settings.cfg.yandexMetricNumber,
"reachGoal",
`penaquiz-result-{${resultQuestion.id}}`
`penaquiz-result-{${resultQuestion.id}}`,
);
};
}
if (VP !== undefined && settings.cfg.vkMetricNumber !== undefined) {
VP.push({
type: "reachGoal",
id: settings.cfg.vkMetricNumber,
goal: `penaquiz-result-{${resultQuestion.id}}`
goal: `penaquiz-result-{${resultQuestion.id}}`,
});
};
}, [])
}
}, []);
return (
<Box
@ -63,6 +63,7 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
settings.cfg.design && !isMobile
? `url(${DESIGN_LIST[settings.cfg.theme]})`
: null,
position: "relative",
}}
>
<Box
@ -71,16 +72,25 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
flexDirection: "column",
justifyContent: "space-between",
alignItems: "center",
pt: "30px",
width: "100%",
height: "100%",
overflow: "auto",
background:
settings.cfg.design && !isMobile
? quizThemes[settings.cfg.theme].isLight
? "transparent"
: "linear-gradient(90deg,#272626, transparent)"
: "linear-gradient(90deg, rgba(39, 38, 38, 0.95) 7.66%, rgba(42, 42, 46, 0.85) 42.12%, rgba(51, 54, 71, 0.4) 100%)"
: theme.palette.background.default,
}}
>
<Box
sx={{
display: "flex",
flexDirection: "column",
alignItems: "center",
width: "100%",
height: "100%",
overflow: "auto",
padding: "0 20px 20px",
scrollbarWidth: "none",
"&::-webkit-scrollbar": {
width: 0,
@ -92,14 +102,18 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
display: "flex",
alignItems: "center",
flexWrap: "wrap",
gap: "30px",
mb: "7px",
mb: "10px",
width: "100%",
maxWidth: "700px",
backgroundColor: "#9A9AAF1A",
borderRadius: "0 0 12px 12px",
padding: "20px 20px 15px",
}}
>
<Typography
sx={{
fontSize: "14px",
color: theme.palette.text.primary,
fontSize: "17px",
color: "#9A9AAF",
wordBreak: "break-word",
}}
>
@ -112,8 +126,7 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
flexDirection: "column",
alignItems: "flex-start",
width: "100%",
maxWidth: "844px",
padding: isMobile ? "0 16px" : isTablet ? "0 78px" : undefined,
maxWidth: "700px",
}}
>
{!resultQuestion?.content.useImage &&
@ -122,24 +135,29 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
videoUrl={resultQuestion.content.video}
containerSX={{
width: "100%",
maxWidth: "844px",
maxWidth: "700px",
height: isMobile ? "100%" : "306px",
}}
/>
)}
{resultQuestion?.content.useImage && resultQuestion.content.back && (
{resultQuestion?.content.useImage &&
resultQuestion.content.back && (
<Box
sx={{ width: "100%", display: "flex", justifyContent: "center" }}
>
<Box
component="img"
src={resultQuestion.content.back}
sx={{
width: "100%",
maxWidth: "306px",
display: "flex",
justifyContent: "center",
}}
>
<img
alt="resultImage"
src={resultQuestion.content.back}
style={{
width: "100%",
height: spec ? "auto" : isMobile ? "236px" : "306px",
borderRadius: "8px",
objectFit: "contain",
borderRadius: "12px",
objectFit: "cover",
overflow: "hidden",
}}
/>
</Box>
@ -148,9 +166,10 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
resultQuestion.description !== " " && (
<Typography
sx={{
fontSize: "24px",
fontSize: "27px",
lineHeight: "32px",
fontWeight: 700,
mt: "25px",
mt: "30px",
color: theme.palette.text.primary,
wordBreak: "break-word",
}}
@ -161,7 +180,9 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
<Typography
sx={{
mt: "20px",
mt: "12px",
fontSize: "17px",
lineHeight: "20px",
color: theme.palette.text.primary,
wordBreak: "break-word",
}}
@ -173,8 +194,9 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
resultQuestion.content.text !== " " && (
<Typography
sx={{
fontSize: "18px",
mt: "30px ",
fontSize: "17px",
lineHeight: "20px",
mt: "25px ",
wordBreak: "break-word",
color: theme.palette.text.primary,
}}
@ -183,29 +205,24 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
</Typography>
)}
</Box>
<Box width="100%">
<Box
sx={{
display: "flex",
width: "100%",
justifyContent: "end",
px: "20px",
}}
>
</Box>
{show_badge && (
<Box
component={Link}
target={"_blank"}
href={`https://${window.location.hostname.includes("s") ? "s" : ""
href={`https://${
window.location.hostname.includes("s") ? "s" : ""
}quiz.pena.digital/squiz/quiz/logo?q=${quizId}`}
sx={{
display: "flex",
alignItems: "center",
mt: "15px",
alignSelf: isMobile ? "center" : "end",
margin: isMobile ? "15px 0 0" : "15px 25px 0 0",
gap: "10px",
textDecoration: "none",
mb: "15px",
position: isTablet || isMobile ? "sticky" : "absolute",
bottom: "90px",
}}
>
<NameplateLogo
@ -216,27 +233,19 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
: "#F5F7FF",
}}
/>
</Box>
)}
</Box>
<Box
sx={{
// boxShadow: "0 0 15px 0 rgba(0,0,0,.08)",
width: "100%",
flexDirection: "column",
display: "flex",
justifyContent: "center",
alignItems: "center",
borderTop: "1px solid #9A9AAF80",
p:
(settings.cfg.resultInfo.showResultForm === "before" &&
!settings.cfg.score) ||
(settings.cfg.resultInfo.showResultForm === "after" &&
resultQuestion.content.redirect)
? "20px"
: "0",
p: "20px",
position: "sticky",
bottom: 0,
}}
>
{settings.cfg.resultInfo.showResultForm === "before" &&
@ -262,7 +271,10 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
: `https://${resultQuestion.content.redirect}`
}
variant="contained"
sx={{ p: "10px 20px", width: "auto", height: "50px" }}
sx={{
p: "10px 20px",
width: "auto",
}}
>
{resultQuestion.content.hint.text || "Перейти на сайт"}
</Button>
@ -270,6 +282,5 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
</Box>
</Box>
</Box>
</Box>
);
};