lukechilds
/
ledger-live-desktop
mirror of https://github.com/lukechilds/ledger-live-desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add custom index.ejs, fix issue with staticPath without app.asar, use better preload with only one window

master
Loëck Vézien 7 years ago
parent
47f5522a8d
commit
149ce6176d
No known key found for this signature in database GPG Key ID: CBCDCE384E853AC4
9 changed files with 143 additions and 160 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/components/DevTools.js
  2. 5
      src/components/layout/Default.js
  3. 6
      src/helpers/staticPath.js
  4. 109
      src/index.ejs
  5. 4
      src/internals/index.js
  6. 97
      src/main/app.js
  7. 4
      src/main/bridge.js
  8. 36
      src/styles/global.js
  9. 36
      static/preload-window.html

6
src/components/DevTools.js
View File

@ -18,17 +18,17 @@ import color from 'color'
import fs from 'fs' import fs from 'fs'
import path from 'path' import path from 'path'
import staticPath from 'helpers/staticPath'
import Box from 'components/base/Box' import Box from 'components/base/Box'
import Bar from 'components/base/Bar' import Bar from 'components/base/Bar'
import CopyToClipboard from 'components/base/CopyToClipboard' import CopyToClipboard from 'components/base/CopyToClipboard'
import { ChartWrapper } from 'components/base/Chart' import { ChartWrapper } from 'components/base/Chart'
import staticPath from 'helpers/staticPath'
import theme from 'styles/theme' import theme from 'styles/theme'
const getLanguages = p => fs.readdirSync(p).filter(f => fs.statSync(path.join(p, f)).isDirectory()) const getLanguages = p => fs.readdirSync(p).filter(f => fs.statSync(path.join(p, f)).isDirectory())
const languages = getLanguages(path.join(staticPath, './i18n')) const languages = getLanguages(path.join(staticPath, '/i18n'))
const mainWindow = remote.BrowserWindow.getAllWindows().find(w => w.name === 'MainWindow') const mainWindow = remote.BrowserWindow.getAllWindows().find(w => w.name === 'MainWindow')

5
src/components/layout/Default.js
View File

@ -2,7 +2,6 @@
import React, { Fragment, Component } from 'react' import React, { Fragment, Component } from 'react'
import styled from 'styled-components' import styled from 'styled-components'
import { ipcRenderer } from 'electron'
import { Route } from 'react-router' import { Route } from 'react-router'
import { translate } from 'react-i18next' import { translate } from 'react-i18next'
@ -28,9 +27,7 @@ const Container = styled(GrowScroll).attrs({
class Default extends Component<{}> { class Default extends Component<{}> {
componentDidMount() { componentDidMount() {
window.requestAnimationFrame( window.requestAnimationFrame(() => (this._timeout = setTimeout(() => window.onAppReady(), 300)))
() => (this._timeout = setTimeout(() => ipcRenderer.send('app-finish-rendering'), 300)),
)
} }
componentWillUnmount() { componentWillUnmount() {

6
src/helpers/staticPath.js
View File

@ -1 +1,5 @@
export default (__DEV__ ? __static : __dirname.replace(/app\.asar$/, 'static')) const isRunningInAsar = process.mainModule.filename.indexOf('app.asar') !== -1
export default (__DEV__
? __static
: isRunningInAsar ? __dirname.replace(/app\.asar$/, 'static') : `${__dirname}/../static`)

109
src/index.ejs
View File

@ -0,0 +1,109 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<style>
* {
-webkit-font-smoothing: antialiased;
box-sizing: border-box;
margin: 0;
padding: 0;
font: inherit;
color: inherit;
user-select: none;
min-width: 0;
/* it will surely make problem in the future... to be inspected. */
flex-shrink: 0;
}
body {
cursor: default;
font-family: "Museo Sans", "Open Sans", Arial, Helvetica, sans-serif;
font-size: 16px;
font-weight: 300;
line-height: 1.5;
}
#app {
display: none;
flex-direction: column;
min-height: 100vh;
}
#preload {
-webkit-app-region: drag;
align-items: center;
background: white;
bottom: 0;
display: none;
flex-direction: column;
justify-content: center;
left: 0;
opacity: 1;
position: fixed;
right: 0;
top: 0;
transition: opacity 0.6s ease-in-out;
z-index: 100;
}
#preload video {
height: 144px;
width: 256px;
}
b {
font-weight: bold;
}
em {
font-style: italic;
}
</style>
<script>
<% if (htmlWebpackPlugin.options.nodeModules) { %>
require('module').globalPaths.push(
'<%= htmlWebpackPlugin.options.nodeModules %>'.replace(/\\/g, '\\\\'),
)
<% } %>
require('source-map-support/source-map-support.js').install()
</script>
</head>
<body>
<div id="preload">
<video autoplay loop muted src="<%= __DEV__ ? '.' : '../static' %>/videos/loader.mp4" />
</div>
<div id="app"></div>
<script>
const { name } = require('electron').remote.getCurrentWindow()
const preloadEl = document.getElementById('preload')
const appEl = document.getElementById('app')
const initApp = () => {
appEl.style.display = 'flex'
preloadEl.style.opacity = 0
preloadEl.addEventListener('transitionend', () => preloadEl.remove())
}
if (name === 'MainWindow') {
preloadEl.style.display = 'flex'
let waitTime = 0
const PRELOAD_WAIT_TIME_MIN = 2e3
const interval = setInterval(() => waitTime += 250, 250)
window.onAppReady = () => {
const delay = PRELOAD_WAIT_TIME_MIN - waitTime
clearInterval(interval)
setTimeout(initApp, delay > 0 ? delay : 1)
}
} else {
initApp()
}
</script>
</body>
</html>

4
src/internals/index.js
View File

@ -8,7 +8,7 @@ import cpuUsage from 'helpers/cpuUsage'
require('../env') require('../env')
require('../init-sentry') require('../init-sentry')
const { FORK_TYPE } = process.env const { DEV_TOOLS, FORK_TYPE } = process.env
process.title = `${require('../../package.json').productName} ${capitalize(FORK_TYPE)}` process.title = `${require('../../package.json').productName} ${capitalize(FORK_TYPE)}`
@ -35,7 +35,7 @@ const onMessage = payload => {
process.on('message', onMessage) process.on('message', onMessage)
if (__DEV__) { if (__DEV__ || DEV_TOOLS) {
cpuUsage(cpuPercent => cpuUsage(cpuPercent =>
sendEvent( sendEvent(
'usage.cpu', 'usage.cpu',

97
src/main/app.js
View File

@ -1,6 +1,6 @@
// @flow // @flow
import { app, BrowserWindow, Menu, ipcMain, screen } from 'electron' import { app, BrowserWindow, Menu, screen } from 'electron'
import debounce from 'lodash/debounce' import debounce from 'lodash/debounce'
import menu from 'main/menu' import menu from 'main/menu'
@ -8,12 +8,10 @@ import db from 'helpers/db'
// necessary to prevent win from being garbage collected // necessary to prevent win from being garbage collected
let mainWindow = null let mainWindow = null
let devWindow = null
let preloadWindow = null
let forceClose = false let forceClose = false
const { ELECTRON_WEBPACK_WDS_PORT, DEV_TOOLS, DEV_TOOLS_MODE } = process.env const { UPGRADE_EXTENSIONS, ELECTRON_WEBPACK_WDS_PORT, DEV_TOOLS, DEV_TOOLS_MODE } = process.env
const devTools = __DEV__ || DEV_TOOLS const devTools = __DEV__ || DEV_TOOLS
@ -111,6 +109,13 @@ function createMainWindow() {
window.on('close', handleCloseWindow(window)) window.on('close', handleCloseWindow(window))
window.on('ready-to-show', () => {
window.show()
setImmediate(() => {
window.focus()
})
})
window.webContents.on('devtools-opened', () => { window.webContents.on('devtools-opened', () => {
window.focus() window.focus()
setImmediate(() => { setImmediate(() => {
@ -118,10 +123,7 @@ function createMainWindow() {
}) })
}) })
return { return window
w: window,
options: windowOptions,
}
} }
function createDevWindow() { function createDevWindow() {
@ -155,7 +157,7 @@ function createDevWindow() {
saveWindowSettings(window) saveWindowSettings(window)
window.loadURL(`${url}/#/dev`) window.loadURL(`${url}#/dev`)
window.setMenu(null) window.setMenu(null)
@ -171,53 +173,6 @@ function createDevWindow() {
return window return window
} }
function createPreloadWindow() {
// Preload renderer of main windows
const { w, options } = createMainWindow()
mainWindow = w
if (__DEV__) {
devWindow = createDevWindow()
}
const windowOptions = {
...options,
alwaysOnTop: true,
closable: false,
fullscreenable: false,
resizable: false,
}
const window = new BrowserWindow(windowOptions)
window.name = 'PreloadWindow'
window.loadURL(`file://${__static}/preload-window.html`)
window.setMenu(null)
window.on('resize', () => {
const [width, height] = window.getSize()
if (mainWindow) {
mainWindow.setSize(width, height)
}
})
window.on('move', () => {
const [x, y] = window.getPosition()
if (mainWindow) {
mainWindow.setPosition(x, y)
}
})
window.on('ready-to-show', () => {
window.show()
setImmediate(() => window && window.focus())
})
return window
}
app.on('before-quit', () => { app.on('before-quit', () => {
forceClose = true forceClose = true
}) })
@ -233,16 +188,16 @@ app.on('window-all-closed', () => {
app.on('activate', () => { app.on('activate', () => {
// On macOS it is common to re-create a window // On macOS it is common to re-create a window
// even after all windows have been closed // even after all windows have been closed
if (mainWindow === null && preloadWindow === null) { if (mainWindow === null) {
preloadWindow = createPreloadWindow() mainWindow = createMainWindow()
} else if (mainWindow !== null) { } else {
mainWindow.show() mainWindow.show()
} }
}) })
const installExtensions = async () => { const installExtensions = async () => {
const installer = require('electron-devtools-installer') // eslint-disable-line const installer = require('electron-devtools-installer')
const forceDownload = !!process.env.UPGRADE_EXTENSIONS const forceDownload = !!UPGRADE_EXTENSIONS
const extensions = ['REACT_DEVELOPER_TOOLS', 'REDUX_DEVTOOLS'] const extensions = ['REACT_DEVELOPER_TOOLS', 'REDUX_DEVTOOLS']
return Promise.all( return Promise.all(
extensions.map(name => installer.default(installer[name], forceDownload)), extensions.map(name => installer.default(installer[name], forceDownload)),
@ -256,23 +211,11 @@ app.on('ready', async () => {
await installExtensions() await installExtensions()
} }
Menu.setApplicationMenu(menu) if (devTools) {
createDevWindow()
preloadWindow = createPreloadWindow()
})
ipcMain.once('app-finish-rendering', () => {
if (preloadWindow !== null) {
preloadWindow.destroy()
preloadWindow = null
} }
if (mainWindow !== null) { Menu.setApplicationMenu(menu)
mainWindow.show()
setImmediate(() => mainWindow !== null && mainWindow.focus())
}
if (__DEV__ && devWindow !== null) { mainWindow = createMainWindow()
devWindow.show()
}
}) })

4
src/main/bridge.js
View File

@ -9,6 +9,8 @@ import cpuUsage from 'helpers/cpuUsage'
import setupAutoUpdater, { quitAndInstall } from './autoUpdate' import setupAutoUpdater, { quitAndInstall } from './autoUpdate'
const { DEV_TOOLS } = process.env
const processes = [] const processes = []
function cleanProcesses() { function cleanProcesses() {
@ -89,7 +91,7 @@ ipcMain.on('msg', (event: any, payload) => {
handler(send, data, type) handler(send, data, type)
}) })
if (__DEV__) { if (__DEV__ || DEV_TOOLS) {
cpuUsage(cpuPercent => cpuUsage(cpuPercent =>
sendEventToWindow('DevWindow', { sendEventToWindow('DevWindow', {
type: 'usage.cpu', type: 'usage.cpu',

36
src/styles/global.js
View File

@ -86,42 +86,6 @@ function transformFonts(allFonts) {
injectGlobal` injectGlobal`
${transformFonts(fonts)}; ${transformFonts(fonts)};
* {
-webkit-font-smoothing: antialiased;
box-sizing: border-box;
margin: 0;
padding: 0;
font: inherit;
color: inherit;
user-select: none;
min-width: 0;
// it will surely make problem in the future... to be inspected.
flex-shrink: 0;
}
body {
cursor: default;
font-family: "Museo Sans", "Open Sans", Arial, Helvetica, sans-serif;
font-size: 16px;
font-weight: 300;
line-height: 1.5;
}
#app {
min-height: 100vh;
display: flex;
flex-direction: column;
}
b {
font-weight: bold;
}
em {
font-style: italic;
}
.scroll-content { .scroll-content {
height: 100%; height: 100%;

36
static/preload-window.html
View File

@ -1,36 +0,0 @@
<html>
<head>
<style>
* {
box-sizing: border-box;
cursor: default;
margin: 0;
padding: 0;
user-select: none;
}
body {
background: white;
}
#app {
-webkit-app-region: drag;
align-items: center;
display: flex;
flex-direction: column;
justify-content: center;
min-height: 100vh;
}
#app video {
height: 144px;
width: 256px;
}
</style>
</head>
<body>
<div id="app">
<video autoplay loop muted src="./videos/loader.mp4" />
</div>
</body>
</html>
Write Preview
Loading…
Cancel
Save