more fixes

eosrio · Jun 12, 2018 · 2edb2df · 2edb2df
1 parent 546b17d
commit 2edb2df
Show file tree

Hide file tree

Showing 13 changed files with 304 additions and 224 deletions.
diff --git a/README.md b/README.md
@@ -21,15 +21,18 @@ User experience focus was also a main part of SimplEOS creation process.
 
 Only download SimplEOS from EOS Rio's [website](https://eosrio.io/simpleos/) or [github](https://github.com/eosrio/simpleos). Avoid scams, do not trust any other source.
 
+Distribution or copy of this software or any of its parts and associated documentation, is not allowed by applicable law, unless previous written permission is given by EOS Rio. All rights are reserved.
+
 SimplEOS doesn't keep any of your information. All information is kept locally only, not in any cloud services or databases.
+
 ## Main Features
 As of 12/06/2018, SimplEOS main features include:
 
 - Local Storage: private keys are encrypted and stored locally only.
-- Import exodus wallet
+- Import Exodus wallet
 - Multiple accounts support
 - Token transfer
-- Password Protected
+- All transactions are password protected
 - Contacts List / Add contacts
 - Transactions / Actions History
 - Voting Portal
@@ -42,6 +45,7 @@ As soon as mainnet is activated with 15% of votes:
 Next features to be implemented:
 - Create new account *- high priority*
 - Create new wallet *- high priority*
+- Edit/remove contacts *- high priority*
 - Testnets support
 - Delegate Permissions
 - Secured Delayed Transactions
@@ -55,13 +59,14 @@ Your private keys are stored locally only and are properly encrypted with a user
 ### Proxy to fetch external data
 External informations outside of the blockchain (such as the Block Producer standard) are fetched via a proxy server provided by EOS Rio, to avoid malformed json data and third-party servers misconfigurations. 
 
-## Installation Instructions
-- Windows
-- MacOS
-- Linux
+## Download
+- [Windows]()
+- [MacOS]()
+- [Linux]()
 
 ## Building Instructions
 
+#### Windows
 ```console
 git clone https://github.com/eosrio/simpleos.git
 cd simpleos
@@ -79,6 +84,10 @@ For development and quick preview
 npm run build && npx @electron-forge/cli start
 ```
 
+#### MacOS
+
+#### Linux
+
 ## Legal Disclaimer
 
 By downloading SimplEOS you agree to the [Terms of Service](https://eosrio.io/terms-of-service/).

diff --git a/package.json b/package.json
@@ -2,11 +2,11 @@
   "name": "simpleos",
   "productName": "simpleos",
   "description": "EOS Blockchain Interface & Wallet",
-  "author": "eosrio",
+  "author": "EOS Rio",
   "repository": "https://github.com/eosrio/simpleos",
   "homepage": "https://github.com/eosrio/simpleos",
   "license": "UNLICENSED",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "scripts": {
     "ng": "ng",
     "start": "electron-forge start",
@@ -33,10 +33,13 @@
             "win32"
           ],
           "config": {
-            "name": "simpleos_wallet",
+            "name": "simplEOS",
+            "title": "simplEOS",
             "loadingGif": "C:/simpleos/simpleos.gif",
-            "icon": "C:/simpleos/src/favicon.ico",
-            "setupIcon": "C:/simpleos/src/favicon.ico"
+            "iconUrl": "file:///C:/simpleos/src/favicon.ico",
+            "setupIcon": "C:/simpleos/src/favicon.ico",
+            "noMsi": false,
+            "setupMsi": "simplEOS-setup"
           }
         },
         {
@@ -45,15 +48,26 @@
             "darwin"
           ],
           "config": {
-            "format": "UFLO"
+            "name": "simplEOS",
+            "format": "UDZO"
           }
         },
         {
           "name": "@electron-forge/maker-deb",
           "platforms": [
             "linux"
           ],
-          "config": {}
+          "config": {
+            "options": {
+              "name": "simplEOS",
+              "productName": "simplEOS",
+              "icon": "/home/entropia/simpleos/src/favicon.ico",
+              "homepage":"https://github.com/eosrio/simpleos",
+              "maintainer":"eosrio",
+              "productDescription": "EOS Blockchain Interface & Wallet by EOS Rio",
+              "description": "EOS Blockchain Interface & Wallet by EOS Rio"
+            }
+          }
         },
         {
           "name": "@electron-forge/maker-rpm",

diff --git a/src/app/dashboard/about/about.component.html b/src/app/dashboard/about/about.component.html
@@ -11,6 +11,7 @@ <h5 style="margin-top: 10px;">Producer name: <span class="blue">eosriobrazil</sp
                 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"><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">
                     <img src="assets/steemit.png" class="steemit">

diff --git a/src/app/dashboard/config/config.component.ts b/src/app/dashboard/config/config.component.ts
@@ -3,6 +3,7 @@ import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 import {Router} from '@angular/router';
 import {EOSJSService} from '../../eosjs.service';
 import {AccountsService} from '../../accounts.service';
+import {VotingService} from '../vote/voting.service';
 
 @Component({
   selector: 'app-config',
@@ -18,7 +19,11 @@ export class ConfigComponent implements OnInit {
   passmatch: boolean;
   clearContacts: boolean;
 
-  constructor(private fb: FormBuilder, private router: Router, private eos: EOSJSService, public aService: AccountsService) {
+  constructor(private fb: FormBuilder,
+              public voteService: VotingService,
+              private router: Router,
+              private eos: EOSJSService,
+              public aService: AccountsService) {
     this.endpointModal = false;
     this.logoutModal = false;
     this.confirmModal = false;
@@ -46,9 +51,17 @@ export class ConfigComponent implements OnInit {
         }
       }
     }
-    this.router.navigateByUrl('/').catch((err) => {
-      console.log(err);
-    });
+    this.aService.accounts = [];
+    this.eos.accounts.next([]);
+
+    setTimeout(() => {
+      window['remote']['app']['relaunch']();
+      window['remote']['app'].exit(0);
+    }, 1000);
+
+    // this.router.navigateByUrl('/').catch((err) => {
+    //   console.log(err);
+    // });
   }
 
   changePass() {