Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@
},
"scripts": [
"src/version.js"
]
],
"allowedCommonJsDependencies": [
"lodash",
"qrcode"
]
},
"configurations": {
"production": {
Expand Down
10 changes: 1 addition & 9 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ function createWindow() {
electron_1.shell.openExternal(linkUrl);
});
if (serve) {
mainWindow.webContents.openDevTools();
require('electron-reload')(__dirname, {
electron: require("".concat(__dirname, "/node_modules/electron"))
});
Expand All @@ -360,15 +361,6 @@ function createWindow() {
slashes: true
}));
}
if (serve) {
//mainWindow.webContents.openDevTools();
var devtools_1 = null;
electron_1.app.once('ready', function () {
devtools_1 = new electron_1.BrowserWindow();
mainWindow.webContents.setDevToolsWebContents(devtools_1.webContents);
mainWindow.webContents.openDevTools({ mode: 'detach' });
});
}
// Emitted when the window is going to close.
mainWindow.on('close', function (event) {
writeLog("close event on mainWindow was triggered. Calling shutdown method. Daemon state is: ".concat(daemonState, "."));
Expand Down
12 changes: 1 addition & 11 deletions main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,7 @@ function createWindow() {
});

if (serve) {
mainWindow.webContents.openDevTools();
require('electron-reload')(__dirname, {
electron: require(`${__dirname}/node_modules/electron`)
});
Expand All @@ -465,17 +466,6 @@ function createWindow() {
}));
}

if (serve) {
//mainWindow.webContents.openDevTools();
let devtools = null

app.once('ready', () => {
devtools = new BrowserWindow();
mainWindow.webContents.setDevToolsWebContents(devtools.webContents);
mainWindow.webContents.openDevTools({ mode: 'detach' });
})
}

// Emitted when the window is going to close.
mainWindow.on('close', (event) => {
writeLog(`close event on mainWindow was triggered. Calling shutdown method. Daemon state is: ${daemonState}.`);
Expand Down
1 change: 0 additions & 1 deletion src/app/components/wallet/receive/receive.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { MatSnackBar } from '@angular/material/snack-bar';
import { WalletService } from '../../../services/wallet.service';
import { Logger } from '../../../services/logger.service';
import * as QRCode from 'qrcode';

@Component({
selector: 'app-receive',
templateUrl: './receive.component.html',
Expand Down
6 changes: 3 additions & 3 deletions src/styles/styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use '@angular/material' as mat;
@import "~@angular/material/theming";
@import "@angular/material/theming";

// for npm material-icons package (to load local files)
// $material-icons-font-path: '~material-icons/iconfont/';
Expand Down Expand Up @@ -280,11 +280,11 @@ span.ellipsis {
.title-bar-button i {
font-size: 20px;
}
*/


.app-electron {
}

*/
.app-electron .login {
height: $app-height;
}
Expand Down
6 changes: 3 additions & 3 deletions src/styles/themes/theming.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$primary: map-get($theme, "primary");
$accent: map-get($theme, "accent");

@include mat.all-component-themes($theme);
// @include mat.all-component-themes($theme);

.mat-menu-panel {
background-color: map-get($background, "dialog");
Expand Down Expand Up @@ -41,8 +41,8 @@
font-size: 16px;
}

.link {
}
// .link {
// }

.link:hover {
text-decoration: underline;
Expand Down
5 changes: 5 additions & 0 deletions tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,10 @@
"include": [
"src/**/*.spec.ts",
"src/**/*.d.ts"
],
"exclude": [
"dist",
"release",
"node_modules"
]
}