Merge remote-tracking branch 'origin/main-demo' into main-dev

2025-08-11 17:09:10 +05:30
parent 78e1ccf39f e835de5424
commit 71f5d2875d
10 changed files with 478 additions and 409 deletions
--- a/app/src/components/Dashboard/DashboardCard.tsx
+++ b/app/src/components/Dashboard/DashboardCard.tsx
@@ -2,11 +2,16 @@ import React, { useState, useRef, useEffect, act } from "react";
 import img from "../../assets/image/image.png";
 import { useNavigate } from "react-router-dom";
 import { getUserData } from "../../functions/getUserData";
-import { useLoadingProgress, useProjectName, useSocketStore } from "../../store/builder/store";
+import {
+  useLoadingProgress,
+  useProjectName,
+  useSocketStore,
+} from "../../store/builder/store";
 import { viewProject } from "../../services/dashboard/viewProject";
 import OuterClick from "../../utils/outerClick";
 import { KebabIcon } from "../icons/ExportCommonIcons";
 import { getAllProjects } from "../../services/dashboard/getAllProjects";
+import { updateProject } from "../../services/dashboard/updateProject";

 interface DashBoardCardProps {
  projectName: string;
@@ -14,7 +19,7 @@ interface DashBoardCardProps {
  projectId: string;
  createdAt?: string;
  isViewed?: string;
-    createdBy?: { _id: string, userName: string };
+  createdBy?: { _id: string; userName: string };
  handleDeleteProject?: (projectId: string) => Promise<void>;
  handleTrashDeleteProject?: (projectId: string) => Promise<void>;
  handleRestoreProject?: (projectId: string) => Promise<void>;
@@ -51,7 +56,7 @@ const DashboardCard: React.FC<DashBoardCardProps> = ({
  createdBy,
  setRecentDuplicateData,
  setProjectDuplicateData,
-    setActiveFolder
+  setActiveFolder,
 }) => {
  const navigate = useNavigate();
  const { setProjectName } = useProjectName();
@@ -64,18 +69,14 @@ const DashboardCard: React.FC<DashBoardCardProps> = ({
  const kebabRef = useRef<HTMLDivElement>(null);

  const navigateToProject = async (e: any) => {
-        console.log('active: ', active);
    if (active && active == "trash") return;
    try {
-            const viewProjects = await viewProject(organization, projectId, userId)
-            console.log('viewProjects: ', viewProjects);
-            console.log('projectName: ', projectName);
-            setLoadingProgress(1)
+      const viewProjects = await viewProject(organization, projectId, userId);
+
+      setLoadingProgress(1);
      setProjectName(projectName);
      navigate(`/${projectId}`);
-        } catch {
-
-        }
+    } catch {}
  };

  const handleOptionClick = async (option: string) => {
@@ -95,18 +96,18 @@ const DashboardCard: React.FC<DashBoardCardProps> = ({
      case "open in new tab":
        try {
          if (active === "shared" && createdBy) {
-                        console.log("ihreq");
-                        const newTab = await viewProject(organization, projectId, createdBy?._id);
-                        console.log('newTab: ', newTab);
+            const newTab = await viewProject(
+              organization,
+              projectId,
+              createdBy?._id
+            );
          } else {
            const newTab = await viewProject(organization, projectId, userId);
-                        console.log('newTab: ', newTab);
+
            setProjectName(projectName);
            setIsKebabOpen(false);
          }
-                } catch (error) {
-
-                }
+        } catch (error) {}
        window.open(`/${projectId}`, "_blank");
        break;
      case "rename":
@@ -120,9 +121,14 @@ const DashboardCard: React.FC<DashBoardCardProps> = ({
              projectName,
              thumbnail,
            });
-                    await handleDuplicateWorkspaceProject(projectId, projectName, thumbnail, userId);
+          await handleDuplicateWorkspaceProject(
+            projectId,
+            projectName,
+            thumbnail,
+            userId
+          );
          if (active === "shared" && setActiveFolder) {
-                        setActiveFolder("myProjects")
+            setActiveFolder("myProjects");
          }
        } else if (handleDuplicateRecentProject) {
          setRecentDuplicateData &&
@@ -130,7 +136,7 @@ const DashboardCard: React.FC<DashBoardCardProps> = ({
              projectId,
              projectName,
              thumbnail,
-                            userId
+              userId,
            });
          await handleDuplicateRecentProject(projectId, projectName, thumbnail);
        }
@@ -156,17 +162,23 @@ const DashboardCard: React.FC<DashBoardCardProps> = ({
        (val: any) => val.projectUuid === projectId || val._id === projectId
      );
      const updateProjects = {
-                projectId: projectUuid,
+        projectId: projectUuid?._id,
        organization,
        userId,
        projectName,
        thumbnail: undefined,
      };
-
+      //   const updatedProjectName = await updateProject(
+      //     projectUuid._id,
+      //     userId,
+      //     organization,
+      //     undefined,
+      //     projectName
+      //   );
      if (projectSocket) {
        projectSocket.emit("v1:project:update", updateProjects);
      }
-        } catch (error) { }
+    } catch (error) {}
  };

  function getRelativeTime(dateString: string): string {
@@ -218,9 +230,18 @@ const DashboardCard: React.FC<DashBoardCardProps> = ({
    >
      <div className="dashboard-card-wrapper">
        <div className="preview-container">
-                    {thumbnail ? <img src={thumbnail} alt="" /> : <img src={img} alt="" />}
+          {thumbnail ? (
+            <img src={thumbnail} alt="" />
+          ) : (
+            <img src={img} alt="" />
+          )}
        </div>
-                <div className="project-details-container" onClick={(e) => { e.stopPropagation() }}>
+        <div
+          className="project-details-container"
+          onClick={(e) => {
+            e.stopPropagation();
+          }}
+        >
          <div className="project-details">
            {isRenaming ? (
              <input
@@ -253,7 +274,11 @@ const DashboardCard: React.FC<DashBoardCardProps> = ({
          </div>
          <div className="users-list-container" ref={kebabRef}>
            <div className="user-profile">
-                            {(!createdBy) ? userName ? userName?.charAt(0).toUpperCase() : "A" : createdBy?.userName?.charAt(0).toUpperCase()}
+              {!createdBy
+                ? userName
+                  ? userName?.charAt(0).toUpperCase()
+                  : "A"
+                : createdBy?.userName?.charAt(0).toUpperCase()}
            </div>
            <button
              className="kebab-wrapper"
--- a/app/src/components/Dashboard/DashboardHome.tsx
+++ b/app/src/components/Dashboard/DashboardHome.tsx
@@ -8,15 +8,16 @@ import { recentlyViewed } from "../../services/dashboard/recentlyViewed";
 import { searchProject } from "../../services/dashboard/searchProjects";
 import { deleteProject } from "../../services/dashboard/deleteProject";
 import ProjectSocketRes from "./socket/projectSocketRes.dev";
+import { generateUniqueId } from "../../functions/generateUniqueId";

 interface Project {
  _id: string;
  projectName: string;
  thumbnail: string;
-  createdBy: { _id: string, userName: string };
+  createdBy: { _id: string; userName: string };
  projectUuid?: string;
  createdAt: string;
-  isViewed?: string
+  isViewed?: string;
 }

 interface RecentProjectsData {
@@ -25,12 +26,12 @@ interface RecentProjectsData {

 const DashboardHome: React.FC = () => {
  const [recentProjects, setRecentProjects] = useState<RecentProjectsData>({});
+
  const [isSearchActive, setIsSearchActive] = useState<boolean>(false);
  const { userId, organization } = getUserData();
  const { projectSocket } = useSocketStore();
  const [recentDuplicateData, setRecentDuplicateData] = useState<Object>({});

-
  const fetchRecentProjects = async () => {
    try {
      const projects = await recentlyViewed(organization, userId);
@@ -38,9 +39,7 @@ const DashboardHome: React.FC = () => {
      if (JSON.stringify(projects) !== JSON.stringify(recentProjects)) {
        setRecentProjects(projects);
      }
-    } catch (error) {
-      console.error("Error fetching recent projects:", error);
-    }
+    } catch (error) {}
  };

  const handleRecentProjectSearch = async (inputValue: string) => {
@@ -65,7 +64,7 @@ const DashboardHome: React.FC = () => {
      //   userId,
      //   organization
      // );
-      // console.log('deletedProject: ', deletedProject);
+      //

      //socket for delete Project
      const deleteProject = {
@@ -91,9 +90,7 @@ const DashboardHome: React.FC = () => {
        };
      });
      setIsSearchActive(false);
-    } catch (error) {
-      console.error("Error deleting project:", error);
-    }
+    } catch (error) {}
  };

  const handleDuplicateRecentProject = async (
@@ -105,7 +102,8 @@ const DashboardHome: React.FC = () => {
      userId,
      thumbnail,
      organization,
-      projectUuid: projectId,
+      projectUuid: generateUniqueId(),
+      refProjectID: projectId,
      projectName,
    };
    projectSocket.emit("v1:project:Duplicate", duplicateRecentProjectData);
--- a/app/src/components/Dashboard/DashboardProjects.tsx
+++ b/app/src/components/Dashboard/DashboardProjects.tsx
@@ -9,6 +9,7 @@ import { deleteProject } from "../../services/dashboard/deleteProject";
 import ProjectSocketRes from "./socket/projectSocketRes.dev";
 import { sharedWithMeProjects } from "../../services/dashboard/sharedWithMeProject";
 import { duplicateProject } from "../../services/dashboard/duplicateProject";
+import { generateUniqueId } from "../../functions/generateUniqueId";

 interface Project {
  _id: string;
@@ -27,7 +28,7 @@ const DashboardProjects: React.FC = () => {
  const [workspaceProjects, setWorkspaceProjects] = useState<WorkspaceProjects>(
    {}
  );
-  const [sharedwithMeProject, setSharedWithMeProjects] = useState<any>([])
+  const [sharedwithMeProject, setSharedWithMeProjects] = useState<any>([]);
  const [projectDuplicateData, setProjectDuplicateData] = useState<Object>({});
  const [isSearchActive, setIsSearchActive] = useState<boolean>(false);
  const [activeFolder, setActiveFolder] = useState<string>("myProjects");
@@ -41,7 +42,11 @@ const DashboardProjects: React.FC = () => {
    }
    if (!setWorkspaceProjects || !setIsSearchActive) return;

-    const searchedProject = await searchProject(organization, userId, inputValue);
+    const searchedProject = await searchProject(
+      organization,
+      userId,
+      inputValue
+    );
    setIsSearchActive(true);
    setWorkspaceProjects(searchedProject.message ? {} : searchedProject);
  };
@@ -49,14 +54,13 @@ const DashboardProjects: React.FC = () => {
  const fetchAllProjects = async () => {
    try {
      const projects = await getAllProjects(userId, organization);
+
      if (!projects || !projects.Projects) return;

      if (JSON.stringify(projects) !== JSON.stringify(workspaceProjects)) {
        setWorkspaceProjects(projects);
      }
-    } catch (error) {
-      console.error("Error fetching projects:", error);
-    }
+    } catch (error) {}
  };

  const handleDeleteProject = async (projectId: any) => {
@@ -66,7 +70,7 @@ const DashboardProjects: React.FC = () => {
      //   userId,
      //   organization
      // );
-      // console.log('deletedProject: ', deletedProject);
+      //
      const deleteProjects = {
        projectId,
        organization,
@@ -77,7 +81,6 @@ const DashboardProjects: React.FC = () => {
      if (projectSocket) {
        projectSocket.emit("v1:project:delete", deleteProjects);
      } else {
-        console.error("Socket is not connected.");
      }
      setWorkspaceProjects((prevDiscardedProjects: WorkspaceProjects) => {
        if (!Array.isArray(prevDiscardedProjects?.Projects)) {
@@ -92,22 +95,28 @@ const DashboardProjects: React.FC = () => {
        };
      });
      setIsSearchActive(false);
-    } catch (error) {
-      console.error("Error deleting project:", error);
-    }
+    } catch (error) {}
  };

  const handleDuplicateWorkspaceProject = async (
    projectId: string,
    projectName: string,
-    thumbnail: string,
+    thumbnail: string
  ) => {
+    // const duplicatedProject = await duplicateProject(
+    //   projectId,
+    //   generateUniqueId(),
+    //   thumbnail,
+    //   projectName
+    // );
+    // console.log("duplicatedProject: ", duplicatedProject);

    const duplicateProjectData = {
      userId,
      thumbnail,
      organization,
-      projectUuid: projectId,
+      projectUuid: generateUniqueId(),
+      refProjectID: projectId,
      projectName,
    };
    projectSocket.emit("v1:project:Duplicate", duplicateProjectData);
@@ -153,16 +162,12 @@ const DashboardProjects: React.FC = () => {
    ));
  };

-
  const sharedProject = async () => {
    try {
      const sharedWithMe = await sharedWithMeProjects();
-      setSharedWithMeProjects(sharedWithMe)
-    } catch {
-
-    }
-  }
-
+      setSharedWithMeProjects(sharedWithMe);
+    } catch {}
+  };

  useEffect(() => {
    if (!isSearchActive) {
@@ -172,10 +177,9 @@ const DashboardProjects: React.FC = () => {

  useEffect(() => {
    if (activeFolder === "shared") {
-      sharedProject()
+      sharedProject();
    }
-  }, [activeFolder])
-
+  }, [activeFolder]);

  return (
    <div className="dashboard-home-container">
@@ -184,7 +188,10 @@ const DashboardProjects: React.FC = () => {
        handleProjectsSearch={handleProjectsSearch}
      />

-      <div className="dashboard-container" style={{ height: "calc(100% - 87px)" }}>
+      <div
+        className="dashboard-container"
+        style={{ height: "calc(100% - 87px)" }}
+      >
        <div className="header-wrapper" style={{ display: "flex", gap: "7px" }}>
          <button
            className={`header ${activeFolder === "myProjects" && "active"}`}
@@ -199,9 +206,14 @@ const DashboardProjects: React.FC = () => {
            Shared with me
          </button>
        </div>
-        <div className="cards-container">{activeFolder == "myProjects" ? renderProjects() : renderSharedProjects()}</div>
+        <div className="cards-container">
+          {activeFolder == "myProjects"
+            ? renderProjects()
+            : renderSharedProjects()}
+        </div>

-        {projectDuplicateData && Object.keys(projectDuplicateData).length > 0 && (
+        {projectDuplicateData &&
+          Object.keys(projectDuplicateData).length > 0 && (
            <ProjectSocketRes
              setIsSearchActive={setIsSearchActive}
              setWorkspaceProjects={setWorkspaceProjects}
@@ -213,5 +225,3 @@ const DashboardProjects: React.FC = () => {
 };

 export default DashboardProjects;
-
-
--- a/app/src/components/ui/FileMenu.tsx
+++ b/app/src/components/ui/FileMenu.tsx
@@ -42,26 +42,27 @@ const FileMenu: React.FC = () => {

  const handleProjectRename = async (projectName: string) => {
    setProjectName(projectName);
-        if (!projectId) return
+    if (!projectId) return;

    // localStorage.setItem("projectName", newName);

    try {
-
      if (!email || !userId) return;

      const projects = await getAllProjects(userId, organization);
      if (!projects || !projects.Projects) return;
      // console.log('projects: ', projects);
-            let projectUuid = projects.Projects.find((val: any) => val.projectUuid === projectId || val._id === projectId)
+      let projectUuid = projects.Projects.find(
+        (val: any) => val.projectUuid === projectId || val._id === projectId
+      );

      const updateProjects = {
-                projectId: projectUuid,
+        projectId: projectUuid?._id,
        organization,
        userId,
        projectName,
-                thumbnail: undefined
-            }
+        thumbnail: undefined,
+      };

      // if (dashBoardSocket) {
      //   const handleResponse = (data: any) => {
@@ -73,6 +74,7 @@ const FileMenu: React.FC = () => {
      // }

      //API for projects rename
+      
      const updatedProjectName = await updateProject(
        projectId,
        userId,
@@ -80,7 +82,7 @@ const FileMenu: React.FC = () => {
        undefined,
        projectName
      );
-            // 
+      console.log("updatedProjectName: ", updatedProjectName, projectId);
    } catch (error) {
      console.error("Error updating project name:", error);
    }
--- a/app/src/modules/scene/controls/transformControls/transformControls.tsx
+++ b/app/src/modules/scene/controls/transformControls/transformControls.tsx
@@ -214,7 +214,7 @@ export default function TransformControl() {
                <TransformControls
                    ref={ref}
                    showX={transformMode === "translate"}
-                    showY={transformMode === "rotate"}
+                    showY={transformMode === "rotate" || transformMode === "translate"}
                    showZ={transformMode === "translate"}
                    object={selectedFloorItem}
                    mode={transformMode}
--- a/app/src/modules/scene/helpers/StatsHelper.tsx
+++ b/app/src/modules/scene/helpers/StatsHelper.tsx
@@ -0,0 +1,22 @@
+import { useEffect, useState } from "react";
+import { Stats } from "@react-three/drei";
+import { detectModifierKeys } from "../../../utils/shortcutkeys/detectModifierKeys";
+
+export default function StatsHelper() {
+    const [visible, setVisible] = useState(false);
+
+    useEffect(() => {
+        const handleKeyDown = (event: KeyboardEvent) => {
+            const keyCombination = detectModifierKeys(event);
+            if (keyCombination === "F1") {
+                event.preventDefault();
+                setVisible(prev => !prev);
+            }
+        };
+
+        window.addEventListener("keydown", handleKeyDown);
+        return () => window.removeEventListener("keydown", handleKeyDown);
+    }, []);
+
+    return visible ? <Stats className="stats" /> : null;
+}
--- a/app/src/modules/scene/scene.tsx
+++ b/app/src/modules/scene/scene.tsx
@@ -14,8 +14,9 @@ import { getAllProjects } from "../../services/dashboard/getAllProjects";
 import { getUserData } from "../../functions/getUserData";
 import { useLoadingProgress, useSocketStore } from "../../store/builder/store";
 import { Color, SRGBColorSpace } from "three";
+import StatsHelper from "./helpers/StatsHelper";

-export default function Scene({ layout }: { readonly layout: 'Main Layout' | 'Comparison Layout' }) {
+export default function Scene({ layout }: { readonly layout: "Main Layout" | "Comparison Layout"; }) {
    const map = useMemo(() => [
        { name: "forward", keys: ["ArrowUp", "w", "W"] },
        { name: "backward", keys: ["ArrowDown", "s", "S"] },
@@ -35,12 +36,18 @@ export default function Scene({ layout }: { readonly layout: 'Main Layout' | 'Co
        getAllProjects(userId, organization)
            .then((projects) => {
                if (!projects || !projects.Projects) return;
-                let project = projects.Projects.find((val: any) => val.projectUuid === projectId || val._id === projectId);
-                const canvas = document.getElementById("sceneCanvas")?.getElementsByTagName('canvas')[0];
+                let project = projects.Projects.find(
+                    (val: any) => val.projectUuid === projectId || val._id === projectId
+                );
+                const canvas = document
+                    .getElementById("sceneCanvas")
+                    ?.getElementsByTagName("canvas")[0];
                if (!canvas) return;
-                const screenshotDataUrl = (canvas as HTMLCanvasElement)?.toDataURL("image/png");
+                const screenshotDataUrl = (canvas as HTMLCanvasElement)?.toDataURL(
+                    "image/png"
+                );
                const updateProjects = {
-                    projectId: project?.projectUuid,
+                    projectId: project?._id,
                    organization,
                    userId,
                    projectName: project?.projectName,
@@ -49,11 +56,12 @@ export default function Scene({ layout }: { readonly layout: 'Main Layout' | 'Co
                if (projectSocket) {
                    projectSocket.emit("v1:project:update", updateProjects);
                }
-            }).catch((err) => {
+            })
+            .catch((err) => {
                console.error(err);
            });
        // eslint-disable-next-line
-    }, [activeModule, assets, loadingProgress])
+    }, [activeModule, assets, loadingProgress]);

    return (
        <KeyboardControls map={map}>
@@ -62,13 +70,9 @@ export default function Scene({ layout }: { readonly layout: 'Main Layout' | 'Co
                shadows
                color="#aaaa"
                eventPrefix="client"
-                onContextMenu={(e) => {
-                    e.preventDefault();
-                }}
+                onContextMenu={(e) => { e.preventDefault(); }}
                performance={{ min: 0.9, max: 1.0 }}
-                onCreated={(e) => {
-                    e.scene.background = layout === 'Main Layout' ? null : new Color(0x19191d);
-                }}
+                onCreated={(e) => { e.scene.background = layout === "Main Layout" ? null : new Color(0x19191d); }}
                gl={{ outputColorSpace: SRGBColorSpace, powerPreference: "high-performance", antialias: true }}
            >
                <Setup />
@@ -76,6 +80,7 @@ export default function Scene({ layout }: { readonly layout: 'Main Layout' | 'Co
                <Builder />
                <Simulation />
                <Visualization />
+                <StatsHelper />
            </Canvas>
        </KeyboardControls>
    );
--- a/app/src/pages/Project.tsx
+++ b/app/src/pages/Project.tsx
@@ -33,7 +33,7 @@ const Project: React.FC = () => {
  const { setUserName } = useUserName();
  const { setOrganization } = useOrganization();
  const { projectId } = useParams();
-  const { setProjectName } = useProjectName();
+  const { projectName, setProjectName } = useProjectName();
  const { userId, email, organization, userName } = getUserData();
  const { selectedUser } = useSelectedUserStore();
  const { isLogListVisible } = useLogger();
@@ -56,7 +56,6 @@ const Project: React.FC = () => {
        const matchedProject = allProjects.find(
          (val: any) => val.projectUuid === projectId || val._id === projectId
        );
-
        if (matchedProject) {
          setProjectName(matchedProject.projectName);
          await viewProject(organization, matchedProject._id, userId);
--- a/app/src/services/dashboard/duplicateProject.ts
+++ b/app/src/services/dashboard/duplicateProject.ts
@@ -1,6 +1,7 @@
 let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;

 export const duplicateProject = async (
+  refProjectID: string,
  projectUuid: string,
  thumbnail: string,
  projectName: string
@@ -16,27 +17,32 @@ export const duplicateProject = async (
          token: localStorage.getItem("token") || "", // Coerce null to empty string
          refresh_token: localStorage.getItem("refreshToken") || "",
        },
-        body: JSON.stringify({ projectUuid, thumbnail, projectName }),
+        body: JSON.stringify({
+          refProjectID,
+          projectUuid,
+          thumbnail,
+          projectName,
+        }),
      }
    );
    const newAccessToken = response.headers.get("x-access-token");
    if (newAccessToken) {
-      //console.log("New token received:", newAccessToken);
+      //
      localStorage.setItem("token", newAccessToken);
    }
-    // console.log("response: ", response);
+    
    if (!response.ok) {
-      console.error("Failed to add project");
+      
    }

    const result = await response.json();
-    // console.log("result: ", result);
+    // 
    return result;
  } catch (error) {
    if (error instanceof Error) {
-      console.log(error.message);
+      
    } else {
-      console.log("An unknown error occurred");
+      
    }
  }
 };
--- a/app/src/services/dashboard/updateProject.ts
+++ b/app/src/services/dashboard/updateProject.ts
@@ -30,6 +30,7 @@ export const updateProject = async (
        body: JSON.stringify(body),
      }
    );
+    console.log('body: ', body);
 
    const newAccessToken = response.headers.get("x-access-token");
    if (newAccessToken) {
@@ -41,6 +42,7 @@ export const updateProject = async (
    }

    const result = await response.json();
+    console.log('result: ', result);
    return result;
  } catch (error) {
    if (error instanceof Error) {