Skip to content

Commit acaa46a

Browse files
authored
Merge pull request #1 from ReacType-2-0/adding-comments
Adding comments
2 parents 0cd268d + 6eb6467 commit acaa46a

File tree

2 files changed

+149
-108
lines changed

2 files changed

+149
-108
lines changed

main.js

Lines changed: 48 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
const path = require('path');
2-
3-
const { app, BrowserWindow, Menu, shell, dialog, ipcMain } = require('electron');
2+
// adding a comment to test github notifications
3+
// adding new comment
4+
5+
const {
6+
app,
7+
BrowserWindow,
8+
Menu,
9+
shell,
10+
dialog,
11+
ipcMain
12+
} = require('electron');
413

514
// Uncomment below for hot reloading during development
615
// require('electron-reload')(__dirname);
716

817
// const isDev = true;
9-
const isDev = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test';
18+
const isDev =
19+
process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test';
1020

1121
// Keep a global reference of the window object, if you don't, the window will
1222
// be closed automatically when the JavaScript object is garbage collected.
@@ -20,9 +30,9 @@ function openFile() {
2030
filters: [
2131
{
2232
name: 'Images',
23-
extensions: ['jpeg', 'jpg', 'png', 'gif', 'pdf'],
24-
},
25-
],
33+
extensions: ['jpeg', 'jpg', 'png', 'gif', 'pdf']
34+
}
35+
]
2636
});
2737

2838
// if no files
@@ -34,10 +44,10 @@ function openFile() {
3444
}
3545

3646
// Choose directory
37-
ipcMain.on('choose_app_dir', event => {
47+
ipcMain.on('choose_app_dir', (event) => {
3848
const directory = dialog.showOpenDialog(mainWindow, {
3949
properties: ['openDirectory'],
40-
buttonLabel: 'Export',
50+
buttonLabel: 'Export'
4151
});
4252

4353
if (!directory) return;
@@ -62,14 +72,14 @@ const createWindow = () => {
6272
height,
6373
webPreferences: {
6474
zoomFactor: 0.7,
65-
'node-Integration': false,
75+
'node-Integration': false
6676
},
6777
show: false,
6878
icon: path.join(__dirname, '/src/public/icons/mac/icon.icns'),
6979
win: {
7080
icon: path.join(__dirname, '/src/public/icons/win/icon.ico'),
71-
target: ['portable'],
72-
},
81+
target: ['portable']
82+
}
7383
});
7484

7585
// and load the index.html of the app.
@@ -88,9 +98,9 @@ const createWindow = () => {
8898
accelerator: process.platform === 'darwin' ? 'Cmd+O' : 'Ctrl+Shift+O',
8999
click() {
90100
openFile();
91-
},
92-
},
93-
],
101+
}
102+
}
103+
]
94104
},
95105
// {
96106
// label: 'Edit',
@@ -116,12 +126,12 @@ const createWindow = () => {
116126
{ role: 'zoomin' },
117127
{ role: 'zoomout' },
118128
{ type: 'separator' },
119-
{ role: 'togglefullscreen' },
120-
],
129+
{ role: 'togglefullscreen' }
130+
]
121131
},
122132
{
123133
role: 'window',
124-
submenu: [{ role: 'minimize' }, { role: 'close' }],
134+
submenu: [{ role: 'minimize' }, { role: 'close' }]
125135
},
126136
{
127137
role: 'help',
@@ -130,22 +140,23 @@ const createWindow = () => {
130140
label: 'Learn More',
131141
click() {
132142
shell.openExternal('https://electronjs.org');
133-
},
134-
},
135-
],
143+
}
144+
}
145+
]
136146
},
137147
{
138148
label: 'Developer',
139149
submenu: [
140150
{
141151
label: 'Toggle Developer Tools',
142-
accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
152+
accelerator:
153+
process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
143154
click() {
144155
mainWindow.webContents.toggleDevTools();
145-
},
146-
},
147-
],
148-
},
156+
}
157+
}
158+
]
159+
}
149160
];
150161

151162
if (process.platform === 'darwin') {
@@ -160,19 +171,19 @@ const createWindow = () => {
160171
{ role: 'hideothers' },
161172
{ role: 'unhide' },
162173
{ type: 'separator' },
163-
{ role: 'quit' },
164-
],
174+
{ role: 'quit' }
175+
]
165176
});
166177

167178
// Edit menu
168179
template[2].submenu.push(
169180
{
170-
type: 'separator',
181+
type: 'separator'
171182
},
172183
{
173184
label: 'Speech',
174-
submenu: [{ role: 'startspeaking' }, { role: 'stopspeaking' }],
175-
},
185+
submenu: [{ role: 'startspeaking' }, { role: 'stopspeaking' }]
186+
}
176187
);
177188

178189
// Window menu
@@ -181,7 +192,7 @@ const createWindow = () => {
181192
{ role: 'minimize' },
182193
{ role: 'zoom' },
183194
{ type: 'separator' },
184-
{ role: 'front' },
195+
{ role: 'front' }
185196
];
186197
}
187198

@@ -202,13 +213,17 @@ const createWindow = () => {
202213
// Some APIs can only be used after this event occurs.
203214
app.on('ready', () => {
204215
if (isDev) {
205-
const { default: installExtension, REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS } = require('electron-devtools-installer');
216+
const {
217+
default: installExtension,
218+
REACT_DEVELOPER_TOOLS,
219+
REDUX_DEVTOOLS
220+
} = require('electron-devtools-installer');
206221

207222
installExtension([REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS])
208223
.then(() => {
209224
createWindow();
210225
})
211-
.catch(err => err);
226+
.catch((err) => err);
212227
} else {
213228
createWindow();
214229
}

0 commit comments

Comments
 (0)