From 4141e2f4c20a8e9f5f6eec672843e9ebddb8b2e5 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sat, 28 Jul 2018 20:44:16 +0900
Subject: [PATCH] refs #452 Fix design of splash screen
---
.electron-vue/webpack.renderer.config.js | 2 +-
src/main/index.js | 6 +--
static/images/loading.svg | 49 ++++++++++++++++++++++++
static/splash-screen.html | 18 +++++----
4 files changed, 63 insertions(+), 12 deletions(-)
create mode 100644 static/images/loading.svg
diff --git a/.electron-vue/webpack.renderer.config.js b/.electron-vue/webpack.renderer.config.js
index 2e4421a7..4a2ac475 100644
--- a/.electron-vue/webpack.renderer.config.js
+++ b/.electron-vue/webpack.renderer.config.js
@@ -164,7 +164,7 @@ if (process.env.NODE_ENV === 'production') {
{
from: path.join(__dirname, '../static'),
to: path.join(__dirname, '../dist/electron/static'),
- ignore: ['.*']
+ ignore: ['.*', '*~']
}
]),
new webpack.DefinePlugin({
diff --git a/src/main/index.js b/src/main/index.js
index b3b9a0fc..a3133247 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -42,7 +42,7 @@ const winURL = process.env.NODE_ENV === 'development'
: `file://${__dirname}/index.html`
const splashURL = process.env.NODE_ENV === 'development'
- ? path.resolve(__dirname, '../../dist/electron/static/splash-screen.html')
+ ? path.resolve(__dirname, '../../static/splash-screen.html')
: `file://${__dirname}/static/splash-screen.html`
// https://github.com/louischatriot/nedb/issues/459
@@ -304,8 +304,8 @@ async function createWindow () {
mainWindow = Splashscreen.initSplashScreen(config)
mainWindowState.manage(mainWindow)
- console.log(winURL)
- // mainWindow.loadURL(winURL)
+
+ mainWindow.loadURL(winURL)
mainWindow.webContents.on('will-navigate', (event) => event.preventDefault())
diff --git a/static/images/loading.svg b/static/images/loading.svg
new file mode 100644
index 00000000..5ef9322e
--- /dev/null
+++ b/static/images/loading.svg
@@ -0,0 +1,49 @@
+
\ No newline at end of file
diff --git a/static/splash-screen.html b/static/splash-screen.html
index 983209d0..f680bfc9 100644
--- a/static/splash-screen.html
+++ b/static/splash-screen.html
@@ -1,13 +1,15 @@
-
+
-
-
-
-
-
- Loading...
-
+
+
+
+
+
+
+
+
+