Skip to content

Commit 06e249c

Browse files
authored
Merge pull request #6 from jeroenouw/v6
Angular 6 upgrade in to master branch
2 parents 9a7954a + 0811f21 commit 06e249c

37 files changed

+5047
-6138
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017 jeroenouw
3+
Copyright (c) 2017 - 2018 jeroenouw
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
![logo](https://jerouw.nl/wp-content/uploads/2017/05/ngfbmd.png "Logo")
1010

11-
# Angular 5 | Material Design | Firebase - Starter kit
12-
A full stack starter app containing [Angular 5](https://angular.io), [Material](https://material.io/) and [Firebase](https://firebase.google.com/).
11+
# Angular 6 | Material Design | Firebase - Starter kit
12+
A full stack starter app containing [Angular 6](https://angular.io), [Material](https://material.io/) and [Firebase](https://firebase.google.com/).
1313

1414
## [Live demo](http://ngxmatfire.jerouw.nl)
1515
![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](
2727
Want to file a bug, contribute some code, or improve documentation? Feel free to place an [issue](https://github.com/jeroenouw/AngularMaterialFirebase/issues).
2828

2929
## License
30-
[![npmlicense](https://img.shields.io/npm/l/ng4matfire.svg)](https://github.com/jeroenouw/AngularMaterialFirebase/blob/master/LICENSE/)
30+
[![npmlicense](https://img.shields.io/npm/l/ngxmatfire.svg)](https://github.com/jeroenouw/AngularMaterialFirebase/blob/master/LICENSE/)

angular-cli.json

Lines changed: 0 additions & 57 deletions
This file was deleted.

angular.json

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"ngxmatfire": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"schematics": {},
11+
"architect": {
12+
"build": {
13+
"builder": "@angular-devkit/build-angular:browser",
14+
"options": {
15+
"outputPath": "dist/ngxmatfire",
16+
"index": "src/index.html",
17+
"main": "src/main.ts",
18+
"tsConfig": "src/tsconfig.app.json",
19+
"polyfills": "src/polyfills.ts",
20+
"assets": [
21+
"src/assets",
22+
"src/favicon.ico"
23+
],
24+
"styles": [
25+
"src/styles.scss"
26+
],
27+
"scripts": []
28+
},
29+
"configurations": {
30+
"production": {
31+
"optimization": true,
32+
"outputHashing": "all",
33+
"sourceMap": false,
34+
"extractCss": true,
35+
"namedChunks": false,
36+
"aot": true,
37+
"extractLicenses": true,
38+
"vendorChunk": false,
39+
"buildOptimizer": true,
40+
"fileReplacements": [
41+
{
42+
"replace": "src/environments/environment.ts",
43+
"with": "src/environments/environment.prod.ts"
44+
}
45+
]
46+
}
47+
}
48+
},
49+
"serve": {
50+
"builder": "@angular-devkit/build-angular:dev-server",
51+
"options": {
52+
"browserTarget": "ngxmatfire:build"
53+
},
54+
"configurations": {
55+
"production": {
56+
"browserTarget": "ngxmatfire:build:production"
57+
}
58+
}
59+
},
60+
"extract-i18n": {
61+
"builder": "@angular-devkit/build-angular:extract-i18n",
62+
"options": {
63+
"browserTarget": "ngxmatfire:build"
64+
}
65+
},
66+
"test": {
67+
"builder": "@angular-devkit/build-angular:karma",
68+
"options": {
69+
"main": "src/test.ts",
70+
"karmaConfig": "src/karma.conf.js",
71+
"polyfills": "src/polyfills.ts",
72+
"tsConfig": "src/tsconfig.spec.json",
73+
"scripts": [],
74+
"styles": [
75+
"src/styles.scss"
76+
],
77+
"assets": [
78+
"src/assets",
79+
"src/favicon.ico"
80+
]
81+
}
82+
},
83+
"lint": {
84+
"builder": "@angular-devkit/build-angular:tslint",
85+
"options": {
86+
"tsConfig": [
87+
"src/tsconfig.app.json",
88+
"src/tsconfig.spec.json"
89+
],
90+
"exclude": []
91+
}
92+
}
93+
}
94+
},
95+
"ngxmatfire-e2e": {
96+
"root": "e2e/",
97+
"projectType": "application",
98+
"architect": {
99+
"e2e": {
100+
"builder": "@angular-devkit/build-angular:protractor",
101+
"options": {
102+
"protractorConfig": "e2e/protractor.conf.js",
103+
"devServerTarget": "ngxmatfire:serve"
104+
}
105+
},
106+
"lint": {
107+
"builder": "@angular-devkit/build-angular:tslint",
108+
"options": {
109+
"tsConfig": "e2e/tsconfig.e2e.json",
110+
"exclude": [
111+
"**/node_modules/**"
112+
]
113+
}
114+
}
115+
}
116+
}
117+
},
118+
"defaultProject": "ngxmatfire"
119+
}

docs/FEATURES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Features in this project:
2-
* Angular 5 front-end with Material Design
2+
* Angular 6 front-end with Material Design
33
* Firebase back-end (0Auth authentication and NoSQL database)
44
* Home page
55
* About page

e2e/tsconfig.json

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
{
2-
"compileOnSave": false,
2+
"extends": "../tsconfig.json",
33
"compilerOptions": {
4-
"declaration": false,
5-
"emitDecoratorMetadata": true,
6-
"experimentalDecorators": true,
4+
"outDir": "../out-tsc/app",
75
"module": "commonjs",
8-
"moduleResolution": "node",
9-
"outDir": "../dist/out-tsc-e2e",
10-
"sourceMap": true,
116
"target": "es5",
12-
"typeRoots": [
13-
"../node_modules/@types"
7+
"types": [
8+
"jasmine",
9+
"jasminewd2",
10+
"node"
1411
]
1512
}
1613
}

0 commit comments

Comments
 (0)