updated

2025-06-23 09:37:53 +05:30
parent 2fbdf8ab61
commit 54b02541c1
278 changed files with 10134 additions and 7904 deletions
--- a/app/src/pages/Dashboard.tsx
+++ b/app/src/pages/Dashboard.tsx
@@ -5,23 +5,14 @@ import {
 import DashboardHome from "../components/Dashboard/DashboardHome";
 import DashboardProjects from "../components/Dashboard/DashboardProjects";
 import DashboardTrash from "../components/Dashboard/DashboardTrash";
-import { getUserData } from "../components/Dashboard/functions/getUserData";
+import { getUserData } from "../functions/getUserData";
 import SidePannel from "../components/Dashboard/SidePannel";
 import DashboardTutorial from "../components/Dashboard/DashboardTutorial";
-import { useProductStore } from "../store/simulation/useProductStore";
-import { useEventsStore } from "../store/simulation/useEventsStore";

 const Dashboard: React.FC = () => {
  const [activeTab, setActiveTab] = useState<string>("Home");
  const { socket } = useSocketStore();
-  const { userId, organization, email, userName } = getUserData();
-  const { clearProducts } = useProductStore();
-  const { clearEvents } = useEventsStore();
-
-  useEffect(() => {
-    clearEvents();
-    clearProducts();
-  }, [])
+  const { organization, email } = getUserData();

  useEffect(() => {
    const token = localStorage.getItem("token");
--- a/app/src/pages/Project.tsx
+++ b/app/src/pages/Project.tsx
@@ -1,144 +1,135 @@
 import React, { useEffect } from "react";
 import useModuleStore from "../store/useModuleStore";
 import {
-  useSocketStore,
-  useOrganization,
-  useUserName,
-  useWallItems,
-  useSaveVersion,
-  useViewSceneStore,
-  useProjectName,
-  useRenameModeStore,
-  useSelectedFloorItem,
-  useZones,
+	useSocketStore,
+	useOrganization,
+	useUserName,
+	useWallItems,
+	useSaveVersion,
+	useViewSceneStore,
+	useProjectName,
+	useRenameModeStore,
+	useSelectedFloorItem,
+	useZones,
+	useSelectedComment,
 } from "../store/builder/store";
 import { useNavigate, useParams } from "react-router-dom";
-import { usePlayButtonStore } from "../store/usePlayButtonStore";
-import MarketPlace from "../modules/market/MarketPlace";
-import LoadingPage from "../components/templates/LoadingPage";
-import KeyPressListener from "../utils/shortcutkeys/handleShortcutKeys";
 import { useSelectedUserStore } from "../store/collaboration/useCollabStore";
 import FollowPerson from "../components/templates/FollowPerson";
 import { useLogger } from "../components/ui/log/LoggerContext";
 import RenderOverlay from "../components/templates/Overlay";
 import LogList from "../components/ui/log/LogList";
-import Footer from "../components/footer/Footer";
 import { useToggleStore } from "../store/useUIToggleStore";
-import VersionSaved from "../components/layout/sidebarRight/versionHisory/VersionSaved";
-import SimulationPlayer from "../components/ui/simulation/simulationPlayer";
-import { useProductStore } from "../store/simulation/useProductStore";
 import { getAllProjects } from "../services/dashboard/getAllProjects";
 import { viewProject } from "../services/dashboard/viewProject";
-import RenameTooltip from "../components/ui/features/RenameTooltip";
-import { setFloorItemApi } from "../services/factoryBuilder/assest/floorAsset/setFloorItemApi";
-import { useAssetsStore } from "../store/builder/useAssetStore";
 import ComparisonSceneProvider from "../components/layout/scenes/ComparisonSceneProvider";
 import MainSceneProvider from "../components/layout/scenes/MainSceneProvider";
+import { getUserData } from "../functions/getUserData";
+import { SceneProvider } from "../modules/scene/sceneContext";
+import { getVersionHistoryApi } from "../services/factoryBuilder/versionControl/getVersionHistoryApi";
+import { useVersionHistoryStore } from "../store/builder/useVersionHistoryStore";
+import { VersionProvider } from "../modules/builder/version/versionContext";
+import ThreadChat from "../components/ui/collaboration/ThreadChat";

 const Project: React.FC = () => {
-  let navigate = useNavigate();
-  const echo = useLogger();
-  const { setToggleUI } = useToggleStore();
-  const { activeModule, setActiveModule } = useModuleStore();
-  const { setAssets } = useAssetsStore();
-  const { setUserName } = useUserName();
-  const { setOrganization } = useOrganization();
-  const { setWallItems } = useWallItems();
-  const { setZones } = useZones();
-  const { isVersionSaved } = useSaveVersion();
-  const { setProducts } = useProductStore();
-  const { projectId } = useParams();
-  const { setProjectName } = useProjectName();
+	let navigate = useNavigate();
+	const echo = useLogger();
+	const { setToggleUI } = useToggleStore();
+	const { setActiveModule } = useModuleStore();
+	const { setUserName } = useUserName();
+	const { setOrganization } = useOrganization();
+	const { setWallItems } = useWallItems();
+	const { setZones } = useZones();
+	const { isVersionSaved } = useSaveVersion();
+	const { projectId } = useParams();
+	const { setProjectName } = useProjectName();
+	const { userId, email, organization, userName } = getUserData();
+	const { selectedUser } = useSelectedUserStore();
+	const { isLogListVisible } = useLogger();
+	const { setVersions } = useVersionHistoryStore();
+	const { selectedComment, commentPositionState } = useSelectedComment();

-  const generateThumbnail = async () => {
-    const email = localStorage.getItem("email");
-    const userId = localStorage.getItem("userId");
-    try {
-      if (!email || !userId) {
-        console.error("User data not found in localStorage");
-        return;
-      }
+	useEffect(() => {
+		if (!email || !userId) {
+			console.error("User data not found in localStorage");
+			return;
+		}

-      const emailParts = email.split("@");
-      if (emailParts.length < 2) {
-        console.error("Invalid email format");
-        return;
-      }
+		getAllProjects(userId, organization).then((projects) => {
+			const filterProject = projects?.Projects.find((val: any) => val.projectUuid === projectId || val._id === projectId)
+			setProjectName(filterProject.projectName)
+			viewProject(organization, filterProject._id, userId).then((viewedProject) => {
+			});
+		});

-      const domainParts = emailParts[1].split(".");
-      const Organization = domainParts[0];
-      const projects = await getAllProjects(
-        userId, Organization
-      );
-      const filterProject = projects?.Projects.find((val: any) => val.projectUuid === projectId || val._id
-        === projectId)
-      const viewedProject = await viewProject(
-        Organization,
-        filterProject._id,
-        userId,
-      );
-      // console.log('filterProject.projectName: ', filterProject.projectName);
-      setProjectName(filterProject.projectName)
+	}, []);

-    }
-    catch {
+	useEffect(() => {
+		if (!projectId) return;
+		getVersionHistoryApi(projectId).then((data) => {
+			const versions: VersionHistory = [];
+			data.versions.forEach((version: any) => {
+				versions.push({
+					version: version.version,
+					versionId: version.versionId,
+					versionName: version.versionName,
+					versionDescription: version.description,
+					timeStamp: version.createdAt,
+					createdBy: version.createdBy.userName
+				})
+			})
+			setVersions(versions);
+		})
+	}, [projectId])

-    }
-  }
-  useEffect(() => {
-    generateThumbnail();
-  }, []);
-  // console.log('isRenameMode: ', isRenameMode);
+	useEffect(() => {
+		if (!isVersionSaved) {
+			setToggleUI(true, true);
+		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [isVersionSaved]);

-  const { selectedUser } = useSelectedUserStore();
-  const { isLogListVisible } = useLogger();
+	useEffect(() => {
+		setWallItems([]);
+		setZones([]);
+		setActiveModule("builder");
+		if (email) {
+			const token = localStorage.getItem("token");
+			if (token) {
+				useSocketStore.getState().initializeSocket(email, organization, token);
+			}
+			if (organization && userName) {
+				setOrganization(organization);
+				setUserName(userName);
+			}
+			echo.success("Log in successful");
+		} else {
+			navigate("/");
+		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, []);

-  useEffect(() => {
-    if (!isVersionSaved) {
-      setToggleUI(true, true);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isVersionSaved]);
-
-  useEffect(() => {
-    setAssets([]);
-    setWallItems([]);
-    setZones([]);
-    setProducts([]);
-    setActiveModule("builder");
-    const email = localStorage.getItem("email");
-    if (email) {
-      const Organization = email.split("@")[1].split(".")[0];
-      const token = localStorage.getItem("token");
-      if (token) {
-        useSocketStore.getState().initializeSocket(email, Organization, token);
-      }
-      const name = localStorage.getItem("userName");
-      if (Organization && name) {
-        setOrganization(Organization);
-        setUserName(name);
-      }
-      echo.success("Log in successful");
-    } else {
-      navigate("/");
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  return (
-    <div className="project-main">
-      <ComparisonSceneProvider />
-      <MainSceneProvider />
-      {selectedUser && <FollowPerson />}
-      {isLogListVisible && (
-        <RenderOverlay>
-          <LogList />
-        </RenderOverlay>
-      )}
-      {activeModule !== "market" && !selectedUser && <Footer />}
-      <VersionSaved />
-    </div>
-  );
+	return (
+		<div className="project-main">
+			<SceneProvider layout="Main Layout">
+				<VersionProvider>
+					<MainSceneProvider />
+				</VersionProvider>
+			</SceneProvider>
+			<SceneProvider layout="Comparison Layout">
+				<VersionProvider>
+					<ComparisonSceneProvider />
+				</VersionProvider>
+			</SceneProvider>
+			{selectedUser && <FollowPerson />}
+			{isLogListVisible && (
+				<RenderOverlay>
+					<LogList />
+				</RenderOverlay>
+			)}
+			{(commentPositionState !== null || selectedComment !== null) && <ThreadChat />}
+		</div>
+	);
 };

 export default Project;
--- a/app/src/pages/UserAuth.tsx
+++ b/app/src/pages/UserAuth.tsx
@@ -11,7 +11,7 @@ import { signInApi } from "../services/factoryBuilder/signInSignUp/signInApi";
 import { signUpApi } from "../services/factoryBuilder/signInSignUp/signUpApi";
 import FingerprintJS from "@fingerprintjs/fingerprintjs";
 import { recentlyViewed } from "../services/dashboard/recentlyViewed";
-import { getUserData } from "../components/Dashboard/functions/getUserData";
+import { getUserData } from "../functions/getUserData";

 const UserAuth: React.FC = () => {
  const [email, setEmail] = useState("");
@@ -56,16 +56,16 @@ const UserAuth: React.FC = () => {
        localStorage.setItem("refreshToken", res.message.refreshToken);

        try {
-          // console.log('res.message.userId: ', res.message.userId);
-          // console.log('organization: ', organization);
          const projects = await recentlyViewed(organization, res.message.userId);
-          // console.log('projects: ', projects);
-
          if (res.message.isShare) {
            if (Object.values(projects.RecentlyViewed).length > 0) {
              const firstId = (Object.values(projects?.RecentlyViewed || {})[0] as any)?._id;
-              setLoadingProgress(1)
-              navigate(`/${firstId}`)
+              if (Object.values(projects?.RecentlyViewed).filter((val: any) => val._id == firstId)) {
+                setLoadingProgress(1)
+                navigate(`/${firstId}`)
+              } else {
+                navigate("/Dashboard")
+              }
            } else {
              setLoadingProgress(1);
              navigate("/Dashboard");