Skip to content

Development #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 56 commits into from
Apr 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
b967fc1
initial state object is working for addChild react component. addChil…
Apr 19, 2019
4e4d8d9
Merge pull request #11 from tolgamizrakci/development
tolgamizrakci Apr 19, 2019
f56dcbc
small config changes
ChristianEdwardPadilla Apr 19, 2019
0f5621f
leftExpansionCol changed to MUI list, functionality stripped
ChristianEdwardPadilla Apr 20, 2019
36adf98
addChild button added
ChristianEdwardPadilla Apr 20, 2019
0db08b3
Merge pull request #12 from ChristianEdwardPadilla/development
spincycle01 Apr 20, 2019
f13ed8d
add component and add child is broken down into two within redux file…
Apr 20, 2019
3001cc6
add component and child working initially. back to js atm
Apr 20, 2019
9653b40
Merge pull request #13 from tolgamizrakci/development
ChristianEdwardPadilla Apr 20, 2019
9077063
labels on boxes, boundRecFunc implemented with hardcoded numbers
ChristianEdwardPadilla Apr 20, 2019
a77d0e7
Merge pull request #15 from ChristianEdwardPadilla/development
ChristianEdwardPadilla Apr 20, 2019
723ca2a
focus component working waiting to merge with Christian
Apr 20, 2019
d4cbcc5
Merge branch 'development' of https://github.com/team-reactype/ReacTy…
Apr 20, 2019
917ecc2
focus component changing on left panel cards
Apr 20, 2019
8441aa6
Merge pull request #16 from tolgamizrakci/development
tolgamizrakci Apr 20, 2019
eb6f8d5
focused secondary text
ChristianEdwardPadilla Apr 20, 2019
22c15e0
addChild button not visible when focused
ChristianEdwardPadilla Apr 20, 2019
97ca836
Merge pull request #17 from ChristianEdwardPadilla/development
ChristianEdwardPadilla Apr 20, 2019
712cb31
adding component and child works but can't be dragged
Apr 21, 2019
a7733c5
Merge pull request #18 from tolgamizrakci/development
ChristianEdwardPadilla Apr 21, 2019
3091e52
can move and resize single child rect, child rect color is based on c…
ChristianEdwardPadilla Apr 21, 2019
3178b20
Merge pull request #19 from ChristianEdwardPadilla/development
ChristianEdwardPadilla Apr 21, 2019
d35c51a
dragging changes
ChristianEdwardPadilla Apr 21, 2019
c3ead03
Merge pull request #20 from ChristianEdwardPadilla/development
tolgamizrakci Apr 21, 2019
66f5e09
commit before pulling dragging changes from christian
Apr 21, 2019
c096a37
changeFocusChild functionality added
ChristianEdwardPadilla Apr 21, 2019
e0e7f90
handletransform working, waiting to merge with Chris
Apr 21, 2019
6db9ccd
Merge pull request #21 from tolgamizrakci/development
ChristianEdwardPadilla Apr 21, 2019
c725dbb
merge with changeFocusChild functionality and save child position fun…
ChristianEdwardPadilla Apr 21, 2019
ae9a7ca
Merge pull request #22 from ChristianEdwardPadilla/development
ChristianEdwardPadilla Apr 21, 2019
4390855
pulling latest canvas changes
Apr 21, 2019
aefbc33
Merge branch 'development' of https://github.com/team-reactype/ReacTy…
Apr 21, 2019
e662560
refactored Rectangle to allow for rendering of grandchildren with smo…
ChristianEdwardPadilla Apr 22, 2019
c67bb8f
duplicate component names no longer allowed
ChristianEdwardPadilla Apr 22, 2019
6731eff
Merge branch 'development' of https://github.com/team-reactype/ReacTy…
ChristianEdwardPadilla Apr 22, 2019
d927ede
Merge pull request #23 from ChristianEdwardPadilla/development
ChristianEdwardPadilla Apr 22, 2019
840947e
some comments
ChristianEdwardPadilla Apr 22, 2019
699832f
Merge pull request #24 from ChristianEdwardPadilla/development
ChristianEdwardPadilla Apr 22, 2019
1f9807b
pulling from latest version in dev
Apr 22, 2019
6aa975a
trying to pull
Apr 22, 2019
79a8635
resizing children now causes correct changes in children position
ChristianEdwardPadilla Apr 22, 2019
8e605d4
resizing children now causes correct changes in children position
ChristianEdwardPadilla Apr 22, 2019
dc525c5
Merge branch 'development' of https://github.com/ChristianEdwardPadil…
ChristianEdwardPadilla Apr 22, 2019
264f825
Merge pull request #25 from ChristianEdwardPadilla/development
spincycle01 Apr 22, 2019
c8d80bb
added childComponentId in state
Apr 22, 2019
837d84d
childcompid merged with canvas resizing fix
Apr 22, 2019
ba36089
Merge pull request #26 from tolgamizrakci/development
tolgamizrakci Apr 22, 2019
b978688
started recursive solution to descendant rendering
ChristianEdwardPadilla Apr 22, 2019
e5a858c
Merge pull request #27 from ChristianEdwardPadilla/development
ChristianEdwardPadilla Apr 22, 2019
bb56b4e
fixed mapping issue
ChristianEdwardPadilla Apr 22, 2019
cea86c2
Merge pull request #28 from ChristianEdwardPadilla/development
ChristianEdwardPadilla Apr 22, 2019
e6bc35b
selectable children and ancestors (&state) working and rendering +bu…
Apr 23, 2019
87baba0
Merge pull request #29 from tolgamizrakci/development
tolgamizrakci Apr 23, 2019
4e59a77
add comp updates ancestors & left panel sort is complete
Apr 23, 2019
8a727d6
Merge branch 'development' of https://github.com/team-reactype/ReacTy…
Apr 23, 2019
fb1f985
Merge pull request #30 from tolgamizrakci/development
tolgamizrakci Apr 23, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,13 @@
{
"extends": [
"plugin:react/recommended",
"airbnb-base"
],
"extends": ["plugin:react/recommended", "airbnb-base"],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018,
"sourceType": "module"
},
"plugins": [
"import",
"react",
"jest",
"jsx-a11y",
"babel"
],
"plugins": ["import", "react", "jest", "jsx-a11y", "babel"],
"parser": "babel-eslint",
"env": {
"browser": true,
Expand All @@ -25,6 +16,7 @@
"jest": true
},
"rules": {
"class-methods-use-this": "off"
"class-methods-use-this": "off",
"linebreak-style": 0
}
}
}
2 changes: 2 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ const {
ipcMain,
} = require('electron');

require('electron-reload')(__dirname);

// const isDev = true;
const isDev = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test';

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"cli-spinner": "^0.2.8",
"commander": "^2.17.1",
"electron": "^2.0.7",
"electron-reload": "^1.4.0",
"enzyme": "^3.4.1",
"konva": "^2.1.7",
"localforage": "^1.7.2",
Expand Down
49 changes: 26 additions & 23 deletions src/actionTypes/index.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
export const LOAD_INIT_DATA = 'LOAD_INIT_DATA';
export const ADD_COMPONENT = 'ADD_COMPONENT';
export const UPDATE_COMPONENT = 'UPDATE_COMPONENT';
export const DELETE_COMPONENT = 'DELETE_COMPONENT';
export const UPDATE_CHILDREN = 'UPDATE_CHILDREN';
export const REASSIGN_PARENT = 'REASSIGN_PARENT';
export const SET_SELECTABLE_PARENTS = 'SET_SELECTABLE_PARENTS';
export const EXPORT_FILES = 'EXPORT_FILES';
export const EXPORT_FILES_SUCCESS = 'EXPORT_FILES_SUCCESS';
export const EXPORT_FILES_ERROR = 'EXPORT_FILES_ERROR';
export const HANDLE_CLOSE = 'HANDLE_CLOSE';
export const HANDLE_TRANSFORM = 'HANDLE_TRANSFORM';
export const CREATE_APPLICATION = 'CREATE_APPLICATION';
export const CREATE_APPLICATION_SUCCESS = 'CREATE_APPLICATION_SUCCESS';
export const CREATE_APPLICATION_ERROR = 'CREATE_APPLICATION_ERROR';
export const TOGGLE_DRAGGING = 'TOGGLE_DRAGGING';
export const MOVE_TO_BOTTOM = 'MOVE_TO_BOTTOM';
export const MOVE_TO_TOP = 'MOVE_TO_TOP';
export const OPEN_EXPANSION_PANEL = 'OPEN_EXPANSION_PANEL';
export const DELETE_PROP = 'DELETE_PROP';
export const ADD_PROP = 'ADD_PROP';
export const DELETE_ALL_DATA = 'DELETE_ALL_DATA';
export const CHANGE_IMAGE_PATH = 'CHANGE_IMAGE_PATH';
export const LOAD_INIT_DATA = "LOAD_INIT_DATA";
export const ADD_COMPONENT = "ADD_COMPONENT";
export const ADD_CHILD = "ADD_CHILD";
export const UPDATE_COMPONENT = "UPDATE_COMPONENT";
export const DELETE_COMPONENT = "DELETE_COMPONENT";
export const CHANGE_FOCUS_COMPONENT = "CHANGE_FOCUS_COMPONENT";
export const CHANGE_FOCUS_CHILD = "CHANGE_FOCUS_CHILD";
export const UPDATE_CHILDREN = "UPDATE_CHILDREN";
export const REASSIGN_PARENT = "REASSIGN_PARENT";
export const SET_SELECTABLE_PARENTS = "SET_SELECTABLE_PARENTS";
export const EXPORT_FILES = "EXPORT_FILES";
export const EXPORT_FILES_SUCCESS = "EXPORT_FILES_SUCCESS";
export const EXPORT_FILES_ERROR = "EXPORT_FILES_ERROR";
export const HANDLE_CLOSE = "HANDLE_CLOSE";
export const HANDLE_TRANSFORM = "HANDLE_TRANSFORM";
export const CREATE_APPLICATION = "CREATE_APPLICATION";
export const CREATE_APPLICATION_SUCCESS = "CREATE_APPLICATION_SUCCESS";
export const CREATE_APPLICATION_ERROR = "CREATE_APPLICATION_ERROR";
export const TOGGLE_DRAGGING = "TOGGLE_DRAGGING";
export const MOVE_TO_BOTTOM = "MOVE_TO_BOTTOM";
export const MOVE_TO_TOP = "MOVE_TO_TOP";
export const OPEN_EXPANSION_PANEL = "OPEN_EXPANSION_PANEL";
export const DELETE_PROP = "DELETE_PROP";
export const ADD_PROP = "ADD_PROP";
export const DELETE_ALL_DATA = "DELETE_ALL_DATA";
export const CHANGE_IMAGE_PATH = "CHANGE_IMAGE_PATH";
Loading