upstream pull + signIn/Up

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"
       }

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"

app/public/index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1", user-scalable=no" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"

app/src/components/ui/componets/RealTimeVisulization.tsx

@@ -4,6 +4,7 @@ import Panel from "./Panel";
 import AddButtons from "./AddButtons";
 import { useSelectedZoneStore } from "../../../store/useZoneStore";
 import DisplayZone from "./DisplayZone";
+import Scene from "../../../modules/scene/scene";
 
 type Side = "top" | "bottom" | "left" | "right";
 
@@ -79,6 +80,12 @@ const RealTimeVisulization: React.FC = () => {
         left: isPlaying ? "0%" : "",
       }}
     >
+      <div
+        className="scene-container"
+        style={{ height: "100%", width: "100%" }}
+      >
+        <Scene />
+      </div>
       <DisplayZone
         zonesData={zonesData}
         selectedZone={selectedZone}
@@ -100,4 +107,3 @@ const RealTimeVisulization: React.FC = () => {
 };
 
 export default RealTimeVisulization;
-

app/src/modules/scene/scene.tsx

@@ -30,7 +30,7 @@ export default function Scene() {
   return (
     <KeyboardControls map={map}>
       <Canvas
-        style={{ width: "100vw", height: "100vh" }}
+        // style={{ width: "100vw", height: "100vh" }}
         eventPrefix="client"
         gl={{ powerPreference: "high-performance", antialias: true }}
         onContextMenu={(e) => {

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";
 import SimulationUI from "../modules/simulation/simulationUI";
 
@@ -24,11 +31,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 Organization = email!.split("@")[1].split(".")[0];
-      const name = localStorage.getItem('userName');
+      const name = localStorage.getItem("userName");
       if (Organization && name) {
         setOrganization(Organization);
         setUserName(name);
@@ -36,7 +43,7 @@ const Project: React.FC = () => {
     } else {
       navigate("/");
     }
-  }, [])
+  }, []);
 
   return (
     <div className="project-main">
@@ -45,8 +52,13 @@ const Project: React.FC = () => {
       <SideBarRight />
       {activeModule === "visualization" && <RealTimeVisulization />}
       <Tools />
-      <Scene />
+      {/* <SimulationUI /> */}
-      <SimulationUI />
+      <div
+        className="canvas-container"
+        style={{ height: "100vh", width: "100vw" }}
+      >
+        {activeModule !== "visualization" && <Scene />}
+      </div>
     </div>
   );
 };

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: