Merge pull request #111 from tolgamizrakci/development

fixed unmerged files

Author: tolgamizrakci

main.js

@@ -66,6 +66,10 @@ const createWindow = () => {
     },
     show: false,
     icon: path.join(__dirname, '/src/public/icons/mac/icon.icns'),
+    win: {
+      icon: path.join(__dirname, '/src/public/icons/win/icon.ico'),
+      target: ['portable'],
+    },
   });
 
   // and load the index.html of the app.

src/components/TransformerComponent.tsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Transformer } from 'react-konva';
-import { ChildInt } from '../utils/interfaces.ts';
+import { ComponentInt, ComponentsInt, ChildInt } from '../utils/interfaces';
 
 export default class TransformerComponent extends Component {
   componentDidMount() {