merger

Author: stormikph

app/src/components/bottom/CodePreview.tsx

@@ -4,7 +4,7 @@ import AceEditor from 'react-ace';
 import { makeStyles } from '@material-ui/core/styles';
 import 'ace-builds/src-noconflict/mode-javascript';
 import 'ace-builds/src-noconflict/theme-monokai';
-import Button from '@material-ui/core/Button';
+// import Button from '@material-ui/core/Button';
 import { Component } from '../../interfaces/Interfaces';
 
 const CodePreview = () => {

app/src/containers/MainContainer.tsx

@@ -2,17 +2,14 @@ import React, { Component } from 'react';
 import BottomPanel from '../components/bottom/BottomPanel';
 import CanvasContainer from '../components/main/CanvasContainer';
 
-//test for resizable component
 import { Resizable } from "re-resizable";
 
-// Main container contains the canvas which renders the components/elements on screen
-// and the bottom panel which displays the code for the component
 class MainContainer extends Component {
   render() {
     return (
       <div className="main-container">
         <div
-          className="main" //ref={main} **no function, commenting out**
+          className="main" 
         >
           <CanvasContainer />
         </div>

app/src/public/styles/style.css

@@ -238,7 +238,6 @@ RIGHT COLUMN
   /* display: flex;
   flex-direction: row; */
   background-color: #fcfcfc;
-  /* box-shadow: 0 -5px 7px 2px rgb(255, 0, 0); */
   margin-right: 100px;
 }