bump version to v1.1.1

Author: serderovsh

iex-wallet.json

@@ -1,4 +1,4 @@
 {
   "name": "iEXWallet",
-  "version": "1.1.0"
+  "version": "1.1.1"
 }

main.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { app, screen, BrowserWindow } from 'electron';
+import { app, BrowserWindow, screen } from 'electron';
 import * as path from 'path';
 import * as url from 'url';
 
@@ -24,8 +24,7 @@ const appConfig = require(path.join(
 console.log('Desktop: ' + appConfig.nameCase + ' v' + appConfig.version);
 
 
-function createWindow()
-{
+function createWindow() {
     // Get screen size
     const size = screen.getPrimaryDisplay().workAreaSize;
 
@@ -34,7 +33,7 @@ function createWindow()
     const browser: any = (isDevMode ? {
         width: size.width,
         height: size.height
-    }: {
+    } : {
         width: 1064,
         height: 650
     });
@@ -64,7 +63,7 @@ function createWindow()
     win.setMenu(null);
 
     // Open the DevTools.
-    if(isDevMode) {
+    if (isDevMode) {
         win.webContents.openDevTools();
     }
 

package-lock.json

@@ -1,7 +1,7 @@
 {
     "name": "iexwallet",
     "description": "Secure Tron Wallet",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "author": {
         "name": "Shamsudin Serderov",
         "email": "iexbase@protonmail.com"
@@ -31,21 +31,21 @@
         "postinstall:electron": "node ./bin/postinstall",
         "ng": "ng",
         "start": "npm run postinstall:electron && npm-run-all -p ng:serve electron:serve",
-        "build": "npm run postinstall:electron && npm run electron:serve-tsc && npm run electron:tsc && ng build",
-        "build:dev": "npm run build -- -c dev",
-        "build:prod": "npm run build -- -c production",
+        "build": "npm run postinstall:electron && npm run electron:serve-tsc && npm run electron:tsc",
+        "build:dev": "npm run build && npm run env:dev && ng build",
+        "build:prod": "npm run build && npm run env:prod && ng build --prod --aot --build-optimizer",
         "ng:serve": "ng serve",
         "ng:serve:web": "npm run postinstall:web && ng serve -o",
         "electron:serve-tsc": "tsc -p tsconfig.json",
         "electron:tsc": "tsc main.ts",
-        "electron:serve": "wait-on http-get://localhost:4200/ && npm run electron:serve-tsc && electron . --serve",
-        "electron:local": "npm run build:prod && electron .",
-        "electron:linux": "npm run build:prod && npx electron-builder build --linux",
-        "electron:windows": "npm run build:prod && npx electron-builder build --windows",
-        "electron:mac": "npm run build:prod && npx electron-builder build --mac",
+        "electron:serve": "wait-on http-get://localhost:4200/ && npm run electron:serve-tsc && npm run env:dev && electron . --serve",
+        "build:linux-release": "npm run build:prod && npx electron-builder build --linux",
+        "build:windows-release": "npm run build:prod && npx electron-builder build --windows",
+        "build:mac-release": "npm run build:prod && npx electron-builder build --mac",
         "test": "npm run postinstall:web && ng test",
         "e2e": "npm run postinstall:web && ng e2e",
-        "version": "conventional-changelog -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md",
+        "fix:tslint": "tslint --fix --project . && tslint --fix '{test,electron,src}/**/*.ts'",
+        "fix:prettier": "prettier --write '{*,**/*}.{js,ts,md,json,scss}'",
         "extract": "ngx-translate-extract -i ./src -o ./src/assets/i18n/{ru,en}.json",
         "env:prod": "rm -f src/environments/index.ts && cp src/environments/prod.ts src/environments/index.ts \n\n# Environment set to: prod\n\n",
         "env:dev": "rm -f src/environments/index.ts && cp src/environments/dev.ts src/environments/index.ts \n\n# Environment set to: dev\n\n",
@@ -138,10 +138,15 @@
         "ngrx-store-logger": "^0.2.2",
         "npm-run-all": "^4.1.5",
         "npx": "^10.2.0",
+        "prettier": "^1.15.3",
         "protractor": "^5.4.2",
         "ts-node": "~7.0.1",
         "tslint": "~5.12.0",
+        "tslint-config-prettier": "^1.17.0",
         "typescript": "~3.2.2",
         "wait-on": "^3.2.0"
+    },
+    "prettier": {
+        "singleQuote": true
     }
 }

package.json

@@ -21,9 +21,9 @@
  */
 
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import {MasterpageComponent} from "@shared/masterpage/masterpage.component";
-import {AuthGuardService} from "./auth-guard.service";
+import { RouterModule, Routes } from '@angular/router';
+import {MasterpageComponent} from '@shared/masterpage/masterpage.component';
+import {AuthGuardService} from './auth-guard.service';
 
 
 

src/app/app-routing.module.ts

@@ -31,8 +31,7 @@ import { TronProvider } from "@providers/tron/tron";
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.scss']
 })
-export class AppComponent implements OnInit
-{
+export class AppComponent implements OnInit {
     /**
      * Create a new AppComponent object
      *
@@ -52,25 +51,37 @@ export class AppComponent implements OnInit
         //
     }
 
+    /**
+     * platform check on agent "electron"
+     *
+     * @returns {boolean | null}
+     */
+    private static isElectronPlatform(): boolean | null {
+        const userAgent =
+            navigator && navigator.userAgent
+                ? navigator.userAgent.toLowerCase()
+                : null;
+        return userAgent && userAgent.indexOf(' electron/') > -1;
+    }
+
     /**
      * We start object life cycle
      *
      * @return void
      */
-    ngOnInit()
-    {
+    ngOnInit() {
         // The project is allowed to run only through "Electron"
-        if (!AppComponent.isElectronPlatform())
+        if (!AppComponent.isElectronPlatform()) {
             throw new Error('Web version is not available');
+        }
 
         this.onPlatformReady();
     }
 
     /**
      * We load providers
      */
-    private onPlatformReady(): void
-    {
+    private onPlatformReady(): void {
         this.appProvider
             .load()
             .then(() => {
@@ -90,8 +101,7 @@ export class AppComponent implements OnInit
     /**
      * Write to the log details of the project
      */
-    onAppLoad(): void
-    {
+    onAppLoad(): void {
         const deviceInfo = os.platform();
 
         this.logger.info(
@@ -123,19 +133,5 @@ export class AppComponent implements OnInit
     private async onLoadListTokens(): Promise<any> {
         this.tron.loadListTokens().then(() => {});
     }
-
-    /**
-     * platform check on agent "electron"
-     *
-     * @returns {boolean | null}
-     */
-    private static isElectronPlatform(): boolean | null
-    {
-        const userAgent =
-            navigator && navigator.userAgent
-                ? navigator.userAgent.toLowerCase()
-                : null;
-        return userAgent && userAgent.indexOf(' electron/') > -1;
-    }
 }
 

src/app/app.component.ts

@@ -12,14 +12,13 @@ import { ActivatedRouteSnapshot,
     RouterStateSnapshot
 } from '@angular/router';
 
-import { Observable } from "rxjs";
+import { Observable } from 'rxjs';
 
 // Providers
-import { WalletProvider } from "@providers/wallet/wallet";
+import { WalletProvider } from '@providers/wallet/wallet';
 
 @Injectable({providedIn: 'root'})
-export class AuthGuardService implements CanActivate
-{
+export class AuthGuardService implements CanActivate {
     /**
      * Contains the information about a route associated with a component loaded in an
      * outlet at a particular moment in time. ActivatedRouteSnapshot can also be used to
@@ -51,14 +50,13 @@ export class AuthGuardService implements CanActivate
      * @return Observable<boolean> | Promise<boolean> | boolean
      */
     canActivate(route: ActivatedRouteSnapshot,
-                state: RouterStateSnapshot): Observable<boolean> | Promise<boolean> | boolean
-    {
+                state: RouterStateSnapshot): Observable<boolean> | Promise<boolean> | boolean {
         this.activatedRoute = route;
 
         // check if user wallet is present
         const isLoggedIn = (this.walletProvider.password != undefined);
         // logged in so return true
-        if (isLoggedIn) return true;
+        if (isLoggedIn) { return true; }
 
         // not logged in so redirect to login page with the return url
         this.router.navigate(['/login'], {

src/app/auth-guard.service.ts

@@ -99,6 +99,7 @@
     position: absolute;
     right: 22px;
     .mat-button-toggle-group {
+        cursor: pointer;
         border: none;
         text-align: right;
         border-bottom: 1px solid rgba(255, 255, 255, 0.05);

src/app/modules/dashboard/pages/dashboard/dashboard.page.scss

@@ -16,11 +16,12 @@ <h1>{{'Settings.SessionLog.Title' | translate}}</h1>
         <span>{{'Settings.SessionLog.Empty' | translate}}</span>.
     </div>
 
-    <div *ngIf="filteredLogs && filteredLogs.length > 0">
-        <div class="log-items" *ngFor="let l of filteredLogs">
+    <div *ngIf="filteredLogs && filteredLogs.length > 0" fxLayout="column">
+        <div class="log-items" *ngFor="let l of filteredLogs" fxFlex>
             <div [ngClass]="{'energized': l.level=='warn', 'royal': l.level=='debug', 'info-color': l.level=='info', 'assertive': l.level=='error'}">
                 <span class="log-timestamp">{{l.timestamp  | amDateFormat:'MMM Do YYYY, h:mm:ss a'}}</span>
-                <span class="log-level">&nbsp; [{{l.level}}]</span>&nbsp; {{l.msg}}
+                <span class="log-level">&nbsp; [{{l.level}}]</span>&nbsp;
+                <span class="log-text">{{l.msg}}</span>
             </div>
         </div>
     </div>

src/app/modules/settings/pages/session-log/session-log.page.html

@@ -15,6 +15,8 @@
 }
 
 .log-items {
+    width: 100%;
+    max-width: 100%;
     font-size: 13px;
     line-height: 1.5;
     font-weight: 100;