Skip to content

Commit a3380e5

Browse files
tolgamizrakcitolgamizrakci
authored
Merge pull request #31 from team-reactype/development
Development
2 parents 4d0c64f + fb1f985 commit a3380e5

29 files changed

+1411
-1223
lines changed

‎.eslintrc.json

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
{
2-
"extends": [
3-
"plugin:react/recommended",
4-
"airbnb-base"
5-
],
2+
"extends": ["plugin:react/recommended", "airbnb-base"],
63
"parserOptions": {
74
"ecmaFeatures": {
85
"jsx": true
96
},
107
"ecmaVersion": 2018,
118
"sourceType": "module"
129
},
13-
"plugins": [
14-
"import",
15-
"react",
16-
"jest",
17-
"jsx-a11y",
18-
"babel"
19-
],
10+
"plugins": ["import", "react", "jest", "jsx-a11y", "babel"],
2011
"parser": "babel-eslint",
2112
"env": {
2213
"browser": true,
@@ -25,6 +16,7 @@
2516
"jest": true
2617
},
2718
"rules": {
28-
"class-methods-use-this": "off"
19+
"class-methods-use-this": "off",
20+
"linebreak-style": 0
2921
}
30-
}
22+
}

‎main.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ const {
77
ipcMain,
88
} = require('electron');
99

10+
require('electron-reload')(__dirname);
11+
1012
// const isDev = true;
1113
const isDev = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test';
1214

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
"cli-spinner": "^0.2.8",
8686
"commander": "^2.17.1",
8787
"electron": "^2.0.7",
88+
"electron-reload": "^1.4.0",
8889
"enzyme": "^3.4.1",
8990
"konva": "^2.1.7",
9091
"localforage": "^1.7.2",

‎src/actionTypes/index.js

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
1-
export const LOAD_INIT_DATA = 'LOAD_INIT_DATA';
2-
export const ADD_COMPONENT = 'ADD_COMPONENT';
3-
export const UPDATE_COMPONENT = 'UPDATE_COMPONENT';
4-
export const DELETE_COMPONENT = 'DELETE_COMPONENT';
5-
export const UPDATE_CHILDREN = 'UPDATE_CHILDREN';
6-
export const REASSIGN_PARENT = 'REASSIGN_PARENT';
7-
export const SET_SELECTABLE_PARENTS = 'SET_SELECTABLE_PARENTS';
8-
export const EXPORT_FILES = 'EXPORT_FILES';
9-
export const EXPORT_FILES_SUCCESS = 'EXPORT_FILES_SUCCESS';
10-
export const EXPORT_FILES_ERROR = 'EXPORT_FILES_ERROR';
11-
export const HANDLE_CLOSE = 'HANDLE_CLOSE';
12-
export const HANDLE_TRANSFORM = 'HANDLE_TRANSFORM';
13-
export const CREATE_APPLICATION = 'CREATE_APPLICATION';
14-
export const CREATE_APPLICATION_SUCCESS = 'CREATE_APPLICATION_SUCCESS';
15-
export const CREATE_APPLICATION_ERROR = 'CREATE_APPLICATION_ERROR';
16-
export const TOGGLE_DRAGGING = 'TOGGLE_DRAGGING';
17-
export const MOVE_TO_BOTTOM = 'MOVE_TO_BOTTOM';
18-
export const MOVE_TO_TOP = 'MOVE_TO_TOP';
19-
export const OPEN_EXPANSION_PANEL = 'OPEN_EXPANSION_PANEL';
20-
export const DELETE_PROP = 'DELETE_PROP';
21-
export const ADD_PROP = 'ADD_PROP';
22-
export const DELETE_ALL_DATA = 'DELETE_ALL_DATA';
23-
export const CHANGE_IMAGE_PATH = 'CHANGE_IMAGE_PATH';
1+
export const LOAD_INIT_DATA = "LOAD_INIT_DATA";
2+
export const ADD_COMPONENT = "ADD_COMPONENT";
3+
export const ADD_CHILD = "ADD_CHILD";
4+
export const UPDATE_COMPONENT = "UPDATE_COMPONENT";
5+
export const DELETE_COMPONENT = "DELETE_COMPONENT";
6+
export const CHANGE_FOCUS_COMPONENT = "CHANGE_FOCUS_COMPONENT";
7+
export const CHANGE_FOCUS_CHILD = "CHANGE_FOCUS_CHILD";
8+
export const UPDATE_CHILDREN = "UPDATE_CHILDREN";
9+
export const REASSIGN_PARENT = "REASSIGN_PARENT";
10+
export const SET_SELECTABLE_PARENTS = "SET_SELECTABLE_PARENTS";
11+
export const EXPORT_FILES = "EXPORT_FILES";
12+
export const EXPORT_FILES_SUCCESS = "EXPORT_FILES_SUCCESS";
13+
export const EXPORT_FILES_ERROR = "EXPORT_FILES_ERROR";
14+
export const HANDLE_CLOSE = "HANDLE_CLOSE";
15+
export const HANDLE_TRANSFORM = "HANDLE_TRANSFORM";
16+
export const CREATE_APPLICATION = "CREATE_APPLICATION";
17+
export const CREATE_APPLICATION_SUCCESS = "CREATE_APPLICATION_SUCCESS";
18+
export const CREATE_APPLICATION_ERROR = "CREATE_APPLICATION_ERROR";
19+
export const TOGGLE_DRAGGING = "TOGGLE_DRAGGING";
20+
export const MOVE_TO_BOTTOM = "MOVE_TO_BOTTOM";
21+
export const MOVE_TO_TOP = "MOVE_TO_TOP";
22+
export const OPEN_EXPANSION_PANEL = "OPEN_EXPANSION_PANEL";
23+
export const DELETE_PROP = "DELETE_PROP";
24+
export const ADD_PROP = "ADD_PROP";
25+
export const DELETE_ALL_DATA = "DELETE_ALL_DATA";
26+
export const CHANGE_IMAGE_PATH = "CHANGE_IMAGE_PATH";

0 commit comments

Comments
 (0)