) => e.stopPropagation();
+
+ return (
+
+ );
+}
+
+export { ModalContent };
diff --git a/src/shared/ui/modal/modal.module.scss b/src/shared/ui/modal/modal.module.scss
index 0808bb2..29462c9 100644
--- a/src/shared/ui/modal/modal.module.scss
+++ b/src/shared/ui/modal/modal.module.scss
@@ -3,7 +3,8 @@
position: absolute;
top: 0;
left: 0;
- width: 100%;
+ bottom: 0;
+ right: 0;
display: flex;
justify-content: center;
align-items: center;
@@ -34,97 +35,6 @@
}
}
-.ModalContent {
- position: absolute;
- top: 0;
- left: 0;
- height: 100%;
- background: white;
- box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3);
- //max-height: 90%;
- overflow: auto;
- width: 100%;
- //border-radius: 8px;
- animation: fadeIn ease 0.3s;
-
- @include iftablet {
- position: relative;
- top: unset;
- bottom: unset;
- left: unset;
- right: unset;
- height: 100%;
- border-radius: rem(8px);
- }
-
- &_open {
- animation: fadeOut ease 0.3s;
- }
-
- &_isIOS {
- height: 100vh !important;
-
- @include iftablet {
- height: 100%;
- }
- }
-
- &__Inner {
- position: relative;
- overflow: hidden;
- height: fit-content;
- }
-}
-
-.Modal {
- position: relative;
-
- &__Close {
- position: absolute;
- top: rem(5px);
- right: rem(5px);
- width: rem(36px);
- height: rem(36px);
- padding: rem(10px);
- cursor: pointer;
- margin-bottom: rem(4px);
- transform: rotate(0deg);
- transition: transform 0.3s;
-
- @include iftablet {
- top: rem(35px);
- right: rem(35px);
- margin-bottom: 0;
- }
-
- @include iflaptop {
- top: rem(50px);
- right: rem(50px);
- }
-
- &:hover,
- &:active {
- transform: rotate(45deg);
- transition: transform 0.3s;
- }
-
- svg {
- width: rem(17px);
- height: rem(17px);
- }
-
- //svg {
- // transform: rotate(0deg);
- // transition: transform 0.3s;
- // &:hover,
- // &:active {
- // transform: rotate(45deg);
- // transition: transform 0.3s;
- // }
- //}
- }
-}
-
@keyframes fadeIn {
0% {
opacity: 0;
diff --git a/src/shared/ui/modal/modal.tsx b/src/shared/ui/modal/modal.tsx
index 0b048cd..e744453 100644
--- a/src/shared/ui/modal/modal.tsx
+++ b/src/shared/ui/modal/modal.tsx
@@ -1,11 +1,10 @@
'use client';
import s from './modal.module.scss';
-import { ReactNode, useEffect, useRef } from 'react';
-import ReactDOM from 'react-dom';
+import { ReactNode, useEffect } from 'react';
import clsx from 'clsx';
-import { useModal } from '@core/providers/modal-provider';
-import { detectIOS, useClickOutside } from '@shared/lib';
+import { detectIOS } from '@shared/lib';
+import { createPortal } from 'react-dom';
interface ModalProps {
isOpen: boolean;
@@ -28,7 +27,7 @@ const Modal = ({ children, isOpen, onClose }: ModalProps) => {
const isIOS = detectIOS();
- return ReactDOM.createPortal(
+ return createPortal(
{
);
};
-function ModalContent(props: {
- children: ReactNode;
- className?: string;
- innerClassName?: string;
- closeByClickOutside?: boolean;
-}) {
- const {
- children,
- className,
- innerClassName,
- closeByClickOutside = false,
- } = props;
-
- const modal = useModal();
-
- const hideModal = () => modal.hideModal();
-
- const modalRef = useRef
(null);
-
- const handleClickOutside = () => {
- if (closeByClickOutside) {
- hideModal();
- }
- };
-
- useClickOutside(modalRef, handleClickOutside);
-
- const isIOS = detectIOS();
-
- return (
- e.stopPropagation()}
- ref={modalRef}
- >
-
-
- );
-}
-
-export { Modal, ModalContent };
-
-const CloseIcon = () => (
-
-);
+export { Modal };
diff --git a/src/shared/ui/text-area/text-area.module.scss b/src/shared/ui/text-area/text-area.module.scss
index b2c9a34..8eb62a7 100644
--- a/src/shared/ui/text-area/text-area.module.scss
+++ b/src/shared/ui/text-area/text-area.module.scss
@@ -15,13 +15,13 @@
.Area {
background: $color-white;
border: 1px solid $color-darkgray;
- border-radius: rem(20px);
- padding: rem(10px) rem(24px);
+ border-radius: rem(16px);
+ padding: rem(10px) rem(10px);
transition: border ease .5s;
font-family: $font-open-sans;
font-weight: $font-regular;
- font-size: rem(18px);
+ font-size: rem(16px);
line-height: 100%;
color: $color-text;
@@ -32,6 +32,8 @@
@include iftablet {
font-size: rem(18px);
+ border-radius: rem(20px);
+ padding: rem(10px) rem(24px);
}
@include iflaptop {
diff --git a/src/views/home/ui/main/main.module.scss b/src/views/home/ui/main/main.module.scss
index 67e1252..2443bd5 100644
--- a/src/views/home/ui/main/main.module.scss
+++ b/src/views/home/ui/main/main.module.scss
@@ -118,33 +118,6 @@
height: rem(60px);
}
}
-
- .Button {
- display: none;
-
- @include iflaptop {
- display: flex;
- flex-direction: row;
- gap: rem(16px);
- height: rem(40px);
- padding: rem(20px);
- }
-
- @include ifdesktop {
- gap: rem(16px);
- height: rem(48px);
- padding: rem(24px);
- }
-
- img {
- width: rem(30px);
- height: rem(30px);
- @include ifdesktop {
- width: rem(40px);
- height: rem(40px);
- }
- }
- }
}
}
diff --git a/src/views/home/ui/main/main.tsx b/src/views/home/ui/main/main.tsx
index 59c7992..620ebef 100644
--- a/src/views/home/ui/main/main.tsx
+++ b/src/views/home/ui/main/main.tsx
@@ -1,14 +1,15 @@
import s from './main.module.scss';
-import { Button } from '@shared/ui';
-import { ConsultationOrder } from '@/entities/home/ConsultationOrder';
import Image from 'next/image';
+import { Button } from '@shared/ui';
+import { ConsultationOrder } from '@/entities/home/consultation-order';
import bgStart from '@public/images/bg-start-desktop.jpg';
import logo from '@public/images/dtr-logo.png';
import waIcon from '@public/svg/whatsapp.svg';
import emailIcon from '@public/svg/email-icon.svg';
import callBtn from '@public/svg/phone-calling.svg';
+import { CallbackOrder } from '@/entities/home/callback-order';
export default function Main() {
return (
@@ -48,10 +49,7 @@ export default function Main() {
>
-
+
diff --git a/src/widgets/footer-form/ui.tsx b/src/widgets/footer-form/ui.tsx
index e5cf40f..8eae072 100644
--- a/src/widgets/footer-form/ui.tsx
+++ b/src/widgets/footer-form/ui.tsx
@@ -6,8 +6,6 @@ import toast from 'react-hot-toast';
import { Controller, useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
import { z } from 'zod';
-
-import man from '@public/images/footer-man.png';
import { sendFormFn } from '@shared/api/api.service';
import { isValidPhoneNumber } from 'libphonenumber-js/min';
@@ -39,8 +37,6 @@ export default function FooterForm() {
clearErrors,
formState: { errors },
} = useForm({
- mode: 'onSubmit',
- reValidateMode: 'onBlur',
resolver: zodResolver(FormSchema),
defaultValues,
});