From 7cd426c2b17b8834a4763e6dcbf60a85c1fa0f0d Mon Sep 17 00:00:00 2001 From: Stefan Aerts Date: Thu, 15 Sep 2016 12:32:49 +0200 Subject: [PATCH 1/7] changed typescript devdep version to include ^ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1e89ac1..a4891d9 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "protractor": "3.3.0", "ts-node": "0.5.5", "tslint": "3.11.0", - "typescript": "1.8.10", + "typescript": "^1.8.10", "typings": "1.3.1" } } From 26c9bb18766e88ab38a5683a0d650324da0bce8f Mon Sep 17 00:00:00 2001 From: Stefan Aerts Date: Thu, 15 Sep 2016 14:02:37 +0200 Subject: [PATCH 2/7] added typings as a npm package and removed older typings from typings.json. removed material exports (MD_TOOLBAR_DIRECTIVES) for example --- package.json | 19 +++++++++++-------- src/app/material.providers.ts | 16 ++++++++-------- typings.json | 4 +--- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index a4891d9..7c6721b 100644 --- a/package.json +++ b/package.json @@ -21,19 +21,22 @@ "@angular/platform-browser": "2.0.0-rc.5", "@angular/platform-browser-dynamic": "2.0.0-rc.5", "@angular/router": "3.0.0-rc.1", - "@angular2-material/button": "^2.0.0-alpha.7-3", - "@angular2-material/card": "^2.0.0-alpha.7-3", - "@angular2-material/core": "^2.0.0-alpha.7-3", - "@angular2-material/toolbar": "^2.0.0-alpha.7-3", - "angularfire2": "^2.0.0-beta.3-pre2", + "@angular2-material/button": "2.0.0-alpha.7-12", + "@angular2-material/card": "2.0.0-alpha.7-12", + "@angular2-material/core": "2.0.0-alpha.7-12", + "@angular2-material/toolbar": "2.0.0-alpha.7-12", + "angularfire2": "2.0.0-beta.3-pre2", "es6-shim": "0.35.1", "firebase": "3.3.0", "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "systemjs": "0.19.26", - "zone.js": "0.6.12" + "zone.js": "0.6.17", + "typescript": "2.0.2" }, "devDependencies": { + "@types/jasmine": "^2.2.30", + "@types/protractor": "^1.5.16", "angular-cli": "1.0.0-beta.10", "codelyzer": "0.0.20", "ember-cli-inject-live-reload": "1.4.0", @@ -45,7 +48,7 @@ "protractor": "3.3.0", "ts-node": "0.5.5", "tslint": "3.11.0", - "typescript": "^1.8.10", - "typings": "1.3.1" + "typescript": "2.0.2", + "typings": "^1.3.1" } } diff --git a/src/app/material.providers.ts b/src/app/material.providers.ts index 1d7fe5d..3ebf32f 100644 --- a/src/app/material.providers.ts +++ b/src/app/material.providers.ts @@ -1,9 +1,9 @@ -import { MD_TOOLBAR_DIRECTIVES } from '@angular2-material/toolbar'; -import { MD_CARD_DIRECTIVES } from '@angular2-material/card'; -import { MD_BUTTON_DIRECTIVES } from '@angular2-material/button'; +// import { MD_TOOLBAR_DIRECTIVES } from '@angular2-material/toolbar'; +// import { MD_CARD_DIRECTIVES } from '@angular2-material/card'; +// import { MD_BUTTON_DIRECTIVES } from '@angular2-material/button'; -export const MD_PROVIDERS = [ - ...MD_TOOLBAR_DIRECTIVES, - ...MD_CARD_DIRECTIVES, - ...MD_BUTTON_DIRECTIVES -]; +// export const MD_PROVIDERS = [ +// ...MD_TOOLBAR_DIRECTIVES, +// ...MD_CARD_DIRECTIVES, +// ...MD_BUTTON_DIRECTIVES +// ]; diff --git a/typings.json b/typings.json index 55ca136..4ef8a72 100644 --- a/typings.json +++ b/typings.json @@ -1,8 +1,6 @@ { "globalDevDependencies": { - "angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459", - "jasmine": "registry:dt/jasmine#2.2.0+20160621224255", - "selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654" + "jasmine": "registry:dt/jasmine#2.2.0+20160621224255" }, "globalDependencies": { "es6-shim": "registry:dt/es6-shim#0.31.2+20160602141504" From 3624343c5fc9448dae04871056eb015118155fce Mon Sep 17 00:00:00 2001 From: Stefan Aerts Date: Thu, 15 Sep 2016 14:20:40 +0200 Subject: [PATCH 3/7] removed typings.json --- package.json | 1 - typings.json | 8 -------- typingsold.json | 8 ++++++++ 3 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 typings.json create mode 100644 typingsold.json diff --git a/package.json b/package.json index 7c6721b..45a5958 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,6 @@ "angular-cli": {}, "scripts": { "start": "ng serve", - "postinstall": "typings install", "lint": "tslint \"src/**/*.ts\"", "test": "ng test", "pree2e": "webdriver-manager update", diff --git a/typings.json b/typings.json deleted file mode 100644 index 4ef8a72..0000000 --- a/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "globalDevDependencies": { - "jasmine": "registry:dt/jasmine#2.2.0+20160621224255" - }, - "globalDependencies": { - "es6-shim": "registry:dt/es6-shim#0.31.2+20160602141504" - } -} diff --git a/typingsold.json b/typingsold.json new file mode 100644 index 0000000..8dd61ff --- /dev/null +++ b/typingsold.json @@ -0,0 +1,8 @@ +{ + // "globalDevDependencies": { + // "jasmine": "registry:dt/jasmine#2.2.0+20160621224255" + // }, + // "globalDependencies": { + // "es6-shim": "registry:dt/es6-shim#0.31.2+20160602141504" + // } +} From 95b4a871a034112ea092f49473bc5e576c65d6f3 Mon Sep 17 00:00:00 2001 From: Stefan Aerts Date: Thu, 15 Sep 2016 14:30:10 +0200 Subject: [PATCH 4/7] ichanged package.json removed typescript from dependencies --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 45a5958..462b897 100644 --- a/package.json +++ b/package.json @@ -30,8 +30,7 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "systemjs": "0.19.26", - "zone.js": "0.6.17", - "typescript": "2.0.2" + "zone.js": "0.6.17" }, "devDependencies": { "@types/jasmine": "^2.2.30", From dd0ce34ef04affe4470a8f4b639f1792a49d310c Mon Sep 17 00:00:00 2001 From: Stefan Aerts Date: Thu, 15 Sep 2016 14:39:12 +0200 Subject: [PATCH 5/7] test git --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 462b897..4372d73 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular2-firebase-auth", - "version": "0.0.0", + "version": "0.0.1", "license": "MIT", "angular-cli": {}, "scripts": { From 071c3216aa9b0c14817d64f7f81a4223091f18e3 Mon Sep 17 00:00:00 2001 From: Stefan Aerts Date: Thu, 15 Sep 2016 14:43:43 +0200 Subject: [PATCH 6/7] test git --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4372d73..462b897 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular2-firebase-auth", - "version": "0.0.1", + "version": "0.0.0", "license": "MIT", "angular-cli": {}, "scripts": { From 9440c266deeed38cd6267dc970ce002ac4389d6e Mon Sep 17 00:00:00 2001 From: Stefan Aerts Date: Fri, 16 Sep 2016 22:29:00 +0200 Subject: [PATCH 7/7] first commit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c210d86..603f673 100644 --- a/README.md +++ b/README.md @@ -41,3 +41,4 @@ Run `ng github-pages:deploy` to deploy to Github Pages. ## Further help To get more help on the `angular-cli` use `ng --help` or go check out the [Angular-CLI README](https://github.com/angular/angular-cli/blob/master/README.md). +# flatmap