fergalmoran/podnoms
1
0
Fork 0
mirror of https://github.com/fergalmoran/podnoms.git synced 2025-12-22 09:18:08 +00:00
Code Issues 4 Packages Projects Releases Wiki Activity

Upgrade to Angular 6 (rxjs is in compat for now)

Browse Source
This commit is contained in:
Fergal Moran
2018-05-05 01:52:06 +01:00
parent 5543f0aea4
commit fa31fc06cc
4 changed files with 203 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
client/.angular-cli.json
View File

@@ -1,66 +0,0 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "pod-noms.web"
},
"apps": [
{
"root": "src",
"outDir": "dist",
"assets": [
"assets",
"favicon.ico",
"firebase-messaging-sw.js",
"facebook-auth.html",
"manifest.json"
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"styles.css"
],
"scripts": [
"../node_modules/jquery/dist/jquery.js",
"../node_modules/tether/dist/js/tether.js",
"../node_modules/popper.js/dist/umd/popper.min.js",
"../node_modules/bootstrap/dist/js/bootstrap.js",
"../node_modules/howler/dist/howler.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json"
},
{
"project": "src/tsconfig.spec.json"
},
{
"project": "e2e/tsconfig.e2e.json"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "css",
"component": {}
}
}

128
client/angular.json Normal file
View File

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

148
client/package.json
View File

@@ -1,75 +1,77 @@
{ {
"name": "pod-noms.web", "name": "pod-noms.web",
"version": "0.22.0", "version": "0.22.0",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve --aot", "start": "ng serve --aot",
"build": "ng build", "build": "ng build",
"test": "ng test", "test": "ng test",
"lint": "ng lint" "lint": "ng lint"
}, },
"ngrxGen": { "ngrxGen": {
"basePath": "./src/app", "basePath": "./src/app",
"seperateDirectory": true "seperateDirectory": true
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^5.2.10", "@angular/animations": "6.0.0",
"@angular/common": "^5.2.10", "@angular/common": "6.0.0",
"@angular/compiler": "^5.2.10", "@angular/compiler": "6.0.0",
"@angular/core": "^5.2.10", "@angular/core": "6.0.0",
"@angular/forms": "^5.2.10", "@angular/forms": "6.0.0",
"@angular/http": "^5.2.10", "@angular/http": "6.0.0",
"@angular/platform-browser": "^5.2.10", "@angular/platform-browser": "6.0.0",
"@angular/platform-browser-dynamic": "^5.2.10", "@angular/platform-browser-dynamic": "6.0.0",
"@angular/router": "^5.2.10", "@angular/router": "6.0.0",
"@aspnet/signalr": "1.0.0-rc1-30631", "@angular-devkit/build-angular": "~0.6.0",
"@ngrx/effects": "^5.1.0", "@aspnet/signalr": "1.0.0-rc1-30631",
"@ngrx/store": "^5.1.0", "@ngrx/effects": "6.0.0-beta.1",
"@ngrx/store-devtools": "^5.1.0", "@ngrx/store": "6.0.0-beta.1",
"@qontu/ngx-inline-editor": "^0.2.0-alpha.12", "@ngrx/store-devtools": "6.0.0-beta.1",
"angular2-jwt": "^0.2.3", "@qontu/ngx-inline-editor": "^0.2.0-alpha.12",
"angular2-moment": "^1.8.0", "angular2-jwt": "^0.2.3",
"angularfire2": "^5.0.0-rc.6", "angular2-moment": "^1.8.0",
"angularx-social-login": "^1.1.8", "angularfire2": "^5.0.0-rc.6",
"applicationinsights-js": "^1.0.15", "angularx-social-login": "^1.1.8",
"bootstrap": "4.1.0", "applicationinsights-js": "^1.0.15",
"core-js": "^2.5.3", "bootstrap": "4.1.0",
"dropzone": "^5.3.0", "core-js": "^2.5.3",
"firebase": "4.12.1", "dropzone": "^5.3.0",
"howler": "^2.0.9", "firebase": "4.12.1",
"jquery": "^3.3.1", "howler": "^2.0.9",
"lodash": "^4.17.5", "jquery": "^3.3.1",
"ng2-toasty": "^4.0.3", "lodash": "^4.17.5",
"ngx-bootstrap": "^2.0.4", "ng2-toasty": "^4.0.3",
"ngx-clipboard": "^10.0.0", "ngx-bootstrap": "^2.0.4",
"ngx-moment": "^2.0.0-rc.0", "ngx-clipboard": "^10.0.0",
"popper.js": "^1.13.0", "ngx-moment": "^2.0.0-rc.0",
"rxjs": "5.5.6", "popper.js": "^1.13.0",
"tether": "^1.4.3", "rxjs": "^6.1.0",
"uglify-es": "^3.3.10", "rxjs-compat": "^6.1.0",
"zone.js": "^0.8.20" "tether": "^1.4.3",
}, "uglify-es": "^3.3.10",
"devDependencies": { "zone.js": "^0.8.26"
"@angular/cli": "1.7.4", },
"@angular/compiler-cli": "^5.2.6", "devDependencies": {
"@angular/language-service": "^5.2.6", "@angular/cli": "6.0.0",
"@types/applicationinsights-js": "^1.0.5", "@angular/compiler-cli": "6.0.0",
"@types/jasmine": "^2.8.6", "@angular/language-service": "6.0.0",
"@types/node": "~9.4.6", "@types/applicationinsights-js": "^1.0.5",
"codelyzer": "^4.2.1", "@types/jasmine": "^2.8.6",
"jasmine-core": "~2.99.1", "@types/node": "~9.4.6",
"jasmine-spec-reporter": "~4.2.1", "codelyzer": "^4.2.1",
"karma": "~2.0.0", "jasmine-core": "~2.99.1",
"karma-chrome-launcher": "~2.2.0", "jasmine-spec-reporter": "~4.2.1",
"karma-cli": "~1.0.1", "karma": "~2.0.0",
"karma-coverage-istanbul-reporter": "^1.4.1", "karma-chrome-launcher": "~2.2.0",
"karma-jasmine": "^1.1.1", "karma-cli": "~1.0.1",
"karma-jasmine-html-reporter": "^0.2.2", "karma-coverage-istanbul-reporter": "^1.4.1",
"protractor": "~5.3.0", "karma-jasmine": "^1.1.1",
"ts-node": "^5.0.1", "karma-jasmine-html-reporter": "^0.2.2",
"tslint": "~5.9.1", "protractor": "~5.3.0",
"typescript": "~2.5.3" "ts-node": "^5.0.1",
} "tslint": "~5.9.1",
"typescript": "2.7.2"
}
} }

1
client/src/app/services/podnoms-auth.service.ts
View File

@@ -116,7 +116,6 @@ export class PodnomsAuthService extends BaseService {
body, body,
this.httpOptions this.httpOptions
) )
.map((res) => true)
.catch(this.handleError); .catch(this.handleError);
} }
public logout() { public logout() {