Skip to content

Commit 5cb0ddc

Browse files
author
john lim
committed
Merge branch 'copyofrevert' into real
2 parents b5a6b69 + 0643e10 commit 5cb0ddc

File tree

8 files changed

+6
-6
lines changed

8 files changed

+6
-6
lines changed

app/electron/menu.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ var MenuBuilder = function(mainWindow, appName) {
1717

1818
const openTutorial = () => {
1919
const tutorial = new BrowserWindow({
20-
width: 1126,
20+
width: 1180,
2121
height: 900,
22-
minWidth: 661,
22+
minWidth: 665,
2323
title: 'Tutorial',
2424
webPreferences: {
2525
nodeIntegration: false,

app/src/components/login/SignIn.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
217217
>
218218
Sign In
219219
</Button>
220-
<Button
220+
{/* <Button
221221
fullWidth
222222
variant="contained"
223223
color="default"
@@ -229,14 +229,14 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
229229
<GitHubIcon />
230230
</Button>
231231
<FacebookLogin
232-
appId={FBAPPID}
232+
appId={FBAPPID}
233233
autoLoad={false}
234234
fields="name, email, picture"
235235
callback={responseFacebook}
236236
icon="fa-facebook-square"
237237
cssClass={'oauth-btn'}
238238
textButton=' Login with Facebook'
239-
/>
239+
/> */}
240240
<Button
241241
fullWidth
242242
variant="contained"

app/src/public/icons/mac/icon.icns

44.7 KB
Binary file not shown.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "reactype",
3-
"version": "3.0.0",
3+
"version": "4.0.0",
44
"description": "Prototyping tool for React/Typescript Applications.",
55
"private": true,
66
"main": "app/electron/main.js",

resources/icon.icns

106 KB
Binary file not shown.

resources/icon.ico

98 KB
Binary file not shown.

resources/icon.png

753 KB
Loading

resources/reactype4.png

-795 KB
Binary file not shown.

0 commit comments

Comments
 (0)