Merge branch 'development' of https://github.com/team-reactype/ReacType

Author: spincycle01

src/actions/components.ts

@@ -1,7 +1,5 @@
 import {
   ComponentInt,
-  ChildInt,
-  ApplicationStateInt,
   ComponentsInt,
   PropInt
 } from "../utils/interfaces";

src/components/App.tsx

@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import '../public/styles/style.css';
-// import { MuiThemeProvider } from '@material-ui/core/styles';
 import AppContainer from '../containers/AppContainer';
 
 export const App: React.SFC = () => (

src/components/BottomPanel.tsx

@@ -31,9 +31,6 @@ interface PropsInt {
 }
 
 class BottomPanel extends Component<PropsInt> {
-  // viewAppDir = () => {
-  //   IPC.send('view_app_dir', this.props.appDir);
-  // };
 
   render() {
     const {

src/components/BottomTabs.tsx

@@ -7,7 +7,6 @@ import Props from "./Props.tsx";
 import HtmlAttr from "./HtmlAttr.tsx";
 import CodePreview from "./CodePreview.tsx";
 import { ComponentInt, ComponentsInt, ChildInt } from "../utils/interfaces";
-// import Tree from "./Tree.jsx";
 
 interface PropsInt {
   focusChild: ChildInt;
@@ -18,11 +17,6 @@ interface PropsInt {
   classes: any;
 }
 
-// interface TreeAttributesInt {
-//   key: string;
-//   value: string;
-// }
-
 interface TreeInt {
   name: string;
   attributes: { [key: string]: { value: string } };
@@ -32,15 +26,13 @@ interface TreeInt {
 const styles = (theme: any): any => ({
   root: {
     flexGrow: 1,
-    // backgroundColor: "#212121",
     backgroundColor: "#333333",
     height: "100%",
     color: "#fff",
     boxShadow: "0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23)"
   },
   tabsRoot: {
     borderBottom: "0.5px solid #424242"
-    // backgroundColor: "#424242"
   },
   tabsIndicator: {
     backgroundColor: "#1de9b6"

src/components/CodePreview.tsx

@@ -1,9 +1,9 @@
 import React, { Component, Fragment } from "react";
-import { withStyles } from "@material-ui/core/styles";
 import { format } from "prettier";
 import componentRender from "../utils/componentRender.util";
 import { ComponentInt, ComponentsInt } from "../utils/interfaces";
-// import SortChildren from './SortChildren.jsx';
+/****   SortCHildren will be fixed , dont XXX the file  *** */
+import SortChildren from './SortChildren.jsx';
 
 type Props = {
   focusComponent: ComponentInt;

src/components/DataTable.tsx

@@ -1,13 +1,11 @@
 import React from "react";
-// import PropTypes from 'prop-types';
 import { withStyles } from "@material-ui/core/styles";
 import Table from "@material-ui/core/Table";
 import TableBody from "@material-ui/core/TableBody";
 import TableCell from "@material-ui/core/TableCell";
 import TableHead from "@material-ui/core/TableHead";
 import TableRow from "@material-ui/core/TableRow";
 import Paper from "@material-ui/core/Paper";
-import Button from "@material-ui/core/Button";
 import DeleteIcon from "@material-ui/icons/Delete";
 import { IconButton } from "@material-ui/core";
 
@@ -74,8 +72,4 @@ function dataTable(props: any) {
   );
 }
 
-// dataTable.propTypes = {
-//   classes: PropTypes.object.isRequired,
-// };
-
 export default withStyles(styles)(dataTable);

src/components/GrandchildRectangle.tsx

@@ -1,7 +1,6 @@
 import React, { Component } from "react";
 import { Rect, Group } from "react-konva";
-// import findComponentById from '../utils/findComponentById.ts';
-import { ComponentInt, ComponentsInt, ChildInt } from "../utils/interfaces";
+import { ComponentsInt } from "../utils/interfaces";
 
 interface PropsInt {
   x: number;
@@ -34,7 +33,6 @@ class GrandchildRectangle extends Component<PropsInt, StateInt> {
   };
 
   getComponentColor(componentId: number) {
-    // const color = findComponentById(componentId, this.props.components).color;
     const color = this.props.components.find(comp => comp.id === componentId)
       .color;
     return color;

src/components/HTMLComponentPanel.tsx

@@ -1,21 +1,16 @@
 import React, { Component } from "react";
-import { connect } from "react-redux";
-import { compose } from "redux";
 import { withStyles } from "@material-ui/core/styles";
-// import TextField from '@material-ui/core/TextField';
 import IconButton from "@material-ui/core/IconButton";
 import ImageIcon from "@material-ui/icons/Image";
 import FormIcon from "@material-ui/icons/Description";
 import ButtonIcon from "@material-ui/icons/EditAttributes";
 import LinkIcon from "@material-ui/icons/Link";
 import ListIcon from "@material-ui/icons/List";
 import ParagraphIcon from "@material-ui/icons/LocalParking";
-// import Typography from '@material-ui/core/Typography';
 import Grid from "@material-ui/core/Grid";
-// import Paper from '@material-ui/core/Paper';
 import Tab from "@material-ui/core/Tab";
 import Chip from "@material-ui/core/Chip";
-// import theme from './theme.ts';
+
 
 interface PropsInt {
   classes: any;

src/components/HtmlAttr.jsx

@@ -3,14 +3,12 @@ import { connect } from "react-redux";
 import { withStyles } from "@material-ui/core/styles";
 import Grid from "@material-ui/core/Grid";
 import TextField from "@material-ui/core/TextField";
-import IconButton from "@material-ui/core/IconButton";
-import Typography from "@material-ui/core/Typography";
 import SaveIcon from "@material-ui/icons/Save";
 import Paper from "@material-ui/core/Paper";
 import Fab from "@material-ui/core/Fab";
 import { updateHtmlAttr } from "../actions/components.ts";
-import { HTMLelements, getSize } from "../utils/htmlElements.util.ts";
-import { ComponentInt, ComponentsInt, ChildInt } from "../utils/interfaces";
+import { HTMLelements } from "../utils/htmlElements.util.ts";
+import { ComponentInt, ChildInt } from "../utils/interfaces";
 
 interface PropsInt {
   updateHtmlAttr: any;
@@ -62,7 +60,6 @@ class HtmlAttr extends Component<PropsInt, StateInt> {
   );
 
   handleSave = (attr: string) => {
-    console.log(attr, this.state[attr]);
     this.props.updateHtmlAttr({ attr, value: this.state[attr] });
     this.setState({
       [attr]: ""
@@ -77,12 +74,8 @@ class HtmlAttr extends Component<PropsInt, StateInt> {
 
   render() {
     const {
-      focusComponent,
       classes,
-      deleteProp,
-      addProp,
       focusChild,
-      updateHtmlAttr
     } = this.props;
 
     const focusChildType = focusChild.htmlElement;