Commit 170919aa authored by dev0tion's avatar dev0tion

Breeze changes

parent 2ad340e9
...@@ -8,20 +8,20 @@ ...@@ -8,20 +8,20 @@
"buildResources": "dist/assets/images" "buildResources": "dist/assets/images"
}, },
"win": { "win": {
"icon": "dist/assets/images/icon", "icon": "dist/assets/images/",
"target": [ "target": [
"nsis" "nsis"
], ],
"artifactName": "${productName}-v${version}-setup-${os}-${env.arch}.${ext}" "artifactName": "${productName}-v${version}-setup-${os}-${env.arch}.${ext}"
}, },
"linux": { "linux": {
"icon": "dist/assets/images/",
"target": [ "target": [
"deb", "deb",
"tar.gz" "tar.gz"
], ],
"synopsis": "Breeze Wallet: Stratis' dual-currency full block light wallet with a strong focus on privacy.", "synopsis": "Breeze Wallet: Stratis' dual-currency full block light wallet with a strong focus on privacy.",
"category": "Utility", "category": "Utility",
"icon": "dist/assets/images/icons",
"artifactName": "${productName}-v${version}-${os}-${arch}.${ext}" "artifactName": "${productName}-v${version}-${os}-${arch}.${ext}"
}, },
"mac": { "mac": {
...@@ -38,12 +38,15 @@ ...@@ -38,12 +38,15 @@
"deleteAppDataOnUninstall": true, "deleteAppDataOnUninstall": true,
"guid": "ed20df62-ff5a-4b83-a5e3-a361357c6e51", "guid": "ed20df62-ff5a-4b83-a5e3-a361357c6e51",
"createDesktopShortcut": true, "createDesktopShortcut": true,
"createStartMenuShortcut": true "createStartMenuShortcut": true,
"license": "../Licenses/breeze-license.txt"
}, },
"msi": { "msi": {
"warningsAsErrors": false "warningsAsErrors": false
}, },
"extraResources": [ "extraResources": [
"daemon/**/*" "daemon/**/*",
"src/assets/images/breeze-logo-tray.png",
"src/assets/images/license_en.txt"
] ]
} }
...@@ -13,8 +13,12 @@ const os = require('os'); ...@@ -13,8 +13,12 @@ const os = require('os');
let serve; let serve;
let testnet; let testnet;
const args = process.argv.slice(1); const args = process.argv.slice(1);
serve = args.some(val => val === "--serve"); serve = args.some(val => val === "--serve" || val === "-serve");
testnet = args.some(val => val === "--testnet"); testnet = !args.some(val => val === "--testnet" || val === "-testnet");
if (args.some(val => val === "--mainnet" || val === "-mainnet")) {
testnet = false;
}
if (serve) { if (serve) {
require('electron-reload')(__dirname, { require('electron-reload')(__dirname, {
...@@ -31,13 +35,6 @@ require('electron-context-menu')({ ...@@ -31,13 +35,6 @@ require('electron-context-menu')({
let mainWindow = null; let mainWindow = null;
function createWindow() { function createWindow() {
let applicationIcon
if (serve) {
applicationIcon = nativeImage.createFromPath("./src/assets/images/breeze-logo-tray.png")
} else {
applicationIcon = nativeImage.createFromPath(path.join(__dirname + '/assets/images/breeze-logo-tray.png'))
}
// Create the browser window. // Create the browser window.
mainWindow = new BrowserWindow({ mainWindow = new BrowserWindow({
width: 1200, width: 1200,
...@@ -48,10 +45,6 @@ function createWindow() { ...@@ -48,10 +45,6 @@ function createWindow() {
title: "Breeze Wallet" title: "Breeze Wallet"
}); });
if (os.platform() === "win32"){
mainWindow.setIcon(applicationIcon);
}
// and load the index.html of the app. // and load the index.html of the app.
mainWindow.loadURL(url.format({ mainWindow.loadURL(url.format({
pathname: path.join(__dirname, '/index.html'), pathname: path.join(__dirname, '/index.html'),
...@@ -159,10 +152,10 @@ function startBitcoinApi() { ...@@ -159,10 +152,10 @@ function startBitcoinApi() {
if (os.platform() === 'win32') { if (os.platform() === 'win32') {
apiPath = path.resolve(__dirname, '..\\..\\resources\\daemon\\Stratis.BreezeD.exe'); apiPath = path.resolve(__dirname, '..\\..\\resources\\daemon\\Stratis.BreezeD.exe');
} else if(os.platform() === 'linux') { } else if(os.platform() === 'linux') {
apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD'); apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD');
} else { } else {
apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD'); apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD');
} }
if(!testnet) { if(!testnet) {
...@@ -190,10 +183,10 @@ function startStratisApi() { ...@@ -190,10 +183,10 @@ function startStratisApi() {
if (os.platform() === 'win32') { if (os.platform() === 'win32') {
apiPath = path.resolve(__dirname, '..\\..\\resources\\daemon\\Stratis.BreezeD.exe'); apiPath = path.resolve(__dirname, '..\\..\\resources\\daemon\\Stratis.BreezeD.exe');
} else if(os.platform() === 'linux') { } else if(os.platform() === 'linux') {
apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD'); apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD');
} else { } else {
apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD'); apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD');
} }
if (!testnet) { if (!testnet) {
stratisProcess = spawnStratis(apiPath, ['stratis'], { stratisProcess = spawnStratis(apiPath, ['stratis'], {
...@@ -205,7 +198,6 @@ function startStratisApi() { ...@@ -205,7 +198,6 @@ function startStratisApi() {
}); });
} }
stratisProcess.stdout.on('data', (data) => { stratisProcess.stdout.on('data', (data) => {
writeLog(`Stratis: ${data}`); writeLog(`Stratis: ${data}`);
}); });
...@@ -220,7 +212,7 @@ function createTray() { ...@@ -220,7 +212,7 @@ function createTray() {
if (serve) { if (serve) {
trayIcon = nativeImage.createFromPath('./src/assets/images/breeze-logo-tray.png'); trayIcon = nativeImage.createFromPath('./src/assets/images/breeze-logo-tray.png');
} else { } else {
trayIcon = nativeImage.createFromPath(path.join(__dirname + '/assets/images/breeze-logo-tray.png')); trayIcon = nativeImage.createFromPath(path.resolve(__dirname, '../../resources/src/assets/images/breeze-logo-tray.png'));
} }
let systemTray = new Tray(trayIcon); let systemTray = new Tray(trayIcon);
......
...@@ -34,7 +34,7 @@ function pack(plat, arch, path, cb) { ...@@ -34,7 +34,7 @@ function pack(plat, arch, path, cb) {
// there is no darwin ia32 electron // there is no darwin ia32 electron
if (plat === 'darwin' && arch === 'ia32') return; if (plat === 'darwin' && arch === 'ia32') return;
let icon = 'src/assets/images/breeze-logo'; let icon = 'src/assets/images/icon';
if (icon) { if (icon) {
DEFAULT_OPTS.icon = icon + (() => { DEFAULT_OPTS.icon = icon + (() => {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
"breeze", "breeze",
"ui", "ui",
"stratis", "stratis",
"bitcoin", "bitcoin",
"angular", "angular",
"electron", "electron",
"typescript", "typescript",
......
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
<span *ngIf="transaction.transactionType == 'sent'" class="text-danger">-</span> <span *ngIf="transaction.transactionType == 'sent'" class="text-danger">-</span>
{{ transaction.transactionAmount + transaction.transactionFee | coinNotation }} {{ transaction.transactionAmount + transaction.transactionFee | coinNotation }}
<small class="text-uppercase"> {{ coinUnit }} </small> <small class="text-uppercase"> {{ coinUnit }} </small>
</li>
<li class="list-inline-item col amount text-left align-baseline">
<span *ngIf="transaction.transactionConfirmedInBlock" class="badge badge-success text-capitalize">Confirmed</span> <span *ngIf="transaction.transactionConfirmedInBlock" class="badge badge-success text-capitalize">Confirmed</span>
<span *ngIf="!transaction.transactionConfirmedInBlock" class="badge badge-warning text-capitalize">Pending</span> <span *ngIf="!transaction.transactionConfirmedInBlock" class="badge badge-warning text-capitalize">Pending</span>
</li> </li>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# you can use {branch} name in version format too # you can use {branch} name in version format too
# version: 1.0.{build}-{branch} # version: 1.0.{build}-{branch}
version: 0.1.0.{build} version: 0.3.0.{build}
pull_requests: pull_requests:
do_not_increment_build_number: true do_not_increment_build_number: true
......
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