diff --git a/app/index.html b/app/index.html index 3b50834..5eafea5 100644 --- a/app/index.html +++ b/app/index.html @@ -10,6 +10,7 @@ margin: 0; padding: 0; } + @keyframes example { 0% {background-color: none;} 25% {background-color: #3f51b5;} @@ -48,7 +49,7 @@ margin: 37vh auto 0 auto; height: 25vh; width: 25vh; - background-image:url('../rings.svg'); + /* background-image:url('../rings.svg'); */ background-size: cover; } #splash2 { @@ -124,9 +125,10 @@ document.addEventListener('DOMContentLoaded', onLoad(), false); function onLoad() { - <% _.forEach(htmlWebpackPlugin.files.js, function(file) { %>loadScript("<%- file %>");<% }); %> + // <% _.forEach(htmlWebpackPlugin.files.js, function(file) { %>loadScript("<%- file %>");<% }); %> // loadScript("<%= JSON.stringify(htmlWebpackPlugin) %>") } + <% _.forEach(htmlWebpackPlugin.files.js, function(file) { %><% }); %> diff --git a/app/src/components/Tree/Tree.tsx b/app/src/components/Tree/Tree.tsx index 50305fa..83b5373 100644 --- a/app/src/components/Tree/Tree.tsx +++ b/app/src/components/Tree/Tree.tsx @@ -14,7 +14,6 @@ declare var window: any interface Props { autoExpandLimit: number - didSelectNode?: (node: q.TreeNode) => void connectionId?: string tree?: q.Tree filter: string diff --git a/app/src/index.tsx b/app/src/index.tsx index a3ae610..cb62d20 100644 --- a/app/src/index.tsx +++ b/app/src/index.tsx @@ -30,11 +30,13 @@ const theme = createMuiTheme({ typography: { useNextVariants: true }, }) -const splash = document.getElementById('splash') -if (splash) { - splash.style.animation = 'unsplash 1s ease-out 0s 1 normal forwards' - setTimeout(() => splash.remove(), 1100) -} +setTimeout(() => { + const splash = document.getElementById('splash') + if (splash) { + splash.style.animation = 'unsplash 0.5s ease-in 0s 1 normal forwards' + setTimeout(() => splash.remove(), 600) + } +}, 300) ReactDOM.render( diff --git a/src/electron.ts b/src/electron.ts index bfcd4b0..6d87f40 100644 --- a/src/electron.ts +++ b/src/electron.ts @@ -28,6 +28,7 @@ function createWindow() { mainWindow = new BrowserWindow({ width: 1024, height: 700, + show: false, webPreferences: { nodeIntegration: true, devTools: true, @@ -35,6 +36,10 @@ function createWindow() { icon: iconPath, }) + mainWindow.once('ready-to-show', () => { + mainWindow && mainWindow.show() + }) + console.log('icon path', iconPath) // and load the index.html of the app. mainWindow.loadFile('app/build/index.html') diff --git a/tsconfig.json b/tsconfig.json index d2dc882..9a4171f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,8 @@ "strictNullChecks": true, "outDir": "./dist", "strict": true, - "module": "esnext", + "module": "commonjs", + "moduleResolution": "node", "sourceRoot": "src/", "lib": ["es2017", "dom"], "sourceMap": true