Skip to content

Commit

Permalink
v0.9.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Igor Lins e Silva committed Aug 28, 2019
1 parent 27e23ab commit 9cd9e91
Show file tree
Hide file tree
Showing 31 changed files with 2,349 additions and 1,307 deletions.
13 changes: 8 additions & 5 deletions index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ app.getVersion = () => version;

const PROTOCOL_PREFIX = 'simpleos';
const args = process.argv.slice(1);


devtools = args.some(val => val === '--devtools');
serve = args.some(val => val === '--serve');

Expand Down Expand Up @@ -327,15 +329,16 @@ async function createWindow() {
}
win = new BrowserWindow({
title: productName,
titleBarStyle: "hiddenInset",
webPreferences: {
nodeIntegration: true,
webSecurity: !serve,
devTools: true
devTools: false
},
darkTheme: true,
width: 1440,
height: 920,
minWidth: 800,
minWidth: 1024,
minHeight: 600,
backgroundColor: _bgColor,
frame: false,
Expand Down Expand Up @@ -652,7 +655,7 @@ function rescheduleAutoClaim() {
if (fs.existsSync(basePath + '/autoclaim.json')) {
const data = fs.readFileSync(cPath);
let autoclaimConf = JSON.parse(data.toString());
if (autoclaimConf['enabled']) {
if (autoclaimConf['enabled'] && productName==="simpleos") {
if (autoclaimConf['WAX-GBM']) {
for (const job of autoclaimConf['WAX-GBM']['jobs']) {
const a = moment.utc(job['next_claim_time']);
Expand Down Expand Up @@ -753,7 +756,7 @@ if (isAutoLaunch) {
appendLock();
autoClaimCheck();
console.log('READY!');
if (isEnableAutoClaim) {
if (isEnableAutoClaim && productName==="simpleos") {
addTrayIcon();
runAutoClaim();
if (process.platform === 'darwin') {
Expand Down Expand Up @@ -781,7 +784,7 @@ if (isAutoLaunch) {

const spawn = require('child_process').spawn;
if (isEnableAutoClaim) {
if (!(fs.existsSync(lockAutoLaunchFile))) {
if (!(fs.existsSync(lockAutoLaunchFile)) && productName==="simpleos") {
spawn(process.execPath, ['--autostart'], {
detached: true,
stdio: 'ignore'
Expand Down
101 changes: 51 additions & 50 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simpleos",
"version": "0.9.2",
"version": "0.9.3",
"productName": "simpleos",
"appId": "io.eosrio.simpleos",
"compilerVersion": "EOS MAINNET",
Expand Down Expand Up @@ -121,26 +121,26 @@
"node_modules"
],
"devDependencies": {
"@angular-devkit/build-angular": "^0.801.1",
"@angular/cli": "^8.1.1",
"@angular/compiler": "^8.1.1",
"@angular/compiler-cli": "^8.1.1",
"@angular/language-service": "^8.1.1",
"@types/echarts": "^4.1.9",
"@types/jasmine": "^3.3.13",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.0.2",
"@webcomponents/custom-elements": "^1.2.2",
"ajv": "^6.10.0",
"@angular-devkit/build-angular": "^0.802.2",
"@angular/cli": "^8.2.2",
"@angular/compiler": "^8.2.2",
"@angular/compiler-cli": "^8.2.2",
"@angular/language-service": "^8.2.2",
"@types/echarts": "^4.1.10",
"@types/jasmine": "^3.4.0",
"@types/jasminewd2": "~2.0.6",
"@types/node": "^12.7.2",
"@webcomponents/custom-elements": "^1.2.4",
"ajv": "^6.10.2",
"angular2-text-mask": "^9.0.0",
"angular2-toaster": "^8.0.0",
"bootstrap": "^4.3.1",
"codelyzer": "~4.5.0",
"core-js": "^2.5.4",
"codelyzer": "~5.1.0",
"core-js": "^2.6.9",
"echarts": "^4.2.1",
"electron": "^5.0.8",
"electron-builder": "^21.1.5",
"electron-reload": "^1.4.0",
"electron": "^6.0.2",
"electron-builder": "^21.2.0",
"electron-reload": "^1.5.0",
"fuse.js": "^3.4.5",
"hammerjs": "^2.0.8",
"jquery": "^3.4.0",
Expand All @@ -156,39 +156,39 @@
"ngx-order-pipe": "^2.0.3",
"ngx-pagination": "^4.1.0",
"npm-run-all": "^4.1.5",
"popper.js": "^1.14.7",
"popper.js": "^1.15.0",
"primeng": "^8.0.1",
"protractor": "^5.4.2",
"rxjs": "^6.5.1",
"rxjs-compat": "^6.5.1",
"rxjs": "^6.5.2",
"rxjs-compat": "^6.5.2",
"text-encoding-shim": "latest",
"text-mask-addons": "^3.7.2",
"ts-node": "^7.0.1",
"tslint": "^5.12.0",
"text-mask-addons": "^3.8.0",
"ts-node": "^8.3.0",
"tslint": "^5.18.0",
"typescript": "3.4.5",
"wait-on": "^3.0.1",
"webpack": "^4.12.0",
"webpack-dev-server": "^3.3.1",
"wait-on": "^3.3.0",
"webpack": "^4.39.2",
"webpack-dev-server": "^3.8.0",
"zone.js": "^0.9.1"
},
"dependencies": {
"@angular/animations": "^8.1.1",
"@angular/cdk": "^8.0.2",
"@angular/common": "^8.1.1",
"@angular/core": "^8.1.1",
"@angular/animations": "^8.2.2",
"@angular/cdk": "^8.1.3",
"@angular/common": "^8.2.2",
"@angular/core": "^8.2.2",
"@angular/flex-layout": "^8.0.0-beta.26",
"@angular/forms": "^8.1.1",
"@angular/forms": "^8.2.2",
"@angular/http": "^8.0.0-beta.10",
"@angular/material": "^8.0.2",
"@angular/material-moment-adapter": "^8.0.2",
"@angular/platform-browser": "^8.1.1",
"@angular/platform-browser-dynamic": "^8.1.1",
"@angular/router": "^8.1.1",
"@clr/angular": "^2.0.2",
"@clr/icons": "^2.0.2",
"@clr/ui": "^2.0.2",
"@fortawesome/angular-fontawesome": "^0.4.0",
"@fortawesome/fontawesome-svg-core": "^1.2.19",
"@angular/material": "^8.1.3",
"@angular/material-moment-adapter": "^8.1.3",
"@angular/platform-browser": "^8.2.2",
"@angular/platform-browser-dynamic": "^8.2.2",
"@angular/router": "^8.2.2",
"@clr/angular": "^2.1.1",
"@clr/icons": "^2.1.1",
"@clr/ui": "^2.1.1",
"@fortawesome/angular-fontawesome": "^0.5.0",
"@fortawesome/fontawesome-svg-core": "^1.2.21",
"@fortawesome/free-brands-svg-icons": "^5.9.0",
"@fortawesome/free-regular-svg-icons": "^5.9.0",
"@fortawesome/free-solid-svg-icons": "^5.9.0",
Expand All @@ -197,33 +197,34 @@
"@fortawesome/pro-solid-svg-icons": "^5.9.0",
"@ledgerhq/hw-transport": "latest",
"@types/crypto-js": "^3.1.43",
"angular-schema-form": "^0.8.13",
"angular7-json-schema-form": "^1.0.4",
"animate.css": "^3.7.0",
"animate.css": "^3.7.2",
"asn1-ber": "^1.0.9",
"auto-launch": "^5.0.5",
"bip32-path": "^0.4.2",
"body-parser": "^1.19.0",
"chart.js": "^2.8.0",
"cors": "^2.8.5",
"crypto-js": "^3.1.9-1",
"electron-context-menu": "^0.13.0",
"electron-context-menu": "^0.14.0",
"eosjs": "^20.0.0",
"express": "^4.17.1",
"fcbuffer": "^2.2.1",
"fcbuffer": "^2.2.2",
"isomorphic-fetch": "^2.2.1",
"keytar": "^4.11.0",
"keytar": "^4.13.0",
"loaderjs": "^1.0.0",
"menu": "^0.2.5",
"node-fetch": "^2.6.0",
"node-pre-gyp": "^0.13.0",
"node-schedule": "^1.3.2",
"open": "^6.3.0",
"portfinder": "^1.0.21",
"primeicons": "^1.0.0",
"quill": "^1.3.6",
"open": "^6.4.0",
"portfinder": "^1.0.22",
"primeicons": "^2.0.0",
"quill": "2.0.0-dev.3",
"socket.io": "^2.2.0",
"socket.io-client": "^2.2.0",
"tar": "^4.4.10",
"tslib": "^1.10.0"
}
}
}
4 changes: 2 additions & 2 deletions src/app/app.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
}

.nav-link {
height: 2rem !important;
height: 1.7rem !important;
cursor: pointer;
}

Expand All @@ -121,7 +121,7 @@
.traffic-lights {
top: 1px;
left: 8px;
margin-top: 13px;
margin-top: 8px;
margin-right: 20px;
}
.focus .traffic-lights > .traffic-light-close, .traffic-lights:hover > .traffic-light-close, .traffic-lights:active > .traffic-light-close {
Expand Down
44 changes: 23 additions & 21 deletions src/app/app.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,42 @@
<!-- -->
<!--</div>-->
<div class="main-container">
<header class="header-1" style="-webkit-app-region: drag; height: 2rem;">
<div class="branding">

<div *ngIf="isMac" class="focus" style="-webkit-app-region: no-drag;">
<div class="traffic-lights">
<button class="traffic-light traffic-light-close" style="margin-right: 10px;" id="close"
(click)="closeWindow()"></button>
<button class="traffic-light traffic-light-minimize" style="margin-right: 10px;" id="minimize"
(click)="minimizeWindow()"></button>
<button class="traffic-light traffic-light-maximize" id="maximize"
(click)="maximizeWindow()"></button>
</div>
</div>

<a class="nav-link">
<header class="header-1" style="-webkit-app-region: drag; height: 1.7rem;flex-basis: 1.7rem;">
<div class="branding" [ngStyle]="{'padding':'0 s10px','text-align':'left','width':(!isMac?'8.5rem':'95%'),'height': '1.7rem'}">
<!-- <div class="branding" [ngStyle]="{'height': '1.7rem','margin':'auto'}">-->
<!-- <div class="branding" [ngStyle]="{'padding':(!isMac?'0 1rem':'0px'),'text-align':(!isMac?'left':'right'),'width':(!isMac?'8.5rem':'85%'),'height': '1.7rem'}">-->

<!-- <div *ngIf="isMac" class="focus" style="-webkit-app-region: no-drag;">-->
<!-- <div class="traffic-lights">-->
<!-- <button class="traffic-light traffic-light-close" style="margin-right: 10px;" id="close"-->
<!-- (click)="closeWindow()"></button>-->
<!-- <button class="traffic-light traffic-light-minimize" style="margin-right: 10px;" id="minimize"-->
<!-- (click)="minimizeWindow()"></button>-->
<!-- <button class="traffic-light traffic-light-maximize" id="maximize"-->
<!-- (click)="maximizeWindow()"></button>-->
<!-- </div>-->
<!-- </div>-->

<a class="nav-link" [ngStyle]="{'margin':(!isMac?'0 0':'0 auto')}">
<span *ngIf="compilerVersion=='EOS MAINNET'" class="title-header"
style="color: #9a9a9a; font-size: 13px;">SimplEOS Wallet {{version}}</span>
style="color: #9a9a9a; font-size: 14px;">SimplEOS Wallet {{version}}</span>
<span *ngIf="compilerVersion!=='EOS MAINNET'" class="title-header"
style="color: #9a9a9a; font-size: 13px;">LIBERLAND Wallet {{version}}</span>
style="color: #9a9a9a; font-size: 14px;">LIBERLAND Wallet {{version}}</span>
</a>

</div>
<div style="width:100%;height: 2.05rem;"
<div style="align-self:end;width:auto;height: 1.7rem;"
*ngIf="compilerVersion=='EOS MAINNET' && (theme.currentTheme !== 'wax' && theme.currentTheme !== 'liberland')">
<a class="nav-link nav-icon other-icon">
<clr-icon shape="moon" *ngIf="dnSet" (click)="see()" class="theme-icon"
style="height: 28px;width: 23px;margin:10px 10px;-webkit-app-region: no-drag;float:right;"></clr-icon>
style="height: auto;width: 23px;margin:8px;-webkit-app-region: no-drag;float:right;"></clr-icon>
<clr-icon shape="sun" *ngIf="!dnSet" (click)="see()" class="theme-icon"
style="height: 28px;width: 23px;margin:10px 10px;-webkit-app-region: no-drag;float:right;"></clr-icon>
style="height:auto;width: 23px;margin:8px;-webkit-app-region: no-drag;float:right;"></clr-icon>
</a>
</div>


<div class="header-actions" *ngIf="!isMac">
<div class="header-actions" style="width:auto;height:1.7rem;" *ngIf="!isMac">
<a (click)="minimizeWindow()" style="-webkit-app-region: no-drag;"
class="nav-link nav-icon other-icon icon-header">
<clr-icon size="18" shape="window-min"></clr-icon>
Expand Down

0 comments on commit 9cd9e91

Please sign in to comment.