Dwinzo-Beta
/
Dwinzo_dev
4
0
Fork 3
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflicts resolved in api file

This commit is contained in:
Gomathi 2025-03-31 19:39:09 +05:30
parent d4e4952de4
commit f78b7ce6c5
7 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/components/ui/componets/Dropped3dWidget.tsx
View File

@ -26,7 +26,6 @@ export default function Dropped3dWidgets() {
Record<string, { id: string; type: string; position: [number, number, number] }[]> Record<string, { id: string; type: string; position: [number, number, number] }[]>
>({}); >({});
const { setWidgets3D } = use3DWidget() const { setWidgets3D } = use3DWidget()
useEffect(() => { useEffect(() => {
if (activeModule !== "visualization") return if (activeModule !== "visualization") return
if (selectedZone.zoneName === "") return; if (selectedZone.zoneName === "") return;

3
app/src/components/ui/componets/RealTimeVisulization.tsx
View File

@ -63,6 +63,7 @@ const RealTimeVisulization: React.FC = () => {
const organization = email?.split("@")[1]?.split(".")[0]; const organization = email?.split("@")[1]?.split(".")[0];
try { try {
const response = await getZone2dData(organization); const response = await getZone2dData(organization);
console.log('response: ', response);
if (!Array.isArray(response)) { if (!Array.isArray(response)) {
return; return;
@ -152,6 +153,7 @@ const RealTimeVisulization: React.FC = () => {
.getState() .getState()
.setZone(selectedZone.zoneName, selectedZone.zoneId); .setZone(selectedZone.zoneName, selectedZone.zoneId);
} }
// Add the dropped object to the zone if the API call is successful // Add the dropped object to the zone if the API call is successful
if (response.message === "FloatWidget created successfully") { if (response.message === "FloatWidget created successfully") {
useDroppedObjectsStore useDroppedObjectsStore
@ -200,6 +202,7 @@ const RealTimeVisulization: React.FC = () => {
<Scene /> <Scene />
</div> </div>
{activeModule === "visualization" && selectedZone.zoneName !== "" && <DroppedObjects />} {activeModule === "visualization" && selectedZone.zoneName !== "" && <DroppedObjects />}
{/* <DroppedObjects /> */}
{activeModule === "visualization" && ( {activeModule === "visualization" && (
<> <>
<DisplayZone <DisplayZone

2
app/src/pages/Project.tsx
View File

@ -52,7 +52,7 @@ const Project: React.FC = () => {
return ( return (
<div className="project-main"> <div className="project-main">
{/* {loadingProgress && <LoadingPage progress={loadingProgress} />} */} {loadingProgress && <LoadingPage progress={loadingProgress} />}
{!isPlaying && ( {!isPlaying && (
<> <>
<ModuleToggle /> <ModuleToggle />

4
app/src/services/realTimeVisulization/zoneData/addWidgets.ts
View File

@ -1,5 +1,5 @@
// let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`; 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://192.168.0.102:5000`;
export const addingWidgets = async ( export const addingWidgets = async (
zoneId: string, zoneId: string,
organization: string, organization: string,

4
app/src/services/realTimeVisulization/zoneData/getFloatingData.ts
View File

@ -1,5 +1,5 @@
// let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`; 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://192.168.0.102:5000`;
export const getFloatingZoneData = async ( export const getFloatingZoneData = async (
ZoneId?: string, ZoneId?: string,
organization?: string organization?: string

4
app/src/services/realTimeVisulization/zoneData/getZoneData.ts
View File

@ -1,5 +1,5 @@
// let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`; 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://192.168.0.102:5000`;
export const getZone2dData = async (organization?: string) => { export const getZone2dData = async (organization?: string) => {
try { try {
const response = await fetch( const response = await fetch(

4
app/src/services/realTimeVisulization/zoneData/panel.ts
View File

@ -1,5 +1,5 @@
// let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`; 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://192.168.0.102:5000`;
type Side = "top" | "bottom" | "left" | "right"; type Side = "top" | "bottom" | "left" | "right";
export const panelData = async ( export const panelData = async (