Skip to content

Commit d62847a

Browse files
committed
update splashscreen
1 parent 87b46f0 commit d62847a

File tree

2 files changed

+17
-19
lines changed

2 files changed

+17
-19
lines changed

app/electron/main.js

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const {
1919

2020

2121
// The splash screen is what appears while the app is loading
22-
const { initSplashScreen, OfficeTemplate } = require('electron-splashscreen');
22+
// const { initSplashScreen, OfficeTemplate } = require('electron-splashscreen');
2323
const { resolve } = require('app-root-path');
2424

2525
// to install react dev tool extension
@@ -88,19 +88,19 @@ async function createWindow() {
8888
});
8989

9090
// Splash screen that appears while loading
91-
const hideSplashscreen = initSplashScreen({
92-
mainWindow: win,
93-
icon: resolve('app/src/public/icons/png/64x64.png'),
94-
url: OfficeTemplate,
95-
width: 500,
96-
height: 300,
97-
brand: 'OS Labs',
98-
productName: 'ReacType',
99-
logo: resolve('app/src/public/icons/png/64x64.png'),
100-
color: '#3BBCAF',
101-
website: 'www.reactype.io',
102-
text: 'Initializing ...',
103-
});
91+
// const hideSplashscreen = initSplashScreen({
92+
// mainWindow: win,
93+
// icon: resolve('app/src/public/icons/png/64x64.png'),
94+
// url: OfficeTemplate,
95+
// width: 500,
96+
// height: 300,
97+
// brand: 'OS Labs',
98+
// productName: 'ReacType',
99+
// logo: resolve('app/src/public/icons/png/64x64.png'),
100+
// color: '#3BBCAF',
101+
// website: 'www.reactype.io',
102+
// text: 'Initializing ...',
103+
// });
104104
// Load app
105105
if (isDev) {
106106
// load app from web-dev server
@@ -113,7 +113,6 @@ async function createWindow() {
113113
// load page once window is loaded
114114
win.once('ready-to-show', () => {
115115
win.show();
116-
hideSplashscreen();
117116
});
118117

119118
// automatically open DevTools when opening the app

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"Tolga Mizrakci",
4747
"Tony Ito-Cole",
4848
"Tyler Sullberg",
49-
"Ulrich Neuj,ahr",
49+
"Ulrich Neujahr",
5050
"William Cheng",
5151
"William Yoon"
5252
],
@@ -61,8 +61,8 @@
6161
"pack": "electron-builder --dir",
6262
"dist": "npm run prod-build && electron-builder",
6363
"dist-mac": "npm run prod-build && electron-builder --mac",
64-
"dist-linux": "npm run prod-build && electron-builder --linux",
65-
"dist-windows": "npm run prod-build && electron-builder --windows",
64+
"dist-linux": "electron-builder --linux",
65+
"dist-windows": "electron-builder --windows",
6666
"dist-all": "npm run prod-build && electron-builder --mac --linux --windows",
6767
"test": "concurrently \"npm run dev-server\" \"cross-env NODE_ENV=test jest --verbose \"",
6868
"server": "nodemon server/server.js"
@@ -194,7 +194,6 @@
194194
"dotenv-webpack": "^5.0.1",
195195
"electron": "^16.0.6",
196196
"electron-builder": "^22.13.1",
197-
"electron-splashscreen": "^1.0.0",
198197
"enzyme-to-json": "^3.5.0",
199198
"esbuild": "^0.14.10",
200199
"eslint": "^4.19.1",

0 commit comments

Comments
 (0)