Fixing merge

bldrs-ai · Dec 7, 2021 · 0fb935c · 0fb935c
2 parents a20e7e6 + 1da15ac
commit 0fb935c
Show file tree

Hide file tree

Showing 19 changed files with 249 additions and 153,008 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/package.json b/package.json
diff --git a/src/Components/AboutPanel.jsx b/src/Components/AboutPanel.jsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import { makeStyles } from '@mui/styles';
+import Paper from '@mui/material/Paper';
+import ItemProperties from './ItemProperties';
+import Close from '../assets/Close.svg'
+
+
+const useStyles = makeStyles((theme) => ({
+  paper: {
+    fontFamily: 'Helvetica',
+    padding: '1em',
+    "& h1, & h2": {
+      color: '#696969',
+    },
+    "& h1": {
+      marginTop: 0
+    }
+  },
+  close:{
+    float:'right',
+    cursor:'pointer',
+    "& svg": {
+        width:'20px',
+        height:'20px',
+    },
+  }
+}));
+
+const AboutPanel = ({close}) => {
+  const classes = useStyles();
+  return (
+      <Paper elevation={3} className={classes.paper}>
+        <div className = {classes.close}onClick = {close}><Close/></div>
+        <h1>About</h1>
+        <p><strong>BLDRS</strong> is a collaborative integration environment for IFC files.
+            We are just getting started!  Stay tuned for the upcoming MVP release.</p>
+        <p>BLDRS is an open source project. Please visit our repository:&nbsp;
+          <a href = {'https://github.com/buildrs/Share'} target="_new">github.com/buildrs/Share</a></p>
+        <h2>Features</h2>
+        <ul>
+          <li>Upload IFC file</li>
+          <li>Select IFC element</li>
+          <li>Get IFC element properties </li>
+          <li>Share IFC element with the URL address</li>
+        </ul>
+      </Paper>
+  );
+};
+
+export default AboutPanel;
diff --git a/src/Components/ItemPanel.jsx b/src/Components/ItemPanel.jsx
@@ -1,61 +1,53 @@
 import React from 'react';
 import { makeStyles } from '@mui/styles';
 import Paper from '@mui/material/Paper';
-
 import ItemProperties from './ItemProperties';
 
-
 const useStyles = makeStyles((theme) => ({
-  contextualMenu: {
-    width: 240,
-    height: 300,
+  itemPanel: {
+    position: 'absolute',
+    display: 'flex',
+    top: 140,
+    right: 20,
+    width: 300,
+    height: 'auto',
     border: 'none',
     marginLeft: '24px',
-    display: 'flex',
     flexDirection: 'column',
     justifyContent: 'space-around',
     alignItems: 'center',
-    top: 152,
-    right: 20,
-    '@media (max-width: 900px)': {
-      height: '50%',
-      top: 140,
-      // width: 400,
-      left: 62,
-    },
   },
   paper: {
+    position: 'absolute',
+    top: 0,
+    right: 0,
     display: 'flex',
-    overflow: 'auto',
     flexDirection: 'column',
-    height: '50px',
-    width: '160px',
+    height: 400,
+    width: 400,
+    overflow: 'auto',
+  },
+  panelTitle: {
+    fontFamily: 'Helvetica',
+    fontSize: 20,
+    fontWeight:600,
+    marginTop: 10,
+    marginBottom:10,
+    marginLeft:10,
+    color: '#D8D8D8',
   },
 }));
 
 
 const ItemPanel = ({viewer, element}) => {
   const classes = useStyles();
   return (
-    <div
-      className={classes.contextualMenu}
-      style={{
-        height: 'auto',
-        position: 'absolute',
-      }}
-    >
+    <div className={classes.itemPanel}>
       <Paper
         elevation={3}
         className={classes.paper}
-        style={{
-          position: 'absolute',
-          width: 'auto',
-          height: 'auto',
-          top: '0px',
-          right: '0px',
-          minHeight: '20%',
-        }}
       >
+        <div className = {classes.panelTitle}>Properties</div>
         <ItemProperties
           viewer = {viewer}
           element = {element} />

diff --git a/src/Components/ItemProperties.jsx b/src/Components/ItemProperties.jsx
@@ -126,8 +126,6 @@ const ItemProperties = ({ viewer, element }) => {
       style={{
         fontFamily: 'Helvetica',
         fontSize: 20,
-
-        marginTop: 40,
       }}
     >
       <tbody>

diff --git a/src/Components/LoginMenu.jsx b/src/Components/LoginMenu.jsx
@@ -5,10 +5,19 @@ import MenuItem from '@mui/material/MenuItem';
 import IconButton from '@mui/material/IconButton';
 import PkgJson from '../../package.json';
 import Person from '../assets/Person.svg';
+import { makeStyles } from '@mui/styles';
+
+const useStyles = makeStyles(() => ({
+  MenuItem: {
+    fontSize: 20,
+    fontFamily:'Helvetica',
+  },
+}));
 
 const LoginMenu = () => {
   const [anchorEl, setAnchorEl] = React.useState(null);
   const open = Boolean(anchorEl);
+  const classes = useStyles();
   const handleClose = () => {
     setAnchorEl(null);
   };
@@ -34,20 +43,21 @@ const LoginMenu = () => {
 
       <Menu
         id='menu-appbar'
+        elevation={2}
         anchorEl={anchorEl}
         anchorOrigin={{
           vertical: 'top',
-          horizontal: 'right',
-        }}
-        keepMounted
-        transformOrigin={{
-          vertical: 'top',
-          horizontal: 'right',
+          horizontal: 'left',
         }}
         open={open}
         onClose={handleClose}
+        PaperProps={{
+            style: {
+              transform: 'translateX(-70px) translateY(0pc)',
+            }
+          }}
       >
-        <MenuItem onClick={handleClose}>Version: {PkgJson.version}</MenuItem>
+        <MenuItem>Version: {PkgJson.version}</MenuItem>
       </Menu>
     </div>
   );

diff --git a/src/Components/NavTree.jsx b/src/Components/NavTree.jsx
@@ -98,7 +98,10 @@ const NavTree = ({
         ref={ref}
       >
         {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */}
-        <div onClick={handleExpansionClick} className={classes.iconContainer}>
+        <div onClick={handleExpansionClick} className={classes.iconContainer}
+             style={{
+              marginLeft:8,
+            }}>
           {icon}
         </div>
         <Typography onClick={handleSelectionClick} className={classes.label}>
@@ -112,6 +115,7 @@ const NavTree = ({
               fontFamily: 'helvetica',
               fontWeight: 600,
               color: '#696969',
+              marginLeft:8,
             }}
           >
             {label}

diff --git a/src/Components/SearchBar.jsx b/src/Components/SearchBar.jsx
@@ -4,7 +4,7 @@ import Paper from '@mui/material/Paper';
 import InputBase from '@mui/material/InputBase';
 import IconButton from '@mui/material/IconButton';
 import Search from '../assets/Search.svg';
-import Hamburger from '../assets/Hamburger.svg';
+import TreeIcon from '../assets/Tree.svg';
 
 const useStyles = makeStyles((theme) => ({
   root: {
@@ -60,7 +60,7 @@ export default function SearchBar({
         onClick={onClickMenu}
         disabled={disabled}
       >
-        <Hamburger style={{ width: 20, height: 20 }} />
+        <TreeIcon style={{ width: 20, height: 20 }} />
       </IconButton>
       <InputBase
         sx={{ ml: 1, flex: 1 }}