Props2 (#82)

* ItemProperties: added wiring for property sets. * package.json: always build before serve. * style property sets * properties drawer * added properties title * build * added accordians to contain sets * item properties sets * minor styles * navpanel style * turn about panel on * add tiny house to the scene * Props2, merged, cleaned up and with tests (#83) * Integrated Oleg changes from main and added unit tests for ItemProperties and updated others. * merge upstream branch, incl tiny house Co-authored-by: Pablo Mayrgundter <pablo.mayrgundter@gmail.com>
bldrs-ai · Jan 27, 2022 · e313a34 · e313a34
1 parent f3a8a7f
commit e313a34
Show file tree

Hide file tree

Showing 21 changed files with 344,853 additions and 7,729 deletions.
diff --git a/docs/index.js b/docs/index.js
diff --git a/docs/index.js.map b/docs/index.js.map
diff --git a/docs/tinyhouse.ifc b/docs/tinyhouse.ifc
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "new-version": "node --experimental-json-modules src/utils/version.mjs > package.json.new && mv package.json.new package.json",
     "copy-web-asm": "cp node_modules/web-ifc/web-ifc.wasm public/static/js",
     "build": "yarn copy-web-asm && yarn clean && yarn new-version && node config/build.js",
-    "serve": "yarn copy-web-asm && node config/serve.js",
+    "serve": "yarn build && node config/serve.js",
     "test": "jest"
   },
   "dependencies": {

diff --git a/public/tinyhouse.ifc b/public/tinyhouse.ifc
diff --git a/src/Components/ItemPanel.jsx b/src/Components/ItemPanel.jsx
@@ -2,7 +2,7 @@ import React, {useState} from 'react';
 import { makeStyles } from '@mui/styles';
 import ItemProperties from './ItemProperties';
 import MenuButton from '../Components/MenuButton';
-import SideMenu from './SideMenu'
+import ItemPropertiesDrawer from './ItemPropertiesDrawer'
 
 
 const useStyles = makeStyles({
@@ -70,9 +70,9 @@ const ItemPanel = ({viewer, element, close, topOffset}) => {
   const classes = useStyles({topOffset:topOffset});
   return (
     <>
-      <SideMenu
+      <ItemPropertiesDrawer
           content = {<ItemProperties viewer = {viewer} element = {element}/>}
-          title = {'Properties'}
+          title = {'IFC Information'}
           onClose = {close}
           open = {open}
         />