Upgrade to Angular 6

Author: jeroenouw

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 jeroenouw
+Copyright (c) 2017 - 2018 jeroenouw
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -8,8 +8,8 @@
 
 ![logo](https://jerouw.nl/wp-content/uploads/2017/05/ngfbmd.png "Logo")  
 
-# Angular 5 | Material Design | Firebase - Starter kit
-A full stack starter app containing [Angular 5](https://angular.io), [Material](https://material.io/) and [Firebase](https://firebase.google.com/).
+# Angular 6 | Material Design | Firebase - Starter kit
+A full stack starter app containing [Angular 6](https://angular.io), [Material](https://material.io/) and [Firebase](https://firebase.google.com/).
 
 ## [Live demo](http://ngxmatfire.jerouw.nl) 
 ![loginpage](https://jerouw.nl/wp-content/uploads/2017/05/ngfbmdprintscreen.png "Logo")  
@@ -27,4 +27,4 @@ A full stack starter app containing [Angular 5](https://angular.io), [Material](
 Want to file a bug, contribute some code, or improve documentation? Feel free to place an [issue](https://github.com/jeroenouw/AngularMaterialFirebase/issues).
 
 ## License
-[![npmlicense](https://img.shields.io/npm/l/ng4matfire.svg)](https://github.com/jeroenouw/AngularMaterialFirebase/blob/master/LICENSE/)
+[![npmlicense](https://img.shields.io/npm/l/ngxmatfire.svg)](https://github.com/jeroenouw/AngularMaterialFirebase/blob/master/LICENSE/)

angular-cli.json

@@ -0,0 +1,128 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "",
+  "projects": {
+    "ngxmatfire": {
+      "root": "",
+      "sourceRoot": ".",
+      "projectType": "application",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "tsConfig": "src/tsconfig.app.json",
+            "polyfills": "src/polyfills.ts",
+            "assets": [
+              "src/assets",
+              "src/favicon.ico"
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "ngxmatfire:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "ngxmatfire:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "ngxmatfire:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "karmaConfig": "./karma.conf.js",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.spec.json",
+            "scripts": [],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "assets": [
+              "src/assets",
+              "src/favicon.ico"
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": []
+          }
+        }
+      }
+    },
+    "ngxmatfire-e2e": {
+      "root": "",
+      "sourceRoot": ".",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "./protractor.conf.js",
+            "devServerTarget": "ngxmatfire:serve"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "e2e/tsconfig.e2e.json"
+            ],
+            "exclude": []
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "ngxmatfire",
+  "schematics": {
+    "@schematics/angular:component": {
+      "prefix": "app",
+      "styleext": "scss"
+    },
+    "@schematics/angular:directive": {
+      "prefix": "app"
+    }
+  }
+}

angular.json

@@ -1,5 +1,5 @@
 ## Features in this project:
-* Angular 5 front-end with Material Design
+* Angular 6 front-end with Material Design
 * Firebase back-end (0Auth authentication and NoSQL database)
 * Home page
 * About page

docs/FEATURES.md

@@ -4,19 +4,19 @@
 module.exports = function (config) {
   config.set({
     basePath: '',
-    frameworks: ['jasmine', '@angular/cli'],
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
       require('karma-coverage-istanbul-reporter'),
-      require('@angular/cli/plugins/karma')
+      require('@angular-devkit/build-angular/plugins/karma')
     ],
     client:{
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     coverageIstanbulReporter: {
-      reports: [ 'html', 'lcovonly' ],
+      dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
       fixWebpackSourcePaths: true
     },
     angularCli: {

karma.conf.js

@@ -2,10 +2,10 @@
   "name": "ngxmatfire",
   "version": "1.0.12",
   "author": "Jeroen Ouwehand",
-  "description": "Full stack starter app with Angular 5, Material Design and Firebase.",
+  "description": "Full stack starter app with Angular 6, Material Design and Firebase.",
   "keywords": [
     "angular",
-    "angular 5",
+    "angular 6",
     "firebase",
     "material",
     "nosql",
@@ -30,44 +30,47 @@
     "i18n": "ng-xi18n"
   },
   "dependencies": {
-    "@angular/animations": "^5.2.9",
-    "@angular/cdk": "^5.2.4",
-    "@angular/common": "^5.2.9",
-    "@angular/compiler": "^5.2.9",
-    "@angular/core": "^5.2.9",
-    "@angular/forms": "^5.2.9",
-    "@angular/http": "^5.2.9",
-    "@angular/material": "^5.2.4",
-    "@angular/platform-browser": "^5.2.9",
-    "@angular/platform-browser-dynamic": "^5.2.9",
-    "@angular/platform-server": "^5.2.9",
-    "@angular/router": "^5.2.9",
+    "@angular/animations": "^6.0.0",
+    "@angular/cdk": "^6.0.1",
+    "@angular/common": "^6.0.0",
+    "@angular/compiler": "^6.0.0",
+    "@angular/core": "^6.0.0",
+    "@angular/forms": "^6.0.0",
+    "@angular/http": "^6.0.0",
+    "@angular/material": "^6.0.1",
+    "@angular/platform-browser": "^6.0.0",
+    "@angular/platform-browser-dynamic": "^6.0.0",
+    "@angular/platform-server": "^6.0.0",
+    "@angular/router": "^6.0.0",
     "core-js": "^2.5.3",
     "firebase": "^4.11.0",
     "hammerjs": "^2.0.8",
-    "rxjs": "^5.5.7",
+    "rxjs": "^6.1.0",
+    "rxjs-compat": "^6.1.0",
     "ts-helpers": "*",
-    "zone.js": "^0.8.20"
+    "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular/cli": "^1.7.3",
-    "@angular/compiler-cli": "^5.2.9",
-    "@angular/language-service": "^5.2.9",
-    "@types/jasmine": "^2.8.6",
-    "@types/node": "^9.4.7",
+    "@angular-devkit/build-angular": "~0.6.0",
+    "@angular/cli": "^6.0.0",
+    "@angular/compiler-cli": "^6.0.0",
+    "@angular/language-service": "^6.0.0",
+    "@types/jasmine": "^2.8.7",
+    "@types/node": "^10.0.3",
     "codelyzer": "^4.2.1",
-    "jasmine-core": "^2.99.1",
+    "jasmine-core": "^3.1.0",
     "jasmine-spec-reporter": "^4.2.1",
-    "karma": "^2.0.0",
+    "karma": "^2.0.2",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
     "karma-coverage-istanbul-reporter": "^1.4.2",
-    "karma-jasmine": "^1.1.1",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "^5.3.0",
-    "ts-node": "^4.1.0",
-    "tslint": "^5.9.1",
-    "typescript": "^2.7.2",
-    "webpack": "^3.11.0"
+    "karma-jasmine": "^1.1.2",
+    "karma-jasmine-html-reporter": "^1.0.0",
+    "protractor": "^5.3.1",
+    "rxjs-tslint": "^0.1.3",
+    "ts-node": "^6.0.2",
+    "tslint": "^5.10.0",
+    "typescript": "2.7.2",
+    "webpack": "^4.6.0"
   }
 }

package.json

@@ -1,7 +1,7 @@
 // Modules 3rd party
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { BrowserAnimationsModule } from '@angular/platform-browser/aniMations';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { MatButtonModule, MatCheckboxModule, MatMenuModule, MatInputModule, MatSnackBarModule,
          MatToolbarModule, MatDialogModule, MatSidenavModule, MatNativeDateModule,
          MatCardModule, MatTabsModule, MatIconModule } from '@angular/Material';
@@ -78,6 +78,9 @@ import { EmailMeComponent } from './components/email-me/email-me.component';
     AuthService,
     WindowService
   ],
+  schemas: [
+    CUSTOM_ELEMENTS_SCHEMA
+  ],
   bootstrap: [AppComponent]
 })
 export class AppModule {

src/app/app.module.ts

@@ -1,5 +1,5 @@
 // Modules 3rd party
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
 import { FormsModule } from '@angular/forms';
@@ -29,7 +29,9 @@ import { PhoneSigninComponent } from './phone-signin/phone-signin.component';
     UsersRouting
   ],
   providers: [
-
+  ],
+  schemas: [
+    CUSTOM_ELEMENTS_SCHEMA
   ],
   exports: [
     SignupComponent,

src/app/components/auth/auth.module.ts

@@ -7,6 +7,6 @@ import { Component } from '@angular/core';
 })
 export class FirstBlockComponent {
   titleOne = 'Starter kit';
-  contentOne = 'Angular 5 | Material Design | Firebase (0Auth authentication and NoSQL database)';
+  contentOne = 'Angular 6 | Material Design | Firebase (0Auth authentication and NoSQL database)';
 
 }