Skip to content

Commit 29c535b

Browse files
Merge pull request #79 from spincycle01/master
App.tsx converted to SFC, cleaned up code
2 parents b20b43d + b5bf798 commit 29c535b

File tree

5 files changed

+38
-57
lines changed

5 files changed

+38
-57
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# ReacType
2+
Prototyping Tool for React/Typescript Applications

index.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

main.js

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -86,35 +86,27 @@ const createWindow = () => {
8686
openFile();
8787
},
8888
},
89-
{
90-
label: 'Export Components',
91-
accelerator: process.platform === 'darwin' ? 'Cmd+E' : 'Ctrl+Shift+E',
92-
click() {
93-
exportComponents();
94-
},
95-
},
96-
],
97-
},
98-
{
99-
label: 'Edit',
100-
submenu: [
101-
{ role: 'undo' },
102-
{ role: 'redo' },
103-
{ type: 'separator' },
104-
{ role: 'cut' },
105-
{ role: 'copy' },
106-
{ role: 'paste' },
107-
{ role: 'pasteandmatchstyle' },
108-
{ role: 'delete' },
109-
{ role: 'selectall' },
11089
],
11190
},
91+
// {
92+
// label: 'Edit',
93+
// submenu: [
94+
// { role: 'undo' },
95+
// { role: 'redo' },
96+
// { type: 'separator' },
97+
// { role: 'cut' },
98+
// { role: 'copy' },
99+
// { role: 'paste' },
100+
// { role: 'pasteandmatchstyle' },
101+
// { role: 'delete' },
102+
// { role: 'selectall' },
103+
// ],
104+
// },
112105
{
113106
label: 'View',
114107
submenu: [
115108
{ role: 'reload' },
116109
{ role: 'forcereload' },
117-
{ role: 'toggledevtools' },
118110
{ type: 'separator' },
119111
{ role: 'resetzoom' },
120112
{ role: 'zoomin' },

src/components/App.tsx

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
11
import React, { Component } from 'react';
22
import '../public/styles/style.css';
3-
import { MuiThemeProvider } from '@material-ui/core/styles';
3+
// import { MuiThemeProvider } from '@material-ui/core/styles';
44
import AppContainer from '../containers/AppContainer';
55

6-
class App extends Component {
7-
render() {
8-
return (
9-
<div className="app">
10-
<div>
11-
<header style={{ height: '40px', width: '100%' }}>ReacType</header>
12-
<AppContainer />
13-
</div>
14-
</div>
15-
);
16-
}
17-
}
6+
export const App: React.SFC = () => (
7+
<div className="app">
8+
<div>
9+
<header style={{ height: '40px', width: '100%' }}>ReacType</header>
10+
<AppContainer />
11+
</div>
12+
</div>
13+
);
1814

1915
export default App;
16+
17+
// class App extends Component {
18+
// // render() {
19+
// return (
20+
// <div className="app">
21+
// <div>
22+
// <header style={{ height: '40px', width: '100%' }}>ReacType</header>
23+
// <AppContainer />
24+
// </div>
25+
// </div>
26+
// );
27+
// }
28+
// }

src/config/index.js

Whitespace-only changes.

0 commit comments

Comments
 (0)