From 87f78ff8cf582407ffdc5752a2f9e8b24a6dd607 Mon Sep 17 00:00:00 2001 From: Nastya Date: Sat, 26 Jul 2025 00:51:47 +0300 Subject: [PATCH] -- --- .gitea/workflows/deployProd.yml | 1 + lib/api/hooks.ts | 8 +++++++- .../ContactForm/ContactForm.tsx | 17 +++++++++++++++++ lib/utils/defineDomain.ts | 2 +- package.json | 1 + src/i18n/i18nWidget.ts | 13 ++++++++++++- src/widgets/popup/QuizPopup.tsx | 2 +- src/widgets/side/QuizSideButton.tsx | 2 +- 8 files changed, 41 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/deployProd.yml b/.gitea/workflows/deployProd.yml index c61638a..d9d99cd 100644 --- a/.gitea/workflows/deployProd.yml +++ b/.gitea/workflows/deployProd.yml @@ -4,6 +4,7 @@ run-name: ${{ gitea.actor }} build image and push to container registry on: registry_package: types: [published] + package_name: "squiz/frontanswerer/main" jobs: # CreateImage: diff --git a/lib/api/hooks.ts b/lib/api/hooks.ts index 75d8634..61c645a 100644 --- a/lib/api/hooks.ts +++ b/lib/api/hooks.ts @@ -62,7 +62,13 @@ export function useQuizData(quizId: string, preview: boolean = false) { }); addQuestions(data.questions.slice(1)); - return data; + + // Возвращаем полную структуру данных с настройками из store + const currentState = useQuizStore.getState(); + return { + ...currentState, + questions: [...currentState.questions, ...data.questions.slice(1)], + }; } if (currentPage >= questions.length) { diff --git a/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx b/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx index c10dba0..2034425 100644 --- a/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx +++ b/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx @@ -177,6 +177,23 @@ export const ContactForm = ({ currentQuestion, onShowResult }: Props) => { // eslint-disable-next-line react-hooks/exhaustive-deps }, []); + // Функция валидации телефона + const validatePhone = (phoneValue: string) => { + // Если номер не пустой и не полный (меньше 10 символов) - это ошибка + if (phoneValue.length > 0 && phoneValue.length < 10) { + return t("Please complete the phone number"); + } + return ""; + }; + + // Проверяем валидность телефона при каждом изменении + const isPhoneValid = phone.length === 0 || phone.length >= 10; + + // Обработчик изменения телефона + const handlePhoneChange = (newPhone: string) => { + setPhone(newPhone); + }; + return (