Merge branch 'dev' into 'main'

фиксы верстки локальной публикации

See merge request frontend/squiz!87
This commit is contained in:
Nastya 2023-12-24 15:04:23 +00:00
commit 0c50f39844
3 changed files with 12 additions and 2 deletions

@ -25,6 +25,8 @@ export const ResultSettings = () => {
const [resultContract, setResultContract] = useState(true); const [resultContract, setResultContract] = useState(true);
const isReadyToLeaveRef = useRef(true); const isReadyToLeaveRef = useRef(true);
console.log('quiz ', quiz)
useEffect( useEffect(
function calcIsReadyToLeave() { function calcIsReadyToLeave() {
let isReadyToLeave = true; let isReadyToLeave = true;

@ -135,7 +135,7 @@ export const ContactForm = ({
setShowResultForm(true) setShowResultForm(true)
} }
}}> }}>
Получить результаты {quiz?.config.formContact?.button || "Получить результаты"}
</Button> </Button>
)} )}
@ -201,7 +201,7 @@ const Inputs = (currentQuestion: any) => {
//@ts-ignore //@ts-ignore
if (questions.some((data) => data.used)) { if (Object.values(questions).some((data) => data.used)) {
return <> return <>
{FC["name"].used ? Name : <></>} {FC["name"].used ? Name : <></>}
{FC["email"].used ? Email : <></>} {FC["email"].used ? Email : <></>}

@ -99,6 +99,14 @@ export const ResultForm = ({
>{resultQuestion.title || "Форма результатов"} >{resultQuestion.title || "Форма результатов"}
</Typography> </Typography>
{resultQuestion.content.text !== "" && resultQuestion.content.text !== " " && <Typography
sx={{
fontSize: "18px",
m: "20px 0"
}}
>{resultQuestion.content.text}</Typography>}
</Box> </Box>
<Box width="100%"> <Box width="100%">