diff --git a/src/components/Layouts/Layout.tsx b/src/components/Layouts/Layout.tsx
index 25919c6..2af9fa5 100644
--- a/src/components/Layouts/Layout.tsx
+++ b/src/components/Layouts/Layout.tsx
@@ -1,17 +1,18 @@
import { Outlet } from 'react-router-dom';
-import { Motivation } from '../Main/Motivation';
import { Header } from './Header';
import { Footer } from './Footer';
import { ModalContainer } from '../Main/ModalContainer';
+import { Contacts } from '../Main/Contacts';
export function Layout() {
return (
<>
-
-
+
+
+
>
diff --git a/src/components/Main/Ellipse.tsx b/src/components/Main/Ellipse.tsx
index 6b454ad..070d782 100644
--- a/src/components/Main/Ellipse.tsx
+++ b/src/components/Main/Ellipse.tsx
@@ -12,16 +12,20 @@ export function Ellipse() {
}
useEffect(() => {
- document.body.addEventListener('mousemove', handleMouseMove);
+ document
+ .querySelector('main')
+ ?.addEventListener('mousemove', handleMouseMove);
return () => {
- document.body.removeEventListener('mousemove', handleMouseMove);
+ document
+ .querySelector('main')
+ ?.removeEventListener('mousemove', handleMouseMove);
};
}, []);
return (
);
diff --git a/src/pages/MainPage.tsx b/src/pages/MainPage.tsx
index d06b607..cc9219a 100644
--- a/src/pages/MainPage.tsx
+++ b/src/pages/MainPage.tsx
@@ -8,13 +8,17 @@ import { Availables } from '../components/Main/Availables';
import { Projects } from '../components/Main/Projects';
import { Trainings } from '../components/Main/Trainings';
import { Events } from '../components/Main/Events';
-import { Contacts } from '../components/Main/Contacts';
import { Ellipse } from '../components/Main/Ellipse';
+import { Motivation } from '../components/Main/Motivation';
+import { useWindowWidth } from '../hooks/useWindowWidth';
export function MainPage() {
+ const width = useWindowWidth();
+
return (
<>
-
+ {width >= 1024 && }
+
@@ -25,7 +29,6 @@ export function MainPage() {
-
>
);
}