From 87fe90f12ce29bd51ccdbc68d5e88508a11642c7 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Wed, 25 Oct 2017 20:14:30 +0100 Subject: [PATCH] Material is in, and working- but the rest of everything has now broken. FML --- client/dev/app.module.ts | 14 ++-- .../components/app-feedback/app-feedback.ts | 4 +- client/dev/components/app-help/app-help.ts | 4 +- .../calendar-chart.component.ts | 4 +- .../calendar-chart/calendar-chart.html | 22 +++--- .../day-breakdown-chart.html | 12 ++-- .../day-breakdown-chart.ts | 4 +- .../grid-chart/grid-chart.component.ts | 4 +- .../dev/components/grid-chart/grid-chart.html | 12 ++-- .../dev/components/loader/loader.component.ts | 4 +- client/dev/components/loader/loader.html | 4 +- .../message-chart/message-chart.html | 22 +++--- .../components/message-chart/message-chart.ts | 4 +- .../dev/components/navbar/navbar.component.ts | 34 ++++----- client/dev/components/navbar/navbar.html | 54 +++++++------- .../overview-chart.component.ts | 4 +- .../overview-chart/overview-chart.html | 36 +++++----- .../splash-screen/splash-screen.html | 2 +- .../components/splash-screen/splash-screen.ts | 4 +- .../time-chart/time-chart.component.ts | 4 +- .../dev/components/time-chart/time-chart.html | 34 ++++----- client/dev/config.js | 17 ++++- client/dev/material.module.ts | 24 +++++++ client/dev/pages/home/home.html | 26 +++---- client/dev/pages/team/team.component.ts | 4 +- client/dev/styles/shared-styles.scss | 2 + client/dev/todo/todo-cmp.ts | 4 +- package-lock.json | 29 ++++++++ package.json | 72 ++++++++++--------- tests/client/todo/components/todo-cmp_test.js | 2 +- 30 files changed, 271 insertions(+), 195 deletions(-) create mode 100644 client/dev/material.module.ts create mode 100644 package-lock.json diff --git a/client/dev/app.module.ts b/client/dev/app.module.ts index eeb263d..e7d60a7 100644 --- a/client/dev/app.module.ts +++ b/client/dev/app.module.ts @@ -14,7 +14,9 @@ import { NavbarComponent } from './components/navbar/navbar.component'; import { TimeChartComponent } from './components/time-chart/time-chart.component'; import { CalendarChartComponent } from './components/calendar-chart/calendar-chart.component'; import {OverviewChartComponent } from './components/overview-chart/overview-chart.component'; -import {MaterialModule} from "@angular/material"; +import { MaterialModule } from './material.module'; +// import {MatNativeDateModule, MATERIAL_COMPATIBILITY_MODE} from '@angular/material'; +// import {MatNativeDateModule, MATERIAL_COMPATIBILITY_MODE} from '@angular/material'; import {SharedModule} from "./shared-helpers.module"; import {LoaderComponent} from "./components/loader/loader.component"; import {TeamComponent} from "./pages/team/team.component"; @@ -40,9 +42,9 @@ const rollbarConfig = { export class RollbarErrorHandler implements ErrorHandler { constructor(private injector: Injector) { } handleError(err:any) : void { - this.injector.get(Rollbar); - let rollbar = this.injector.get(Rollbar); - rollbar.error(err.originalError || err); + // this.injector.get(Rollbar); + // let rollbar = this.injector.get(Rollbar); + // rollbar.error(err.originalError || err); } } @@ -54,6 +56,7 @@ export class RollbarErrorHandler implements ErrorHandler { homeRouting, BrowserAnimationsModule, MaterialModule, + // MatNativeDateModule, SharedModule, Angulartics2Module.forRoot([ Angulartics2GoogleTagManager ]) ], @@ -83,7 +86,8 @@ export class RollbarErrorHandler implements ErrorHandler { useFactory: () => { return new Rollbar(rollbarConfig) } - } + }, + // {provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}, ], bootstrap: [ App diff --git a/client/dev/components/app-feedback/app-feedback.ts b/client/dev/components/app-feedback/app-feedback.ts index 7a23def..c1520fe 100644 --- a/client/dev/components/app-feedback/app-feedback.ts +++ b/client/dev/components/app-feedback/app-feedback.ts @@ -3,8 +3,8 @@ import {Component} from "@angular/core"; @Component({ selector: 'app-feedback', - templateUrl: 'components/app-feedback/app-feedback.html', - styleUrls: ['components/app-feedback/app-feedback.css'] + templateUrl: 'app-feedback.html', + styleUrls: ['app-feedback.css'] }) export class AppFeedbackComponent { constructor() { diff --git a/client/dev/components/app-help/app-help.ts b/client/dev/components/app-help/app-help.ts index 6b0f172..9609eff 100644 --- a/client/dev/components/app-help/app-help.ts +++ b/client/dev/components/app-help/app-help.ts @@ -3,7 +3,7 @@ import {Component} from "@angular/core"; @Component({ selector: 'app-help', - templateUrl: 'components/app-help/app-help.html', - styleUrls: ['components/app-help/app-help.css'] + templateUrl: 'app-help.html', + styleUrls: ['app-help.css'] }) export class AppHelpComponent {} diff --git a/client/dev/components/calendar-chart/calendar-chart.component.ts b/client/dev/components/calendar-chart/calendar-chart.component.ts index 200bca2..65f2b34 100644 --- a/client/dev/components/calendar-chart/calendar-chart.component.ts +++ b/client/dev/components/calendar-chart/calendar-chart.component.ts @@ -2,8 +2,8 @@ import { Component } from "@angular/core"; @Component({ selector: "calendar-chart", - templateUrl: "components/calendar-chart/calendar-chart.html", - styleUrls: ["components/calendar-chart/calendar-chart.css"] + templateUrl: "calendar-chart.html", + styleUrls: ["calendar-chart.css"] }) export class CalendarChartComponent { } diff --git a/client/dev/components/calendar-chart/calendar-chart.html b/client/dev/components/calendar-chart/calendar-chart.html index 52928f1..663ccb8 100644 --- a/client/dev/components/calendar-chart/calendar-chart.html +++ b/client/dev/components/calendar-chart/calendar-chart.html @@ -1,18 +1,18 @@ - +
- - - + + +
- -

Calendar View

 - Team Happiness by Date - - + +

Calendar View

 + Team Happiness by Date + + - + - + diff --git a/client/dev/components/day-breakdown-chart/day-breakdown-chart.html b/client/dev/components/day-breakdown-chart/day-breakdown-chart.html index ab70d37..ad5d08d 100644 --- a/client/dev/components/day-breakdown-chart/day-breakdown-chart.html +++ b/client/dev/components/day-breakdown-chart/day-breakdown-chart.html @@ -1,12 +1,12 @@ - - -

Day Details

 - Breakdown of team results for {{formatedDate}} - + + +

Day Details

 + Breakdown of team results for {{formatedDate}} +

{{noDataMessage}}

Select a different date to view, by clicking a day on the chart to the left

- + diff --git a/client/dev/components/day-breakdown-chart/day-breakdown-chart.ts b/client/dev/components/day-breakdown-chart/day-breakdown-chart.ts index ea0002c..b514161 100644 --- a/client/dev/components/day-breakdown-chart/day-breakdown-chart.ts +++ b/client/dev/components/day-breakdown-chart/day-breakdown-chart.ts @@ -8,8 +8,8 @@ declare const d3, tippy, moment; @Component({ selector: 'day-breakdown-chart', - templateUrl: 'components/day-breakdown-chart/day-breakdown-chart.html', - styleUrls: ['components/day-breakdown-chart/day-breakdown-chart.css'] + templateUrl: 'day-breakdown-chart.html', + styleUrls: ['day-breakdown-chart.css'] }) export class DayBreakdownChartComponent implements OnInit, OnDestroy { diff --git a/client/dev/components/grid-chart/grid-chart.component.ts b/client/dev/components/grid-chart/grid-chart.component.ts index 90e9f53..5e18260 100644 --- a/client/dev/components/grid-chart/grid-chart.component.ts +++ b/client/dev/components/grid-chart/grid-chart.component.ts @@ -7,8 +7,8 @@ declare const d3, tippy; @Component({ selector: 'grid-chart', - templateUrl: 'components/grid-chart/grid-chart.html', - styleUrls: ['components/grid-chart/grid-chart.css'] + templateUrl: 'grid-chart.html', + styleUrls: ['grid-chart.css'] }) export class GridChartComponent { diff --git a/client/dev/components/grid-chart/grid-chart.html b/client/dev/components/grid-chart/grid-chart.html index 491a298..b5073f7 100644 --- a/client/dev/components/grid-chart/grid-chart.html +++ b/client/dev/components/grid-chart/grid-chart.html @@ -1,12 +1,12 @@ - - -

Average Sentiment Calendar

 - Click a day for more stats - + + +

Average Sentiment Calendar

 + Click a day for more stats +

Not enough data to display results

The calendar grid chart will appear here when there is more data in the system

- + diff --git a/client/dev/components/loader/loader.component.ts b/client/dev/components/loader/loader.component.ts index 2f67c55..dc2fe06 100644 --- a/client/dev/components/loader/loader.component.ts +++ b/client/dev/components/loader/loader.component.ts @@ -1,10 +1,10 @@ import {Component, Input} from "@angular/core"; -import {MdProgressSpinnerModule} from '@angular/material'; +import {MatProgressSpinnerModule} from '@angular/material'; @Component({ selector: "loader", - templateUrl: "components/loader/loader.html" + templateUrl: "loader.html" }) export class LoaderComponent { diff --git a/client/dev/components/loader/loader.html b/client/dev/components/loader/loader.html index 8b13029..7aa91e0 100644 --- a/client/dev/components/loader/loader.html +++ b/client/dev/components/loader/loader.html @@ -1,5 +1,5 @@ - - + diff --git a/client/dev/components/message-chart/message-chart.html b/client/dev/components/message-chart/message-chart.html index 24a9ef8..7dae5b1 100644 --- a/client/dev/components/message-chart/message-chart.html +++ b/client/dev/components/message-chart/message-chart.html @@ -1,9 +1,9 @@ - - -

Comments

 - Recent anatomised team cements - - + + +

Comments

 + Recent anatomised team cements + +
@@ -17,9 +17,9 @@ {{comment.date}}
- - - - + + + + - + diff --git a/client/dev/components/message-chart/message-chart.ts b/client/dev/components/message-chart/message-chart.ts index 5e694b8..903c6ab 100644 --- a/client/dev/components/message-chart/message-chart.ts +++ b/client/dev/components/message-chart/message-chart.ts @@ -7,8 +7,8 @@ declare const moment, tippy; @Component({ selector: "message-chart", - templateUrl: "components/message-chart/message-chart.html", - styleUrls: ["components/message-chart/message-chart.css"] + templateUrl: "message-chart.html", + styleUrls: ["message-chart.css"] }) export class MessageChartComponent implements OnInit, OnDestroy { diff --git a/client/dev/components/navbar/navbar.component.ts b/client/dev/components/navbar/navbar.component.ts index 6d47d34..4835153 100644 --- a/client/dev/components/navbar/navbar.component.ts +++ b/client/dev/components/navbar/navbar.component.ts @@ -3,15 +3,15 @@ import {Http} from "@angular/http"; import {Router, ActivatedRoute} from "@angular/router"; import {TeamService} from "../../services/team.service"; import {AllTeamsService} from "../../services/all-teams.service"; -import {MdDialog, MdSnackBar} from "@angular/material"; +import {MatDialog, MatSnackBar} from "@angular/material"; import {AppFeedbackComponent} from "../app-feedback/app-feedback"; import {AppHelpComponent} from "../app-help/app-help"; import { Angulartics2 } from 'angulartics2'; @Component({ selector: "navbar", - templateUrl: "components/navbar/navbar.html", - styleUrls: ["components/navbar/navbar.css"], + templateUrl: "navbar.html", + styleUrls: ["navbar.css"], providers: [AppFeedbackComponent] }) @@ -25,11 +25,11 @@ export class NavbarComponent { constructor( private http: Http, private route: ActivatedRoute, - private dialog: MdDialog, + // private dialog: MatDialog, router: Router, private teamService: TeamService, private allTeamsService: AllTeamsService, - public snackBar: MdSnackBar, + // public snackBar: MatSnackBar, private angulartics2: Angulartics2 ) { this.router = router; @@ -54,15 +54,15 @@ export class NavbarComponent { this.angulartics2.eventTrack.next({ action: action, properties: properties}); } - openFeedbackDialog(){ - this.dialog.open(AppFeedbackComponent); - this.trackNavigationAnalyticEvents('FeedbackDialogOpened'); - } + // openFeedbackDialog(){ + // this.dialog.open(AppFeedbackComponent); + // this.trackNavigationAnalyticEvents('FeedbackDialogOpened'); + // } - openHelpDialog(){ - this.dialog.open(AppHelpComponent); - this.trackNavigationAnalyticEvents('HelpDialogOpened'); - } + // openHelpDialog(){ + // this.dialog.open(AppHelpComponent); + // this.trackNavigationAnalyticEvents('HelpDialogOpened'); + // } navigateToTeam(teamName) { this.router.navigate([`./${teamName}`]); @@ -76,10 +76,10 @@ export class NavbarComponent { this.trackNavigationAnalyticEvents('NavigatedBackToHome'); } - showFeatureUnavailableToast() { - this.snackBar.open('Feature still under development, or not available on demo', 'Got it'); - this.trackNavigationAnalyticEvents('TriedToAccessAlphaComponent'); - } + // showFeatureUnavailableToast() { + // this.snackBar.open('Feature still under development, or not available on demo', 'Got it'); + // this.trackNavigationAnalyticEvents('TriedToAccessAlphaComponent'); + // } } diff --git a/client/dev/components/navbar/navbar.html b/client/dev/components/navbar/navbar.html index d901a5a..13d5180 100644 --- a/client/dev/components/navbar/navbar.html +++ b/client/dev/components/navbar/navbar.html @@ -8,8 +8,8 @@
-
- + - - - Today - Last week - Last month - - + + + Today + Last week + Last month + + - + diff --git a/client/dev/components/splash-screen/splash-screen.html b/client/dev/components/splash-screen/splash-screen.html index 2ba4695..0b835a3 100644 --- a/client/dev/components/splash-screen/splash-screen.html +++ b/client/dev/components/splash-screen/splash-screen.html @@ -11,7 +11,7 @@

An Error may have Occurred Rendering the App

This has been logged, and will be looked into

- +
diff --git a/client/dev/components/splash-screen/splash-screen.ts b/client/dev/components/splash-screen/splash-screen.ts index 59ee41b..7d0c4ff 100644 --- a/client/dev/components/splash-screen/splash-screen.ts +++ b/client/dev/components/splash-screen/splash-screen.ts @@ -3,8 +3,8 @@ import { trigger, style, transition, animate } from '@angular/animations'; @Component({ selector: "splash-screen", - templateUrl: "components/splash-screen/splash-screen.html", - styleUrls: ["components/splash-screen/splash-screen.css"], + templateUrl: "splash-screen.html", + styleUrls: ["splash-screen.css"], animations: [ trigger('fadeInOut', [ transition(':enter', [ // :enter is alias to 'void => *' diff --git a/client/dev/components/time-chart/time-chart.component.ts b/client/dev/components/time-chart/time-chart.component.ts index 67e57ff..024abd2 100644 --- a/client/dev/components/time-chart/time-chart.component.ts +++ b/client/dev/components/time-chart/time-chart.component.ts @@ -7,8 +7,8 @@ declare const d3, moment, tippy; @Component({ selector: "time-chart", - templateUrl: "components/time-chart/time-chart.html", - styleUrls: ["components/time-chart/time-chart.css"] + templateUrl: "time-chart.html", + styleUrls: ["time-chart.css"] }) export class TimeChartComponent implements OnInit, OnDestroy { diff --git a/client/dev/components/time-chart/time-chart.html b/client/dev/components/time-chart/time-chart.html index cdaf0eb..6dcf829 100644 --- a/client/dev/components/time-chart/time-chart.html +++ b/client/dev/components/time-chart/time-chart.html @@ -1,14 +1,14 @@ - +
- - - + + +
- -

Time Chart

 - Team Happiness over Time - - + +

Time Chart

 + Team Happiness over Time + +
@@ -16,12 +16,12 @@

The line chart will appear here when there is more data in the system

- - - - Breakdown - Aggregate - - + + + + Breakdown + Aggregate + + - + diff --git a/client/dev/config.js b/client/dev/config.js index c98e9ab..6cba24e 100644 --- a/client/dev/config.js +++ b/client/dev/config.js @@ -10,6 +10,7 @@ System.config({ app: 'app', // angular bundles + '@angular/core': 'npm:@angular/core/bundles/core.umd.js', '@angular/common': 'npm:@angular/common/bundles/common.umd.js', '@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js', @@ -18,11 +19,25 @@ System.config({ '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', - '@angular/material': 'npm:@angular/material/bundles/material.umd.js', '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.js', '@angular/animations/browser': 'npm:@angular/animations/bundles/animations-browser.umd.js', '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js', + '@angular/cdk': 'npm:@angular/cdk/bundles/cdk.umd.js', + '@angular/cdk/a11y': 'npm:@angular/cdk/bundles/cdk-a11y.umd.js', + '@angular/cdk/bidi': 'npm:@angular/cdk/bundles/cdk-bidi.umd.js', + '@angular/cdk/coercion': 'npm:@angular/cdk/bundles/cdk-coercion.umd.js', + '@angular/cdk/keycodes': 'npm:@angular/cdk/bundles/cdk-keycodes.umd.js', + '@angular/cdk/observe-content': 'npm:@angular/cdk/bundles/cdk-observe-content.umd.js', + '@angular/cdk/platform': 'npm:@angular/cdk/bundles/cdk-platform.umd.js', + '@angular/cdk/portal': 'npm:@angular/cdk/bundles/cdk-portal.umd.js', + '@angular/cdk/rxjs': 'npm:@angular/cdk/bundles/cdk-rxjs.umd.js', + '@angular/cdk/table': 'npm:@angular/cdk/bundles/cdk-table.umd.js', + '@angular/cdk/testing': 'npm:@angular/cdk/bundles/cdk-testing.umd.js', + + '@angular/material': 'npm:@angular/material', + '@angular/material/button': 'npm:@angular/material/bundles/material-button.umd.js', + // Client side analytics and error tracking 'angulartics2': 'npm:angulartics2/dist/core.umd.js', 'rollbar': 'npm:rollbar/dist/rollbar.noconflict.umd.js', diff --git a/client/dev/material.module.ts b/client/dev/material.module.ts new file mode 100644 index 0000000..db818ba --- /dev/null +++ b/client/dev/material.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; + +import { + MatButtonModule, +} from '@angular/material/button'; + +@NgModule({ + imports: [ + // MatButton, + // MatMenuModule, + // MatToolbarModule, + // MatIconModule, + // MatCardModule + ], + exports: [ + MatButtonModule + // MatButton, + // MatMenuModule, + // MatToolbarModule, + // MatIconModule, + // MatCardModule + ] +}) +export class MaterialModule {} diff --git a/client/dev/pages/home/home.html b/client/dev/pages/home/home.html index 802d0b5..76181dd 100644 --- a/client/dev/pages/home/home.html +++ b/client/dev/pages/home/home.html @@ -10,29 +10,29 @@
- - -

Teams

 - Average mood of each team - + + +

Teams

 + Average mood of each team + - +
- + {{team.average}}% -

{{team.teamName}}

- 80% Response Rate - - +

{{team.teamName}}

+ 80% Response Rate + +
- +

No Teams Found

No teams have been configured yet, or there was an error fetching them

- +
diff --git a/client/dev/pages/team/team.component.ts b/client/dev/pages/team/team.component.ts index c57b6fc..c085afb 100644 --- a/client/dev/pages/team/team.component.ts +++ b/client/dev/pages/team/team.component.ts @@ -2,8 +2,8 @@ import {Component } from "@angular/core"; @Component({ selector: "team-page", - templateUrl: "pages/team/team.html", - styleUrls: ["pages/team/team.css"] + templateUrl: "team.html", + styleUrls: ["team.css"] }) export class TeamComponent { diff --git a/client/dev/styles/shared-styles.scss b/client/dev/styles/shared-styles.scss index 39c1898..10ef364 100644 --- a/client/dev/styles/shared-styles.scss +++ b/client/dev/styles/shared-styles.scss @@ -3,6 +3,8 @@ This file contains reusable styles for common elements that are performed throughout the application. */ +@import "~@angular/material/prebuilt-themes/indigo-pink.css"; + @import "constants.scss"; // All hardcoded reused values, must be defined as a constant /* Common properties */ diff --git a/client/dev/todo/todo-cmp.ts b/client/dev/todo/todo-cmp.ts index 7899a7d..0e6a6c4 100644 --- a/client/dev/todo/todo-cmp.ts +++ b/client/dev/todo/todo-cmp.ts @@ -20,8 +20,8 @@ type Todo = { @Component({ selector: "todo-cmp", - templateUrl: "todo/todo.html", - styleUrls: ["todo/todo.css"] + templateUrl: "todo.html", + styleUrls: ["todo.css"] }) export class TodoCmp implements OnInit { title: string = "ng2do"; diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..575a7ab --- /dev/null +++ b/package-lock.json @@ -0,0 +1,29 @@ +{ + "name": "happy-team", + "version": "0.0.1", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@angular/cdk": { + "version": "2.0.0-beta.12", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-2.0.0-beta.12.tgz", + "integrity": "sha1-OiQ8tiuT9OA5EgunD5ANyeI1Yi4=", + "requires": { + "tslib": "1.8.0" + } + }, + "@angular/material": { + "version": "2.0.0-beta.12", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-2.0.0-beta.12.tgz", + "integrity": "sha1-cbbQt7AhiR5dDjaIwdS9eMdFf1g=", + "requires": { + "tslib": "1.8.0" + } + }, + "tslib": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz", + "integrity": "sha512-ymKWWZJST0/CkgduC2qkzjMOWr4bouhuURNXCn/inEX0L57BnRG6FhX76o7FOnsjHazCjfU2LKeSrlS2sIKQJg==" + } + } +} diff --git a/package.json b/package.json index f1a9ba1..8fb4453 100644 --- a/package.json +++ b/package.json @@ -16,50 +16,52 @@ "ngc": "node_modules/.bin/ngc -p tsconfig-aot.json" }, "dependencies": { - "@angular/animations": "^4.1.1", - "@angular/common": "^4.1.1", - "@angular/compiler": "^4.1.1", - "@angular/compiler-cli": "^4.4.5", - "@angular/core": "^4.1.1", - "@angular/forms": "^4.1.1", - "@angular/http": "^4.1.1", - "@angular/material": "^2.0.0-beta.3", - "@angular/platform-browser": "^4.1.1", - "@angular/platform-browser-dynamic": "^4.1.1", - "@angular/platform-server": "^4.4.5", - "@angular/router": "^4.0.0", - "angulartics2": "^2.4.0", - "babel-preset-es2015": "^6.1.18", - "babel-preset-es2016": "^6.0.11", - "babel-preset-stage-0": "^6.1.18", + "@angular/animations": "^4.4.3", + "@angular/cdk": "^2.0.0-beta.12", + "@angular/common": "^4.4.3", + "@angular/compiler": "^4.4.3", + "@angular/core": "^4.4.3", + "@angular/forms": "^4.4.3", + "@angular/http": "^4.4.3", + "@angular/material": "^2.0.0-beta.12", + "@angular/platform-browser": "^4.4.3", + "@angular/platform-browser-dynamic": "^4.4.3", + "@angular/platform-server": "^4.4.6", + "@angular/router": "^4.4.3", + "@angular/service-worker": "^1.0.0-beta.16", + "angulartics2": "^2.5.0", + "babel-preset-es2015": "^6.24.1", + "babel-preset-es2016": "^6.24.1", + "babel-preset-stage-0": "^6.24.1", "babel-regenerator-runtime": "^6.5.0", - "babel-register": "^6.7.2", - "bluebird": "^3.3.4", - "body-parser": "^1.5.0", - "compression": "^1.6.2", + "babel-register": "^6.26.0", + "bluebird": "^3.5.1", + "body-parser": "^1.18.2", + "compression": "^1.7.1", "dotenv": "^4.0.0", - "express": "~4.14.0", - "express-content-length-validator": "1.0.0", + "express": "^4.14.1", + "express-content-length-validator": "^1.0.0", "hammerjs": "^2.0.8", - "helmet": "^2.1.1", - "lodash": "^4.6.1", - "mongoose": "^4.4.7", - "morgan": "^1.5.2", - "newrelic": "^1.18.2", - "nodemon": "^1.9.2", - "reflect-metadata": "^0.1.3", - "rollbar": "^2.2.9", - "rxjs": "^5.0.0-beta.12", - "systemjs": "^0.19.24", - "typescript": "2.3", + "helmet": "^2.3.0", + "lodash": "^4.17.4", + "mongoose": "^4.12.4", + "morgan": "^1.9.0", + "newrelic": "^1.40.0", + "nodemon": "^1.12.1", + "reflect-metadata": "^0.1.10", + "rollbar": "^2.2.10", + "rxjs": "^5.5.0", + "systemjs": "^0.19.47", + "typescript": "^2.3.4", "zone.js": "^0.7.8" }, "devDependencies": { + "@angular/compiler-cli": "^4.4.3", "aliv": "^1.6.0", "babili": "0.0.6", "browser-sync": "^2.5.2", "chai": "^3.5.0", - "concurrently": "^2.0.0", + "concurrently": "^2.2.0", "coveralls": "^2.11.2", "del": "^2.2.1", "gulp": "^3.9.0", @@ -76,7 +78,7 @@ "gulp-uglify": "^1.1.0", "gulp-util": "^3.0.3", "istanbul": "^0.4.4", - "jasmine-core": "^2.2.0", + "jasmine-core": "^2.8.0", "karma": "^1.3.0", "karma-chrome-launcher": "^2.0.0", "karma-coverage": "^1.1.1", diff --git a/tests/client/todo/components/todo-cmp_test.js b/tests/client/todo/components/todo-cmp_test.js index deeab5a..df3c047 100644 --- a/tests/client/todo/components/todo-cmp_test.js +++ b/tests/client/todo/components/todo-cmp_test.js @@ -15,7 +15,7 @@ var testing_1 = require("@angular/core/testing"); var Observable_1 = require("rxjs/Observable"); var todo_cmp_1 = require("../../../../client/dev/todo/todo-cmp"); var todo_service_1 = require("../../../../client/dev/todo/todo-service"); -var MockTodoService = (function (_super) { +var MockTodoService = /** @class */ (function (_super) { __extends(MockTodoService, _super); function MockTodoService() { return _super !== null && _super.apply(this, arguments) || this;