From 4e285329fc595bb2d90ab6171417e61ffaf39c9b Mon Sep 17 00:00:00 2001 From: Vishnu Date: Tue, 25 Mar 2025 15:07:06 +0530 Subject: [PATCH 1/4] compose update --- compose.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/compose.yaml b/compose.yaml index 9f6a00b..2b5e419 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,12 +1,13 @@ services: frontend: build: - context: ./frontend + context: ./app + dockerfile: Dockerfile args: - REACT_APP_SERVER_SOCKET_API_BASE_URL=185.100.212.76:8000 - REACT_APP_SERVER_REST_API_BASE_URL=185.100.212.76:5000 - REACT_APP_SERVER_MARKETPLACE_URL=185.100.212.76:50011 - container_name: dwinzo-frontend + container_name: dwinzo-beta stdin_open: true tty: true ports: @@ -16,7 +17,7 @@ services: - PORT=3000 - DOCSIFY_PORT=8201 volumes: - - ./frontend:/app + - ./app:/app volumes: frontend: From 83c65f62afd8987a6945ee619f7eeae24bc927fe Mon Sep 17 00:00:00 2001 From: Vishnu Date: Tue, 25 Mar 2025 15:33:31 +0530 Subject: [PATCH 2/4] docker error fixed --- app/package-lock.json | 52 ++++++------------- app/package.json | 2 +- app/public/index.html | 2 +- .../ui/componets/RealTimeVisulization.tsx | 8 ++- app/src/pages/Project.tsx | 2 +- 5 files changed, 26 insertions(+), 40 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index 84bb185..d9af69f 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,11 +1,11 @@ { - "name": "dwinzo-app", + "name": "dwinzo-beta", "version": "0.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "dwinzo-app", + "name": "dwinzo-beta", "version": "0.1.0", "dependencies": { "@react-three/csg": "^3.2.0", @@ -2012,7 +2012,7 @@ "version": "0.8.1", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", - "devOptional": true, + "dev": true, "dependencies": { "@jridgewell/trace-mapping": "0.3.9" }, @@ -2024,7 +2024,7 @@ "version": "0.3.9", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", - "devOptional": true, + "dev": true, "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" @@ -4263,26 +4263,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==", - "license": "MIT", - "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", @@ -4394,25 +4374,25 @@ "version": "1.0.11", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", - "devOptional": true + "dev": true }, "node_modules/@tsconfig/node12": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "devOptional": true + "dev": true }, "node_modules/@tsconfig/node14": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "devOptional": true + "dev": true }, "node_modules/@tsconfig/node16": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", - "devOptional": true + "dev": true }, "node_modules/@turf/along": { "version": "7.1.0", @@ -8975,7 +8955,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "devOptional": true + "dev": true }, "node_modules/cross-env": { "version": "7.0.3", @@ -9840,7 +9820,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "devOptional": true, + "dev": true, "engines": { "node": ">=0.3.1" } @@ -15197,7 +15177,7 @@ "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "devOptional": true + "dev": true }, "node_modules/makeerror": { "version": "1.0.12", @@ -20637,7 +20617,7 @@ "version": "10.9.2", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", - "devOptional": true, + "dev": true, "dependencies": { "@cspotcode/source-map-support": "^0.8.0", "@tsconfig/node10": "^1.0.7", @@ -20680,7 +20660,7 @@ "version": "8.3.4", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", - "devOptional": true, + "dev": true, "dependencies": { "acorn": "^8.11.0" }, @@ -20692,7 +20672,7 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "devOptional": true + "dev": true }, "node_modules/tsconfig-paths": { "version": "3.15.0", @@ -21179,7 +21159,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "devOptional": true + "dev": true }, "node_modules/v8-to-istanbul": { "version": "8.1.1", @@ -22238,7 +22218,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "devOptional": true, + "dev": true, "engines": { "node": ">=6" } diff --git a/app/package.json b/app/package.json index f1ea92a..a749ff8 100644 --- a/app/package.json +++ b/app/package.json @@ -39,7 +39,7 @@ "prepare": "husky", "prestart": "tsc scripts/git-prompt.ts && node scripts/git-prompt.js", "start": "react-scripts start", - "build": "react-scripts build", + "build": "GENERATE_SOURCEMAP=false react-scripts build", "test": "jest", "cypress:open": "cypress open", "cypress:run": "cypress run" diff --git a/app/public/index.html b/app/public/index.html index 47d3d43..571e395 100644 --- a/app/public/index.html +++ b/app/public/index.html @@ -3,7 +3,7 @@ - + { left: isPlaying ? "0%" : "", }} > +
+ +
{ }; export default RealTimeVisulization; - diff --git a/app/src/pages/Project.tsx b/app/src/pages/Project.tsx index a1af9db..1706b3f 100644 --- a/app/src/pages/Project.tsx +++ b/app/src/pages/Project.tsx @@ -44,7 +44,7 @@ const Project: React.FC = () => { {activeModule === "visualization" && } - + {activeModule !== "visualization" && } ); }; From 8456a1e9352bbe5fb37ff31cb2fe8ea31038b7cb Mon Sep 17 00:00:00 2001 From: Vishnu Date: Tue, 25 Mar 2025 15:33:38 +0530 Subject: [PATCH 3/4] docker error fixed --- app/src/modules/scene/scene.tsx | 2 +- app/src/pages/Project.tsx | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app/src/modules/scene/scene.tsx b/app/src/modules/scene/scene.tsx index d3e37fd..f10303a 100644 --- a/app/src/modules/scene/scene.tsx +++ b/app/src/modules/scene/scene.tsx @@ -30,7 +30,7 @@ export default function Scene() { return ( { diff --git a/app/src/pages/Project.tsx b/app/src/pages/Project.tsx index 1706b3f..70e351c 100644 --- a/app/src/pages/Project.tsx +++ b/app/src/pages/Project.tsx @@ -6,7 +6,14 @@ import useModuleStore from "../store/useModuleStore"; import RealTimeVisulization from "../components/ui/componets/RealTimeVisulization"; import Tools from "../components/ui/Tools"; import Scene from "../modules/scene/scene"; -import { useSocketStore, useFloorItems, useOrganization, useUserName, useWallItems, useZones } from "../store/store"; +import { + useSocketStore, + useFloorItems, + useOrganization, + useUserName, + useWallItems, + useZones, +} from "../store/store"; import { useNavigate } from "react-router-dom"; const Project: React.FC = () => { @@ -23,11 +30,11 @@ const Project: React.FC = () => { setFloorItems([]); setWallItems([]); setZones([]); - const email = localStorage.getItem('email') + const email = localStorage.getItem("email"); if (email) { useSocketStore.getState().initializeSocket(email); - const Organization = (email!.split("@")[1]).split(".")[0]; - const name = localStorage.getItem('userName'); + const Organization = email!.split("@")[1].split(".")[0]; + const name = localStorage.getItem("userName"); if (Organization && name) { setOrganization(Organization); setUserName(name); @@ -35,7 +42,7 @@ const Project: React.FC = () => { } else { navigate("/"); } - }, []) + }, []); return (
@@ -44,7 +51,12 @@ const Project: React.FC = () => { {activeModule === "visualization" && } - {activeModule !== "visualization" && } +
+ {activeModule !== "visualization" && } +
); }; From cf86dc8c379e0c86e6fa92b285d3a8e52da59836 Mon Sep 17 00:00:00 2001 From: Vishnu Date: Wed, 26 Mar 2025 11:18:23 +0530 Subject: [PATCH 4/4] refactor: update z-index values, enhance UserAuth checkbox, and improve sidebar styles; add ZoneProperties and Vector3Input components --- .../icons/RealTimeVisulationIcons.tsx | 6 +- .../components/layout/sidebarLeft/Header.tsx | 5 +- .../layout/sidebarRight/SideBarRight.tsx | 45 ++++++++------ .../sidebarRight/customInput/Vector3Input.tsx | 59 +++++++++++++++++++ .../mechanics/MachineMechanics.tsx | 28 +++++---- .../properties/ZoneProperties.tsx | 17 ++++++ .../sidebarRight/simulation/Simulations.tsx | 7 ++- app/src/components/ui/ModuleToggle.tsx | 26 +++++--- .../ui/componets/RealTimeVisulization.tsx | 49 +++++++++------ app/src/pages/Project.tsx | 12 ++-- app/src/pages/UserAuth.tsx | 2 +- app/src/styles/components/tools.scss | 2 +- app/src/styles/layout/sidebar.scss | 24 +++++++- app/src/styles/pages/realTimeViz.scss | 10 +++- 14 files changed, 219 insertions(+), 73 deletions(-) create mode 100644 app/src/components/layout/sidebarRight/customInput/Vector3Input.tsx create mode 100644 app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx diff --git a/app/src/components/icons/RealTimeVisulationIcons.tsx b/app/src/components/icons/RealTimeVisulationIcons.tsx index 228cd21..1d144d6 100644 --- a/app/src/components/icons/RealTimeVisulationIcons.tsx +++ b/app/src/components/icons/RealTimeVisulationIcons.tsx @@ -107,7 +107,7 @@ export function StockIncreseIcon() { fill="none" xmlns="http://www.w3.org/2000/svg" > - + - - + + { const { toggleUI, setToggleUI } = useToggleStore(); + const { activeModule } = useModuleStore(); + return (
@@ -19,7 +22,7 @@ const Header: React.FC = () => {
{ - setToggleUI(!toggleUI); + if (activeModule !== "market") setToggleUI(!toggleUI); }} > diff --git a/app/src/components/layout/sidebarRight/SideBarRight.tsx b/app/src/components/layout/sidebarRight/SideBarRight.tsx index 737271e..b361395 100644 --- a/app/src/components/layout/sidebarRight/SideBarRight.tsx +++ b/app/src/components/layout/sidebarRight/SideBarRight.tsx @@ -1,6 +1,8 @@ import React, { useEffect, useState } from "react"; import Header from "./Header"; -import useModuleStore, { useSubModuleStore } from "../../../store/useModuleStore"; +import useModuleStore, { + useSubModuleStore, +} from "../../../store/useModuleStore"; import { AnalysisIcon, MechanicsIcon, @@ -15,6 +17,7 @@ import AsstePropertiies from "./properties/AssetProperties"; import Analysis from "./analysis/Analysis"; import Simulations from "./simulation/Simulations"; import { useSelectedActionSphere } from "../../../store/store"; +import ZoneProperties from "./properties/ZoneProperties"; const SideBarRight: React.FC = () => { const { activeModule } = useModuleStore(); @@ -24,7 +27,8 @@ const SideBarRight: React.FC = () => { // Reset subModule whenever activeModule changes useEffect(() => { - setSubModule("properties"); + if (activeModule !== "simulation") setSubModule("properties"); + if (activeModule === "simulation") setSubModule("mechanics"); }, [activeModule]); return ( @@ -32,32 +36,38 @@ const SideBarRight: React.FC = () => {
{toggleUI && (
-
setSubModule("properties")} - > - -
+ onClick={() => setSubModule("properties")} + > + +
+ {/* )} */} {activeModule === "simulation" && ( <>
setSubModule("mechanics")} >
setSubModule("simulations")} >
setSubModule("analysis")} > @@ -73,6 +83,7 @@ const SideBarRight: React.FC = () => {
+ {/* */} {/* */}
@@ -82,17 +93,17 @@ const SideBarRight: React.FC = () => { {toggleUI && activeModule === "simulation" && ( <> - {(subModule === "mechanics" && selectedActionSphere) && ( + {subModule === "mechanics" && selectedActionSphere && (
)} - {(subModule === "mechanics" && !selectedActionSphere) && ( + {subModule === "mechanics" && !selectedActionSphere && (
- {/* */} +
)} diff --git a/app/src/components/layout/sidebarRight/customInput/Vector3Input.tsx b/app/src/components/layout/sidebarRight/customInput/Vector3Input.tsx new file mode 100644 index 0000000..9a6389a --- /dev/null +++ b/app/src/components/layout/sidebarRight/customInput/Vector3Input.tsx @@ -0,0 +1,59 @@ +import React from "react"; +import { EyeDroperIcon } from "../../../icons/ExportCommonIcons"; + +interface PositionInputProps { + onChange: (value: string) => void; // Callback for value change + header: string; + placeholder?: string; // Optional placeholder + type?: string; // Input type (e.g., text, number, email) +} + +const Vector3Input: React.FC = ({ + onChange, + header, + placeholder = "Enter value", // Default placeholder + type = "number", // Default type +}) => { + return ( +
+
+ {header}{" "} +
+ +
+
+
+
+
X :
+ onChange(e.target.value)} + placeholder={placeholder} + /> +
+
+
Y :
+ onChange(e.target.value)} + placeholder={placeholder} + min={0} + /> +
+
+
Z :
+ onChange(e.target.value)} + placeholder={placeholder} + /> +
+
+
+ ); +}; + +export default Vector3Input; diff --git a/app/src/components/layout/sidebarRight/mechanics/MachineMechanics.tsx b/app/src/components/layout/sidebarRight/mechanics/MachineMechanics.tsx index 85ae67a..9a7e81b 100644 --- a/app/src/components/layout/sidebarRight/mechanics/MachineMechanics.tsx +++ b/app/src/components/layout/sidebarRight/mechanics/MachineMechanics.tsx @@ -14,8 +14,8 @@ import EyeDropInput from "../../../ui/inputs/EyeDropInput"; import { useSelectedActionSphere } from "../../../../store/store"; const MachineMechanics: React.FC = () => { - const { selectedActionSphere, setSelectedActionSphere } = useSelectedActionSphere(); - console.log('selectedActionSphere: ', selectedActionSphere); + const { selectedActionSphere } = useSelectedActionSphere(); + console.log("selectedActionSphere: ", selectedActionSphere); const [actionList, setActionList] = useState([]); const [triggerList, setTriggerList] = useState([]); const [selectedItem, setSelectedItem] = useState<{ @@ -71,7 +71,9 @@ const MachineMechanics: React.FC = () => { return (
-
{selectedActionSphere.path.modelName}
+
+ {selectedActionSphere?.path?.modelName || "path name not found"} +
{/*
Process:
{ {actionList.map((action, index) => (
{ {triggerList.map((trigger, index) => (
{ label="Speed" value="" activeOption=".mm" - onChange={() => { }} + onChange={() => {}} /> diff --git a/app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx b/app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx new file mode 100644 index 0000000..3428b48 --- /dev/null +++ b/app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx @@ -0,0 +1,17 @@ +import React from "react"; +import RenameInput from "../../../ui/inputs/RenameInput"; +import Vector3Input from "../customInput/Vector3Input"; + +const ZoneProperties = () => { + return ( +
+
+ +
+ {}} header="Target"/> + {}} header="Position"/> +
+ ); +}; + +export default ZoneProperties; diff --git a/app/src/components/layout/sidebarRight/simulation/Simulations.tsx b/app/src/components/layout/sidebarRight/simulation/Simulations.tsx index 2a361ba..2a12734 100644 --- a/app/src/components/layout/sidebarRight/simulation/Simulations.tsx +++ b/app/src/components/layout/sidebarRight/simulation/Simulations.tsx @@ -28,7 +28,7 @@ const DropList: React.FC = ({ val }) => { }} > {val.pathName} -
+
@@ -87,8 +87,9 @@ const Simulations: React.FC = () => { {productsList.map((action, index) => (
{ const { activeModule, setActiveModule } = useModuleStore(); + const { setToggleUI } = useToggleStore(); return (
setActiveModule("builder")} + onClick={() => { + setActiveModule("builder"); + setToggleUI(true); + }} >
@@ -23,7 +28,10 @@ const ModuleToggle: React.FC = () => {
setActiveModule("simulation")} + onClick={() => { + setActiveModule("simulation"); + setToggleUI(true); + }} >
@@ -34,7 +42,10 @@ const ModuleToggle: React.FC = () => { className={`module-list ${ activeModule === "visualization" && "active" }`} - onClick={() => setActiveModule("visualization")} + onClick={() => { + setActiveModule("visualization"); + setToggleUI(true); + }} >
@@ -42,10 +53,11 @@ const ModuleToggle: React.FC = () => {
Visualization
setActiveModule("market")} + className={`module-list ${activeModule === "market" && "active"}`} + onClick={() => { + setActiveModule("market"); + setToggleUI(false); + }} >
diff --git a/app/src/components/ui/componets/RealTimeVisulization.tsx b/app/src/components/ui/componets/RealTimeVisulization.tsx index 6494a6d..bccfa86 100644 --- a/app/src/components/ui/componets/RealTimeVisulization.tsx +++ b/app/src/components/ui/componets/RealTimeVisulization.tsx @@ -5,6 +5,7 @@ import AddButtons from "./AddButtons"; import { useSelectedZoneStore } from "../../../store/useZoneStore"; import DisplayZone from "./DisplayZone"; import Scene from "../../../modules/scene/scene"; +import useModuleStore from "../../../store/useModuleStore"; type Side = "top" | "bottom" | "left" | "right"; @@ -60,6 +61,7 @@ const RealTimeVisulization: React.FC = () => { }); const { isPlaying } = usePlayButtonStore(); + const { activeModule } = useModuleStore(); const { selectedZone, setSelectedZone } = useSelectedZoneStore(); useEffect(() => { @@ -75,33 +77,44 @@ const RealTimeVisulization: React.FC = () => { id="real-time-vis-canvas" className="realTime-viz canvas" style={{ - height: isPlaying ? "100vh" : "", - width: isPlaying ? "100%" : "", - left: isPlaying ? "0%" : "", + height: isPlaying || activeModule !== "visualization" ? "100vh" : "", + width: isPlaying || activeModule !== "visualization" ? "100vw" : "", + left: isPlaying || activeModule !== "visualization" ? "0%" : "", }} >
- + {activeModule === "visualization" && ( + <> + - {!isPlaying && ( - + {!isPlaying && ( + + )} + + + )} - -
); }; diff --git a/app/src/pages/Project.tsx b/app/src/pages/Project.tsx index d05de5e..02a02b9 100644 --- a/app/src/pages/Project.tsx +++ b/app/src/pages/Project.tsx @@ -21,8 +21,8 @@ const Project: React.FC = () => { let navigate = useNavigate(); const { activeModule } = useModuleStore(); - const { userName, setUserName } = useUserName(); - const { organization, setOrganization } = useOrganization(); + const { setUserName } = useUserName(); + const { setOrganization } = useOrganization(); const { setFloorItems } = useFloorItems(); const { setWallItems } = useWallItems(); const { setZones } = useZones(); @@ -50,15 +50,13 @@ const Project: React.FC = () => { - {activeModule === "visualization" && } - + + {activeModule !== "market" && } {/* */}
- {activeModule !== "visualization" && } -
+ >
); }; diff --git a/app/src/pages/UserAuth.tsx b/app/src/pages/UserAuth.tsx index b89f34e..851ab7e 100644 --- a/app/src/pages/UserAuth.tsx +++ b/app/src/pages/UserAuth.tsx @@ -141,7 +141,7 @@ const UserAuth: React.FC = () => {
{!isSignIn && (
- +
I have read and agree to the terms of service
diff --git a/app/src/styles/components/tools.scss b/app/src/styles/components/tools.scss index 166f041..0c30a55 100644 --- a/app/src/styles/components/tools.scss +++ b/app/src/styles/components/tools.scss @@ -14,7 +14,7 @@ width: fit-content; transition: width 0.2s; background-color: var(--background-color); - z-index: #{$z-index-tools}; + z-index: #{$z-index-default}; .split { height: 20px; width: 2px; diff --git a/app/src/styles/layout/sidebar.scss b/app/src/styles/layout/sidebar.scss index c7cd9e5..eba4ba9 100644 --- a/app/src/styles/layout/sidebar.scss +++ b/app/src/styles/layout/sidebar.scss @@ -662,16 +662,30 @@ .collapse-header-container { @include flex-space-between; padding-right: 12px; + margin-top: 8px; + border-top: 1px solid var(--border-color); + border-bottom: 1px solid var(--border-color); + .header { + color: var(--accent-color); + } } .process-container { + padding: 0 12px; + margin: 6px 0; .value { + @include flex-space-between; .arrow-container { + height: 16px; + width: 16px; } .active { + rotate: 90deg; } } .children-drop { .value { + padding: 6px; + border-left: 1px solid var(--border-color); } } } @@ -716,12 +730,16 @@ } .global-properties-container, .analysis-main-container, - .asset-properties-container { + .asset-properties-container, + .zone-properties-container { .header { padding: 8px 12px; border-top: 1px solid var(--highlight-accent-color); border-bottom: 1px solid var(--highlight-accent-color); color: var(--accent-color); + .input-value { + color: inherit; + } } .input-container { @include flex-center; @@ -759,7 +777,11 @@ } .custom-input-container { .header { + @include flex-space-between; border: none; + .eyedrop-button { + @include flex-center; + } } .inputs-container { @include flex-space-between; diff --git a/app/src/styles/pages/realTimeViz.scss b/app/src/styles/pages/realTimeViz.scss index d8d7680..c6eb8b5 100644 --- a/app/src/styles/pages/realTimeViz.scss +++ b/app/src/styles/pages/realTimeViz.scss @@ -11,6 +11,13 @@ top: 50%; left: calc(270px + 45px); transform: translate(0, -50%); + border-radius: #{$border-radius-medium}; + transition: all 0.2s; + z-index: #{$z-index-default}; + + .scene-container { + overflow: hidden; + } .icon { display: flex; @@ -180,7 +187,6 @@ } } - &.top-panel, &.bottom-panel { left: 0; @@ -387,4 +393,4 @@ } } } -} \ No newline at end of file +}