coderiver-org
diff --git a/‎LICENSE
Lines changed: 1 addition & 1 deletion b/‎LICENSE
Lines changed: 1 addition & 1 deletion
diff --git a/‎package.json
Lines changed: 40 additions & 101 deletions b/‎package.json
Lines changed: 40 additions & 101 deletions
diff --git a/‎src/app/components/passport/login/login.component.pug
Lines changed: 2 additions & 2 deletions b/‎src/app/components/passport/login/login.component.pug
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/app/material/material.module.ts
Lines changed: 0 additions & 114 deletions b/‎src/app/material/material.module.ts
Lines changed: 0 additions & 114 deletions
diff --git a/‎src/app/services/auth.service.ts
Lines changed: 5 additions & 3 deletions b/‎src/app/services/auth.service.ts
Lines changed: 5 additions & 3 deletions
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 xiayinchang
+Copyright (c) 2018 coderiver
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 
@@ -4,41 +4,34 @@
   "description": "",
   "scripts": {
     "ng": "ng",
-    "start": "npm run color-less && ng serve -o",
+    "start": "npm run color-less && ng serve --proxy-config proxy.conf.json  --host 0.0.0.0 -o",
     "build": "npm run color-less && ng build --prod --build-optimizer",
     "test": "ng test",
-    "lint": "npm run lint:ts && npm run lint:style",
+    "lint": "npm run lint:style",
     "e2e": "ng e2e",
-    "watch": "ng serve --proxy-config proxy.conf.json  --host 0.0.0.0 --disable-host-check",
     "postinstall": "node ./scripts/pug-rule-insert.js",
-    "analyze": "npm run color-less && ng build --prod --build-optimizer --stats-json",
-    "test-coverage": "ng test --code-coverage --watch=false",
     "color-less": "node scripts/color-less.js",
     "lint:ts": "ng lint",
     "lint:style": "stylelint \"{src}/**/*.less\" --syntax less",
     "lint-staged": "lint-staged",
     "tslint-check": "tslint-config-prettier-check ./tslint.json",
-    "hmr": "ng serve -c=hmr",
+    "hmr": "npm run color-less && ng serve -c=hmr",
     "test:coverage": "jest --runInBand --coverage",
     "test:snapshot": "jest --coverage -u",
     "test:watch": "jest --clearCache && jest --watch"
   },
-  "author": "xiayinchang",
+  "author": "coderiver",
   "license": "MIT",
   "dependencies": {
-    "@angular/animations": "7.1.4",
-    "@angular/cdk": "7.2.0",
-    "@angular/common": "7.1.4",
-    "@angular/compiler": "7.1.4",
-    "@angular/core": "7.1.4",
-    "@angular/flex-layout": "7.0.0-beta.22",
-    "@angular/forms": "7.1.4",
-    "@angular/http": "7.1.4",
-    "@angular/material": "7.2.0",
-    "@angular/platform-browser": "7.1.4",
-    "@angular/platform-browser-dynamic": "7.1.4",
-    "@angular/platform-server": "7.1.4",
-    "@angular/router": "7.1.4",
+    "@angular/animations": "7.2.0",
+    "@angular/cdk": "7.2.1",
+    "@angular/common": "7.2.0",
+    "@angular/compiler": "7.2.0",
+    "@angular/core": "7.2.0",
+    "@angular/forms": "7.2.0",
+    "@angular/platform-browser": "7.2.0",
+    "@angular/platform-browser-dynamic": "7.2.0",
+    "@angular/router": "7.2.0",
     "@delon/abc": "^7.0.0-rc.1",
     "@delon/acl": "^7.0.0-rc.1",
     "@delon/auth": "^7.0.0-rc.1",
@@ -48,68 +41,22 @@
     "@delon/mock": "^7.0.0-rc.1",
     "@delon/theme": "^7.0.0-rc.1",
     "@delon/util": "^7.0.0-rc.1",
-    "ajv": "^6.4.0",
-    "apollo-angular": "1.5.0",
-    "apollo-angular-link-http": "1.4.0",
-    "apollo-cache-inmemory": "1.3.12",
-    "apollo-client": "2.4.8",
-    "apollo-link-ws": "1.0.12",
-    "apollo-server-express": "2.3.1",
-    "body-parser": "1.18.3",
-    "cookie-parser": "1.4.3",
-    "core-js": "2.6.1",
-    "express": "4.16.4",
-    "glob": "7.1.3",
-    "graphql": "14.0.2",
-    "graphql-subscriptions": "1.0.0",
-    "graphql-tag": "2.10.0",
-    "graphql-tools": "4.0.3",
-    "hammerjs": "2.0.8",
-    "ng-alain": "^7.0.0-rc.1",
     "ng-zorro-antd": "^7.0.0-rc.2",
-    "passport": "0.4.0",
-    "passport-facebook-token": "3.3.0",
-    "passport-google-plus-token": "2.1.0",
-    "passport-jwt": "4.0.0",
-    "passport-local": "1.0.0",
-    "passport-twitter-token": "1.3.0",
-    "redis": "2.8.0",
-    "reflect-metadata": "0.1.12",
-    "request": "2.88.0",
     "rxjs": "6.3.3",
-    "rxjs-compat": "6.3.3",
     "screenfull": "^4.0.0",
-    "subscriptions-transport-ws": "0.9.15",
-    "ws": "6.1.2",
     "zone.js": "0.8.26"
   },
   "devDependencies": {
-    "@angular-builders/jest": "^7.0.0",
-    "@angular-devkit/build-angular": "0.11.4",
-    "@angular/cli": "7.1.4",
-    "@angular/compiler-cli": "7.1.4",
-    "@angular/language-service": "7.1.4",
+    "@angular-builders/jest": "^7.2.0",
+    "@angular-devkit/build-angular": "0.12.1",
+    "@angular/cli": "7.2.1",
+    "@angular/compiler-cli": "7.2.0",
     "@angularclass/hmr": "^2.1.3",
-    "@types/cookie-parser": "1.4.1",
-    "@types/express": "4.16.0",
-    "@types/glob": "7.1.1",
-    "@types/graphql": "14.0.3",
-    "@types/helmet": "0.0.42",
     "@types/jasmine": "^3.3.0",
     "@types/jasminewd2": "^2.0.6",
-    "@types/jest": "^23.3.9",
-    "@types/joi": "14.0.1",
-    "@types/jsonwebtoken": "8.3.0",
-    "@types/mongoose": "5.3.5",
     "@types/node": "^10.12.9",
-    "@types/passport": "1.0.0",
-    "@types/passport-jwt": "3.0.1",
-    "@types/passport-local": "1.0.33",
-    "@types/request": "2.48.1",
-    "@types/ws": "6.0.1",
     "apply-loader": "^2.0.0",
-    "codelyzer": "4.5.0",
-    "concurrently": "4.1.0",
+    "codelyzer": "^4.5.0",
     "editorconfig-tools": "^0.1.1",
     "husky": "^1.2.0",
     "istanbul-reports": "^2.0.1",
@@ -120,47 +67,39 @@
     "jest-sonar-reporter": "^2.0.0",
     "less-bundle-promise": "^1.0.7",
     "lint-staged": "^8.0.5",
-    "ng-alain": "^7.0.0-rc.1",
     "ngx-wallaby-jest": "0.0.1",
-    "node-sass": "4.11.0",
-    "nodemon-webpack-plugin": "4.0.7",
     "prettier": "^1.12.1",
     "prettier-stylelint": "^0.4.2",
     "protractor": "5.4.2",
     "pug": "^2.0.3",
     "pug-jest": "^1.0.1",
     "pug-loader": "^2.4.0",
-    "rimraf": "2.6.2",
     "stylelint": "^9.2.0",
-    "stylelint-config-standard": "^18.2.0",
-    "ts-loader": "5.3.2",
     "ts-node": "7.0.1",
-    "tslint": "5.12.0",
+    "tslint": "^5.12.0",
     "tslint-config-prettier": "^1.12.0",
-    "tslint-language-service": "^0.9.9",
-    "tslint-loader": "3.6.0",
-    "typescript": "3.1.1",
-    "webpack": "4.28.2",
-    "webpack-cli": "3.1.2",
-    "webpack-node-externals": "1.7.2"
+    "typescript": "3.2.2",
+    "webpack": "4.28.2"
   },
   "lint-staged": {
-    "*.{cmd,html,json,md,sh,txt,xml,yml}": [
-      "editorconfig-tools fix",
-      "git add"
-    ],
-    "*.ts": [
-      "npm run lint:ts",
-      "prettier --write",
-      "git add"
-    ],
-    "*.less": [
-      "npm run lint:style",
-      "prettier --write",
-      "git add"
-    ],
-    "ignore": [
-      "src/assets/*"
-    ]
+    "linters": {
+      "*.{cmd,html,json,md,sh,txt,xml,yml}": [
+        "editorconfig-tools fix",
+        "git add"
+      ],
+      "*.ts": [
+        "npm run lint:ts",
+        "prettier --write",
+        "git add"
+      ],
+      "*.less": [
+        "npm run lint:style",
+        "prettier --write",
+        "git add"
+      ],
+      "ignore": [
+        "src/assets/*"
+      ]
+    }
   }
 }
@@ -18,8 +18,8 @@ form(nz-form, [formGroup]='form', (ngSubmit)='submit()', role='form')
           nz-input-group(nzSize='large', nzPrefixIcon='anticon anticon-user')
             input(nz-input, formControlName='mobile', placeholder='mobile number')
           nz-form-explain(*ngIf='mobile.dirty && mobile.errors')
-            ng-container(*ngIf='mobile.errors.required') 请输入手机号！
-            ng-container(*ngIf='mobile.errors.pattern') 手机号格式错误！
+            ng-container(*ngIf='mobile.errors.required') 请输入手机号
+            ng-container(*ngIf='mobile.errors.pattern') 手机号格式错误
       nz-form-item
         nz-form-control
           nz-row([nzGutter]='8')
 
@@ -3,6 +3,7 @@ import { HttpClient } from '@angular/common/http';
 import {Observable, of} from 'rxjs';
 import { IToken } from '@shared/interfaces/token.interface';
 import 'rxjs/add/operator/mergeMap';
+import { mergeMap} from 'rxjs/operators';
 
 @Injectable()
 export class AuthService {
@@ -33,11 +34,12 @@ export class AuthService {
   }
 
   facebookSignIn(code: string): Observable<any> {
-    return this.httpClient.post('api/auth/facebook/signin', { code })
-      .flatMap((token: IToken) => {
+    return this.httpClient.post('api/auth/facebook/signin', { code }).pipe(
+      mergeMap((token: IToken) => {
         localStorage.setItem('token', token.token);
         return of(token);
-      }).pipe();
+      })
+    );
   }
 
   requestTwitterRedirectUri(): Observable<any> {