Skip to content

Commit

Permalink
0.5.3 stability release
Browse files Browse the repository at this point in the history
  • Loading branch information
igorls committed Jun 18, 2018
1 parent 4f0cc29 commit 67dc620
Show file tree
Hide file tree
Showing 24 changed files with 1,032 additions and 906 deletions.
3 changes: 2 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"node_modules/@clr/icons/clr-icons.min.css",
"node_modules/primeng/resources/themes/darkness/theme.css",
"node_modules/angular2-toaster/toaster.css",
"node_modules/primeng/resources/primeng.min.css"
"node_modules/primeng/resources/primeng.min.css",
"node_modules/primeicons/primeicons.css"
],
"scripts": [
"node_modules/@clr/icons/clr-icons.min.js",
Expand Down
5 changes: 3 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ function createWindow() {
win = new BrowserWindow({
title: 'simplEOS',
darkTheme: true,
x: 100,
y: 100,
width: 1440,
height: 800,
minWidth: 800,
Expand All @@ -59,14 +57,17 @@ function createWindow() {
icon: path.join(__dirname, 'src/assets/icons/ico/simpleos.ico')
});
win.setMenu(null);

win.loadURL(url.format({
pathname: path.join(__dirname, 'ng-dist', 'index.html'),
protocol: 'file:',
slashes: true
}));

if (devtools) {
win.webContents.openDevTools();
}

win.on('closed', () => {
win = null
});
Expand Down
44 changes: 34 additions & 10 deletions ng-dist/3rdpartylicenses.txt
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

primeng@5.2.7
primeng@6.0.0-rc.1
MIT
The MIT License (MIT)

Expand Down Expand Up @@ -406,7 +406,7 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

@angular/[email protected].4
@angular/[email protected].5
MIT
MIT

Expand Down Expand Up @@ -441,15 +441,15 @@ For more information, please refer to <http://unlicense.org>
MIT
MIT

@angular/[email protected].4
@angular/[email protected].5
MIT
MIT

@clr/[email protected]-rc.2
@clr/[email protected]
MIT
MIT

@angular/[email protected].4
@angular/[email protected].5
MIT
MIT

Expand Down Expand Up @@ -620,15 +620,15 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

@angular/[email protected].4
@angular/[email protected].5
MIT
MIT

@angular/[email protected].4
@angular/[email protected].5
MIT
MIT

@angular/[email protected].4
@angular/[email protected].5
MIT
MIT

Expand Down Expand Up @@ -802,11 +802,35 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

@clr/[email protected]
[email protected]
MIT
MIT License

Copyright (c) 2018 PrimeTek

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

@clr/[email protected]
MIT
MIT

@clr/[email protected]-rc.2
@clr/[email protected]
MIT
MIT

Expand Down
2 changes: 1 addition & 1 deletion ng-dist/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ng-dist/polyfills.js

Large diffs are not rendered by default.

Binary file added ng-dist/primeicons.eot
Binary file not shown.
92 changes: 92 additions & 0 deletions ng-dist/primeicons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ng-dist/primeicons.ttf
Binary file not shown.
Binary file added ng-dist/primeicons.woff
Binary file not shown.
2 changes: 1 addition & 1 deletion ng-dist/styles.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ng-dist/vendor.js

Large diffs are not rendered by default.

27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simpleos",
"version": "0.5.2",
"version": "0.5.3",
"productName": "simpleos",
"description": "EOS Blockchain Interface & Wallet",
"author": {
Expand Down Expand Up @@ -82,7 +82,7 @@
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.6.8",
"@angular/cli":"^6.0.8",
"@angular/cli": "^6.0.8",
"@angular/compiler": "^6.0.5",
"@angular/compiler-cli": "^6.0.5",
"@types/jasmine": "~2.8.6",
Expand All @@ -94,20 +94,20 @@
"babel-plugin-transform-async-to-generator": "^6.24.1",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"bootstrap":"^4.1.1",
"bootstrap": "^4.1.1",
"codelyzer": "~4.2.1",
"core-js": "^2.5.4",
"electron":"^2.0.2",
"electron-builder":"20.14.7",
"electron-reload":"^1.2.2",
"eosjs":"^15.0.0",
"electron": "^2.0.2",
"electron-builder": "20.14.7",
"electron-reload": "^1.2.2",
"eosjs": "^15.0.0",
"hammerjs": "^2.0.8",
"jquery": "^3.3.1",
"moment": "^2.22.2",
"ng-lottie":"^0.3.1",
"ng-lottie": "^0.3.1",
"npm-run-all": "^4.1.3",
"popper.js": "^1.14.3",
"primeng":"^6.0.0-rc.1",
"primeng": "^6.0.0-rc.1",
"protractor": "~5.3.0",
"rxjs": "^6.2.0",
"rxjs-compat": "^6.2.0",
Expand All @@ -119,7 +119,7 @@
"zone.js": "^0.8.26"
},
"dependencies": {
"@angular/animations":"^6.0.5",
"@angular/animations": "^6.0.5",
"@angular/cdk": "^6.0.5",
"@angular/common": "^6.0.5",
"@angular/core": "^6.0.5",
Expand All @@ -141,9 +141,10 @@
"@fortawesome/pro-regular-svg-icons": "^5.1.0-8",
"@fortawesome/pro-solid-svg-icons": "^5.1.0-8",
"electron-builder-squirrel-windows": "^20.15.0",
"electron-updater":"^2.21.11",
"electron-webpack":"^2.1.2",
"electron-updater": "2.21.10",
"electron-webpack": "^2.1.2",
"menu": "^0.2.5",
"opn":"^5.3.0"
"opn": "^5.3.0",
"primeicons": "^1.0.0-beta.7"
}
}
21 changes: 3 additions & 18 deletions src/app/accounts.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export class AccountsService {

constructor(private http: HttpClient, private eos: EOSJSService) {
this.accounts = [];
this.usd_rate = 0;
this.usd_rate = 10.00;
this.fetchEOSprice();
this.eos.online.asObservable().subscribe((onlineStatus) => {
console.log('onlineStatus', onlineStatus);
Expand Down Expand Up @@ -87,29 +87,17 @@ export class AccountsService {
}
}

refreshFromChain() {
console.log('REFRESH!');
refreshFromChain(): void {
const PQ = [];
// Build promise queue
// if (this.accounts.length === 0) {
// setTimeout(() => {
// this.refreshFromChain();
// }, 2000);
// }
this.accounts.forEach((account, idx) => {
// console.log(account, idx);
const tempPromise = new Promise((resolve, reject) => {
this.eos.getAccountInfo(account['name']).then((newdata) => {
// console.log(newdata);
this.eos.getTokens(account['name']).then((tokens) => {
// console.log(tokens);
this.eos.getRefunds(account['name']).then((refunds) => {
console.log(refunds);
let ref_time = null;
let balance = 0;
let ref_net = 0;
let ref_cpu = 0;

if (refunds.rows.length > 0) {
ref_net = AccountsService.parseEOS(refunds.rows[0]['cpu_amount']);
ref_cpu = AccountsService.parseEOS(refunds.rows[0]['cpu_amount']);
Expand Down Expand Up @@ -147,17 +135,14 @@ export class AccountsService {
});
PQ.push(tempPromise);
});
// Verify completion
Promise.all(PQ).then(() => {
console.log('Update finished!');
// this.eos.accounts.next(accountMap);
this.eos.storeAccountData(this.accounts);
});
}

fetchEOSprice() {
this.http.get('https://api.coinmarketcap.com/v2/ticker/1765/').subscribe((result: any) => {
this.usd_rate = result.data.quotes.USD['price'];
this.usd_rate = parseFloat(result.data.quotes.USD['price']);
});
}
}
6 changes: 3 additions & 3 deletions src/app/dashboard/about/about.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<div class="col-lg-6">
<h1><span class="white">About </span><span class="blue">EOS Rio</span></h1>
<h5 style="margin-top: 10px;">Producer name: <span class="blue">eosriobrazil</span></h5>
<p class="paragraph">EOS Rio is a Block Producer candidate based in Rio de Janeiro.</p>
<p class="paragraph">EOS Rio is a Block Producer based in Rio de Janeiro.</p>
<p class="paragraph">Located in Brazil, EOS Rio contributes to the geographical and cultural distribution of the EOS network,
which is an important feature of a reliable and robust Delegated Proof of Stake (DPoS) network.</p>
<p class="paragraph">We are a team of crypto-enthusiasts and EOS supporters who have been following EOS.IO development since
its first releases by contributing with discussion, tests, and offering open-source tools for the
its first release, contributing with discussion, tests, and offering open-source tools for the
community, such as a control panel for other Block Producers, a sandbox environment for developers, a
tool to map and optimize network topology and now, SimplEOS :)</p>
<p class="paragraph">For more information on our projects, visit <a href="https://eosrio.io/" class="website">eosrio.io</a></p>
<p class="paragraph">For more information on our projects, visit <a href="https://eosrio.io/" class="website" target="_blank">eosrio.io</a></p>
<p class="paragraph"><strong>Help us continue funding this projects by voting for us as Block Producers :)</strong></p>
<p>
<a href="https://steemit.com/@eosrio" target="_blank" class="social-icon">
Expand Down
Loading

0 comments on commit 67dc620

Please sign in to comment.