typescript update to app graphContainer and sidebarContainer

Author: gspletzer

package-lock.json

@@ -1,17 +1,24 @@
-import React, { Component } from "react";
+import * as React from "react";
 import "../../../assets/style/App.scss";
-import { ContentsContainer } from "./ContentsContainer.tsx";
-import SidebarContainer from "./SidebarContainer.jsx";
+import { ContentsContainer } from "./ContentsContainer";
+import { SidebarContainer } from "./SidebarContainer";
 import UpdatePopUpContainer from "./UpdatePopUpContainer.jsx";
 import historyController from "../../controllers/historyController";
 import collectionsController from "../../controllers/collectionsController";
 // import ReqResCtrl from '../../controllers/reqResController';
 
-const { api } = window;
+//const { api } = window;
+declare global {
+  interface Window {
+    api: any;
+  }
+}
+
+let api = window.api;
 // const EventEmitter = require('events');
 // const {dialog} = require('electron').remote
-class App extends Component {
-  constructor(props) {
+export class App extends React.Component<any, any> {
+  constructor(props: any) {
     super(props);
   }
 
@@ -30,7 +37,7 @@ class App extends Component {
     // window on error fires for any error in program, opens a dialog allowing
     // user to continue or refresh.
     // refresh sends to ipcMain
-    let errorCount = 0;
+    let errorCount: number = 0;
     // window.onerror = (error, url, line) => {
     //   // implement an error counter and a check for odd numbered errors due to
     //   // behavior of react cross origin error in electron. This attempts to ignore
@@ -51,7 +58,7 @@ class App extends Component {
   }
 
   render() {
-    api.receive("fromMain", (data) => console.log(data));
+    api.receive("fromMain", (data: {}) => console.log(data));
     api.send("toMain", "MEAT WITH SAUCE");
     return (
       <div id="app">
@@ -63,4 +70,4 @@ class App extends Component {
   }
 }
 
-export default App;
+//export default App;

src/client/components/containers/App.jsx src/client/components/containers/App.tsxsrc/client/components/containers/App.jsx renamed to src/client/components/containers/App.tsx

@@ -0,0 +1,18 @@
+import * as React from "react";
+import Graph from "../display/Graph.jsx";
+
+export class GraphContainer extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+  }
+
+  render() {
+    return (
+      <div>
+        <Graph />
+      </div>
+    );
+  }
+}
+
+//export default GraphContainer;

src/client/components/containers/GraphContainer.jsx

@@ -0,0 +1,22 @@
+import * as React from "react";
+import ComposerContainer from "../composer/ComposerContainer.jsx";
+import HistoryContainer from "./HistoryContainer.jsx";
+import CollectionsContainer from "./CollectionsContainer.jsx";
+
+export class SidebarContainer extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+  }
+
+  render() {
+    return (
+      <div className="sidebar_composer-console">
+        <ComposerContainer />
+        <CollectionsContainer />
+        <HistoryContainer />
+      </div>
+    );
+  }
+}
+
+//export default SidebarContainer;

src/client/components/containers/GraphContainer.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { render } from "react-dom";
 import { Provider } from "react-redux";
-import App from "./client/components/containers/App.jsx";
+import { App } from "./client/components/containers/App";
 import store from "./client/store";
 //import ReactModal from "react-modal";