Merge pull request #12 from MetacityTools/dev

Release v0.2.0

Author: vojtatom

.prettierrc

@@ -8,7 +8,7 @@
     "importOrder": [
         "^@utils/(.*)$",
         "^@bananagl/(.*)$",
-        "^@components/(.*)$",
+        "^@editor/(.*)$",
         "^@elements/(.*)$",
         "^@assets/(.*)$",
         "^[./]"

README.md

@@ -1,6 +1,6 @@
 # 🏡 [Metacity Studio](https://studio.metacity.cc)
 
-![Screenshot](src/assets/splash/screen.png)
+![Screenshot](./studio.png)
 
 Metacity Studio is an online tool for integrating and visualizing spatial and tabular data.
 
@@ -25,18 +25,40 @@ Currently:
 
 The project is in active development. The roadmap is as follows:
 
-### v0.1.2
+### v0.3.0
 
--   [ ] Connect tabular data
--   [ ] Project export
--   [ ] Project import
-
-### v0.1.1
+-   [ ] Viewer - Details TBA
+-   [ ] Optional interactivity - build BVH only if user opts-in to make the loaded models clickable
+-   [ ] Integrate Google Sheets imports
 
--   [ ] Baking/Transforming models to Table-like format
--   [ ] Allow labeling geometry
+### v0.2.1
 
-### v0.1.0 - 👨‍💻 In progress
+-   [ ] Project export
+-   [ ] Resize guard update graphics (The "Oops" message is pretty lame)
+-   [ ] Transforming original metadata to a table
+-   [ ] Extract Utils to separate SDK form metacity editors
+
+### v0.2.0 - 👨‍💻 In progress
+
+-   [x] Infrastructure for the built-in viewer (vite setup, etc.)
+-   [x] Building a hierarchy of models (floors, buildings, blocks, etc.) - ✨WIP
+    -   [x] Deselect all - button and shortcut
+    -   [x] Group models
+    -   [x] Group groups
+    -   [x] Delete groups
+    -   [x] Move groups (and models)
+-   [x] View settings in the annotate settings - move it to the canvas
+-   [x] Loading tabular data (CSV) and linking it to the hierarchy.
+    -   [x] Loading CSV
+    -   [x] CSV editor
+    -   [x] Multiple CSVs
+    -   [x] Linking CSV rows to the hierarchy
+    -   [x] Unlinking CSV rows from the hierarchy
+-   [x] Resolve table editing issues - maybe leave out table editing all togheter?
+-   [x] Privacy Policy docs
+-   [x] Add text to the Convert dialog
+
+### v0.1.0 - ✅ Released
 
 -   [x] Rectangular select
 -   [x] Merge submodels

package-lock.json

@@ -1,7 +1,7 @@
 {
     "name": "metacity-studio",
     "private": true,
-    "version": "0.1.0",
+    "version": "0.2.0",
     "type": "module",
     "scripts": {
         "dev": "vite",
@@ -12,26 +12,28 @@
         "@headlessui/react": "^1.7.14",
         "@loaders.gl/core": "^3.3.3",
         "@loaders.gl/gltf": "^3.3.3",
-        "@types/three": "^0.150.0",
+        "@vojtatom/csvts": "^0.1.0",
         "allotment": "^1.18.1",
         "clsx": "^1.2.1",
         "fast-deep-equal": "^3.1.3",
         "gl-matrix": "^3.4.3",
-        "package.json": "^0.0.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-icons": "^4.8.0",
         "react-router-dom": "^6.9.0",
         "react18-json-view": "^0.0.8",
         "shpts": "^1.0.4",
+        "uuid": "^9.0.0",
         "web-ifc": "0.0.39",
         "web-ifc-three": "0.0.123"
     },
     "devDependencies": {
         "@trivago/prettier-plugin-sort-imports": "^4.1.1",
-        "@types/node": "^18.15.5",
+        "@types/node": "^18.16.14",
         "@types/react": "^18.0.28",
         "@types/react-dom": "^18.0.11",
+        "@types/three": "^0.150.0",
+        "@types/uuid": "^9.0.1",
         "@vitejs/plugin-react": "^3.1.0",
         "autoprefixer": "^10.4.14",
         "postcss": "^8.4.21",

package.json

@@ -0,0 +1,26 @@
+import { ViteDevServer } from 'vite';
+
+export default (routes: string[]) => ({
+    name: 'trailing',
+    configureServer(server: ViteDevServer) {
+        server.middlewares.use((req, res, next) => {
+            const assets = ['ts', 'css', 'js'];
+
+            const requestURLwithoutLeadingSlash = req?.url?.substring(1);
+            const referrerWithoutTrailingSlash = req.headers.referer?.split('/').pop();
+            const fileExtension = req.url?.split('.').pop();
+
+            if (routes.includes(requestURLwithoutLeadingSlash || '')) {
+                req.url = `${req.url}/`;
+            }
+
+            if (
+                routes.includes(referrerWithoutTrailingSlash || '') &&
+                assets.includes(fileExtension || '')
+            ) {
+                req.url = `/${referrerWithoutTrailingSlash}${req.url}`;
+            }
+            next();
+        });
+    },
+});