From f78b7ce6c5785fcd0b48e02506fe4fb5c98c558d Mon Sep 17 00:00:00 2001
From: Gomathi9520 <gomathi@hexrfactory.com>
Date: Mon, 31 Mar 2025 19:39:09 +0530
Subject: [PATCH] conflicts resolved in api file

---
 app/src/components/ui/componets/Dropped3dWidget.tsx           | 1 -
 app/src/components/ui/componets/RealTimeVisulization.tsx      | 3 +++
 app/src/pages/Project.tsx                                     | 2 +-
 app/src/services/realTimeVisulization/zoneData/addWidgets.ts  | 4 ++--
 .../services/realTimeVisulization/zoneData/getFloatingData.ts | 4 ++--
 app/src/services/realTimeVisulization/zoneData/getZoneData.ts | 4 ++--
 app/src/services/realTimeVisulization/zoneData/panel.ts       | 4 ++--
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/src/components/ui/componets/Dropped3dWidget.tsx b/app/src/components/ui/componets/Dropped3dWidget.tsx
index c627af4..94c5e45 100644
--- a/app/src/components/ui/componets/Dropped3dWidget.tsx
+++ b/app/src/components/ui/componets/Dropped3dWidget.tsx
@@ -26,7 +26,6 @@ export default function Dropped3dWidgets() {
         Record<string, { id: string; type: string; position: [number, number, number] }[]>
     >({});
     const { setWidgets3D } = use3DWidget()
-
     useEffect(() => {
         if (activeModule !== "visualization") return
         if (selectedZone.zoneName === "") return;
diff --git a/app/src/components/ui/componets/RealTimeVisulization.tsx b/app/src/components/ui/componets/RealTimeVisulization.tsx
index 3f81518..f6a041a 100644
--- a/app/src/components/ui/componets/RealTimeVisulization.tsx
+++ b/app/src/components/ui/componets/RealTimeVisulization.tsx
@@ -63,6 +63,7 @@ const RealTimeVisulization: React.FC = () => {
       const organization = email?.split("@")[1]?.split(".")[0];
       try {
         const response = await getZone2dData(organization);
+        console.log('response: ', response);
 
         if (!Array.isArray(response)) {
           return;
@@ -152,6 +153,7 @@ const RealTimeVisulization: React.FC = () => {
           .getState()
           .setZone(selectedZone.zoneName, selectedZone.zoneId);
       }
+
       // Add the dropped object to the zone if the API call is successful
       if (response.message === "FloatWidget created successfully") {
         useDroppedObjectsStore
@@ -200,6 +202,7 @@ const RealTimeVisulization: React.FC = () => {
         <Scene />
       </div>
       {activeModule === "visualization" && selectedZone.zoneName !== "" && <DroppedObjects />}
+      {/* <DroppedObjects /> */}
       {activeModule === "visualization" && (
         <>
           <DisplayZone
diff --git a/app/src/pages/Project.tsx b/app/src/pages/Project.tsx
index 8e426aa..a7800e1 100644
--- a/app/src/pages/Project.tsx
+++ b/app/src/pages/Project.tsx
@@ -52,7 +52,7 @@ const Project: React.FC = () => {
 
   return (
     <div className="project-main">
-      {/* {loadingProgress && <LoadingPage progress={loadingProgress} />} */}
+      {loadingProgress && <LoadingPage progress={loadingProgress} />}
       {!isPlaying && (
         <>
           <ModuleToggle />
diff --git a/app/src/services/realTimeVisulization/zoneData/addWidgets.ts b/app/src/services/realTimeVisulization/zoneData/addWidgets.ts
index 08969ab..8539e54 100644
--- a/app/src/services/realTimeVisulization/zoneData/addWidgets.ts
+++ b/app/src/services/realTimeVisulization/zoneData/addWidgets.ts
@@ -1,5 +1,5 @@
-// let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
-let url_Backend_dwinzo = `http://192.168.0.102:5000`;
+let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
+// let url_Backend_dwinzo = `http://192.168.0.102:5000`;
 export const addingWidgets = async (
   zoneId: string,
   organization: string,
diff --git a/app/src/services/realTimeVisulization/zoneData/getFloatingData.ts b/app/src/services/realTimeVisulization/zoneData/getFloatingData.ts
index 0246175..80d2b19 100644
--- a/app/src/services/realTimeVisulization/zoneData/getFloatingData.ts
+++ b/app/src/services/realTimeVisulization/zoneData/getFloatingData.ts
@@ -1,5 +1,5 @@
-// let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
-let url_Backend_dwinzo = `http://192.168.0.102:5000`;
+let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
+// let url_Backend_dwinzo = `http://192.168.0.102:5000`;
 export const getFloatingZoneData = async (
   ZoneId?: string,
   organization?: string
diff --git a/app/src/services/realTimeVisulization/zoneData/getZoneData.ts b/app/src/services/realTimeVisulization/zoneData/getZoneData.ts
index f68ef15..efbac3b 100644
--- a/app/src/services/realTimeVisulization/zoneData/getZoneData.ts
+++ b/app/src/services/realTimeVisulization/zoneData/getZoneData.ts
@@ -1,5 +1,5 @@
-// let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
-let url_Backend_dwinzo = `http://192.168.0.102:5000`;
+let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
+// let url_Backend_dwinzo = `http://192.168.0.102:5000`;
 export const getZone2dData = async (organization?: string) => {
   try {
     const response = await fetch(
diff --git a/app/src/services/realTimeVisulization/zoneData/panel.ts b/app/src/services/realTimeVisulization/zoneData/panel.ts
index 6d93d1f..82f1289 100644
--- a/app/src/services/realTimeVisulization/zoneData/panel.ts
+++ b/app/src/services/realTimeVisulization/zoneData/panel.ts
@@ -1,5 +1,5 @@
-// let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
-let url_Backend_dwinzo = `http://192.168.0.102:5000`;
+let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
+// let url_Backend_dwinzo = `http://192.168.0.102:5000`;
 type Side = "top" | "bottom" | "left" | "right";
 
 export const panelData = async (