Typing corections on AppContainer component

Author: tonyito

src/components/App.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import '../public/styles/style.css';
-import AppContainer from '../containers/AppContainer.tsx';
+import AppContainer from '../containers/AppContainer';
 
 export const App: React.SFC = () => (
   <div className="app">

src/containers/AppContainer.tsx

@@ -7,7 +7,7 @@ import LeftContainer from './LeftContainer';
 import MainContainer from './MainContainer';
 import theme from '../components/theme';
 // import { loadInitData } from '../actions/components.ts';
-import { ComponentInt, ComponentsInt } from '../utils/Interfaces';
+import { ComponentInt, ComponentsInt, Action } from '../utils/Interfaces';
 import * as actions from '../actions/components';
 
 // ** Used with electron to render
@@ -20,9 +20,8 @@ type Props = {
   totalComponents: number;
   loading: boolean;
   selectableChildren: Array<number>;
-  loadInitData: any;
-  changeImagePath: any;
-  changed: boolean;
+  loadInitData: () => void;
+  changeImagePath: () => void;
 };
 
 type State = {
@@ -40,7 +39,7 @@ const mapStateToProps = (store: any) => ({
   selectableChildren: store.workspace.selectableChildren
 });
 
-const mapDispatchToProps = (dispatch: any) => ({
+const mapDispatchToProps = (dispatch: (arg: a) => void) => ({
   loadInitData: () => dispatch(actions.loadInitData()),
   // loadInitData: () => {},
   changeImagePath: (imageSource: string) => 

src/containers/MainContainer.tsx

@@ -4,23 +4,22 @@
 import React, { Component } from "react";
 import { connect } from "react-redux";
 import { MuiThemeProvider } from "@material-ui/core/styles";
-import BottomPanel from "../components/BottomPanel.tsx";
-import theme from "../components/theme.ts";
+import BottomPanel from "../components/BottomPanel";
+import theme from "../components/theme";
 import {
   handleTransform,
   changeFocusChild,
   changeComponentFocusChild,
   deleteChild
-} from "../actions/components.ts";
-import KonvaStage from "../components/KonvaStage.tsx";
-import { ComponentInt, ComponentsInt } from "../utils/Interfaces.ts";
+} from "../actions/components";
+import KonvaStage from "../components/KonvaStage";
+import { ComponentInt, ComponentsInt } from "../utils/Interfaces";
 import * as actions from '../actions/components';
 
 interface PropsInt {
   image: HTMLImageElement | null;
   components: ComponentsInt;
   focusComponent: ComponentInt;
-  selectableChildren: Array<number>;
   classes: any;
   addComponent: any;
   addChild: any;
@@ -34,6 +33,7 @@ interface PropsInt {
   focusChild: any;
   changeComponentFocusChild: any;
   deleteChild: any;
+  imageSource: string;
 }
 
 interface StateInt {

src/reducers/componentReducer.ts

@@ -1,14 +1,10 @@
-<<<<<<< HEAD
 import {
   ComponentInt,
   ChildInt,
   ApplicationStateInt,
   Action
 } from '../utils/Interfaces';
 
-=======
-import { ComponentInt, ChildInt, ApplicationStateInt } from '../utils/Interfaces';
->>>>>>> 8ba7c2096cd63a22e916fe1c390ab30a4df2c14a
 
 import {
   LOAD_INIT_DATA,

src/reducers/index.ts

@@ -1,6 +1,6 @@
 import { combineReducers } from 'redux';
 
-import componentReducer from './componentReducer.ts';
+import componentReducer from './componentReducer';
 
 const reducers = combineReducers({
   workspace: componentReducer,