diff --git a/app/src/components/ui/collaboration/ThreadChat.tsx b/app/src/components/ui/collaboration/ThreadChat.tsx index be52ec7..61c33cb 100644 --- a/app/src/components/ui/collaboration/ThreadChat.tsx +++ b/app/src/components/ui/collaboration/ThreadChat.tsx @@ -13,7 +13,6 @@ import { deleteThreadApi } from "../../../services/factoryBuilder/comments/delet import { createThreadApi } from "../../../services/factoryBuilder/comments/createThreadApi"; import { getRelativeTime } from "./function/getRelativeTime"; - const ThreadChat: React.FC = () => { const { userId, organization } = getUserData(); const [openThreadOptions, setOpenThreadOptions] = useState(false); @@ -42,7 +41,6 @@ const ThreadChat: React.FC = () => { useEffect(() => { if (comments.length > 0 && selectedComment) { - const allMessages = comments .flatMap((val: any) => @@ -60,7 +58,7 @@ const ThreadChat: React.FC = () => { }); setMessages(allMessages); - + } }, [selectedComment]) @@ -251,9 +249,6 @@ const ThreadChat: React.FC = () => { threadTitle: value }; - - - if (threadSocket) { setInputActive(false); diff --git a/app/src/modules/builder/builder.tsx b/app/src/modules/builder/builder.tsx index c1ed9a5..ab123ad 100644 --- a/app/src/modules/builder/builder.tsx +++ b/app/src/modules/builder/builder.tsx @@ -274,7 +274,7 @@ export default function Builder() { - {/* */} + ); } diff --git a/app/src/modules/builder/groups/floorPlanGroup.tsx b/app/src/modules/builder/groups/floorPlanGroup.tsx index 8f1c2f2..ed3065d 100644 --- a/app/src/modules/builder/groups/floorPlanGroup.tsx +++ b/app/src/modules/builder/groups/floorPlanGroup.tsx @@ -148,7 +148,7 @@ const FloorPlanGroup = ({ floorPlanGroup, floorPlanGroupLine, floorPlanGroupPoin } if (toolMode === "Wall") { - drawWall(raycaster, plane, floorPlanGroupPoint, snappedPoint, isSnapped, isSnappedUUID, line, ispreSnapped, anglesnappedPoint, isAngleSnapped, lines, floorPlanGroupLine, floorPlanGroup, ReferenceLineMesh, LineCreated, currentLayerPoint, dragPointControls, setNewLines, setDeletedLines, activeLayer, socket, projectId, selectedVersion?.versionId || '',); + // drawWall(raycaster, plane, floorPlanGroupPoint, snappedPoint, isSnapped, isSnappedUUID, line, ispreSnapped, anglesnappedPoint, isAngleSnapped, lines, floorPlanGroupLine, floorPlanGroup, ReferenceLineMesh, LineCreated, currentLayerPoint, dragPointControls, setNewLines, setDeletedLines, activeLayer, socket, projectId, selectedVersion?.versionId || '',); } if (toolMode === "Floor") { diff --git a/app/src/modules/builder/groups/zoneGroup.tsx b/app/src/modules/builder/groups/zoneGroup.tsx index 929256f..bfaba3f 100644 --- a/app/src/modules/builder/groups/zoneGroup.tsx +++ b/app/src/modules/builder/groups/zoneGroup.tsx @@ -39,7 +39,7 @@ const ZoneGroup: React.FC = () => { const { selectedVersionStore } = useVersionContext(); const { selectedVersion } = selectedVersionStore(); const { projectId } = useParams(); - const { userId, organization, email } = getUserData(); + const { userId, organization } = getUserData(); const groupsRef = useRef(); diff --git a/app/src/modules/builder/wall/Instances/instance/wall.tsx b/app/src/modules/builder/wall/Instances/instance/wall.tsx index a6c5787..4b44892 100644 --- a/app/src/modules/builder/wall/Instances/instance/wall.tsx +++ b/app/src/modules/builder/wall/Instances/instance/wall.tsx @@ -8,8 +8,8 @@ import { useWallStore } from '../../../../../store/builder/useWallStore'; import { useWallClassification } from './helpers/useWallClassification'; import { useFrame, useThree } from '@react-three/fiber'; import { useWallVisibility } from '../../../../../store/builder/store'; -import { Decal, PivotControls } from '@react-three/drei'; -import { Base, Geometry, Subtraction } from '@react-three/csg'; +import { Decal } from '@react-three/drei'; +import { Base } from '@react-three/csg'; function Wall({ wall }: { readonly wall: Wall }) { const { walls } = useWallStore(); diff --git a/app/src/modules/collaboration/comments/commentsGroup.tsx b/app/src/modules/collaboration/comments/commentsGroup.tsx index 08f39c0..c15e468 100644 --- a/app/src/modules/collaboration/comments/commentsGroup.tsx +++ b/app/src/modules/collaboration/comments/commentsGroup.tsx @@ -1,18 +1,16 @@ import { useEffect, useState } from "react"; import { useThree } from "@react-three/fiber"; -import { MathUtils, Vector3 } from "three"; +import { Vector3 } from "three"; import CommentInstances from "./instances/commentInstances"; import { Sphere } from "@react-three/drei"; import { useActiveTool, useSelectedComment } from "../../../store/builder/store"; - function CommentsGroup() { const { gl, raycaster, camera, scene, pointer, size } = useThree(); const { activeTool } = useActiveTool(); const [hoverPos, setHoverPos] = useState(null); const { setSelectedComment, setCommentPositionState, setPosition2Dstate } = useSelectedComment(); - useEffect(() => { const canvasElement = gl.domElement; diff --git a/app/src/modules/collaboration/comments/instances/commentInstances.tsx b/app/src/modules/collaboration/comments/instances/commentInstances.tsx index 2a9922e..1030b17 100644 --- a/app/src/modules/collaboration/comments/instances/commentInstances.tsx +++ b/app/src/modules/collaboration/comments/instances/commentInstances.tsx @@ -6,17 +6,16 @@ import { useParams } from 'react-router-dom'; import { getUserData } from '../../../../functions/getUserData'; import { getRelativeTime } from '../../../../components/ui/collaboration/function/getRelativeTime'; - function CommentInstances() { const { comments, setComments } = useCommentStore(); const { projectId } = useParams(); const { userId } = getUserData() + const getThreads = async () => { if (!projectId) return; try { const getComments = await getAllThreads(projectId); - const formattedThreads = Array.isArray(getComments.data) ? getComments.data.map((thread: any) => ({ ...thread, @@ -32,7 +31,6 @@ function CommentInstances() { : [], })) : []; - // console.log('formattedThreads: ', formattedThreads); setComments(formattedThreads); } catch (err) { // console.error("Failed to fetch threads:", err); diff --git a/app/src/store/builder/useBuilderStore.ts b/app/src/store/builder/useBuilderStore.ts index a23198b..da52a2e 100644 --- a/app/src/store/builder/useBuilderStore.ts +++ b/app/src/store/builder/useBuilderStore.ts @@ -83,7 +83,7 @@ export const useBuilderStore = create()( // Wall - wallThickness: 0.1, + wallThickness: 0.5, wallHeight: 7, outsideMaterial: 'Default Material', insideMaterial: 'Default Material',