Merge branch 'master' into package

merge from pulled master

Author: h15200

.babelrc

@@ -6,9 +6,12 @@
   },
   "presets": [
     "@babel/preset-env",
-    "@babel/preset-react"
+    "@babel/preset-react",
+    "@babel/preset-typescript"
   ],
   "plugins": [
-        ["@babel/transform-runtime"]
-    ],
+    ["@babel/transform-runtime"],
+    ["@babel/proposal-class-properties"],
+    ["@babel/proposal-object-rest-spread"]
+  ]
 }

package-lock.json

@@ -15,7 +15,8 @@
     "package-all": "electron-builder  build -mwl",
     "package-linux": "electron-builder build --linux",
     "gh-publish-mac": "electron-builder build --x64 --mac -p always",
-    "gh-publish": "electron-builder build -mwl -p always"
+    "gh-publish": "electron-builder build -mwl -p always",
+    "check-types": "tsc"
   },
   "author": {
     "name": "Swell",
@@ -263,15 +264,26 @@
   },
   "devDependencies": {
     "@babel/core": "^7.10.3",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.10.4",
     "@babel/plugin-transform-runtime": "^7.10.3",
     "@babel/preset-env": "^7.10.3",
     "@babel/preset-react": "^7.10.1",
-    "@babel/preset-typescript": "^7.10.1",
+    "@babel/preset-typescript": "^7.10.4",
     "@jest-runner/electron": "^3.0.0",
     "@testing-library/jest-dom": "^5.11.0",
     "@testing-library/react": "^10.4.3",
-    "@typescript-eslint/eslint-plugin": "^3.4.0",
-    "@typescript-eslint/parser": "^3.4.0",
+    "@types/cookie": "^0.4.0",
+    "@types/jest": "^26.0.4",
+    "@types/node": "^14.0.20",
+    "@types/node-fetch": "^2.5.7",
+    "@types/react": "^16.9.41",
+    "@types/react-dom": "^16.9.8",
+    "@types/react-redux": "^7.1.9",
+    "@types/set-cookie-parser": "0.0.6",
+    "@types/ws": "^7.2.6",
+    "@typescript-eslint/eslint-plugin": "^3.6.0",
+    "@typescript-eslint/parser": "^3.6.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^24.9.0",
     "babel-loader": "^8.1.0",
@@ -308,8 +320,11 @@
     "prettier": "^2.0.5",
     "react-test-renderer": "^16.13.1",
     "sass-loader": "^7.3.1",
+    "source-map-loader": "^1.0.1",
     "spectron": "^9.0.0",
     "style-loader": "^0.23.1",
+    "ts-loader": "^8.0.0",
+    "typescript": "^3.9.6",
     "url-loader": "^4.1.0",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.12",

package.json

@@ -1,16 +1,24 @@
-import React, { Component } from "react";
-import ContentsContainer from "./ContentsContainer.jsx";
-import ReqResCtrl from "../../controllers/reqResController";
+import * as React from "react";
 import "../../../assets/style/App.scss";
-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;
+  }
+}
 
-class App extends Component {
-  constructor(props) {
+let api = window.api;
+// const EventEmitter = require('events');
+// const {dialog} = require('electron').remote
+export class App extends React.Component<any, any> {
+  constructor(props: any) {
     super(props);
   }
 
@@ -30,7 +38,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,6 +59,8 @@ class App extends Component {
   }
 
   render() {
+    api.receive("fromMain", (data: {}) => console.log(data));
+    api.send("toMain", "MEAT WITH SAUCE");
     return (
       <div id="app">
         <UpdatePopUpContainer />
@@ -61,4 +71,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

@@ -1,23 +1,23 @@
-import React, { Component } from "react";
+import * as React from "react";
 
-import GraphContainer from './GraphContainer.jsx';
+import { GraphContainer } from "./GraphContainer";
 import ReqResContainer from "./ReqResContainer.jsx";
 import NavBarContainer from "./NavBarContainer.jsx";
 
-class Contents extends Component {
-  constructor(props) {
+export class ContentsContainer extends React.Component<any, any> {
+  constructor(props: any) {
     super(props);
   }
 
   render() {
     return (
       <div className="contents">
-        <GraphContainer/>
+        <GraphContainer />
         <NavBarContainer />
         <ReqResContainer />
       </div>
     );
   }
 }
 
-export default Contents;
+// export default Contents;

…ponents/containers/ContentsContainer.jsx …ponents/containers/ContentsContainer.tsxsrc/client/components/containers/ContentsContainer.jsx renamed to src/client/components/containers/ContentsContainer.tsx src/client/components/containers/ContentsContainer.jsx renamed to src/client/components/containers/ContentsContainer.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;