Merge pull request #188 from stratisproject/ui

Get version from package.json

Merge pull request #188 from stratisproject/ui
Get version from package.json
00fac826 · Pieterjan Vanhoof · GitHub · d9300cfd · 6ad0e552 · 00fac826
Commit 00fac826 authored Aug 05, 2017 by Pieterjan Vanhoof Committed by GitHub Aug 05, 2017
Showing with 19 additions and 6 deletions

main.ts Breeze.UI/main.ts +2 -1

app.component.ts Breeze.UI/src/app/app.component.ts +14 -2

app.module.ts Breeze.UI/src/app/app.module.ts +2 -2

index.html Breeze.UI/src/index.html +1 -1

No files found.
--- a/Breeze.UI/main.ts
+++ b/Breeze.UI/main.ts
@@ -36,7 +36,8 @@ function createWindow() {
    frame: true,
    minWidth: 1200,
    minHeight: 700,
-    icon: __dirname + "/assets/images/breeze-logo.png"
+    icon: __dirname + "/assets/images/breeze-logo.png",
+    title: "Breeze Wallet"
  });

   // and load the index.html of the app.

--- a/Breeze.UI/src/app/app.component.ts
+++ b/Breeze.UI/src/app/app.component.ts
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
+import { Title } from '@angular/platform-browser';

 import { ApiService } from './shared/services/api.service';

+import { remote } from 'electron';
+
 import 'rxjs/add/operator/retryWhen';
 import 'rxjs/add/operator/delay';

@@ -13,17 +16,26 @@ import 'rxjs/add/operator/delay';
 })

 export class AppComponent implements OnInit {
-  constructor(private router: Router, private apiService: ApiService) {}
+  constructor(private router: Router, private apiService: ApiService, private titleService: Title) {}
  private errorMessage: any;
  private responseMessage: any;
  private loading: boolean = true;

  ngOnInit() {
+    this.setTitle();
    this.apiService.getWalletFiles().retryWhen(errors => errors.delay(2000)).subscribe(() => this.startApp());
  }

-  startApp() {
+  private startApp() {
    this.loading = false;
    this.router.navigate(['/login']);
  }
+
+  private setTitle() {
+    let applicationName = "Breeze Wallet";
+    let applicationVersion = remote.app.getVersion();
+    let releaseCycle = "alpha";
+    let newTitle = applicationName + " v" + applicationVersion + " " + releaseCycle;
+    this.titleService.setTitle(newTitle);
+  }
 }
--- a/Breeze.UI/src/app/app.module.ts
+++ b/Breeze.UI/src/app/app.module.ts
 import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
+import { BrowserModule, Title } from '@angular/platform-browser';
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { HttpModule } from '@angular/http';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
@@ -51,7 +51,7 @@ import { LogoutConfirmationComponent } from './wallet/logout-confirmation/logout
    TransactionDetailsComponent,
    LogoutConfirmationComponent
  ],
-  providers: [ ApiService, GlobalService ],
+  providers: [ ApiService, GlobalService, Title ],
  bootstrap: [ AppComponent ]
 })


--- a/Breeze.UI/src/index.html
+++ b/Breeze.UI/src/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
  <meta charset="utf-8">
-  <title>Breeze Wallet v0.1.0 alpha</title>
+  <title>Breeze Wallet</title>
  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 </head>
 <body>