Skip to content

html components in progress, canvas improvements, styling changes #52

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 55 commits into from
May 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
2a830ca
working with small changes
ChristianEdwardPadilla Apr 26, 2019
f718225
changed initial component state
ChristianEdwardPadilla Apr 26, 2019
28f6499
rough working version of pseudochild, still janky with zIndex. Also s…
ChristianEdwardPadilla Apr 29, 2019
2a6638a
more cleanup
ChristianEdwardPadilla Apr 29, 2019
76bf666
even more cleanup
ChristianEdwardPadilla Apr 29, 2019
64b3638
dashed lines for pseudochild
ChristianEdwardPadilla Apr 29, 2019
9c43e93
fixed rect overlapping by using a .sort in KonvaStage. Could be a per…
ChristianEdwardPadilla Apr 29, 2019
dea1694
comment related to sort
ChristianEdwardPadilla Apr 29, 2019
e6a79dd
Merge branch 'master' of https://github.com/team-reactype/ReacType in…
ChristianEdwardPadilla Apr 29, 2019
038cfa4
Merge pull request #40 from ChristianEdwardPadilla/development
spincycle01 Apr 29, 2019
f9a6e9d
trying to pull from upstream
Apr 29, 2019
e74ab3a
Disallow adding App component as child
ShlomoPorges Apr 29, 2019
92abc76
changed the Electron load, so that application renders after fully lo…
spincycle01 Apr 29, 2019
011a600
transformer anchors are always selectable
ChristianEdwardPadilla Apr 30, 2019
afa4ced
transformer actually still unselectable under smaller component
ChristianEdwardPadilla Apr 30, 2019
9cdc8fe
canvas snap grid & styling update
Apr 30, 2019
801cf7b
Merge pull request #41 from tolgamizrakci/development
tolgamizrakci Apr 30, 2019
a64c9e6
added DataTable, worked on add prop Logic and more
ShlomoPorges Apr 30, 2019
95cf898
small gui changes
ShlomoPorges Apr 30, 2019
27378bd
canvas ratios first working draft
ChristianEdwardPadilla Apr 30, 2019
2a59c1c
installed and UNinstalled react--data-grid
ShlomoPorges Apr 30, 2019
50a4d24
Merge pull request #42 from ShlomoPorges/development
ShlomoPorges Apr 30, 2019
16b9688
fully-featured canvas, working version
ChristianEdwardPadilla Apr 30, 2019
845aa4d
Merge pull request #43 from ChristianEdwardPadilla/development
ChristianEdwardPadilla Apr 30, 2019
dda6a38
adding htmlcomp panel
Apr 30, 2019
5f3b025
Merge branch 'development' of https://github.com/team-reactype/ReacTy…
Apr 30, 2019
2909d9b
export functionality exists for components solely. Presently cannont…
spincycle01 Apr 30, 2019
00839dc
changed focusChild Logic in state, Added state InitialFocusChild and …
ShlomoPorges Apr 30, 2019
efde5d5
after resolving merge conflicts
ShlomoPorges Apr 30, 2019
9b09733
Merge pull request #44 from ShlomoPorges/development
ShlomoPorges Apr 30, 2019
50f97c9
adding functionality to add html comps
Apr 30, 2019
ee5f484
removed Draggable from state
ShlomoPorges Apr 30, 2019
63eeb36
adding html comps works
May 1, 2019
b37ba20
Merge pull request #45 from tolgamizrakci/development
tolgamizrakci May 1, 2019
ed58a68
incorporated changes to the canvas with code exporting. Currently run…
spincycle01 May 1, 2019
f04183b
functionality with the canvas and new export features added
spincycle01 May 1, 2019
2a26d99
Merge pull request #46 from spincycle01/master
ChristianEdwardPadilla May 1, 2019
fa731e6
accepted incoming changes (small merge conflict)
ShlomoPorges May 1, 2019
ee70ca4
added html element file, logic when adding child. fixed delete comone…
ShlomoPorges May 1, 2019
2d70dfa
Merge pull request #47 from ShlomoPorges/development
tolgamizrakci May 1, 2019
72cfffd
pseudoChild no longer lives in state, it is generated only when neede…
ChristianEdwardPadilla May 1, 2019
96b21b0
pseudochild totally removed from state, transformer working
ChristianEdwardPadilla May 2, 2019
61c5f26
nothing
ChristianEdwardPadilla May 2, 2019
0db331d
fixed grandchildren HTML issues
ChristianEdwardPadilla May 2, 2019
ff1511c
final canvas version
ChristianEdwardPadilla May 2, 2019
b1e5d7c
Merge pull request #48 from ChristianEdwardPadilla/development
spincycle01 May 2, 2019
a062161
pulling latest
tolgamizrakci May 2, 2019
ee59241
commented out TableGrid file. not used. missing dependency
ShlomoPorges May 2, 2019
e7f2a69
worked on prop form and DataTable changed, props form change
ShlomoPorges May 2, 2019
ade12be
styling changes
tolgamizrakci May 2, 2019
65e1ff0
Merge pull request #49 from tolgamizrakci/development
tolgamizrakci May 2, 2019
740d94d
Merge branch 'development' of https://github.com/team-reactype/ReacTy…
ShlomoPorges May 2, 2019
b4f4f9c
Merge pull request #50 from ShlomoPorges/development
ShlomoPorges May 2, 2019
cc97a52
html element panel in progress
tolgamizrakci May 3, 2019
639d41c
Merge pull request #51 from tolgamizrakci/development
tolgamizrakci May 3, 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
32 changes: 16 additions & 16 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#!/usr/bin/env node
const util = require('util');
const program = require('commander');
const execFile = util.promisify(require('child_process').execFile);
const { Spinner } = require('cli-spinner');
// const util = require('util');
// const program = require('commander');
// const execFile = util.promisify(require('child_process').execFile);
// const { Spinner } = require('cli-spinner');

const spinner = new Spinner('running app... %s');
spinner.setSpinnerString('|/-\\');
// const spinner = new Spinner('running app... %s');
// spinner.setSpinnerString('|/-\\');

program
.version('1.0.0', '-v, --version, -V')
.description('An application for prototyping React application.');
// program
// .version('1.0.0', '-v, --version, -V')
// .description('An application for prototyping React application.');

program
.command('start')
.description('Start-up reactype app')
.action(() => {
spinner.start();
execFile('npm', ['start']).catch(err => console.log(err));
});
// program
// .command('start')
// .description('Start-up reactype app')
// .action(() => {
// spinner.start();
// execFile('npm', ['start']).catch(err => console.log(err));
// });

program.parse(process.argv);
18 changes: 18 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const {
ipcMain,
} = require('electron');


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

// const isDev = true;
Expand Down Expand Up @@ -34,6 +35,11 @@ function openFile() {
mainWindow.webContents.send('new-file', file);
}

// export files
function exportComponents() {
console.log('hi from exportComponents');
}

// Choose directory
ipcMain.on('choose_app_dir', (event) => {
const directory = dialog.showOpenDialog(mainWindow, {
Expand All @@ -60,10 +66,15 @@ const createWindow = () => {
mainWindow = new BrowserWindow({
width,
height,
show: false,
});

// and load the index.html of the app.
mainWindow.loadURL(`file://${__dirname}/build/index.html`);
// load page once window is loaded
mainWindow.once('ready-to-show', () => {
mainWindow.show();
});

const template = [{
label: 'File',
Expand All @@ -73,6 +84,13 @@ const createWindow = () => {
click() {
openFile();
},
},
{
label: 'Export Components',
accelerator: process.platform === 'darwin' ? 'Cmd+E' : 'Ctrl+Shift+E',
click() {
exportComponents();
},
}],
},
{
Expand Down
Loading