From 017a4b26f1e2e92242566c10fb3c73d39abc52d9 Mon Sep 17 00:00:00 2001 From: skeris Date: Sat, 20 Jan 2024 19:33:46 +0300 Subject: [PATCH 01/17] =?UTF-8?q?=D0=BF=D0=BE=D1=87=D0=B8=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D0=BA=D0=B8=D0=B4=D0=BA=D1=83=20=D0=B7=D0=B0=20?= =?UTF-8?q?=D0=BB=D0=BE=D1=8F=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20?= =?UTF-8?q?-=20=D0=BD=D0=B5=20=D1=83=D1=87=D0=B8=D1=82=D1=8B=D0=B2=D0=B0?= =?UTF-8?q?=D0=BB=D0=BE=D1=81=D1=8C=20=D1=87=D1=82=D0=BE=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BB=D0=B8=D1=87=D0=B5=D1=81=D1=82=D0=B2=D0=BE=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=82=D1=80=D0=B0=D1=87=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B4?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=B3=20=D0=BB=D0=B5=D0=B6=D0=B8=D1=82=20?= =?UTF-8?q?=D0=B2=D0=BE=20=D0=B2=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=BD=D0=BE?= =?UTF-8?q?=D0=B9=20=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83=D1=80=D0=B5?= =?UTF-8?q?=20wallet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Tariffs/tariffsUtils/calcTariffPrices.ts | 2 ++ src/pages/Tariffs/tariffsUtils/createTariffElements.tsx | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/Tariffs/tariffsUtils/calcTariffPrices.ts b/src/pages/Tariffs/tariffsUtils/calcTariffPrices.ts index 42dd1d6b..0306bfe3 100644 --- a/src/pages/Tariffs/tariffsUtils/calcTariffPrices.ts +++ b/src/pages/Tariffs/tariffsUtils/calcTariffPrices.ts @@ -11,6 +11,7 @@ export function calcIndividualTariffPrices( priceBeforeDiscounts: number; priceAfterDiscounts: number; } { + console.log('MAGIC', purchasesAmount) const priceBeforeDiscounts = tariff.price || tariff.privileges.reduce( @@ -46,6 +47,7 @@ export function calcIndividualTariffPrices( priceAfterDiscounts *= findDiscountFactor(cart.appliedLoyaltyDiscount); priceAfterDiscounts *= findDiscountFactor(cart.appliedCartPurchasesDiscount); + 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 a5c9c786..e7c759d1 100644 --- a/src/pages/Tariffs/tariffsUtils/createTariffElements.tsx +++ b/src/pages/Tariffs/tariffsUtils/createTariffElements.tsx @@ -16,11 +16,12 @@ export const createTariffElements = ( const tariffElements = filteredTariffs .filter((tariff) => tariff.privileges.length > 0) .map((tariff, index) => { + console.log('USSSSSES', user) const { priceBeforeDiscounts, priceAfterDiscounts } = calcIndividualTariffPrices( tariff, discounts, - user.purchasesAmount, + user.wallet.spent, [], user.isUserNko, ); From ee09655fbf86021a6fd8802f514b0a8c7a61db66 Mon Sep 17 00:00:00 2001 From: Tamara Date: Thu, 25 Jan 2024 04:26:58 +0300 Subject: [PATCH 02/17] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=B8=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20=D0=B5=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82=D0=BE=D0=B2,=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B2=D0=B0=D1=80=D0=B8=D0=B0=D0=BD=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D0=B0=20=D0=B2=20=D0=B2=D0=BE?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=81=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ContactFormPage/ContactFormPage.tsx | 45 +++-- .../ResultPage/cards/EmailSettingsCard.tsx | 188 +++++++++--------- .../Tariffs/tariffsUtils/calcTariffPrices.ts | 4 +- .../tariffsUtils/createTariffElements.tsx | 2 +- .../ViewPublicationPage/questions/Emoji.tsx | 10 + .../ViewPublicationPage/questions/Images.tsx | 10 +- .../ViewPublicationPage/questions/Variant.tsx | 4 + .../ViewPublicationPage/questions/Varimg.tsx | 8 + src/pages/createQuize/MyQuizzesFull.tsx | 2 +- .../QuizPreviewQuestionTypes/Emoji.tsx | 10 + .../QuizPreviewQuestionTypes/Images.tsx | 7 +- .../QuizPreviewQuestionTypes/Variant.tsx | 14 +- .../QuizPreviewQuestionTypes/Varimg.tsx | 12 +- src/ui_kit/RadioCheck.tsx | 6 +- src/ui_kit/RadioIcon.tsx | 9 +- 15 files changed, 200 insertions(+), 131 deletions(-) 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, }} > ; +} +export default function RadioIcon({ sx }: Props) { const theme = useTheme(); return ( @@ -11,6 +13,7 @@ export default function RadioIcon() { display: "flex", alignItems: "center", justifyContent: "center", + ...sx, }} > Date: Fri, 26 Jan 2024 01:36:32 +0300 Subject: [PATCH 03/17] =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D0=BE=D0=BC=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B8=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=20=D0=B2=20=D1=84=D0=BE=D1=80=D0=BC=D0=B5=20=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=D0=BA=D1=82=D0=BE=D0=B2,=20=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=20=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20=D1=82=D0=B0=D0=BC=20?= =?UTF-8?q?=D0=B6=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NewField/NewFieldParent.tsx | 64 +++++++++---------- .../NewField/WindowNewField.tsx | 12 +++- 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/src/pages/ContactFormPage/NewField/NewFieldParent.tsx b/src/pages/ContactFormPage/NewField/NewFieldParent.tsx index d3a44318..095940c7 100644 --- a/src/pages/ContactFormPage/NewField/NewFieldParent.tsx +++ b/src/pages/ContactFormPage/NewField/NewFieldParent.tsx @@ -71,38 +71,38 @@ export default function NewFieldParent({ text={""} /> - - Ключ - { - updateQuiz(quiz.id, (quiz) => { - quiz.config.formContact.fields[defaultValue].key = target.value; - }); - }} - placeholder="text" - sx={{ - "& .css-1d3z3hw-MuiOutlinedInput-notchedOutline": { - border: "none", - }, - "& .MuiInputBase-root": { - height: "48px", - borderRadius: "10px", - backgroundColor: "#EEE4FC", - }, - }} - /> - { - updateQuiz(quiz.id, (quiz) => { - quiz.config.formContact.fields[defaultValue].required = - target.checked; - }); - }} - label={"Обязательно к заполнению"} - /> - + {/**/} + {/* Ключ*/} + {/* {*/} + {/* updateQuiz(quiz.id, (quiz) => {*/} + {/* quiz.config.formContact.fields[defaultValue].key = target.value;*/} + {/* });*/} + {/* }}*/} + {/* placeholder="text"*/} + {/* sx={{*/} + {/* "& .css-1d3z3hw-MuiOutlinedInput-notchedOutline": {*/} + {/* border: "none",*/} + {/* },*/} + {/* "& .MuiInputBase-root": {*/} + {/* height: "48px",*/} + {/* borderRadius: "10px",*/} + {/* backgroundColor: "#EEE4FC",*/} + {/* },*/} + {/* }}*/} + {/* />*/} + {/* {*/} + {/* updateQuiz(quiz.id, (quiz) => {*/} + {/* quiz.config.formContact.fields[defaultValue].required =*/} + {/* target.checked;*/} + {/* });*/} + {/* }}*/} + {/* label={"Обязательно к заполнению"}*/} + {/* />*/} + {/**/} {/* Запрашивать на diff --git a/src/pages/ContactFormPage/NewField/WindowNewField.tsx b/src/pages/ContactFormPage/NewField/WindowNewField.tsx index f7c8bf7e..0a3df6f2 100644 --- a/src/pages/ContactFormPage/NewField/WindowNewField.tsx +++ b/src/pages/ContactFormPage/NewField/WindowNewField.tsx @@ -128,7 +128,11 @@ export default function WindowNewField({ drawerState, closeDrawer }: Props) { {buttonSetting.flatMap((e, i) => drawerState.field === e.value || drawerState.field === "all" ? ( { SSHC(e.value); @@ -139,9 +143,13 @@ export default function WindowNewField({ drawerState, closeDrawer }: Props) { ? theme.palette.brightPurple.main : "transparent", color: - switchState === e.value && drawerState.field === "all" + (switchState === e.value && drawerState.field === "all") || + drawerState.field === e.value ? "#ffffff" : theme.palette.grey3.main, + "&:hover": { + background: switchState === e.value ? "#581CA7" : "#f5f5f5", + }, }} > {e.icon} From 05851caa9fb648fd27863b5d3f6d04fdd726812a Mon Sep 17 00:00:00 2001 From: Nastya Date: Sat, 27 Jan 2024 00:04:33 +0300 Subject: [PATCH 04/17] =?UTF-8?q?=D1=83=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=20=D0=BA=D1=80=D0=BE=D0=BC=D0=B5=20=D1=82=D0=B5=D0=BA=D1=81?= =?UTF-8?q?=D1=82=D0=B0=20=D0=B2=20=D1=84=D0=BE=D1=80=D0=BC=D0=B5=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82=D0=BE=D0=B2=20=D1=83=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D1=8B=20=D0=B8=D0=BD=D0=BF=D1=83=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ContactFormPage/NewField/NewFieldParent.tsx | 6 ++++++ src/pages/ContactFormPage/NewField/SwitchNewField.tsx | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/src/pages/ContactFormPage/NewField/NewFieldParent.tsx b/src/pages/ContactFormPage/NewField/NewFieldParent.tsx index 095940c7..71078d39 100644 --- a/src/pages/ContactFormPage/NewField/NewFieldParent.tsx +++ b/src/pages/ContactFormPage/NewField/NewFieldParent.tsx @@ -21,6 +21,7 @@ interface Props { placeholderHelp: string; placeholderField: string; closeDrawer: () => void; + noinputs: boolean } export default function NewFieldParent({ @@ -30,6 +31,7 @@ export default function NewFieldParent({ placeholderField, outerContainerSx: sx, children, + noinputs = false }: Props) { const quiz = useCurrentQuiz(); @@ -44,6 +46,8 @@ export default function NewFieldParent({ gap: "20px", }} > + {!noinputs && + <> Подсказка + } + {/**/} {/* Ключ*/} {/* ); @@ -34,6 +35,7 @@ export default function SwitchNewField({ closeDrawer={closeDrawer} placeholderHelp={"Введите Email"} placeholderField={"mail@example.ru"} + noinputs={true} defaultValue={"email"} /> ); @@ -43,6 +45,7 @@ export default function SwitchNewField({ closeDrawer={closeDrawer} placeholderHelp={"Введите номер"} placeholderField={"+7 900 000 00 00"} + noinputs={true} defaultValue={"phone"} > {/* ); @@ -78,6 +82,7 @@ export default function SwitchNewField({ closeDrawer={closeDrawer} placeholderHelp={"Введите адрес"} placeholderField={"Москва, Лаврушинский пер., 10"} + noinputs={true} defaultValue={"address"} /> ); From 6a84f9c7fe257c0345ee8a19a31fb28e48654a71 Mon Sep 17 00:00:00 2001 From: Nastya Date: Sat, 27 Jan 2024 00:11:50 +0300 Subject: [PATCH 05/17] =?UTF-8?q?=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB=D0=B5=20=D0=B2=D0=BC=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=20=D1=81=D0=BB=D0=BE=D0=B2=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D1=81=D0=BA=D0=B0=D0=B7=D0=BA=D0=B0=20=D0=B2=20?= =?UTF-8?q?=D0=A4=D0=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ContactFormPage/NewField/NewFieldParent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ContactFormPage/NewField/NewFieldParent.tsx b/src/pages/ContactFormPage/NewField/NewFieldParent.tsx index 71078d39..748cd780 100644 --- a/src/pages/ContactFormPage/NewField/NewFieldParent.tsx +++ b/src/pages/ContactFormPage/NewField/NewFieldParent.tsx @@ -49,7 +49,7 @@ export default function NewFieldParent({ {!noinputs && <> - Подсказка + Название поля { updateQuiz(quiz.id, (quiz) => { From 4418e143389522a56d4300692c0df08b9754d917 Mon Sep 17 00:00:00 2001 From: Nastya Date: Sat, 27 Jan 2024 03:45:48 +0300 Subject: [PATCH 06/17] =?UTF-8?q?=D0=B2=D0=BE=D0=BF=D1=80=D0=BE=D1=81=20?= =?UTF-8?q?=D0=BE=20=D0=BF=D0=BE=D0=BA=D1=83=D0=BF=D0=BA=D0=B5=20=D1=82?= =?UTF-8?q?=D0=B0=D1=80=D0=B8=D1=84=D0=B0=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7?= =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=20=D1=86=D0=B5=D0=BD=D1=83=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D1=81=D0=BA=D0=B8=D0=B4=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Tariffs/tariffsUtils/createTariffElements.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Tariffs/tariffsUtils/createTariffElements.tsx b/src/pages/Tariffs/tariffsUtils/createTariffElements.tsx index 0c557ad9..eb958ed7 100644 --- a/src/pages/Tariffs/tariffsUtils/createTariffElements.tsx +++ b/src/pages/Tariffs/tariffsUtils/createTariffElements.tsx @@ -47,7 +47,7 @@ export const createTariffElements = ( buttonProps={{ text: "Выбрать", onClick: () => - onclick({ id: tariff._id, price: priceBeforeDiscounts / 100 }), + onclick({ id: tariff._id, price: priceAfterDiscounts / 100 }), }} headerText={tariff.name} text={tariff.privileges.map((p) => `${p.name} - ${p.amount}`)} From dcc2bc3cb7889ff53a701c794ab644b77a9a2948 Mon Sep 17 00:00:00 2001 From: Nastya Date: Sat, 27 Jan 2024 04:52:49 +0300 Subject: [PATCH 07/17] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Landing/Counter.tsx | 2 +- src/pages/Landing/FooterLanding.tsx | 4 ++-- src/pages/Landing/Hero.tsx | 7 ++++++- src/pages/Landing/HowItWorks.tsx | 10 +++++----- src/pages/Landing/WhatTheFeatures.tsx | 7 +++++-- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/pages/Landing/Counter.tsx b/src/pages/Landing/Counter.tsx index 1b8637ff..2680ce5c 100644 --- a/src/pages/Landing/Counter.tsx +++ b/src/pages/Landing/Counter.tsx @@ -109,7 +109,7 @@ export default function Counter() { > 760 - готовых шаблонов для разных ниш + готовых шаблонов для разных ниш

(в разработке) diff --git a/src/pages/Landing/FooterLanding.tsx b/src/pages/Landing/FooterLanding.tsx index 0708e15c..81760a94 100644 --- a/src/pages/Landing/FooterLanding.tsx +++ b/src/pages/Landing/FooterLanding.tsx @@ -121,7 +121,7 @@ export default function Component() { >