Commit 813ec0f6 authored by zeroleak's avatar zeroleak
Browse files

cleanup

parent 97c51a93
......@@ -237,10 +237,6 @@ class App extends React.Component<Props> {
</Link>
</li>
</ul>
{cliService.isLoggedIn() && !walletService.isReady() && <div>
{utils.spinner()}
</div>}
<div className="footerNav">
<div>
{cliService.isConnected() && <small>{cliService.getServerName()}</small>}
......
......@@ -13,13 +13,13 @@
import { app, BrowserWindow, ipcMain, systemPreferences } from 'electron';
import { autoUpdater } from 'electron-updater';
import log from 'electron-log';
import path from 'path';
import MenuBuilder from './menu';
import { CliLocal } from './mainProcess/cliLocal';
import fs from "fs";
import { GUI_LOG_FILE, IPC_CAMERA } from './const';
import guiConfig from './mainProcess/guiConfig';
export default class AppUpdater {
constructor() {
log.transports.file.level = 'info';
......@@ -92,18 +92,18 @@ else {
}
});
const EXTRA_RESOURCES_PATH = app.isPackaged
? path.join(process.resourcesPath, 'extraResources')
: path.join(__dirname, '../extraResources');
const getExtraResource = (resourceFilename: string): string => {
return path.join(EXTRA_RESOURCES_PATH, resourceFilename);
}
// fix Linux icon
const os = require('os');
switch (os.platform()) {
case 'darwin':
mainWindow.setIcon('resources/icon.icns');
break;
case 'win32':
mainWindow.setIcon('resources/icon.ico');
break;
default:
mainWindow.setIcon('resources/icon.png');
break;
if (os.platform() === 'linux') {
mainWindow.setIcon(getExtraResource("icon.png"));
}
// GUI proxy
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
......@@ -110,7 +110,10 @@
"owner": "electron-react-boilerplate",
"repo": "electron-react-boilerplate",
"private": false
}
},
"extraResources": [
"./extraResources/**"
]
},
"repository": {
"type": "git",
......@@ -189,7 +192,7 @@
"css-loader": "^3.4.2",
"detect-port": "^1.3.0",
"electron": "^7.1.7",
"electron-builder": "^21.2.0",
"electron-builder": "^22.9.1",
"electron-devtools-installer": "^2.2.4",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment