Good change! #5

Merged
bomb-on merged 4 commits from master into master 6 years ago

1
.gitignore vendored

@ -8,3 +8,4 @@ npm-debug.log
npm-debug.log.*
thumbs.db
!.gitkeep
.idea

11762
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -1,4 +1,4 @@
import {app, BrowserWindow} from 'electron'
import {app, BrowserWindow, Menu} from 'electron'
/**
* Set `__static` path to static files in production
@ -21,7 +21,6 @@ const store = new Store();
const fs = require('fs');
const utils = require('electron-util');
utils.enforceMacOSAppLocation();
let homedir = (process.platform === 'win32') ? process.env.HOMEPATH : process.env.HOME;
let wowdir = `${homedir}/Wownero`;
@ -35,13 +34,14 @@ let wallet = new wowrpc.WowRpc(wowdir);
console.log(`getWalletDir(): ${wowdir}`);
const Menu = electron.Menu;
const winURL = process.env.NODE_ENV === 'development' ? `http://localhost:9080` : `file://${__dirname}/index.html`
import { platform, cliPath } from './binaries';
console.log(cliPath);
function createWindow() {
utils.enforceMacOSAppLocation();
mainWindow = new BrowserWindow({
height: 550,
useContentSize: true,
@ -64,6 +64,41 @@ function createWindow() {
mainWindow = null;
console.log('lat0rz');
});
const template = [
{
label: 'Edit',
submenu: [
{ role: 'undo' },
{ role: 'redo' },
{ type: 'separator' },
{ role: 'cut' },
{ role: 'copy' },
{ role: 'paste' },
{ role: 'pasteandmatchstyle' },
{ role: 'delete' },
{ role: 'selectall' }
]
}
];
if (process.platform === 'darwin') {
template.unshift({
label: app.getName(),
submenu: [
{ role: 'about' },
{ type: 'separator' },
{ role: 'services', submenu: [] },
{ type: 'separator' },
{ role: 'hide' },
{ role: 'hideothers' },
{ role: 'unhide' },
{ type: 'separator' },
{ role: 'quit' }
]
});
}
const menu = Menu.buildFromTemplate(template);
Menu.setApplicationMenu(menu);
}
app.on('ready', createWindow)

@ -146,7 +146,14 @@
'Background mining initiated... CPU intensity 200%',
'Trolling Masari community about their non-premine premine',
'Deleting System32 folder',
'Downloading BLACKED.Riley.Reid.XXX.SD.MP4'
'Downloading BLACKED.Riley.Reid.XXX.SD.MP4',
'Forming Voltron!',
'Generating Wownero Roadmap...',
'Generating Wownero Whitepaper...',
'Sending all funds to wownero.win',
'Shaving away klubus and grumbo',
'Contacting Stealy for more plumbus',
'Rebuilding WinoBot!'
]
}
},
@ -175,6 +182,12 @@
showPassword() {
return this.$store.state.password_box.message !== "";
},
rotateMessage() {
this.$store.commit('showMessage', {
'title': this.$store.state.message_box.title,
'message': this.entryFromArr(this.messages)
});
},
hasMessage() {
if(this.$store.state.message_box.title !== "") {
let url = this.entryFromArr(this.message_box_images);
@ -189,6 +202,7 @@
}
this.$store.commit('showMessage', a);
setInterval(this.rotateMessage, 5000);
}
return true;
} else {

@ -733,6 +733,10 @@ main.dashboard div[data-collapsed=false] .card-body {
margin-left: 20px;
}
.loading {
width: 500px;
}
.loading, .password {
width: 100%;
height: 100%;
@ -1167,4 +1171,4 @@ main.enterpassword .password_seq .heli {
position: fixed;
left: 420px;
bottom: 4px;
}
}