mehanix · mhmad-nr · Jun 2, 2024 · Jun 2, 2024 · Jun 2, 2024 · Jun 2, 2024
diff --git a/.env b/.env
@@ -1 +1,2 @@
-API_URL='https://localhost:4133/'
+VITE_API_URL='https://localhost:4133/'
+VITE_APP_SERVICE_URI="https://arcada-backend-cff36b685fa8.herokuapp.com/"
diff --git a/index.html b/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <link rel="manifest" href="/manifest.json" />
+
+    <title>Arcada</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <script type="module" src="/src/index.tsx"></script>
+
+  </body>
+</html>
diff --git a/package.json b/package.json
@@ -20,18 +20,18 @@
     "react": "^18.0.0",
     "react-device-detect": "^2.2.2",
     "react-dom": "^18.0.0",
-    "react-scripts": "5.0.0",
-    "tabler-icons-react": "^1.43.0",
-    "three": "^0.140.0",
-    "typescript": "^4.6.3",
-    "web-vitals": "^2.1.4",
-    "zustand": "^3.7.2"
+    "tabler-icons-react": "^1.56.0",
+    "three": "^0.165.0",
+    "typescript": "^5.4.5",
+    "vite": "^5.0.8",
+    "vite-plugin-svgr": "4.2.0",
+    "web-vitals": "^4.0.1",
+    "zustand": "^4.5.2"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
+    "dev": "vite",
+    "build": "tsc && vite build",
+    "preview": "vite preview"
   },
   "eslintConfig": {
     "extends": [
@@ -52,6 +52,7 @@
     ]
   },
   "devDependencies": {
-    "@types/three": "^0.139.0"
+    "@types/three": "^0.165.0",
+    "@vitejs/plugin-react": "^4.3.0"
   }
 }
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/manifest.json b/public/manifest.json
@@ -7,11 +7,6 @@
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/x-icon"
     },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
     {
       "src": "logo512.png",
       "type": "image/png",

diff --git a/public/site.webmanifest b/public/site.webmanifest
@@ -0,0 +1,19 @@
+{
+    "name": "",
+    "short_name": "",
+    "icons": [
+        {
+            "src": "/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}
diff --git a/src/api/api-client.tsx b/src/api/api-client.tsx
@@ -1,5 +1,5 @@
 
-export const endpoint = process.env.REACT_APP_SERVICE_URI ? process.env.REACT_APP_SERVICE_URI : 'http://localhost:4133/';
+export const endpoint = import.meta.env.VITE_APP_SERVICE_URI ?import.meta.env.VITE_APP_SERVICE_URI : 'http://localhost:4133/';
 
 
 export function getCategoriesRequest() {

diff --git a/src/editor/editor/objects/TransformControls/Handle.ts b/src/editor/editor/objects/TransformControls/Handle.ts
@@ -4,6 +4,7 @@ import { Point } from "../../../../helpers/Point";
 import { viewportX, viewportY } from "../../../../helpers/ViewportCoordinates";
 import { Furniture } from "../Furniture";
 import { TransformLayer } from "./TransformLayer";
+import { WALL_THICKNESS } from "../../constants";
 
 export enum HandleType {
     Horizontal,
@@ -191,10 +192,10 @@ export class Handle extends Graphics {
                   //end of wall
                   else if (
                     this.localCoords.x + amount >=
-                    this.target.parent.length - this.target.width - WALL_THICKNESS * 0.5 //parent wall length
+                    (this.target.parent as any).length - this.target.width - WALL_THICKNESS * 0.5 //parent wall length
                   ) {
                     this.target.position.x =
-                      this.target.parent.length -
+                      (this.target.parent as any).length -
                       this.target.width -
                       WALL_THICKNESS * 0.5;
                   }

diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts
diff --git a/src/ui/Layout/ToolNavbar.tsx b/src/ui/Layout/ToolNavbar.tsx
@@ -4,7 +4,7 @@ import {
   Icon as TablerIcon,
   Armchair,
   BorderLeft,
-  ArrowBottomSquare,
+  ArrowDownSquare,
   DeviceFloppy,
   Upload,
   Ruler2,
@@ -16,7 +16,6 @@ import {
   Window,
   Door,
   Plus,
-  Help,
   SquareX,
   Dimensions,
   Printer,
@@ -223,7 +222,7 @@ export function ToolNavbar() {
               message: "Click and drag to measure areas",
             })
           }} />
-          <NavbarLink icon={ArrowBottomSquare} label="Snap to grid" onClick={() => {
+          <NavbarLink icon={ArrowDownSquare} label="Snap to grid" onClick={() => {
             setSnap(!snap);
             cleanNotifications();
             showNotification({

diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
@@ -0,0 +1,2 @@
+/// <reference types="vite/client" />
+declare module '*.gif';
diff --git a/vite.config.mts b/vite.config.mts
@@ -0,0 +1,9 @@
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
+
+export default defineConfig({
+  plugins: [react()],
+  build: {
+    outDir: 'build' // Change the output directory to 'build'
+  }
+})