From 62a5b29beae4aa1789740a7411e562a6a7a208b8 Mon Sep 17 00:00:00 2001 From: aleksandr-raw <104529174+aleksandr-raw@users.noreply.github.com> Date: Fri, 19 Apr 2024 12:26:25 +0400 Subject: [PATCH 1/7] replaced png to svg yandexLogo, improved behavior logic of yandexModal --- .../IntegrationYandex/YandexButton.tsx | 6 +++--- .../IntegrationYandex/YandexModal.tsx | 16 +++++++++++++--- .../IntegrationsPage/mocks/YandexMetricaLogo.tsx | 6 ++++++ .../IntegrationsPage/mocks/yandexMetricaLogo.svg | 9 +++++++++ 4 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 src/pages/IntegrationsPage/mocks/YandexMetricaLogo.tsx create mode 100644 src/pages/IntegrationsPage/mocks/yandexMetricaLogo.svg diff --git a/src/pages/IntegrationsPage/IntegrationYandex/YandexButton.tsx b/src/pages/IntegrationsPage/IntegrationYandex/YandexButton.tsx index 64e6e843..89d55334 100644 --- a/src/pages/IntegrationsPage/IntegrationYandex/YandexButton.tsx +++ b/src/pages/IntegrationsPage/IntegrationYandex/YandexButton.tsx @@ -1,6 +1,6 @@ -import { Box, Typography, useTheme } from "@mui/material"; +import { Box, useTheme } from "@mui/material"; import { FC } from "react"; -import YandexMetric from "../mocks/YandexMetric.png"; +import { YandexMetricaLogo } from "../mocks/YandexMetricaLogo"; type PartnerItemProps = { setIsModalOpen: (value: boolean) => void; @@ -34,7 +34,7 @@ export const YandexButton: FC = ({ }} onClick={() => setIsModalOpen(true)} > - {"Yandex.Метрика"} + ); diff --git a/src/pages/IntegrationsPage/IntegrationYandex/YandexModal.tsx b/src/pages/IntegrationsPage/IntegrationYandex/YandexModal.tsx index c2543032..5bf66888 100644 --- a/src/pages/IntegrationsPage/IntegrationYandex/YandexModal.tsx +++ b/src/pages/IntegrationsPage/IntegrationYandex/YandexModal.tsx @@ -30,6 +30,16 @@ export default function YandexModal({ isModalOpen, handleCloseModal }: Props) { const [currentValue, setCurrentValue] = useState( yandexNumber ? yandexNumber.toString() : "", ); + const handleClose = () => { + handleCloseModal(); + if (!yandexNumber) { + setIsSave(false); + return; + } + setIsSave(true); + setCurrentValue(yandexNumber.toString()); + }; + const handleSave = () => { updateQuiz(quiz?.id, (quiz) => { quiz.config.yandexMetricNumber = currentValue @@ -55,7 +65,7 @@ export default function YandexModal({ isModalOpen, handleCloseModal }: Props) { return (