forked from tmobile/jazz
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request tmobile#44 in CAP/jazz_webapp from ga-tracking to …
…master * commit '2da4cf9cb98b5ce1388ed1eb0e5983867a118041': remove dev ga tracking ga tracking
- Loading branch information
Showing
4 changed files
with
125 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,90 @@ | ||
|
|
||
| import { Component } from '@angular/core'; | ||
| import {AfterViewInit, Component, ElementRef, OnInit} from '@angular/core'; | ||
| import {ToasterContainerComponent, ToasterService, ToasterConfig} from 'angular2-toaster'; | ||
| import {Idle, DEFAULT_INTERRUPTSOURCES} from '@ng-idle/core'; | ||
| import {Keepalive} from '@ng-idle/keepalive'; | ||
| import { AuthenticationService, MessageService } from './core/services/index'; | ||
| import { Router } from '@angular/router'; | ||
| import { Location } from '@angular/common'; | ||
| import {AuthenticationService, MessageService} from './core/services/index'; | ||
| import {NavigationEnd, Router} from '@angular/router'; | ||
| import {Location} from '@angular/common'; | ||
| import {BodyOutputType} from 'angular2-toaster'; | ||
|
|
||
| import {environment} from "../environments/environment"; | ||
| declare let ga; | ||
| @Component({ | ||
| selector: 'app-root', | ||
| templateUrl: './app.component.html', | ||
| // directives: [ToasterContainerComponent], | ||
| // directives: [ToasterContainerComponent], | ||
| providers: [ToasterService, MessageService], | ||
| styleUrls: ['./app.component.scss'] | ||
| }) | ||
| export class AppComponent { | ||
| idleState = 'Not started.'; | ||
| export class AppComponent implements OnInit{ | ||
| idleState = 'Not started.'; | ||
| timedOut = false; | ||
| lastPing?: Date = null; | ||
| public wrapperClass = ''; | ||
| tst:any; | ||
| public wrapperClass = ''; | ||
| tst: any; | ||
|
|
||
| constructor( | ||
| private toasterService: ToasterService, | ||
| private idle: Idle, | ||
| private location: Location, | ||
| private keepalive: Keepalive, | ||
| private messageservice: MessageService, | ||
| private authenticationservice: AuthenticationService, | ||
| private router: Router | ||
| ) { | ||
|
|
||
| constructor( | ||
| private toasterService: ToasterService, | ||
| private idle: Idle, | ||
| private location: Location, | ||
| private keepalive: Keepalive,private router: Router, | ||
| private messageservice:MessageService, | ||
| private authenticationservice:AuthenticationService | ||
| ) { | ||
|
|
||
| // sets an idle timeout of 15 mins, for testing purposes. | ||
| idle.setIdle(60*15); | ||
| // sets an idle timeout of 15 mins, for testing purposes. | ||
| idle.setIdle(60 * 15); | ||
| // sets a timeout period of 15 mins. after 30 mins of inactivity, the user will be considered timed out. | ||
| idle.setTimeout(60*15); | ||
| idle.setTimeout(60 * 15); | ||
| // sets the default interrupts, in this case, things like clicks, scrolls, touches to the document | ||
| idle.setInterrupts(DEFAULT_INTERRUPTSOURCES); | ||
|
|
||
| idle.onTimeout.subscribe(() => { | ||
| if(this.authenticationservice.isLoggedIn()){ | ||
| this.authenticationservice.logout(); | ||
| this.router.navigate(['']);//location.path routed to landing page | ||
| let msg = this.messageservice.sessionEnd("true"); | ||
| this.toasterService.pop('error','Oops!',msg); | ||
| } | ||
| if (this.authenticationservice.isLoggedIn()) { | ||
| this.authenticationservice.logout(); | ||
| this.router.navigate(['']);//location.path routed to landing page | ||
| let msg = this.messageservice.sessionEnd("true"); | ||
| this.toasterService.pop('error', 'Oops!', msg); | ||
| } | ||
|
|
||
| this.idleState = 'Timed out!'; | ||
| this.timedOut = true; | ||
| this.reset(); | ||
| this.timedOut = true; | ||
| this.reset(); | ||
| }); | ||
|
|
||
| this.reset(); | ||
| //location.path routed to landing page | ||
| this.reset(); | ||
| //location.path routed to landing page | ||
| if (location.path() == '') { | ||
| this.wrapperClass = 'landing'; | ||
| } | ||
| this.toasterService = toasterService; | ||
| } | ||
| reset() { | ||
| this.toasterService = toasterService; | ||
| } | ||
|
|
||
| ngOnInit() { | ||
| if(environment.gaTrackingId) { | ||
| ga('create', environment.gaTrackingId, 'auto'); | ||
| this.router.events.subscribe(event => { | ||
| if(event instanceof NavigationEnd){ | ||
| ga('set', 'page', event.urlAfterRedirects); | ||
| ga('send', 'pageview'); | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| reset() { | ||
| this.idle.watch(); | ||
| this.idleState = 'Started.'; | ||
| this.timedOut = false; | ||
| } | ||
|
|
||
| public toasterconfig : ToasterConfig = | ||
| new ToasterConfig({ | ||
| showCloseButton: true, | ||
| tapToDismiss: false, | ||
| timeout: 4000, | ||
| limit:1 | ||
| }); | ||
| public toasterconfig: ToasterConfig = | ||
| new ToasterConfig({ | ||
| showCloseButton: true, | ||
| tapToDismiss: false, | ||
| timeout: 4000, | ||
| limit: 1 | ||
|
|
||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,5 +14,6 @@ export const environment = { | |
| }, | ||
| userJourney: { | ||
| registrationMessage: '' | ||
| } | ||
| }, | ||
| gaTrackingId: 'UA-121896506-1' | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,5 +14,6 @@ export const environment = { | |
| }, | ||
| userJourney: { | ||
| registrationMessage: '' | ||
| } | ||
| }, | ||
| gaTrackingId: '' | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters