Merge pull request #78 from Pear-Trading/Release-v0.1.10

TBSliver · web-flow · commit f6b5f4273d8c · 2018-05-24T13:02:43.000+01:00
Release v0.1.10
diff --git a/.gitignore b/.gitignore
@@ -41,6 +41,9 @@ testem.log
 /e2e/*.js
 /e2e/*.map
 
+# build 
+/dist
+
 # local env variable
 /src/environments/environment.local.ts
 /src/environments/environment.prod.ts
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 # Next Release
 
+# 0.1.10
+
+* Allowed for creation of yearly recurring transactions
+* Added google analytics
+
 # 0.1.9
 
 * Made layout change to make it neater when chart doesn't show
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -1,3 +1,5 @@
+import { environment } from '../environments/environment';
+
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { LocationStrategy, HashLocationStrategy } from '@angular/common';
@@ -38,6 +40,8 @@ import { P500Component } from './pages/500.component';
 import { AuthModule } from './auth/auth.module';
 import { DashboardModule } from './dashboard/dashboard.module';
 
+
+
 @NgModule({
   imports: [
     BrowserModule,
@@ -78,4 +82,10 @@ import { DashboardModule } from './dashboard/dashboard.module';
   ],
   bootstrap: [ AppComponent ]
 })
-export class AppModule { }
+export class AppModule {
+  constructor () {
+    if (environment.enableAnalytics) {
+      (<any>window).ga('create', environment.analyticsKey, 'auto');
+    }
+  }
+}
diff --git a/src/app/dashboard/add-data.component.html b/src/app/dashboard/add-data.component.html
@@ -62,6 +62,9 @@
                   <label class="btn btn-secondary mb-0" [class.active]="recurringType == 'quarterly'">
                     <input value="quarterly" type="radio" name="radios" style="display:none;" [(ngModel)]="recurringType" (ngModelChange)="transactionFormValidate()">Quarterly
                   </label>
+                  <label class="btn btn-secondary mb-0" [class.active]="recurringType == 'yearly'">
+                    <input value="yearly" type="radio" name="radios" style="display:none;" [(ngModel)]="recurringType" (ngModelChange)="transactionFormValidate()">Yearly
+                  </label>
                 </div>
               </div>
               <span class="help-block">Please give the period of time the purchase will recur from "Time of Transaction".</span>
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
@@ -1,9 +1,10 @@
 import { Component } from '@angular/core';
-import { Router } from '@angular/router';
+import {Router, NavigationEnd} from "@angular/router";
 import { GraphWidget } from '../widgets/graph-widget.component';
 import { OrgBarSnippetComponent } from '../snippets/org-snippet-bar.component';
 import { GraphPanel } from '../panels/graph-panel.component';
 import { DataType } from '../shared/data-types.enum';
+import { environment } from '../../environments/environment';
 
 @Component({
   templateUrl: 'dashboard.component.html'
@@ -50,6 +51,14 @@ export class DashboardComponent {
       dataType: DataType.currency,
     },
   ];
-
-  constructor() { }
+  constructor(private router: Router) {
+    if (environment.enableAnalytics) {
+       this.router.events.subscribe(event => {
+        if (event instanceof NavigationEnd) {
+          (<any>window).ga('set', 'page', event.urlAfterRedirects);
+          (<any>window).ga('send', 'pageview');
+        }
+      });
+    }
+  }
 }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -7,4 +7,6 @@ export const environment = {
   production: false,
   apiUrl: 'https://dev.peartrade.org/api',
   mapApiKey: 'CHANGEME',
+  enableAnalytics: false,
+  analyticsKey: 'CHANGEME',
 };
diff --git a/src/environments/environments.tar.enc b/src/environments/environments.tar.enc
diff --git a/src/index.html b/src/index.html
@@ -18,7 +18,6 @@
   <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
 
 </head>
-
 <body class="app header-fixed sidebar-fixed">
   <!-- Enable bootstrap 4 theme -->
   <script>window.__theme = 'bs4';</script>
@@ -123,6 +122,13 @@
     <div class="sk-cube3 sk-cube"></div>
   </div>
  </app-root>
+ <app-root></app-root>
+ <script>
+   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+   })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+ </script>
 </body>
 
 </html>
