From 071a99189f70d276f9d3fb5216f2a778e2b33a5f Mon Sep 17 00:00:00 2001
From: inmake <inmake.ru@gmail.com>
Date: Mon, 29 Jul 2024 19:47:43 +0500
Subject: [PATCH] upd

---
 client/src/layouts/DefaultLayout.tsx    |  2 +-
 client/src/layouts/WithFooterLayout.tsx | 33 +++++++++++++++++
 client/src/main.tsx                     | 47 ++++++++++++++-----------
 client/src/pages/AboutPage.tsx          |  2 --
 client/src/pages/AboutProjectsPage.tsx  |  6 ++--
 client/src/pages/FavoritesPage2.tsx     |  2 +-
 6 files changed, 64 insertions(+), 28 deletions(-)
 create mode 100644 client/src/layouts/WithFooterLayout.tsx

diff --git a/client/src/layouts/DefaultLayout.tsx b/client/src/layouts/DefaultLayout.tsx
index 8f11104..4d349ae 100644
--- a/client/src/layouts/DefaultLayout.tsx
+++ b/client/src/layouts/DefaultLayout.tsx
@@ -19,7 +19,7 @@ const DefaultLayout = () => {
 
   return (
     <>
-      <FullScreen handle={onFullscreenHandle}>
+      <FullScreen handle={onFullscreenHandle} className="flex flex-col min-h-screen">
         {isMobile ? <MobileHeader /> : <DesktopHeader />}
         {modal}
         <Outlet />
diff --git a/client/src/layouts/WithFooterLayout.tsx b/client/src/layouts/WithFooterLayout.tsx
new file mode 100644
index 0000000..93f369b
--- /dev/null
+++ b/client/src/layouts/WithFooterLayout.tsx
@@ -0,0 +1,33 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+import { Outlet } from "react-router-dom";
+import { isMobile } from "react-device-detect";
+import { FullScreen, useFullScreenHandle } from "react-full-screen";
+import { useEffect } from "react";
+import useModal from "../store/useModal";
+import useFullScreen from "../store/useFullScreen";
+import DesktopHeader from "../components/header/Header/DesktopHeader";
+import MobileHeader from "../components/header/Header/MobileHeader";
+import Footer from "../components/Footer";
+
+const WithoutFooterLayout = () => {
+  const { modal } = useModal();
+  const { setOnFullscreen } = useFullScreen();
+  const onFullscreenHandle = useFullScreenHandle();
+
+  useEffect(() => {
+    setOnFullscreen(onFullscreenHandle);
+  }, []);
+
+  return (
+    <>
+      <FullScreen handle={onFullscreenHandle} className="flex flex-col min-h-screen">
+        {isMobile ? <MobileHeader /> : <DesktopHeader />}
+        {modal}
+        <Outlet />
+        <Footer />
+      </FullScreen>
+    </>
+  );
+};
+
+export default WithoutFooterLayout;
diff --git a/client/src/main.tsx b/client/src/main.tsx
index 1ab4b8e..137139a 100644
--- a/client/src/main.tsx
+++ b/client/src/main.tsx
@@ -8,11 +8,12 @@ import ComplexWingPage from "./pages/ComplexWingPage";
 import AboutProjectsPage from "./pages/AboutProjectsPage";
 import UnitTypesPage from "./pages/UnitTypesPage";
 import AboutPage from "./pages/AboutPage";
-import ApartmentPage from "./pages/ApartmentPage";
+// import ApartmentPage from "./pages/ApartmentPage";
 import VirtualTourPage from "./pages/VirtualTourPage";
 import UnitTypesItemPage from "./pages/UnitTypesItemPage";
 import SearchPage2 from "./pages/SearchPage2";
 import FavoritesPage2 from "./pages/FavoritesPage2";
+import WithoutFooterLayout from "./layouts/WithFooterLayout";
 
 const router = createBrowserRouter([
   {
@@ -35,23 +36,20 @@ const router = createBrowserRouter([
         path: "masterplan/:complexId/wing",
         element: <ComplexWingPage />,
       },
+      {
+        path: "virtual-tour/:unitType",
+        element: <VirtualTourPage />,
+      },
+    ],
+  },
+  {
+    path: "/",
+    element: <WithoutFooterLayout />,
+    children: [
       {
         path: "about-projects",
         element: <AboutProjectsPage />,
       },
-      {
-        path: "unit-types",
-        children: [
-          {
-            index: true,
-            element: <UnitTypesPage />,
-          },
-          {
-            path: ":type",
-            element: <UnitTypesItemPage />,
-          },
-        ],
-      },
       {
         path: "about",
         element: <AboutPage />,
@@ -64,13 +62,22 @@ const router = createBrowserRouter([
         path: "search",
         element: <SearchPage2 />,
       },
+      // {
+      //   path: "search/:id",
+      //   element: <ApartmentPage />,
+      // },
       {
-        path: "search/:id",
-        element: <ApartmentPage />,
-      },
-      {
-        path: "virtual-tour/:unitType",
-        element: <VirtualTourPage />,
+        path: "unit-types",
+        children: [
+          {
+            index: true,
+            element: <UnitTypesPage />,
+          },
+          {
+            path: ":type",
+            element: <UnitTypesItemPage />,
+          },
+        ],
       },
     ],
   },
diff --git a/client/src/pages/AboutPage.tsx b/client/src/pages/AboutPage.tsx
index e2e1a62..f7767e1 100644
--- a/client/src/pages/AboutPage.tsx
+++ b/client/src/pages/AboutPage.tsx
@@ -2,7 +2,6 @@ import { isMobile } from "react-device-detect";
 import OurStory from "../components/companyPage/OurStory";
 import InvestmentPortfolio from "../components/companyPage/InvestmentPortfolio";
 import OurValues from "../components/companyPage/OurValues/OurValues";
-import Footer from "../components/Footer";
 
 const AboutPage = () => {
   return (
@@ -22,7 +21,6 @@ const AboutPage = () => {
       </h1>
       <InvestmentPortfolio />
       <OurValues />
-      <Footer />
     </section>
   );
 };
diff --git a/client/src/pages/AboutProjectsPage.tsx b/client/src/pages/AboutProjectsPage.tsx
index 6ba0f84..2d98a50 100644
--- a/client/src/pages/AboutProjectsPage.tsx
+++ b/client/src/pages/AboutProjectsPage.tsx
@@ -1,5 +1,4 @@
 import { isMobile } from "react-device-detect";
-import Footer from "../components/Footer";
 import Button from "../components/Button";
 import LeftArrowIcon from "../components/icons/LeftArrowIcon";
 import LivingSolutionSlider from "../components/aboutComplex/LivingSolutionSlider";
@@ -126,7 +125,7 @@ function AboutProjectsPage() {
   };
 
   return (
-    <>
+    <div className="overflow-x-hidden">
       <section
         className={`xl:pt-16 sm:pt-10 font-usual ${
           isMobile ? "pt-16" : ""
@@ -486,8 +485,7 @@ function AboutProjectsPage() {
           </div>
         </div>
       </section>
-      <Footer />
-    </>
+    </div>
   );
 }
 
diff --git a/client/src/pages/FavoritesPage2.tsx b/client/src/pages/FavoritesPage2.tsx
index 2b7e574..a456a1a 100644
--- a/client/src/pages/FavoritesPage2.tsx
+++ b/client/src/pages/FavoritesPage2.tsx
@@ -207,7 +207,7 @@ function FavoritesPage2() {
   }
 
   return (
-    <div className="pt-[58px]">
+    <div className="flex-1 pt-[58px]">
       <div className="p-6">
         <div className="pb-4 border-b border-[#E2E2DC] flex justify-between">
           <p className="text-2xl font-semibold">