Skip to content

Commit 2daedb2

Browse files
committed
converted App to App.tsx and theme to theme.ts.
1 parent fb017ac commit 2daedb2

File tree

9 files changed

+32
-15
lines changed

9 files changed

+32
-15
lines changed

main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ function exportComponents() {
4444
ipcMain.on('choose_app_dir', (event) => {
4545
const directory = dialog.showOpenDialog(mainWindow, {
4646
properties: ['openDirectory'],
47+
buttonLabel: 'Export',
4748
});
4849

4950
if (!directory) return;

src/components/App.jsx renamed to src/components/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { Component } from 'react';
22
import '../public/styles/style.css';
33
import { MuiThemeProvider } from '@material-ui/core/styles';
4-
import theme from './theme';
4+
import theme from './theme.ts';
55
import AppContainer from '../containers/AppContainer.jsx';
66

77
class App extends Component {

src/components/HTMLComponentPanel.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import ButtonIcon from "@material-ui/icons/EditAttributes";
1010
import LinkIcon from "@material-ui/icons/Link";
1111
import ListIcon from "@material-ui/icons/List";
1212
import ParagraphIcon from "@material-ui/icons/LocalParking";
13-
import theme from "../components/theme";
13+
import theme from "../components/theme.ts";
1414
import Typography from '@material-ui/core/Typography';
1515
import Grid from "@material-ui/core/Grid";
1616
import Paper from "@material-ui/core/Paper";

src/components/__tests__/App.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
// import '../../setupTests';
33
import { shallow } from 'enzyme';
4-
import App from '../App.jsx';
4+
import App from '../App.tsx';
55
import AppContainer from '../../containers/AppContainer.jsx';
66

77
it('contains a AppContainer', () => {

src/components/theme.js renamed to src/components/theme.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
import { createMuiTheme } from '@material-ui/core/styles';
22
// import teal from '@material-ui/core/colors/teal';
33
import indigo from '@material-ui/core/colors/indigo';
4+
import { Palette } from '@material-ui/core/styles/createPalette';
45

5-
const theme = createMuiTheme({
6+
interface palette {
7+
primary: object;
8+
secondary: any;
9+
}
10+
11+
interface theme {
12+
palette: palette;
13+
}
14+
15+
const theme: theme = createMuiTheme({
616
palette: {
717
primary: {
818
light: '#00e676',

src/containers/AppContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import LeftContainer from './LeftContainer.jsx';
77
import MainContainer from './MainContainer.jsx';
88
import RightContainer from './RightContainer.jsx';
99
import convertIdsToObjs from '../utils/convertIdsToObjs.util';
10-
import theme from '../components/theme';
10+
import theme from '../components/theme.ts';
1111
import { loadInitData } from '../actions/components';
1212

1313
const mapStateToProps = store => ({

src/containers/MainContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import List from '@material-ui/core/List';
66
import ListItem from '@material-ui/core/ListItem';
77
import ListItemText from '@material-ui/core/ListItemText';
88
import BottomPanel from '../components/BottomPanel.jsx';
9-
import theme from '../components/theme';
9+
import theme from '../components/theme.ts';
1010
import {
1111
openExpansionPanel,
1212
handleTransform,

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'babel-polyfill';
22
import React from 'react';
33
import ReactDOM from 'react-dom';
44
import { Provider } from 'react-redux';
5-
import App from './components/App.jsx';
5+
import App from './components/App.tsx';
66
import store from './store';
77

88
ReactDOM.render(

src/utils/componentRender.util.js

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
const componentRender = (component) => {
1+
const componentRender = (component, data) => {
22
const {
33
stateful,
4-
children,
4+
id,
5+
position,
6+
childrenArray,
57
title,
68
props,
79
} = component;
@@ -10,8 +12,8 @@ const componentRender = (component) => {
1012
return `
1113
import React, { Component } from 'react';
1214
import PropTypes from 'prop-types';
13-
${children.map(child => `import ${child.title} from './${child.title}.tsx'`).join('\n')}
14-
15+
${childrenArray.map(child => `import ${child.componentName} from './${child.componentName}.tsx'`).join('\n')}
16+
1517
class ${title} extends Component {
1618
constructor(props) {
1719
super(props);
@@ -21,7 +23,7 @@ const componentRender = (component) => {
2123
const { ${props.map(p => `${p.key}`).join(', ')} } = this.props;
2224
return (
2325
<div>
24-
${children.map(child => `<${child.title} ${child.props.map(prop => `${prop.key}={${prop.value}}`).join(' ')}/>`).join('\n')}
26+
${childrenArray.map(child => `<${child.componentName}/>`).join('\n')}
2527
</div>
2628
)
2729
}
@@ -38,11 +40,15 @@ const componentRender = (component) => {
3840
return `
3941
import React from 'react';
4042
import PropTypes from 'prop-types';
41-
${children.map(child => `import ${child.title} from './${child.title}.tsx'`).join('\n')}
42-
43+
${childrenArray.map(child => `import ${child.componentName} from './${child.componentName}.tsx'`).join('\n')}
44+
45+
46+
type Props = {
47+
48+
}
4349
const ${title} = props => (
4450
<div>
45-
${children.map(child => `<${child.title} ${child.props.map(prop => `${prop.key}={${prop.value}}`).join(' ')}/>`).join('\n')}
51+
${childrenArray.map(child => `<${child.componentName}/>`).join('\n')}
4652
</div>
4753
);
4854

0 commit comments

Comments
 (0)