Merge remote-tracking branch 'origin/main' into ui

app/package-lock.json

@@ -4133,25 +4133,6 @@
         "url": "https://github.com/sponsors/gregberge"
       }
     },
-    "node_modules/@testing-library/dom": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
-      "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==",
-      "peer": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^5.0.1",
-        "aria-query": "5.3.0",
-        "chalk": "^4.1.0",
-        "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.5.0",
-        "pretty-format": "^27.0.2"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@testing-library/jest-dom": {
       "version": "5.17.0",
       "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz",

app/src/components/layout/sidebarLeft/visualization/Templates.tsx

@@ -5,7 +5,6 @@ const Templates = () => {
   const { templates, removeTemplate } = useTemplateStore();
   const { setSelectedZone } = useSelectedZoneStore();
 
-  console.log("templates: ", templates);
   const handleDeleteTemplate = (id: string) => {
     removeTemplate(id);
   };

app/src/modules/market/AssetPreview.tsx

@@ -9,7 +9,7 @@ import * as THREE from "three";
 // Define the shape of the selected card
 interface SelectedCard {
   assetName: string;
-  uploadedOn: string;
+  uploadedOn: number;
   price: number;
   rating: number;
   views: number;

app/src/modules/market/Card.tsx

@@ -12,14 +12,14 @@ import { getAssetDownload } from "../../services/marketplace/getAssetDownload";
 
 interface CardProps {
   assetName: string;
-  uploadedOn: string;
+  uploadedOn: number;
   price: number;
   rating: number;
   views: number;
   image: string;
   onSelectCard: (cardData: {
     assetName: string;
-    uploadedOn: string;
+    uploadedOn: number;
     price: number;
     rating: number;
     views: number;

app/src/modules/market/CardsContainer.tsx

@@ -23,7 +23,7 @@ interface ModelsProps {
 const CardsContainer: React.FC<ModelsProps> = ({ models }) => {
   const [selectedCard, setSelectedCard] = useState<{
     assetName: string;
-    uploadedOn: string;
+    uploadedOn: number;
     price: number;
     rating: number;
     views: number;
@@ -31,7 +31,7 @@ const CardsContainer: React.FC<ModelsProps> = ({ models }) => {
 
   const handleCardSelect = (cardData: {
     assetName: string;
-    uploadedOn: string;
+    uploadedOn: number;
     price: number;
     rating: number;
     views: number;
@@ -48,7 +48,7 @@ const CardsContainer: React.FC<ModelsProps> = ({ models }) => {
             <Card
               key={assetDetail._id}
               assetName={assetDetail?.filename}
-              uploadedOn={assetDetail.uploadDate.toString()}
+              uploadedOn={assetDetail.uploadDate}
               price={36500}
               rating={4.5}
               views={800}

app/src/modules/market/FilterSearch.tsx

@@ -29,11 +29,10 @@ const FilterSearch: React.FC<ModelsProps> = ({
   filteredModels,
 }) => {
   const [activeOption, setActiveOption] = useState("Sort by"); // State for active option
-  console.log("filteredModels: ", filteredModels);
 
   const handleSelect = (option: string) => {
     setActiveOption(option);
-    console.log("option: ", option);
+
     // Alphabet ascending
     // Alphabet descending
     // All

app/src/services/realTimeVisulization/zoneData/getSelect2dZoneData.ts

@@ -1,5 +1,4 @@
 let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
-console.log("url_Backend_dwinzo: ", url_Backend_dwinzo);
 
 export const getSelect2dZoneData = async (
   ZoneId?: string,

app/src/styles/components/marketPlace/marketPlace.scss

@@ -47,10 +47,9 @@
         border-radius: $border-radius-large;
 
         .search-container {
-          border: none !important;
-          box-shadow: $box-shadow-medium;
           border-radius: $border-radius-large;
-
+          outline: 1px solid var(--border-color);
+          border: none;
           input {
             border: none !important;
             outline: none;
@@ -60,6 +59,12 @@
 
       .regularDropdown-container {
         max-width: 159px;
+        height: 100%;
+        border-radius: #{$border-radius-large};
+        border: 1px solid var(--border-color);
+        .dropdown-header {
+          align-items: center;
+        }
       }
 
       .button {