From de6fc691e79e58d62396f17d6641d2dae5020873 Mon Sep 17 00:00:00 2001
From: zojgame <zogame002@gmail.com>
Date: Tue, 30 Jan 2024 12:24:54 +0500
Subject: [PATCH] bug fix

---
 src/App.tsx                                   | 18 ++--
 src/components/ViewToggle.tsx                 |  4 +-
 .../desktop/ParameterDescription.tsx          | 20 ++--
 .../mobile/Appartment/HelpPanel.tsx           |  3 +-
 .../mobile/Appartment/ImageSlider.tsx         | 21 +++--
 .../mobile/Appartment/LayoutSlider.tsx        | 60 +++++++-----
 .../mobile/Appartment/Parameters.tsx          | 22 +++--
 .../mobile/Appartment/PopupModal.tsx          |  3 +-
 .../mobile/Appartment/ViewControllerModal.tsx | 18 ++--
 src/consts/viewParams.ts                      | 29 ------
 src/consts/villas.ts                          | 37 ++++++++
 src/hooks/useVilla.tsx                        | 15 +++
 src/main.tsx                                  |  2 +-
 src/pages/Desktop/Apartment.tsx               | 72 --------------
 src/pages/Desktop/Desktop.tsx                 | 68 +++++++++++++-
 src/pages/Mobile/Apartment.tsx                | 94 -------------------
 src/pages/Mobile/Mobile.tsx                   | 92 +++++++++++++++++-
 src/store/store.ts                            |  6 +-
 src/types/appartment.ts                       | 12 +--
 19 files changed, 310 insertions(+), 286 deletions(-)
 delete mode 100644 src/consts/viewParams.ts
 create mode 100644 src/consts/villas.ts
 create mode 100644 src/hooks/useVilla.tsx
 delete mode 100644 src/pages/Desktop/Apartment.tsx
 delete mode 100644 src/pages/Mobile/Apartment.tsx

diff --git a/src/App.tsx b/src/App.tsx
index 283c58f..7d2142f 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,14 +1,20 @@
 import { isMobile } from "react-device-detect";
+import { useEffect } from "react";
 import "./App.css";
-
+import { useVilla } from "./hooks/useVilla";
 import Desktop from "./pages/Desktop/Desktop";
-import Apartment from "./pages/Mobile/Apartment";
-// import MapComponent from "./components/Map/Map";
-import { MapComponent } from "./components/Map/Map";
+import Mobile from "./pages/Mobile/Mobile";
+import useStore from "./store/store";
 
 function App() {
-  return <>{isMobile ? <Apartment /> : <Desktop />}</>;
-  return <>{/* <MapComponent /> */}</>;
+  const { villa } = useVilla();
+  const { setCurrentVilla } = useStore();
+
+  useEffect(() => {
+    setCurrentVilla(villa);
+  }, [setCurrentVilla, villa]);
+
+  return <>{isMobile ? <Mobile /> : <Desktop />}</>;
 }
 
 export default App;
diff --git a/src/components/ViewToggle.tsx b/src/components/ViewToggle.tsx
index e96adaa..a1e8947 100644
--- a/src/components/ViewToggle.tsx
+++ b/src/components/ViewToggle.tsx
@@ -38,9 +38,9 @@ const ViewToggle = ({ offset, isDesktop }: ViewSwitcherProps) => {
       <div
         className={`${
           isDesktop ? "" : "border-2"
-        } even bg-white rounded-[32px] flex text-sm justify-center w-fit transition-all duration-300 ease-in-out select-none cursor-pointer`}
+        } even bg-white rounded-[32px] flex text-sm justify-center w-fit transition-all duration-300 ease-in-out select-none cursor-pointer mx-auto`}
         style={{
-          opacity: offset ? offset : 1,
+          opacity: offset,
           pointerEvents: `${offset === 0 ? "none" : "auto"}`,
         }}
       >
diff --git a/src/components/desktop/ParameterDescription.tsx b/src/components/desktop/ParameterDescription.tsx
index c426edf..0a0b0f3 100644
--- a/src/components/desktop/ParameterDescription.tsx
+++ b/src/components/desktop/ParameterDescription.tsx
@@ -1,33 +1,33 @@
-import { Parameters } from "../../types/appartment";
+import useStore from "../../store/store";
 
-type ParameterDescriptionProps = {
-  params: Parameters;
-};
+const ParameterDescription = () => {
+  const { currentVilla } = useStore();
 
-const ParameterDescription = ({ params }: ParameterDescriptionProps) => {
   return (
     <div className="flex py-6 gap-6 items-center justify-center border">
-      <h2 className="text-[#050409] font-medium text-2xl">{params.type}</h2>
+      <h2 className="text-[#050409] font-medium text-2xl">
+        {currentVilla && currentVilla.type}
+      </h2>
       <div className="h-8 bg-[#DDD7D6] w-[1px]" />
       <div className="flex flex-col">
         <div className="flex gap-4 justify-between">
           <div className="text-[#666668]">Villa Theme</div>
-          <div>{params.villaTheme}</div>
+          <div>{currentVilla && currentVilla.villaTheme}</div>
         </div>
         <div className="flex gap-4">
           <div className="text-[#666668]">Total no. of Bedrooms</div>
-          <div>{params.totalCountBedroms}</div>
+          <div>{currentVilla && currentVilla.totalCountBedroms}</div>
         </div>
       </div>
       <div className="h-8 bg-[#DDD7D6] w-[1px]" />
       <div className="flex flex-col">
         <div className="flex gap-4 justify-between">
           <div className="text-[#666668]">Plot area</div>
-          <div>{params.plotArea}</div>
+          <div>{currentVilla && currentVilla.plotArea}</div>
         </div>
         <div className="flex gap-4">
           <div className="text-[#666668]">Total Build up Area</div>
-          <div>{params.totalBuildUpArea}</div>
+          <div>{currentVilla && currentVilla.totalBuildUpArea}</div>
         </div>
       </div>
     </div>
diff --git a/src/components/mobile/Appartment/HelpPanel.tsx b/src/components/mobile/Appartment/HelpPanel.tsx
index 5e93e92..5144fb5 100644
--- a/src/components/mobile/Appartment/HelpPanel.tsx
+++ b/src/components/mobile/Appartment/HelpPanel.tsx
@@ -1,4 +1,3 @@
-import { A1MViewParams } from "../../../consts/viewParams";
 import CrossIcon from "../../../icons/CrossIcon";
 import useStore from "../../../store/store";
 import ButtonPanel from "./ButtonPanel";
@@ -8,7 +7,7 @@ const HelpPanel = () => {
   const { setPanel, setModal } = useStore();
 
   const handleOnClose = () => {
-    setModal(<ViewControllerModal parameters={A1MViewParams} />);
+    setModal(<ViewControllerModal />);
     setPanel(<ButtonPanel />);
   };
 
diff --git a/src/components/mobile/Appartment/ImageSlider.tsx b/src/components/mobile/Appartment/ImageSlider.tsx
index 5be6fc9..b4a8384 100644
--- a/src/components/mobile/Appartment/ImageSlider.tsx
+++ b/src/components/mobile/Appartment/ImageSlider.tsx
@@ -1,15 +1,18 @@
-import { Parameters as ParametersType } from "../../../types/appartment";
+import useStore from "../../../store/store";
 
-type ImageSliderProps = {
-  parameters: ParametersType;
-};
-
-const ImageSlider = ({ parameters }: ImageSliderProps) => {
+const ImageSlider = () => {
+  const { currentVilla } = useStore();
   return (
     <div className="flex p-6 gap-2 overflow-x-scroll">
-      {parameters.perspectiveWorkings.map((working) => (
-        <img className="rounded-lg" src={working} alt="" key={working} />
-      ))}
+      {currentVilla &&
+        currentVilla.perspectiveWorkings.map((working) => (
+          <img
+            className="rounded-lg"
+            src={working.image}
+            alt=""
+            key={working.id}
+          />
+        ))}
     </div>
   );
 };
diff --git a/src/components/mobile/Appartment/LayoutSlider.tsx b/src/components/mobile/Appartment/LayoutSlider.tsx
index 3607a1e..50819f8 100644
--- a/src/components/mobile/Appartment/LayoutSlider.tsx
+++ b/src/components/mobile/Appartment/LayoutSlider.tsx
@@ -1,13 +1,16 @@
 import { useState } from "react";
 import { useSwipeable } from "react-swipeable";
-import { SliderType } from "../../../types/appartment";
+import useStore from "../../../store/store";
 
-type LayoutSliderProps = {
-  sliders: SliderType[];
-};
+const titleViews = [
+  { id: 1, value: "Ground Floor" },
+  { id: 2, value: "First Floor" },
+  { id: 3, value: "Parking" },
+];
 
-const LayoutSlider = ({ sliders }: LayoutSliderProps) => {
+const LayoutSlider = () => {
   const [offset, setOffset] = useState(0);
+  const { currentVilla } = useStore();
 
   const handleOnRight = () => {
     if (offset < 0) {
@@ -16,7 +19,7 @@ const LayoutSlider = ({ sliders }: LayoutSliderProps) => {
   };
 
   const handleOnLeft = () => {
-    if (offset > 1 - sliders.length) {
+    if (currentVilla?.sliders && offset > 1 - currentVilla.sliders.length) {
       setOffset((prev) => prev - 1);
     }
   };
@@ -34,9 +37,12 @@ const LayoutSlider = ({ sliders }: LayoutSliderProps) => {
             transform: `translateY(${offset * 28}px)`,
           }}
         >
-          {sliders.map(({ title }) => (
-            <h2 key={title} className="h-7 font-medium text-[16px] text-center">
-              {title}
+          {titleViews.map((title) => (
+            <h2
+              key={title.id}
+              className="h-7 font-medium text-[16px] text-center"
+            >
+              {title.value}
             </h2>
           ))}
         </div>
@@ -49,26 +55,28 @@ const LayoutSlider = ({ sliders }: LayoutSliderProps) => {
             transform: `translateX(${offset * 100}vw)`,
           }}
         >
-          {sliders.map((slider) => (
-            <div
-              className={`h-full min-w-full flex flex-col px-6 transition-all duration-300`}
-              key={slider.title}
-            >
-              <img src={slider.image} alt="" />
-            </div>
-          ))}
+          {currentVilla?.sliders &&
+            currentVilla.sliders.map((slider) => (
+              <div
+                className={`h-full min-w-full flex flex-col px-6 transition-all duration-300`}
+                key={slider.id}
+              >
+                <img src={slider.image} alt="" />
+              </div>
+            ))}
         </div>
       </div>
       <div className="flex justify-center pb-4">
-        {sliders.map(({ title }, index) => (
-          <div className="p-1" key={title}>
-            <div
-              className={`w-2 h-2  rounded-full transition-all duration-300 ${
-                0 - index === offset ? "bg-[#050409]" : "bg-[#DDD7D6]"
-              }`}
-            ></div>
-          </div>
-        ))}
+        {currentVilla?.sliders &&
+          currentVilla.sliders.map((slider, index) => (
+            <div className="p-1" key={slider.id}>
+              <div
+                className={`w-2 h-2  rounded-full transition-all duration-300 ${
+                  0 - index === offset ? "bg-[#050409]" : "bg-[#DDD7D6]"
+                }`}
+              ></div>
+            </div>
+          ))}
       </div>
     </div>
   );
diff --git a/src/components/mobile/Appartment/Parameters.tsx b/src/components/mobile/Appartment/Parameters.tsx
index ba87671..a626ca9 100644
--- a/src/components/mobile/Appartment/Parameters.tsx
+++ b/src/components/mobile/Appartment/Parameters.tsx
@@ -1,30 +1,32 @@
-import { Parameters } from "../../../types/appartment";
+import useStore from "../../../store/store";
 
-type ParametersProps = {
-  parameters: Parameters;
-};
+const Parameters = () => {
+  const { currentVilla } = useStore();
 
-const Parameters = ({ parameters }: ParametersProps) => {
   return (
     <div className="p-6 border-b">
       <h2 className="text-xl font-medium ">Parameters</h2>
       <div className="flex flex-col gap-2 pt-4">
         <div className="flex justify-between gap-4">
           <div className="w-1/2 text-sm text-[#666668] font-medium">Type</div>
-          <div className="w-1/2 text-sm font-medium">{parameters.type}</div>
+          <div className="w-1/2 text-sm font-medium">
+            {currentVilla && currentVilla.type}
+          </div>
         </div>
         <div className="flex justify-between gap-4">
           <div className="w-1/2 text-sm text-[#666668] font-medium">
             Plot area
           </div>
-          <div className="w-1/2 text-sm font-medium">{parameters.plotArea}</div>
+          <div className="w-1/2 text-sm font-medium">
+            {currentVilla && currentVilla.plotArea}
+          </div>
         </div>
         <div className="flex justify-between gap-4">
           <div className="w-1/2 text-sm text-[#666668] font-medium">
             Total Build up Area
           </div>
           <div className="w-1/2 text-sm font-medium">
-            {parameters.totalBuildUpArea}
+            {currentVilla && currentVilla.totalBuildUpArea}
           </div>
         </div>
         <div className="flex justify-between gap-4">
@@ -32,7 +34,7 @@ const Parameters = ({ parameters }: ParametersProps) => {
             Total no. of Bedrooms
           </div>
           <div className="w-1/2 text-sm font-medium">
-            {parameters.totalCountBedroms}
+            {currentVilla && currentVilla.totalCountBedroms}
           </div>
         </div>
         <div className="flex justify-between gap-4">
@@ -40,7 +42,7 @@ const Parameters = ({ parameters }: ParametersProps) => {
             Villa Theme
           </div>
           <div className="w-1/2 text-sm font-medium">
-            {parameters.villaTheme}
+            {currentVilla && currentVilla.villaTheme}
           </div>
         </div>
       </div>
diff --git a/src/components/mobile/Appartment/PopupModal.tsx b/src/components/mobile/Appartment/PopupModal.tsx
index b7db7a0..e30e715 100644
--- a/src/components/mobile/Appartment/PopupModal.tsx
+++ b/src/components/mobile/Appartment/PopupModal.tsx
@@ -1,7 +1,6 @@
 import { useState } from "react";
 import useStore from "../../../store/store";
 import ViewControllerModal from "./ViewControllerModal";
-import { A1MViewParams } from "../../../consts/viewParams";
 import ButtonPanel from "./ButtonPanel";
 import { popups } from "../../../consts/popups";
 
@@ -14,7 +13,7 @@ const PopupModal = () => {
   };
 
   const handleOnComplete = () => {
-    setModal(<ViewControllerModal parameters={A1MViewParams} />);
+    setModal(<ViewControllerModal />);
     setPanel(<ButtonPanel />);
   };
 
diff --git a/src/components/mobile/Appartment/ViewControllerModal.tsx b/src/components/mobile/Appartment/ViewControllerModal.tsx
index d437cd2..74a2cbb 100644
--- a/src/components/mobile/Appartment/ViewControllerModal.tsx
+++ b/src/components/mobile/Appartment/ViewControllerModal.tsx
@@ -1,20 +1,14 @@
 import { useEffect, useState } from "react";
 import { SwipeEventData, useSwipeable } from "react-swipeable";
 import ButtonSwipperIcon from "../../../icons/ButtonSwipperIcon";
-import { Parameters as ParametersType } from "../../../types/appartment";
+// import { Parameters as ParametersType } from "../../../types/appartment";
 import Parameters from "./Parameters";
-// import LayoutSlider from "./LayoutSlider";
-// import LayoutSlider from "./ImageSlider";
 import LayoutSlider from "./LayoutSlider";
 import ImageSlider from "./ImageSlider";
 import ViewToggle from "../../ViewToggle";
 
-type ViewControllerModalProps = {
-  parameters: ParametersType;
-};
-
-const ViewControllerModal = ({ parameters }: ViewControllerModalProps) => {
-  const { sliders } = parameters;
+const ViewControllerModal = () => {
+  // const { sliders } = parameters;
   const [offset, setOffset] = useState(1);
   const [isTouchable, setIsTouchable] = useState(true);
   const [scrollY, setScrollY] = useState(0);
@@ -69,9 +63,9 @@ const ViewControllerModal = ({ parameters }: ViewControllerModalProps) => {
           className="h-[calc(100vh-110px)] overflow-y-scroll relative"
           onScroll={handleOnScroll}
         >
-          <LayoutSlider sliders={sliders} />
-          <Parameters parameters={parameters} />
-          <ImageSlider parameters={parameters} />
+          <LayoutSlider />
+          <Parameters />
+          <ImageSlider />
         </div>
         <div className="px-6 py-4 mt-auto border">
           <button
diff --git a/src/consts/viewParams.ts b/src/consts/viewParams.ts
deleted file mode 100644
index eceaca8..0000000
--- a/src/consts/viewParams.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Parameters } from "../types/appartment";
-
-const A1MViewParams: Parameters = {
-  type: "A1M",
-  plotArea: "1080 Sq.m",
-  totalBuildUpArea: "472 Sq.m",
-  totalCountBedroms: 5,
-  villaTheme: "Modern",
-  sliders: [
-    {
-      title: "Ground Floor",
-      image: "/images/apartment/A1M/A1M_GF.png",
-    },
-    {
-      title: "First Floor",
-      image: "/images/apartment/A1M/A1M_1F.png",
-    },
-    {
-      title: "Parking",
-      image: "/images/apartment/A1M/A1M_P.png",
-    },
-  ],
-  perspectiveWorkings: [
-    "/images/apartment/A1M/perspectiveWorking/009_Villa_A1MO_CAM_01_R05.jpg",
-    "/images/apartment/A1M/perspectiveWorking/009_Villa_A1MO_CAM_02_R05.jpg",
-  ],
-};
-
-export { A1MViewParams };
diff --git a/src/consts/villas.ts b/src/consts/villas.ts
new file mode 100644
index 0000000..2654e6c
--- /dev/null
+++ b/src/consts/villas.ts
@@ -0,0 +1,37 @@
+import { Villa } from "../types/appartment";
+
+const villaA1M: Villa = {
+  type: "A1M",
+  plotArea: "1080 Sq.m",
+  totalBuildUpArea: "472 Sq.m",
+  totalCountBedroms: 5,
+  villaTheme: "Modern",
+  sliders: [
+    {
+      id: 1,
+      image: "/images/apartment/A1M/A1M_GF.png",
+    },
+    {
+      id: 2,
+      image: "/images/apartment/A1M/A1M_1F.png",
+    },
+    {
+      id: 3,
+      image: "/images/apartment/A1M/A1M_P.png",
+    },
+  ],
+  perspectiveWorkings: [
+    {
+      id: 1,
+      image: "/images/apartment/A1M/perspectiveWorking/009_Villa_A1MO_CAM_01_R05.jpg",
+    },
+    {
+      id: 2,
+      image: "/images/apartment/A1M/perspectiveWorking/009_Villa_A1MO_CAM_02_R05.jpg",
+    },
+  ],
+};
+
+const villas =[villaA1M]
+
+export { villaA1M, villas };
diff --git a/src/hooks/useVilla.tsx b/src/hooks/useVilla.tsx
new file mode 100644
index 0000000..f28fd3e
--- /dev/null
+++ b/src/hooks/useVilla.tsx
@@ -0,0 +1,15 @@
+import { useParams } from "react-router-dom";
+import { villas } from "../consts/villas";
+import { villaA1M } from "../consts/villas";
+
+function useVilla() {
+  const { villaTitle } = useParams();
+  const currentVilla = villas.find((villa) => villa.type === villaTitle);
+  if (!currentVilla) {
+    return { villa: villaA1M };
+  }
+
+  return { villa: currentVilla };
+}
+
+export { useVilla };
diff --git a/src/main.tsx b/src/main.tsx
index f0bccee..92200c5 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -5,7 +5,7 @@ import "./index.css";
 
 const router = createBrowserRouter([
   {
-    path: "/",
+    path: "/villa/:villaTitle",
     element: <App />,
   },
 ]);
diff --git a/src/pages/Desktop/Apartment.tsx b/src/pages/Desktop/Apartment.tsx
deleted file mode 100644
index 87cc47a..0000000
--- a/src/pages/Desktop/Apartment.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Unity, useUnityContext } from "react-unity-webgl";
-import { useEffect } from "react";
-import { ReactUnityEventParameter } from "react-unity-webgl/distribution/types/react-unity-event-parameters";
-import useStore from "../../store/store";
-import LoaderModal from "../../components/LoaderModal";
-import ButtonPanel from "../../components/desktop/ButtonPanel";
-import ParameterDescription from "../../components/desktop/ParameterDescription";
-import { A1MViewParams } from "../../consts/viewParams";
-import LayoutsButtonContainer from "../../components/desktop/LayoutsButtonContainer";
-
-const Apartment = () => {
-  const { loader, setLoader, setSendMessageToUnity } = useStore();
-
-  const {
-    unityProvider,
-    isLoaded,
-    sendMessage,
-    addEventListener,
-    removeEventListener,
-  } = useUnityContext({
-    loaderUrl: "builds/estate-webgl.loader.js",
-    dataUrl: "builds/estate-webgl.data.unityweb",
-    frameworkUrl: "builds/estate-webgl.framework.js.unityweb",
-    codeUrl: "builds/estate-webgl.wasm.unityweb",
-    streamingAssetsUrl: "StreamingAssets",
-  });
-
-  const handleSetLoaded = (isSceneLoaded: ReactUnityEventParameter) => {
-    if (isSceneLoaded === 0) {
-      setLoader(<LoaderModal />);
-    } else {
-      setLoader(null);
-    }
-  };
-
-  useEffect(() => {
-    addEventListener("SetLoaded", handleSetLoaded);
-
-    return () => {
-      removeEventListener("SetLoaded", handleSetLoaded);
-    };
-  }, []);
-
-  useEffect(() => {
-    if (!isLoaded) {
-      setLoader(<LoaderModal />);
-    } else {
-      setLoader(null);
-      setSendMessageToUnity(sendMessage);
-      sendMessage("LevelSwitcher", "LoadSceneSingle", "Outdoor/A1");
-    }
-  }, [isLoaded]);
-
-  return (
-    <>
-      {loader}
-      <div className="pt-[101px] pb-[63px] px-[215px] relative">
-        <div className="relative">
-          <ButtonPanel />
-          <Unity
-            unityProvider={unityProvider}
-            style={{ width: "100%", height: "100%" }}
-          />
-          <LayoutsButtonContainer />
-        </div>
-        <ParameterDescription params={A1MViewParams} />
-      </div>
-    </>
-  );
-};
-
-export default Apartment;
diff --git a/src/pages/Desktop/Desktop.tsx b/src/pages/Desktop/Desktop.tsx
index 9c1117c..2732d54 100644
--- a/src/pages/Desktop/Desktop.tsx
+++ b/src/pages/Desktop/Desktop.tsx
@@ -1,7 +1,71 @@
-import Apartment from "./Apartment";
+import { Unity, useUnityContext } from "react-unity-webgl";
+import { useEffect } from "react";
+import { ReactUnityEventParameter } from "react-unity-webgl/distribution/types/react-unity-event-parameters";
+import useStore from "../../store/store";
+import LoaderModal from "../../components/LoaderModal";
+import ButtonPanel from "../../components/desktop/ButtonPanel";
+import ParameterDescription from "../../components/desktop/ParameterDescription";
+import LayoutsButtonContainer from "../../components/desktop/LayoutsButtonContainer";
 
 const Desktop = () => {
-  return <Apartment />;
+  const { loader, setLoader, setSendMessageToUnity } = useStore();
+
+  const {
+    unityProvider,
+    isLoaded,
+    sendMessage,
+    addEventListener,
+    removeEventListener,
+  } = useUnityContext({
+    loaderUrl: "builds/estate-webgl.loader.js",
+    dataUrl: "builds/estate-webgl.data.unityweb",
+    frameworkUrl: "builds/estate-webgl.framework.js.unityweb",
+    codeUrl: "builds/estate-webgl.wasm.unityweb",
+    streamingAssetsUrl: "StreamingAssets",
+  });
+
+  const handleSetLoaded = (isSceneLoaded: ReactUnityEventParameter) => {
+    if (isSceneLoaded === 0) {
+      setLoader(<LoaderModal />);
+    } else {
+      setLoader(null);
+    }
+  };
+
+  useEffect(() => {
+    addEventListener("SetLoaded", handleSetLoaded);
+
+    return () => {
+      removeEventListener("SetLoaded", handleSetLoaded);
+    };
+  }, []);
+
+  useEffect(() => {
+    if (!isLoaded) {
+      setLoader(<LoaderModal />);
+    } else {
+      setLoader(null);
+      setSendMessageToUnity(sendMessage);
+      sendMessage("LevelSwitcher", "LoadSceneSingle", "Outdoor/A1");
+    }
+  }, [isLoaded]);
+
+  return (
+    <>
+      {loader}
+      <div className="pt-[101px] pb-[63px] px-[215px] relative">
+        <div className="relative">
+          <ButtonPanel />
+          <Unity
+            unityProvider={unityProvider}
+            style={{ width: "100%", height: "100%" }}
+          />
+          <LayoutsButtonContainer />
+        </div>
+        <ParameterDescription />
+      </div>
+    </>
+  );
 };
 
 export default Desktop;
diff --git a/src/pages/Mobile/Apartment.tsx b/src/pages/Mobile/Apartment.tsx
deleted file mode 100644
index 3555449..0000000
--- a/src/pages/Mobile/Apartment.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { useEffect } from "react";
-import { ReactUnityEventParameter } from "react-unity-webgl/distribution/types/react-unity-event-parameters";
-import { Unity, useUnityContext } from "react-unity-webgl";
-import useStore from "../../store/store";
-import LoaderModal from "../../components/LoaderModal";
-import ButtonPanel from "../../components/mobile/Appartment/ButtonPanel";
-import ViewControllerModal from "../../components/mobile/Appartment/ViewControllerModal";
-import { A1MViewParams } from "../../consts/viewParams";
-
-const Apartment = () => {
-  const {
-    modal,
-    loader,
-    panel,
-    setCurrentView,
-    setModal,
-    setPanel,
-    setSendMessageToUnity,
-    setLoader,
-  } = useStore();
-
-  const {
-    unityProvider,
-    isLoaded,
-    sendMessage,
-    addEventListener,
-    removeEventListener,
-  } = useUnityContext({
-    loaderUrl: "builds/estate-webgl.loader.js",
-    dataUrl: "builds/estate-webgl.data.unityweb",
-    frameworkUrl: "builds/estate-webgl.framework.js.unityweb",
-    codeUrl: "builds/estate-webgl.wasm.unityweb",
-    streamingAssetsUrl: "StreamingAssets",
-  });
-
-  const handleSetLoaded = (isSceneLoaded: ReactUnityEventParameter) => {
-    if (isSceneLoaded === 0) {
-      setLoader(<LoaderModal />);
-    } else {
-      setModal(<ViewControllerModal parameters={A1MViewParams} />);
-      setLoader(null);
-    }
-  };
-
-  const handleSetView = (view: ReactUnityEventParameter) => {
-    setCurrentView(view as number);
-  };
-
-  useEffect(() => {
-    addEventListener("SetLoaded", handleSetLoaded);
-    addEventListener("SetView", handleSetView);
-
-    return () => {
-      removeEventListener("SetLoaded", handleSetLoaded);
-      removeEventListener("SetView", handleSetView);
-    };
-  }, []);
-
-  useEffect(() => {
-    if (!isLoaded) {
-      setLoader(<LoaderModal />);
-    } else {
-      setLoader(null);
-      sendMessage("LevelSwitcher", "LoadSceneSingle", "Outdoor/A1");
-      setSendMessageToUnity(sendMessage);
-      setModal(<ViewControllerModal parameters={A1MViewParams} />);
-      setPanel(<ButtonPanel />);
-    }
-  }, [
-    isLoaded,
-    sendMessage,
-    setLoader,
-    setModal,
-    setPanel,
-    setSendMessageToUnity,
-  ]);
-
-  return (
-    <>
-      {modal}
-      {loader}
-
-      <div className="h-screen overflow-hidden relative">
-        {panel}
-        <Unity
-          unityProvider={unityProvider}
-          style={{ width: "100vw", height: "100vh" }}
-        />
-      </div>
-    </>
-  );
-};
-
-export default Apartment;
diff --git a/src/pages/Mobile/Mobile.tsx b/src/pages/Mobile/Mobile.tsx
index e35db4f..8aa9876 100644
--- a/src/pages/Mobile/Mobile.tsx
+++ b/src/pages/Mobile/Mobile.tsx
@@ -1,7 +1,95 @@
-import Apartment from "./Apartment";
+import { useEffect } from "react";
+import { ReactUnityEventParameter } from "react-unity-webgl/distribution/types/react-unity-event-parameters";
+import { Unity, useUnityContext } from "react-unity-webgl";
+import useStore from "../../store/store";
+import LoaderModal from "../../components/LoaderModal";
+import ButtonPanel from "../../components/mobile/Appartment/ButtonPanel";
+import ViewControllerModal from "../../components/mobile/Appartment/ViewControllerModal";
 
 const Mobile = () => {
-  return <Apartment />;
+  const {
+    modal,
+    loader,
+    panel,
+    setCurrentView,
+    setModal,
+    setPanel,
+    currentVilla,
+    setSendMessageToUnity,
+    setLoader,
+  } = useStore();
+
+  const {
+    unityProvider,
+    isLoaded,
+    sendMessage,
+    addEventListener,
+    removeEventListener,
+  } = useUnityContext({
+    loaderUrl: "builds/estate-webgl.loader.js",
+    dataUrl: "builds/estate-webgl.data.unityweb",
+    frameworkUrl: "builds/estate-webgl.framework.js.unityweb",
+    codeUrl: "builds/estate-webgl.wasm.unityweb",
+    streamingAssetsUrl: "StreamingAssets",
+  });
+
+  const handleSetLoaded = (isSceneLoaded: ReactUnityEventParameter) => {
+    if (isSceneLoaded === 0) {
+      setLoader(<LoaderModal />);
+    } else {
+      setModal(<ViewControllerModal />);
+      setLoader(null);
+    }
+  };
+
+  const handleSetView = (view: ReactUnityEventParameter) => {
+    setCurrentView(view as number);
+  };
+
+  useEffect(() => {
+    addEventListener("SetLoaded", handleSetLoaded);
+    addEventListener("SetView", handleSetView);
+
+    return () => {
+      removeEventListener("SetLoaded", handleSetLoaded);
+      removeEventListener("SetView", handleSetView);
+    };
+  }, []);
+
+  useEffect(() => {
+    if (!isLoaded) {
+      setLoader(<LoaderModal />);
+    } else {
+      setLoader(null);
+      sendMessage("LevelSwitcher", "LoadSceneSingle", "Outdoor/A1");
+      setSendMessageToUnity(sendMessage);
+      setModal(<ViewControllerModal />);
+      setPanel(<ButtonPanel />);
+    }
+  }, [
+    isLoaded,
+    sendMessage,
+    setLoader,
+    setModal,
+    setPanel,
+    setSendMessageToUnity,
+    currentVilla,
+  ]);
+
+  return (
+    <>
+      {modal}
+      {loader}
+
+      <div className="h-screen overflow-hidden relative">
+        {panel}
+        <Unity
+          unityProvider={unityProvider}
+          style={{ width: "100vw", height: "100vh" }}
+        />
+      </div>
+    </>
+  );
 };
 
 export default Mobile;
diff --git a/src/store/store.ts b/src/store/store.ts
index bdadc4f..13993e7 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -1,14 +1,16 @@
 import { ReactUnityEventParameter } from "react-unity-webgl/distribution/types/react-unity-event-parameters";
 import { create } from "zustand";
+import { Villa } from "../types/appartment";
 
 interface StoreType {
-  
+  currentVilla: Villa | null;
   loader: React.ReactNode | null;
   panel: React.ReactNode | null;
   modal: React.ReactNode | null;
   sendMessageToUnity:  ((gameObjectName: string, methodName: string, parameter?: ReactUnityEventParameter) => void) | null;
   currentView: number;
 
+  setCurrentVilla: (villa: Villa) => void;
   setCurrentView: (view: number) => void;
   setModal: (modal: React.ReactNode | null) => void;
   setPanel: (panel: React.ReactNode | null) => void;
@@ -17,12 +19,14 @@ interface StoreType {
 }
 
 const useStore = create<StoreType>((set) => ({
+  currentVilla: null,
   modal: null,  
   panel: null,  
   sendMessageToUnity: null,
   loader: null,
   currentView: 1,
 
+  setCurrentVilla: (villa) => set(() => ({currentVilla: villa})),
   setCurrentView: (view) => set(() => ({currentView: view})),
   setModal: (modal) => set(() => ({ modal: modal })),
   setPanel: (panel) => set(() => ({ panel: panel })),
diff --git a/src/types/appartment.ts b/src/types/appartment.ts
index 208040b..80323aa 100644
--- a/src/types/appartment.ts
+++ b/src/types/appartment.ts
@@ -1,16 +1,16 @@
-type Slider = {
-    title:  string;
+type SliderImage = {
+    id: number;
     image: string;
 }
 
-type Parameters = {
+type Villa = {
   type: string;
   plotArea: string;
   totalBuildUpArea: string;
   totalCountBedroms: number;
   villaTheme: string;
-  sliders: Slider[];
-  perspectiveWorkings: string[]
+  sliders: SliderImage[];
+  perspectiveWorkings: SliderImage[]
 };
 
 type ViewSwitcher ={
@@ -19,4 +19,4 @@ type ViewSwitcher ={
   unityHandler: string,
 }
 
-export type {Slider as SliderType, Parameters, ViewSwitcher}
\ No newline at end of file
+export type {SliderImage as SliderType, Villa, ViewSwitcher}
\ No newline at end of file