1.2.1-alpha relese merge (SkalskiP#45)

Author: SkalskiP

README.md

@@ -241,6 +241,17 @@ Our application is being actively developed. If you have an idea for a new funct
 - [ ] Integration with external storage - Amazon S3, Google Drive, Dropbox
 - [ ] Copy annotations from previous image into the next one
 
+## Citation
+
+```
+@MISC{make-sense,
+   author = {Piotr Skalski},
+   title = {{Make Sense}},
+   howpublished = "\url{https://github.com/SkalskiP/make-sense/}",
+   year = {2019},
+}
+```
+
 ## License
 
 This project is licensed under the GPL-3.0 License - see the [LICENSE][2] file for details

src/App.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import './App.scss';
 import EditorView from "./views/EditorView/EditorView";
 import MainView from "./views/MainView/MainView";
-import {ProjectType} from "./data/ProjectType";
+import {ProjectType} from "./data/enums/ProjectType";
 import {AppState} from "./store";
 import {connect} from "react-redux";
 import PopupView from "./views/PopupView/PopupView";

src/data/Direction.ts

@@ -7,5 +7,6 @@ export interface EditorData {
     canvasSize: ISize,
     activeImageScale: number,
     activeImageRectOnCanvas: IRect,
+    activeKeyCombo: string[],
     event?: Event
 }

src/data/EditorData.ts

@@ -1,7 +1,7 @@
-import {AnchorType} from "./AnchorType";
 import {IPoint} from "../interfaces/IPoint";
+import {Direction} from "./enums/Direction";
 
 export interface RectAnchor {
-    type: AnchorType,
+    type: Direction,
     position: IPoint
 }

src/data/RectAnchor.ts

@@ -1,4 +1,4 @@
-export enum Context {
+export enum ContextType {
     EDITOR = "EDITOR",
     LEFT_NAVBAR = "LEFT_NAVBAR",
     RIGHT_NAVBAR = "RIGHT_NAVBAR",

src/data/AcceptedFileType.ts renamed to src/data/enums/AcceptedFileType.ts

@@ -1,4 +1,4 @@
-export enum AnchorType {
+export enum Direction {
     TOP = "TOP",
     BOTTOM = "BOTTOM",
     LEFT = "LEFT",