Skip to content

Commit

Permalink
Merge branch '0.5.0-alpha'
Browse files Browse the repository at this point in the history
  • Loading branch information
unknown committed Jul 7, 2018
2 parents 6dda786 + ea426cf commit b1a6fc7
Show file tree
Hide file tree
Showing 7 changed files with 161 additions and 19 deletions.
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "jse-desktop",
"version": "0.4.9",
"version": "0.5.0",
"author": "JSECOIN",
"description": "JSE Desktop APP",
"license": "(ISC OR GPL-3.0)",
Expand Down
2 changes: 1 addition & 1 deletion src/main/index.js
Expand Up @@ -5,7 +5,7 @@ import { autoUpdater } from 'electron-updater';
//import { readFileSync } from 'fs';
//import crypto from 'crypto';

const appVersion = '0.4.9';
const appVersion = '0.5.0';

//test
app.disableHardwareAcceleration();
Expand Down
26 changes: 12 additions & 14 deletions src/renderer/App.vue
Expand Up @@ -274,20 +274,18 @@ export default {
});
}, false);
document.addEventListener('socketConnectionMade', function(e) {
if (self.$store.state.app.autoMine) {
//check jsecoin global var if mining has started.
if (window.quitMining) {
self.$store.dispatch({
type: 'startPlatformMining',
});
} else {
self.$store.dispatch({
type: 'stopPlatformMining',
});
}
}
}, false);
//on app initialise when socket connection is made start mining
//clear event only needed on init connection
if (self.$store.state.app.autoMine) {
const socketConnectionMade = () => {
console.log('#######Socket connection init!');
self.$store.dispatch({
type: 'startPlatformMining',
});
document.removeEventListener('socketConnectionMade', socketConnectionMade, false);
};
document.addEventListener('socketConnectionMade', socketConnectionMade, false);
}
//set timer to refresh updates from when user obj last updated
self.$store.commit('updateFromNow');
Expand Down
30 changes: 30 additions & 0 deletions src/renderer/assets/images/logo_animation.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/renderer/components/SplashLoadingScreen-Page.vue
Expand Up @@ -6,7 +6,7 @@

<script>
import axios from 'axios';
import splashAnimation from '@/components/widgets/Splash.vue';
import splashAnimation from '@/components/widgets/SplashV2.vue';
/**
* @description
Expand Down
114 changes: 114 additions & 0 deletions src/renderer/components/widgets/SplashV2.vue

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/renderer/store/modules/app.js
@@ -1,6 +1,6 @@
const state = {
version: '0.4.9', //app version no
major: 49, //support only this server release
version: '0.5.0', //app version no
major: 50, //support only this server release
platform: 'web', //platform type [desktop, mobile web]
isDev: true, //is in development mode
loading: true, //app loading indicator
Expand Down

0 comments on commit b1a6fc7

Please sign in to comment.