assets added based on categoryin builder

2025-03-31 12:07:25 +05:30
parent 988d7c92db
commit e1200f52d0
10 changed files with 543 additions and 478 deletions
--- a/app/src/components/layout/sidebarLeft/Assets.tsx
+++ b/app/src/components/layout/sidebarLeft/Assets.tsx
@@ -1,13 +1,29 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import Search from "../../ui/inputs/Search";
 import vehicle from "../../../assets/image/vehicles.png";
 import workStation from "../../../assets/image/workStation.png";
 import machines from "../../../assets/image/machines.png";
 import feneration from "../../../assets/image/feneration.png";
 import worker from "../../../assets/image/worker.png";
+import { getCategoryAsset } from "../../../services/factoryBuilder/assest/assets/getCategoryAsset";
+
+interface AssetProp {
+  filename: string;
+  thumbnail: string;
+  category: string;
+  description: string;
+  tags: string;
+  url: String;
+  uploadDate: number;
+  isArchieve: boolean;
+  animated: boolean;
+  price: number;
+  CreatedBy: String;
+}
 const Assets: React.FC = () => {
  const [searchValue, setSearchValue] = useState<string>("");
  const [selectedCategory, setSelectedCategory] = useState<string | null>(null);
+  const [filteredAsset, setFilteredAsset] = useState<AssetProp[]>([]);

  const handleSearchChange = (value: string) => {
    setSearchValue(value);
@@ -34,56 +50,18 @@ const Assets: React.FC = () => {
      categoryImage: feneration,
    },
    {
-      assetName: "Forklift",
-      assetImage: "",
      category: "Vehicles",
      categoryImage: vehicle,
    },
    {
-      assetName: "AGV",
-      assetImage: "",
-      category: "Vehicles",
-      categoryImage: vehicle,
-    },
-    {
-      assetName: "Pallet",
-      assetImage: "",
      category: "Workstation",
      categoryImage: workStation,
    },
    {
-      assetName: "Controller",
-      assetImage: "",
-      category: "Workstation",
-      categoryImage: workStation,
-    },
-    {
-      assetName: "Conveyor",
-      assetImage: "",
-      category: "Workstation",
-      categoryImage: workStation,
-    },
-    {
-      assetName: "VMC",
-      assetImage: "",
      category: "Machines",
      categoryImage: machines,
    },
    {
-      assetName: "CMC",
-      assetImage: "",
-      category: "Machines",
-      categoryImage: machines,
-    },
-    {
-      assetName: "Male Worker",
-      assetImage: "",
-      category: "Workers",
-      categoryImage: worker,
-    },
-    {
-      assetName: "Female Worker",
-      assetImage: "",
      category: "Workers",
      categoryImage: worker,
    },
@@ -94,12 +72,13 @@ const Assets: React.FC = () => {
    new Set(categoryList.map((asset) => asset.category))
  );

-  // Filter assets based on the selected category
-  const filteredAssets =
-    selectedCategory !== null
-      ? categoryList.filter((asset) => asset.category === selectedCategory)
-      : [];
-
+  const fetchCategoryAssets = async (asset: any) => {
+    try {
+      setSelectedCategory(asset);
+      const res = await getCategoryAsset(asset);
+      setFilteredAsset(res);
+    } catch (error) {}
+  };
  return (
    <div className="assets-container">
      <Search onChange={handleSearchChange} />
@@ -118,16 +97,17 @@ const Assets: React.FC = () => {
          </div>
          <h2>{selectedCategory}</h2>
          <div className="assets-container">
-            {filteredAssets.map((asset, index) => (
-              <div key={index} className="assets">
-                <img
-                  src={asset.assetImage}
-                  alt={asset.assetName}
-                  className="asset-image"
-                />
-                <div className="asset-name">{asset.assetName}</div>
-              </div>
-            ))}
+            {filteredAsset &&
+              filteredAsset?.map((asset: any, index: number) => (
+                <div key={index} className="assets">
+                  <img
+                    src={asset.thumbnail}
+                    alt={asset.filename}
+                    className="asset-image"
+                  />
+                  <div className="asset-name">{asset.filename}</div>
+                </div>
+              ))}
          </div>
        </div>
      ) : (
@@ -142,7 +122,7 @@ const Assets: React.FC = () => {
                <div
                  key={index}
                  className="category"
-                  onClick={() => setSelectedCategory(category)}
+                  onClick={() => fetchCategoryAssets(category)}
                >
                  <img
                    src={categoryInfo?.categoryImage || ""}
@@ -161,4 +141,3 @@ const Assets: React.FC = () => {
 };

 export default Assets;
-
--- a/app/src/components/layout/sidebarRight/analysis/RenderAnalysisInputs.tsx
+++ b/app/src/components/layout/sidebarRight/analysis/RenderAnalysisInputs.tsx
@@ -27,7 +27,14 @@ const RenderAnalysisInputs: React.FC<InputRendererProps> = ({
          );
        }
        if (preset.type === "range") {
-          return <InputRange key={index} label={preset.inputs.label} />;
+          return (
+            <InputRange
+              key={index}
+              label={preset.inputs.label}
+              min={0}
+              max={0}
+            />
+          );
        }
        return null;
      })}
--- a/app/src/components/layout/sidebarRight/properties/AssetProperties.tsx
+++ b/app/src/components/layout/sidebarRight/properties/AssetProperties.tsx
@@ -17,12 +17,6 @@ const AssetProperties: React.FC = () => {
  const [userData, setUserData] = useState<UserData[]>([]); // State to track user data
  const [nextId, setNextId] = useState(1); // Unique ID for new entries
  const { selectedFloorItem } = useselectedFloorItem();
-  let xValue = selectedFloorItem.position.x;
-  let zValue = selectedFloorItem.position.z;
-  let rotationRad = selectedFloorItem.rotation.y;
-  let rotationDeg = THREE.MathUtils.radToDeg(rotationRad);
-
-  // useEffect(() => {}, [selectedFloorItem]);
  // Function to handle adding new user data
  const handleAddUserData = () => {
    const newUserData: UserData = {
@@ -59,10 +53,15 @@ const AssetProperties: React.FC = () => {

      <PositionInput
        onChange={() => {}}
-        value1={xValue.toFixed(5)}
-        value2={zValue.toFixed(5)}
+        value1={selectedFloorItem.position.x.toFixed(5)}
+        value2={selectedFloorItem.position.z.toFixed(5)}
+      />
+      <RotationInput
+        onChange={() => {}}
+        value={parseFloat(
+          THREE.MathUtils.radToDeg(selectedFloorItem.rotation.y).toFixed(5)
+        )}
      />
-      <RotationInput onChange={() => {}} value={rotationDeg} />

      <div className="split"></div>

--- a/app/src/components/layout/sidebarRight/properties/GlobalProperties.tsx
+++ b/app/src/components/layout/sidebarRight/properties/GlobalProperties.tsx
@@ -16,7 +16,7 @@ import {
  useWallVisibility,
 } from "../../../../store/store";
 import { setEnvironment } from "../../../../services/factoryBuilder/environment/setEnvironment";
-
+import * as CONSTANTS from "../../../../types/world/worldConstants";
 const GlobalProperties: React.FC = () => {
  const { toggleView, setToggleView } = useToggleView();
  const { selectedWallItem, setSelectedWallItem } = useSelectedWallItem();
@@ -29,18 +29,20 @@ const GlobalProperties: React.FC = () => {
  const { renderDistance, setRenderDistance } = useRenderDistance();
  const { socket } = useSocketStore();
  const [limitDistance, setLimitDistance] = useState(false);
-  const [distance, setDistance] = useState<number>(5);
+  const [distance, setDistance] = useState<number>(30);

  const [limitGridDistance, setLimitGridDistance] = useState(false);
  const [gridDistance, setGridDistance] = useState<number>(5);

  function optimizeScene() {
    setLimitDistance(true);
-    setDistance(5);
+    setDistance(30);
  }

  function updateDistance(value: number) {
+    console.log("value: ", value);
    setDistance(value);
+    setRenderDistance(value);
  }

  function updateGridDistance(value: number) {
@@ -134,6 +136,15 @@ const GlobalProperties: React.FC = () => {
    }
  };

+  // function changeRenderDistance(e: any) {
+  //   if (parseInt(e.target.value) < 20) {
+  //     setRenderDistance(20);
+  //   } else if (parseInt(e.target.value) > 75) {
+  //     setRenderDistance(75);
+  //   } else {
+  //     setRenderDistance(parseInt(e.target.value));
+  //   }
+  // }
  return (
    <div className="global-properties-container">
      <div className="header">Environment</div>
@@ -169,7 +180,7 @@ const GlobalProperties: React.FC = () => {
      />

      <div className="split"></div>
-
+      {/* //visibleEdgeColor={CONSTANTS.outlineConfig.assetDeleteColor} */}
      <InputToggle
        inputKey="4"
        label="Limit Render Distance"
@@ -183,6 +194,8 @@ const GlobalProperties: React.FC = () => {
        disabled={!limitDistance}
        value={distance}
        key={"5"}
+        min={CONSTANTS.distanceConfig.minDistance}
+        max={CONSTANTS.distanceConfig.maxDistance}
        onChange={(value: number) => updateDistance(value)}
      />

--- a/app/src/components/ui/Tools.tsx
+++ b/app/src/components/ui/Tools.tsx
@@ -62,9 +62,15 @@ const Tools: React.FC = () => {

  // Reset activeTool whenever activeModule changes
  useEffect(() => {
-    setToggleUI(localStorage.getItem('navBarUi') ? localStorage.getItem('navBarUi') === 'true' : true)
+    setToggleUI(
+      localStorage.getItem("navBarUi")
+        ? localStorage.getItem("navBarUi") === "true"
+        : true
+    );
  }, []);
-
+  useEffect(() => {
+    console.log("activeModule", activeModule);
+  }, [activeModule]);
  useEffect(() => {
    setActiveTool(activeSubTool);
    setActiveSubTool(activeSubTool);
@@ -80,7 +86,11 @@ const Tools: React.FC = () => {
    } else {
      setToggleView(false);
    }
-    setToggleUI(localStorage.getItem('navBarUi') ? localStorage.getItem('navBarUi') === 'true' : true)
+    setToggleUI(
+      localStorage.getItem("navBarUi")
+        ? localStorage.getItem("navBarUi") === "true"
+        : true
+    );
    setToggleThreeD(!toggleThreeD);
    setActiveSubTool("cursor");
    setActiveTool("cursor");
@@ -202,8 +212,9 @@ const Tools: React.FC = () => {
              <div className="activeDropicon">
                {activeSubTool == "cursor" && (
                  <div
-                    className={`tool-button ${activeTool === "cursor" ? "active" : ""
-                      }`}
+                    className={`tool-button ${
+                      activeTool === "cursor" ? "active" : ""
+                    }`}
                    onClick={() => {
                      setActiveTool("cursor");
                    }}
@@ -213,8 +224,9 @@ const Tools: React.FC = () => {
                )}
                {activeSubTool == "free-hand" && (
                  <div
-                    className={`tool-button ${activeTool === "free-hand" ? "active" : ""
-                      }`}
+                    className={`tool-button ${
+                      activeTool === "free-hand" ? "active" : ""
+                    }`}
                    onClick={() => {
                      setActiveTool("free-hand");
                    }}
@@ -224,8 +236,9 @@ const Tools: React.FC = () => {
                )}
                {activeSubTool == "delete" && (
                  <div
-                    className={`tool-button ${activeTool === "delete" ? "active" : ""
-                      }`}
+                    className={`tool-button ${
+                      activeTool === "delete" ? "active" : ""
+                    }`}
                    onClick={() => {
                      setActiveTool("delete");
                    }}
@@ -297,8 +310,9 @@ const Tools: React.FC = () => {
                <div className="split"></div>
                <div className="draw-tools">
                  <div
-                    className={`tool-button ${activeTool === "draw-wall" ? "active" : ""
-                      }`}
+                    className={`tool-button ${
+                      activeTool === "draw-wall" ? "active" : ""
+                    }`}
                    onClick={() => {
                      setActiveTool("draw-wall");
                    }}
@@ -307,8 +321,9 @@ const Tools: React.FC = () => {
                    <WallIcon isActive={activeTool === "draw-wall"} />
                  </div>
                  <div
-                    className={`tool-button ${activeTool === "draw-zone" ? "active" : ""
-                      }`}
+                    className={`tool-button ${
+                      activeTool === "draw-zone" ? "active" : ""
+                    }`}
                    onClick={() => {
                      setActiveTool("draw-zone");
                    }}
@@ -317,8 +332,9 @@ const Tools: React.FC = () => {
                    <ZoneIcon isActive={activeTool === "draw-zone"} />
                  </div>
                  <div
-                    className={`tool-button ${activeTool === "draw-aisle" ? "active" : ""
-                      }`}
+                    className={`tool-button ${
+                      activeTool === "draw-aisle" ? "active" : ""
+                    }`}
                    onClick={() => {
                      setActiveTool("draw-aisle");
                    }}
@@ -327,8 +343,9 @@ const Tools: React.FC = () => {
                    <AsileIcon isActive={activeTool === "draw-aisle"} />
                  </div>
                  <div
-                    className={`tool-button ${activeTool === "draw-floor" ? "active" : ""
-                      }`}
+                    className={`tool-button ${
+                      activeTool === "draw-floor" ? "active" : ""
+                    }`}
                    onClick={() => {
                      setActiveTool("draw-floor");
                    }}
@@ -344,8 +361,9 @@ const Tools: React.FC = () => {
                <div className="split"></div>
                <div className="draw-tools">
                  <div
-                    className={`tool-button ${activeTool === "measure" ? "active" : ""
-                      }`}
+                    className={`tool-button ${
+                      activeTool === "measure" ? "active" : ""
+                    }`}
                    onClick={() => {
                      setActiveTool("measure");
                    }}
@@ -361,8 +379,9 @@ const Tools: React.FC = () => {
                <div className="split"></div>
                <div className="draw-tools">
                  <div
-                    className={`tool-button ${activeTool === "pen" ? "active" : ""
-                      }`}
+                    className={`tool-button ${
+                      activeTool === "pen" ? "active" : ""
+                    }`}
                    onClick={() => {
                      setActiveTool("pen");
                    }}
@@ -394,8 +413,9 @@ const Tools: React.FC = () => {
            <div className="split"></div>
            <div className="general-options">
              <div
-                className={`tool-button ${activeTool === "comment" ? "active" : ""
-                  }`}
+                className={`tool-button ${
+                  activeTool === "comment" ? "active" : ""
+                }`}
                onClick={() => {
                  setActiveTool("comment");
                }}
@@ -404,8 +424,9 @@ const Tools: React.FC = () => {
              </div>
              {toggleThreeD && (
                <div
-                  className={`tool-button ${activeTool === "play" ? "active" : ""
-                    }`}
+                  className={`tool-button ${
+                    activeTool === "play" ? "active" : ""
+                  }`}
                  onClick={() => {
                    setIsPlaying(!isPlaying);
                  }}
@@ -416,8 +437,9 @@ const Tools: React.FC = () => {
            </div>
            <div className="split"></div>
            <div
-              className={`toggle-threed-button${toggleThreeD ? " toggled" : ""
-                }`}
+              className={`toggle-threed-button${
+                toggleThreeD ? " toggled" : ""
+              }`}
              onClick={toggleSwitch}
            >
              <div className={`toggle-option${!toggleThreeD ? " active" : ""}`}>
--- a/app/src/components/ui/inputs/InputRange.tsx
+++ b/app/src/components/ui/inputs/InputRange.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-
+import * as CONSTANTS from "../../../types/world/worldConstants";
 interface InputToggleProps {
  label: string; // Represents the toggle state (on/off)
  min?: number;
@@ -14,8 +14,8 @@ const InputRange: React.FC<InputToggleProps> = ({
  label,
  onClick,
  onChange,
-  min = 0,
-  max = 10,
+  min,
+  max,
  disabled,
  value = 5,
 }) => {
@@ -23,6 +23,7 @@ const InputRange: React.FC<InputToggleProps> = ({

  function handleChange(e: React.ChangeEvent<HTMLInputElement>) {
    const newValue = parseInt(e.target.value); // Parse the value to an integer
+
    setRangeValue(newValue); // Update the local state

    if (onChange) {