reverting dashboard rendering to webview, part 2

This commit is contained in:
Roman committed 2020-06-17 16:02:40 +03:00
1 parent d413235ed9
commit 50ab4905dc
10 files changed
+16 -16

No files matched your search

+2 -2
View File
@@ -31,7 +31,7 @@ let windowManager: WindowManager = null;
let clusterManager: ClusterManager = null;
const vmURL = formatUrl({
pathname: path.join(__dirname, "dist/index.html"),
pathname: path.join(__dirname, "index.html"),
protocol: "file",
slashes: true,
})
@@ -123,7 +123,7 @@ app.on('window-all-closed', function () {
app.on("activate", () => {
if (!windowManager) {
logger.debug("activate main window")
windowManager = new WindowManager(false)
windowManager = new WindowManager({ showSplash: false })
windowManager.showMain(vmURL)
}
})
+2 -2
View File
@@ -11,7 +11,7 @@ export class WindowManager {
protected promiseIpc: any
protected windowState: windowStateKeeper.State;
constructor(showSplash = true) {
constructor({ showSplash = true } = {}) {
this.promiseIpc = new PromiseIpc({ timeout: 2000 })
// Manage main window size&position with persistence
this.windowState = windowStateKeeper({
@@ -32,7 +32,7 @@ export class WindowManager {
}
})
if (showSplash) {
this.splashWindow.loadFile(getStaticUrl("splash.html"))
this.splashWindow.loadURL(getStaticUrl("splash.html"))
this.splashWindow.show()
}
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<div id="app_vue">
<div id="app">
<div id="lens-container" />
<div class="draggable-top"/>
<div class="main-view" :class="{ 'menu-visible': isMenuVisible }">
@@ -2,7 +2,7 @@
<span class="hashicon" ref="hashicon" />
</template>
<script>
import hashicon from '@/_vue/components/hashicon/hashicon'
import hashicon from 'hashicon'
export default {
name:'Hashicon',
-1
View File
@@ -39,7 +39,6 @@ setTimeout(() => {
console.log("start vue")
new Vue({
components: { App },
persist,
store,
router,
template: '<App/>'
-4
View File
@@ -9,9 +9,5 @@
<div id="app"></div>
<!--<div id="app_vue"></div>-->
<!--<script src="dll.js"></script>-->
<!--<script src="renderer_vue.js"></script>-->
</body>
</html>