Upgraded Angular-CLI

Author: pmould

.editorconfig

@@ -5,10 +5,9 @@ root = true
 charset = utf-8
 indent_style = space
 indent_size = 2
-end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
 [*.md]
-max_line_length = 0
+max_line_length = off
 trim_trailing_whitespace = false

angular-cli.json

@@ -7,17 +7,26 @@
     {
       "root": "src",
       "outDir": "dist",
-      "assets": "assets",
+      "assets": [
+        "assets",
+        "app.js"
+      ],
       "index": "index.html",
       "main": "main.ts",
       "test": "test.ts",
       "tsconfig": "tsconfig.json",
       "prefix": "app",
       "mobile": false,
       "styles": [
+        "../bower_components/bootstrap/dist/css/bootstrap.css",
+        "../bower_components/font-awesome/css/font-awesome.css",
+        "../node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css",
         "styles.css"
       ],
-      "scripts": [],
+      "scripts": [
+        "../bower_components/jquery/dist/jquery.js",
+        "../bower_components/bootstrap/dist/js/bootstrap.js"
+      ],
       "environments": {
         "source": "environments/environment.ts",
         "dev": "environments/environment.ts",

package.json

@@ -18,6 +18,7 @@
     "@angular/core": "2.0.2",
     "@angular/forms": "2.0.2",
     "@angular/http": "2.0.2",
+    "@angular/material": "^2.0.0-alpha.10",
     "@angular/platform-browser": "2.0.2",
     "@angular/platform-browser-dynamic": "2.0.2",
     "@angular/router": "3.0.0",
@@ -28,6 +29,7 @@
     "body-parser": "^1.15.2",
     "jquery": "^3.1.1",
     "moment": "^2.16.0",
+    "ng2-meta": "^2.0.3",
     "nodemailer": "^2.6.4",
     "rxjs": "5.0.0-beta.12",
     "ts-helpers": "^1.1.1",
@@ -37,7 +39,7 @@
     "@types/core-js": "^0.9.34",
     "@types/jasmine": "^2.2.30",
     "@types/jquery": "^2.0.33",
-    "angular-cli": "1.0.0-beta.16",
+    "angular-cli": "^1.0.0-beta.21",
     "codelyzer": "~0.0.26",
     "jasmine-core": "2.4.1",
     "jasmine-spec-reporter": "2.5.0",