diff --git a/src/pages/ContactFormPage/ContactFormPage.tsx b/src/pages/ContactFormPage/ContactFormPage.tsx
index d77e8b26..e4757860 100644
--- a/src/pages/ContactFormPage/ContactFormPage.tsx
+++ b/src/pages/ContactFormPage/ContactFormPage.tsx
@@ -60,30 +60,31 @@ export default function ContactFormPage() {
-
-
- Как собрать данные посетителя
- {" "}
- {/*
-
- */}
-
+ {/**/}
+ {/* */}
+ {/* Как собрать данные посетителя*/}
+ {/* {" "}*/}
+ {/* /!* */}
+ {/* */}
+ {/* *!/*/}
+ {/**/}
{!quiz?.config.formContact.fields.name.used &&
!quiz?.config.formContact.fields.email.used &&
!quiz?.config.formContact.fields.phone.used &&
diff --git a/src/pages/ResultPage/cards/EmailSettingsCard.tsx b/src/pages/ResultPage/cards/EmailSettingsCard.tsx
index 2840a16b..2dec663f 100644
--- a/src/pages/ResultPage/cards/EmailSettingsCard.tsx
+++ b/src/pages/ResultPage/cards/EmailSettingsCard.tsx
@@ -156,100 +156,100 @@ export const EmailSettingsCard = ({ quizExpand }: Props) => {
},
}}
/>
-
- E-mail ответа
-
- {
- updateQuiz(quiz.id, (quiz) => {
- quiz.config.resultInfo.reply = target.value;
- });
- }}
- sx={{
- margin: isMobile ? "10px 0" : 0,
- width: "100%",
- "& .MuiInputBase-root": {
- color: "#000000",
- backgroundColor: expand
- ? theme.palette.background.default
- : "transparent",
- height: "48px",
- borderRadius: "10px",
- ".MuiOutlinedInput-notchedOutline": {
- borderWidth: "1px !important",
- border: expand ? "none" : null,
- },
- "& .MuiInputBase-input::placeholder": {
- color: "#4D4D4D",
- opacity: 0.8,
- },
- },
- }}
- inputProps={{
- sx: {
- fontSize: "18px",
- lineHeight: "21px",
- py: 0,
- paddingLeft: "18px",
- },
- }}
- />
-
- Имя отправителя
-
- {
- updateQuiz(quiz.id, (quiz) => {
- quiz.config.resultInfo.replname = target.value;
- });
- }}
- sx={{
- margin: isMobile ? "10px 0" : 0,
- width: "100%",
- "& .MuiInputBase-root": {
- color: "#000000",
- backgroundColor: expand
- ? theme.palette.background.default
- : "transparent",
- height: "48px",
- borderRadius: "10px",
- ".MuiOutlinedInput-notchedOutline": {
- borderWidth: "1px !important",
- border: expand ? "none" : null,
- },
- "& .MuiInputBase-input::placeholder": {
- color: "#4D4D4D",
- opacity: 0.8,
- },
- },
- }}
- inputProps={{
- sx: {
- fontSize: "18px",
- lineHeight: "21px",
- py: 0,
- paddingLeft: "18px",
- },
- }}
- />
+ {/**/}
+ {/* E-mail ответа*/}
+ {/**/}
+ {/* {*/}
+ {/* updateQuiz(quiz.id, (quiz) => {*/}
+ {/* quiz.config.resultInfo.reply = target.value;*/}
+ {/* });*/}
+ {/* }}*/}
+ {/* sx={{*/}
+ {/* margin: isMobile ? "10px 0" : 0,*/}
+ {/* width: "100%",*/}
+ {/* "& .MuiInputBase-root": {*/}
+ {/* color: "#000000",*/}
+ {/* backgroundColor: expand*/}
+ {/* ? theme.palette.background.default*/}
+ {/* : "transparent",*/}
+ {/* height: "48px",*/}
+ {/* borderRadius: "10px",*/}
+ {/* ".MuiOutlinedInput-notchedOutline": {*/}
+ {/* borderWidth: "1px !important",*/}
+ {/* border: expand ? "none" : null,*/}
+ {/* },*/}
+ {/* "& .MuiInputBase-input::placeholder": {*/}
+ {/* color: "#4D4D4D",*/}
+ {/* opacity: 0.8,*/}
+ {/* },*/}
+ {/* },*/}
+ {/* }}*/}
+ {/* inputProps={{*/}
+ {/* sx: {*/}
+ {/* fontSize: "18px",*/}
+ {/* lineHeight: "21px",*/}
+ {/* py: 0,*/}
+ {/* paddingLeft: "18px",*/}
+ {/* },*/}
+ {/* }}*/}
+ {/*/>*/}
+ {/**/}
+ {/* Имя отправителя*/}
+ {/**/}
+ {/* {*/}
+ {/* updateQuiz(quiz.id, (quiz) => {*/}
+ {/* quiz.config.resultInfo.replname = target.value;*/}
+ {/* });*/}
+ {/* }}*/}
+ {/* sx={{*/}
+ {/* margin: isMobile ? "10px 0" : 0,*/}
+ {/* width: "100%",*/}
+ {/* "& .MuiInputBase-root": {*/}
+ {/* color: "#000000",*/}
+ {/* backgroundColor: expand*/}
+ {/* ? theme.palette.background.default*/}
+ {/* : "transparent",*/}
+ {/* height: "48px",*/}
+ {/* borderRadius: "10px",*/}
+ {/* ".MuiOutlinedInput-notchedOutline": {*/}
+ {/* borderWidth: "1px !important",*/}
+ {/* border: expand ? "none" : null,*/}
+ {/* },*/}
+ {/* "& .MuiInputBase-input::placeholder": {*/}
+ {/* color: "#4D4D4D",*/}
+ {/* opacity: 0.8,*/}
+ {/* },*/}
+ {/* },*/}
+ {/* }}*/}
+ {/* inputProps={{*/}
+ {/* sx: {*/}
+ {/* fontSize: "18px",*/}
+ {/* lineHeight: "21px",*/}
+ {/* py: 0,*/}
+ {/* paddingLeft: "18px",*/}
+ {/* },*/}
+ {/* }}*/}
+ {/*/>*/}
)}
diff --git a/src/pages/Tariffs/tariffsUtils/calcTariffPrices.ts b/src/pages/Tariffs/tariffsUtils/calcTariffPrices.ts
index 0306bfe3..23e5b460 100644
--- a/src/pages/Tariffs/tariffsUtils/calcTariffPrices.ts
+++ b/src/pages/Tariffs/tariffsUtils/calcTariffPrices.ts
@@ -11,7 +11,7 @@ export function calcIndividualTariffPrices(
priceBeforeDiscounts: number;
priceAfterDiscounts: number;
} {
- console.log('MAGIC', purchasesAmount)
+ console.log("MAGIC", purchasesAmount);
const priceBeforeDiscounts =
tariff.price ||
tariff.privileges.reduce(
@@ -47,7 +47,7 @@ export function calcIndividualTariffPrices(
priceAfterDiscounts *= findDiscountFactor(cart.appliedLoyaltyDiscount);
priceAfterDiscounts *= findDiscountFactor(cart.appliedCartPurchasesDiscount);
- console.log("OLOLOLOLO", cart, discounts, purchasesAmount, tariff)
+ console.log("OLOLOLOLO", cart, discounts, purchasesAmount, tariff);
// cart.allAppliedDiscounts.forEach((discount) => {
// priceAfterDiscounts *= findDiscountFactor(discount)
// })
diff --git a/src/pages/Tariffs/tariffsUtils/createTariffElements.tsx b/src/pages/Tariffs/tariffsUtils/createTariffElements.tsx
index e7c759d1..0c557ad9 100644
--- a/src/pages/Tariffs/tariffsUtils/createTariffElements.tsx
+++ b/src/pages/Tariffs/tariffsUtils/createTariffElements.tsx
@@ -16,7 +16,7 @@ export const createTariffElements = (
const tariffElements = filteredTariffs
.filter((tariff) => tariff.privileges.length > 0)
.map((tariff, index) => {
- console.log('USSSSSES', user)
+ console.log("USSSSSES", user);
const { priceBeforeDiscounts, priceAfterDiscounts } =
calcIndividualTariffPrices(
tariff,
diff --git a/src/pages/ViewPublicationPage/questions/Emoji.tsx b/src/pages/ViewPublicationPage/questions/Emoji.tsx
index 8ca6bdb3..d5efc4db 100644
--- a/src/pages/ViewPublicationPage/questions/Emoji.tsx
+++ b/src/pages/ViewPublicationPage/questions/Emoji.tsx
@@ -102,6 +102,16 @@ export const Emoji = ({ currentQuestion }: EmojiProps) => {
color: theme.palette.text.primary,
display: "flex",
gap: "10px",
+ alignItems:
+ variant.answer.length <= 60 ? "center" : "flex-start",
+ position: "relative",
+ height: "80px",
+ "& .MuiFormControlLabel-label": {
+ wordBreak: "break-word",
+ height: variant.answer.length <= 60 ? undefined : "60px",
+ overflow: "auto",
+ paddingLeft: "45px",
+ },
}}
value={index}
onClick={(event) => {
diff --git a/src/pages/ViewPublicationPage/questions/Images.tsx b/src/pages/ViewPublicationPage/questions/Images.tsx
index a1dbf31b..bc654356 100644
--- a/src/pages/ViewPublicationPage/questions/Images.tsx
+++ b/src/pages/ViewPublicationPage/questions/Images.tsx
@@ -72,7 +72,7 @@ export const Images = ({ currentQuestion }: ImagesProps) => {
}}
onClick={(event) => {
event.preventDefault();
-
+ console.log(variant.answer.length);
updateAnswer(
currentQuestion.content.id,
currentQuestion.content.variants[index].id,
@@ -107,8 +107,16 @@ export const Images = ({ currentQuestion }: ImagesProps) => {
marginTop: "10px",
marginLeft: 0,
padding: "10px",
+ display: "flex",
+ alignItems:
+ variant.answer.length <= 60 ? "center" : "flex-start",
+ position: "relative",
+ height: "80px",
"& .MuiFormControlLabel-label": {
wordBreak: "break-word",
+ height: variant.answer.length <= 60 ? undefined : "60px",
+ overflow: "auto",
+ paddingLeft: "45px",
},
}}
value={index}
diff --git a/src/pages/ViewPublicationPage/questions/Variant.tsx b/src/pages/ViewPublicationPage/questions/Variant.tsx
index 47c1f53e..54919f66 100644
--- a/src/pages/ViewPublicationPage/questions/Variant.tsx
+++ b/src/pages/ViewPublicationPage/questions/Variant.tsx
@@ -163,6 +163,8 @@ const VariantItem = ({
? "white"
: theme.palette.background.default,
display: "flex",
+ alignItems: variant.answer.length <= 60 ? "center" : "flex-start",
+ position: "relative",
maxWidth: "685px",
maxHeight: "85px",
justifyContent: "space-between",
@@ -172,6 +174,8 @@ const VariantItem = ({
},
"& .MuiFormControlLabel-label": {
wordBreak: "break-word",
+ height: variant.answer.length <= 60 ? undefined : "60px",
+ overflow: "auto",
},
}}
value={index}
diff --git a/src/pages/ViewPublicationPage/questions/Varimg.tsx b/src/pages/ViewPublicationPage/questions/Varimg.tsx
index 36c3e98b..47fd661d 100644
--- a/src/pages/ViewPublicationPage/questions/Varimg.tsx
+++ b/src/pages/ViewPublicationPage/questions/Varimg.tsx
@@ -88,9 +88,16 @@ export const Varimg = ({ currentQuestion }: VarimgProps) => {
? theme.palette.primary.main
: "#9A9AAF",
display: "flex",
+ alignItems:
+ variant.answer.length <= 60 ? "center" : "flex-start",
+ position: "relative",
+ height: "80px",
margin: isMobile ? 0 : undefined,
"& .MuiFormControlLabel-label": {
wordBreak: "break-word",
+ height: variant.answer.length <= 60 ? undefined : "60px",
+ overflow: "auto",
+ paddingLeft: "45px",
},
}}
value={index}
@@ -108,6 +115,7 @@ export const Varimg = ({ currentQuestion }: VarimgProps) => {
}}
control={
}
diff --git a/src/pages/createQuize/MyQuizzesFull.tsx b/src/pages/createQuize/MyQuizzesFull.tsx
index e8379a58..48286e12 100644
--- a/src/pages/createQuize/MyQuizzesFull.tsx
+++ b/src/pages/createQuize/MyQuizzesFull.tsx
@@ -82,7 +82,7 @@ export default function MyQuizzesFull({
quiz.name = QuizgenegationName({ quiz });
});
}
-
+
return (
@@ -99,8 +101,11 @@ export default function Images({ question, widthPreview }: Props) {
;
}
-export default function RadioCheck({ color = "#7E2AEA" }: Props) {
+export default function RadioCheck({ color = "#7E2AEA", sx }: Props) {
const theme = useTheme();
return (
@@ -15,6 +16,7 @@ export default function RadioCheck({ color = "#7E2AEA" }: Props) {
display: "flex",
alignItems: "center",
justifyContent: "center",
+ ...sx,
}}
>