Skip to content

Commit 97738b6

Browse files
spincycle01ChristianEdwardPadilla
authored andcommitted
created landing page in pages folder, added image files
2 parents d753eb3 + fc08543 commit 97738b6

File tree

6 files changed

+203
-160
lines changed

6 files changed

+203
-160
lines changed

main.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
const path = require('path');
22

3-
const {
4-
app, BrowserWindow, Menu, shell, dialog, ipcMain,
5-
} = require('electron');
3+
const { app, BrowserWindow, Menu, shell, dialog, ipcMain } = require('electron');
64

75
// Uncomment below for hot reloading during development
86
// require('electron-reload')(__dirname);
@@ -36,7 +34,7 @@ function openFile() {
3634
}
3735

3836
// Choose directory
39-
ipcMain.on('choose_app_dir', (event) => {
37+
ipcMain.on('choose_app_dir', event => {
4038
const directory = dialog.showOpenDialog(mainWindow, {
4139
properties: ['openDirectory'],
4240
buttonLabel: 'Export',
@@ -63,11 +61,15 @@ const createWindow = () => {
6361
width,
6462
height,
6563
webPreferences: {
66-
zoomFactor: 0.8,
64+
zoomFactor: 0.7,
6765
'node-Integration': false,
6866
},
6967
show: false,
7068
icon: path.join(__dirname, '/src/public/icons/mac/icon.icns'),
69+
win: {
70+
icon: path.join(__dirname, '/src/public/icons/win/icon.ico'),
71+
target: ['portable'],
72+
},
7173
});
7274

7375
// and load the index.html of the app.
@@ -200,11 +202,7 @@ const createWindow = () => {
200202
// Some APIs can only be used after this event occurs.
201203
app.on('ready', () => {
202204
if (isDev) {
203-
const {
204-
default: installExtension,
205-
REACT_DEVELOPER_TOOLS,
206-
REDUX_DEVTOOLS,
207-
} = require('electron-devtools-installer');
205+
const { default: installExtension, REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS } = require('electron-devtools-installer');
208206

209207
installExtension([REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS])
210208
.then(() => {

src/components/DataTable.tsx

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
import React from "react";
2-
import { withStyles } from "@material-ui/core/styles";
3-
import Table from "@material-ui/core/Table";
4-
import TableBody from "@material-ui/core/TableBody";
5-
import TableCell from "@material-ui/core/TableCell";
6-
import TableHead from "@material-ui/core/TableHead";
7-
import TableRow from "@material-ui/core/TableRow";
8-
import Paper from "@material-ui/core/Paper";
9-
import DeleteIcon from "@material-ui/icons/Delete";
10-
import { IconButton } from "@material-ui/core";
1+
import React from 'react';
2+
import { withStyles } from '@material-ui/core/styles';
3+
import Table from '@material-ui/core/Table';
4+
import TableBody from '@material-ui/core/TableBody';
5+
import TableCell from '@material-ui/core/TableCell';
6+
import TableHead from '@material-ui/core/TableHead';
7+
import TableRow from '@material-ui/core/TableRow';
8+
import Paper from '@material-ui/core/Paper';
9+
import DeleteIcon from '@material-ui/icons/Delete';
10+
import { IconButton } from '@material-ui/core';
1111

1212
const styles = (theme: any) => ({
1313
root: {
14-
width: "80%",
15-
marginTop: theme.spacing.unit * 3
14+
width: '80%',
15+
marginTop: theme.spacing.unit * 3,
1616
// overflowX: "auto"
1717
},
1818
table: {
19-
minWidth: 500
20-
}
19+
minWidth: 500,
20+
},
2121
});
2222

2323
/** **************************
@@ -28,31 +28,25 @@ const styles = (theme: any) => ({
2828
function dataTable(props: any) {
2929
const { classes, rowData, rowHeader, deletePropHandler } = props;
3030

31-
const renderHeader = rowHeader.map((col: any, idx: number) => (
32-
<TableCell key={`head_+${idx}`}>{col}</TableCell>
33-
));
31+
const renderHeader = rowHeader.map((col: any, idx: number) => <TableCell key={`head_+${idx}`}>{col}</TableCell>);
3432

3533
function renderRowCells(row: any) {
3634
if (!row) return;
3735
// for some reason we must put each value in a div.
3836
return rowHeader.map((header: string, idx: number) => (
39-
<TableCell align={"center"} key={`td_${idx}`}>
37+
<TableCell align={'center'} key={`td_${idx}`}>
4038
{/* <div align={'center'} padding = {'none'} >{typeof row[header] === 'string' ? row[header] : row[header].toString()}</div> */}
4139
{/* {row[header]} */}
42-
{typeof row[header] === "string" ? row[header] : row[header].toString()}
40+
{typeof row[header] === 'string' ? row[header] : row[header].toString()}
4341
</TableCell>
4442
));
4543
}
4644
// style={{height: 30}}
4745
const renderRows = rowData.map((row: any) => (
4846
<TableRow key={`row-${row.id}`}>
4947
{renderRowCells(row)}
50-
<TableCell align={"center"} padding={"none"}>
51-
<IconButton
52-
color="default"
53-
fontSize="small"
54-
onClick={() => deletePropHandler(row.id)}
55-
>
48+
<TableCell align={'center'} padding={'none'}>
49+
<IconButton color="default" fontSize="small" onClick={() => deletePropHandler(row.id)}>
5650
<DeleteIcon />
5751
</IconButton>
5852
{/* <Button style={{height: 20}} onClick={() => deletePropHandler(row.id)}>Delete</Button> */}
@@ -62,7 +56,7 @@ function dataTable(props: any) {
6256

6357
return (
6458
<Paper className={classes.root}>
65-
<Table className={classes.table} selectable={"true"}>
59+
<Table className={classes.table} selectable={'true'}>
6660
<TableHead>
6761
<TableRow>{renderHeader}</TableRow>
6862
</TableHead>

src/components/Props.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ class Props extends Component {
189189
<Fragment>
190190
<div className="props-container" style={{ marginTop: '20px', width: '90%', height: '80%' }}>
191191
<Grid container spacing={8}>
192-
<Grid item xs={4}>
192+
<Grid item xs={3}>
193193
<form className="props-input" onSubmit={this.handleAddProp}>
194194
<Grid container spacing={8}>
195195
<Grid item xs={6}>
@@ -274,6 +274,7 @@ class Props extends Component {
274274
<Grid item xs={8}>
275275
<DataTable rowHeader={rowHeader} rowData={propsRows} deletePropHandler={deleteProp} />
276276
</Grid>
277+
<Grid item xs={1} />
277278
</Grid>
278279
</div>
279280
</Fragment>

src/components/TransformerComponent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { Component } from 'react';
22
import { Transformer } from 'react-konva';
3-
import { ChildInt } from '../utils/interfaces.ts';
3+
import { ChildInt } from '../utils/interfaces';
44

55
export default class TransformerComponent extends Component {
66
componentDidMount() {

src/public/styles/style.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ html {
1212
body {
1313
margin: 0;
1414
padding: 0;
15-
font-family: 'Open sans', sans-serif;
15+
font-family: "Open sans", sans-serif;
1616
font-weight: 400;
1717
overflow: hidden;
1818
}
@@ -206,6 +206,7 @@ RIGHT COLUMN
206206
flex-direction: row; */
207207
background-color: #fcfcfc;
208208
/* box-shadow: 0 -5px 7px 2px rgb(255, 0, 0); */
209+
margin-right: 100px;
209210
}
210211

211212
.htmlattr {

0 commit comments

Comments
 (0)