diff --git a/package-lock.json b/package-lock.json index ea9e4f56..32cdc60c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1675,9 +1675,9 @@ "integrity": "sha1-brfXQYHVATYqO9O0a29X72J2JCU=" }, "angulartics2": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/angulartics2/-/angulartics2-3.3.0.tgz", - "integrity": "sha1-kQogA0ako5kLCk9QMpFsxIPf9WM=" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/angulartics2/-/angulartics2-4.0.0.tgz", + "integrity": "sha512-TuHtwTsPqd9BzYsMiqu0VX9qOeVzPJwpvrLJEDhcG0aR3IT2T8QV0zC4FndiowZJ8FmxE0FjRjNJieehIvbz4g==" }, "ansi": { "version": "0.3.1", diff --git a/package.json b/package.json index 996a5c2f..c9b3fa2b 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "@ngx-meta/core": "^4.0.1", "angular2-jwt": "^0.2.3", "angularfire2": "^5.0.0-rc.3", - "angulartics2": "3.3.0", + "angulartics2": "4.0.0", "body-parser": "^1.18.2", "bunyan-middleware": "^0.8.0", "clean-css": "^4.1.9", diff --git a/src/client/app/+account/account.component.html b/src/client/app/+account/account.component.html index ddc51e96..8129500b 100644 --- a/src/client/app/+account/account.component.html +++ b/src/client/app/+account/account.component.html @@ -1,7 +1,7 @@

{{ user.displayName }}

- + Update Photo @@ -17,20 +17,20 @@

{{ user.displayName }}

+ angularticsAction="FocusedOnAccountDisplayNameInput"> - + + angularticsAction="HoveredOverAccountEmailCheckmarkIcon"> --> + angularticsAction="FocusedOnAccountPhonenumberInput"> - + color="primary" id="update-btn" angulartics2On="input" angulartics2On="click" angularticsAction="ClickUpdateProfile">Save Changes
@@ -83,20 +83,20 @@

{{ user.displayName }}

- + required - + required + angulartics2On="click" angularticsAction="ClickUpdateProfile">Save Changes
-
\ No newline at end of file + diff --git a/src/client/app/+home/__snapshots__/home.component.spec.ts.snap b/src/client/app/+home/__snapshots__/home.component.spec.ts.snap index 1f5f88f8..246df867 100644 --- a/src/client/app/+home/__snapshots__/home.component.spec.ts.snap +++ b/src/client/app/+home/__snapshots__/home.component.spec.ts.snap @@ -30,7 +30,7 @@ exports[`HomeComponent should compile 1`] = ` + `; diff --git a/src/client/app/+home/home.component.html b/src/client/app/+home/home.component.html index 9e818dc9..5676d0f0 100644 --- a/src/client/app/+home/home.component.html +++ b/src/client/app/+home/home.component.html @@ -3,7 +3,7 @@

Hello, Angular Developer!

Welcome to a blazing fast Angular Universal development starter

+ angulartics2On="click" angularticsAction="ViewRepo"> Github @@ -85,4 +85,4 @@

Hello, Angular Developer!

- \ No newline at end of file + diff --git a/src/client/app/+home/home.component.spec.ts b/src/client/app/+home/home.component.spec.ts index e8133b5e..143cd59a 100644 --- a/src/client/app/+home/home.component.spec.ts +++ b/src/client/app/+home/home.component.spec.ts @@ -1,6 +1,7 @@ import { By } from '@angular/platform-browser' import { RouterTestingModule } from '@angular/router/testing' -import { Angulartics2, Angulartics2GoogleAnalytics, Angulartics2Module } from 'angulartics2' +import { Angulartics2, Angulartics2Module } from 'angulartics2' +import { Angulartics2GoogleAnalytics } from 'angulartics2/ga' import { HomeComponent } from './home.component' import { async, ComponentFixture, TestBed } from '@angular/core/testing' import { Component } from '@angular/core' diff --git a/src/client/app/app.component.spec.ts b/src/client/app/app.component.spec.ts index e1a16b78..ad49bb71 100644 --- a/src/client/app/app.component.spec.ts +++ b/src/client/app/app.component.spec.ts @@ -12,7 +12,8 @@ import { SharedModule } from './shared/shared.module' import { EnvConfig } from '../../../tools/config/app.config' import { ENV_CONFIG } from './app.config' import { EnvironmentService } from './shared/services/environment.service' -import { Angulartics2GoogleAnalytics, Angulartics2Module } from 'angulartics2' +import { Angulartics2Module } from 'angulartics2' +import { Angulartics2GoogleAnalytics } from 'angulartics2/ga' import { HttpClientTestingModule } from '@angular/common/http/testing' import { NavbarService } from './shared/navbar/navbar.service' import { MatCardModule } from '@angular/material' diff --git a/src/client/app/app.component.ts b/src/client/app/app.component.ts index 8734139b..457567a6 100644 --- a/src/client/app/app.component.ts +++ b/src/client/app/app.component.ts @@ -8,7 +8,7 @@ import { HttpClient } from '@angular/common/http' import { WebSocketService } from './shared/services/web-socket.service' import { DOCUMENT, TransferState } from '@angular/platform-browser' import { SettingService } from './shared/services/setting.service' -import { Angulartics2GoogleAnalytics } from 'angulartics2' +import { Angulartics2GoogleAnalytics } from 'angulartics2/ga' import { MatIconRegistry, MatSidenav, MatSlideToggle } from '@angular/material' import { ActivatedRoute, NavigationEnd, Router } from '@angular/router' import { InjectionService } from './shared/services/injection.service' diff --git a/src/client/app/app.module.ts b/src/client/app/app.module.ts index 1196bef2..a48ec8e3 100644 --- a/src/client/app/app.module.ts +++ b/src/client/app/app.module.ts @@ -9,7 +9,8 @@ import { NotFoundModule } from './not-found/not-found.module' import { BrowserModule, makeStateKey } from '@angular/platform-browser' import { EnvironmentService } from './shared/services/environment.service' import { ServerResponseService } from './shared/services/server-response.service' -import { Angulartics2GoogleAnalytics, Angulartics2Module } from 'angulartics2' +import { Angulartics2Module } from 'angulartics2' +import { Angulartics2GoogleAnalytics } from 'angulartics2/ga' import { HTTP_INTERCEPTORS, HttpClientModule, HttpResponse } from '@angular/common/http' import { GlobalErrorHandler } from './shared/services/error-handler.service' import { SettingService } from './shared/services/setting.service' diff --git a/src/client/app/not-found/not-found.component.ts b/src/client/app/not-found/not-found.component.ts index 8d3b90d6..caf978af 100644 --- a/src/client/app/not-found/not-found.component.ts +++ b/src/client/app/not-found/not-found.component.ts @@ -8,6 +8,7 @@ import { FormControl, FormGroup, Validators } from '@angular/forms' import { ServerResponseService } from './../shared/services/server-response.service' import { ActivatedRoute, Router } from '@angular/router' import { Observable } from 'rxjs/Observable' +import { filter } from 'rxjs/operators' import { SEONode, SEOService } from '../shared/services/seo.service' import { MatChipInputEvent, MatDialog, MatSnackBar } from '@angular/material' import { ModalConfirmationComponent } from '../shared/modal-confirmation/modal-confirmation.component' @@ -128,7 +129,7 @@ export class NotFoundComponent { .map(a => a.tab ? +a.tab : 0) private url$ = Observable.of(this.router.url.split('?')[0]) - .filter(a => !a.includes('.')) + .pipe(filter(a => !a.includes('.'))) .shareReplay() public settingsForm = new FormGroup({ diff --git a/src/client/app/shared/navbar/__snapshots__/navbar.component.spec.ts.snap b/src/client/app/shared/navbar/__snapshots__/navbar.component.spec.ts.snap index 5defc86c..aef13ed9 100644 --- a/src/client/app/shared/navbar/__snapshots__/navbar.component.spec.ts.snap +++ b/src/client/app/shared/navbar/__snapshots__/navbar.component.spec.ts.snap @@ -12,7 +12,7 @@ exports[`NavbarComponent should compile 1`] = ` FB-ANGULAR-UNIVERSAL-STARTER @@ -32,4 +32,4 @@

{{ user.email }}

- \ No newline at end of file + diff --git a/src/client/app/shared/shared.module.ts b/src/client/app/shared/shared.module.ts index 6b3cf942..2154dcbb 100644 --- a/src/client/app/shared/shared.module.ts +++ b/src/client/app/shared/shared.module.ts @@ -12,7 +12,8 @@ import { EnvironmentService } from './services/environment.service' import { COOKIE_HOST_WHITELIST } from './services/http-cookie-interceptor.service' import { ENV_CONFIG } from '../app.config' import { NavbarService } from './navbar/navbar.service' -import { Angulartics2GoogleAnalytics, Angulartics2Module } from 'angulartics2' +import { Angulartics2Module } from 'angulartics2' +import { Angulartics2GoogleAnalytics } from 'angulartics2/ga' import { MaterialModule } from './material.module' import { ClickOutsideDirective } from './directives/click-outside.directive' import { SocialButtonDirective } from './directives/social-button.directive' @@ -74,7 +75,7 @@ export function loggerConfigFactory(ps: PlatformService, gooogleAnalytics: Angul FormsModule, ReactiveFormsModule, MarkdownToHtmlModule, - Angulartics2Module.forChild(), + Angulartics2Module, FlexLayoutModule ], exports: [