Merge branch 'max_dev' of Software_Engineering_I/greenvironment-frontend into master

package.json

@@ -17,47 +17,47 @@
     "@angular/compiler": "~8.2.14",
     "@angular/core": "^8.2.14",
     "@angular/flex-layout": "^8.0.0-beta.27",
-    "@angular/forms": "~7.0.0",
-    "@angular/http": "~7.0.0",
+    "@angular/forms": "^7.2.15",
+    "@angular/http": "^7.2.15",
     "@angular/material": "^8.2.3",
     "@angular/platform-browser": "8.2.14",
     "@angular/platform-browser-dynamic": "^8.2.14",
     "@angular/router": "~8.2.14",
-    "apollo-angular": "^1.7.0",
-    "apollo-angular-link-http": "^1.6.0",
-    "apollo-cache-inmemory": "^1.3.2",
-    "apollo-client": "^2.6.0",
+    "apollo-angular": "^1.8.0",
+    "apollo-angular-link-http": "^1.9.0",
+    "apollo-cache-inmemory": "^1.6.5",
+    "apollo-client": "^2.6.8",
     "apollo-link": "^1.2.11",
-    "core-js": "^2.5.4",
+    "core-js": "^2.6.11",
     "graphql": "^14.3.1",
     "graphql-tag": "^2.10.0",
     "hammerjs": "^2.0.8",
     "js-sha512": "^0.8.0",
-    "ngx-socket-io": "^2.0.0",
+    "ngx-socket-io": "^2.1.1",
     "node-sass": "^4.13.0",
     "rxjs": "~6.3.3",
     "ts-md5": "^1.2.7",
-    "zone.js": "~0.8.26"
+    "zone.js": "^0.8.29"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.803.20",
-    "@angular/cli": "^8.3.20",
+    "@angular-devkit/build-angular": "^0.803.21",
+    "@angular/cli": "^8.3.21",
     "@angular/compiler-cli": "^8.2.14",
-    "@angular/language-service": "~7.0.0",
-    "@types/jasmine": "~2.8.8",
-    "@types/jasminewd2": "~2.0.3",
+    "@angular/language-service": "^7.2.15",
+    "@types/jasmine": "^2.8.16",
+    "@types/jasminewd2": "^2.0.8",
     "@types/node": "~8.9.4",
     "codelyzer": "~4.5.0",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "^4.4.1",
     "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~2.0.1",
+    "karma-coverage-istanbul-reporter": "^2.1.1",
     "karma-jasmine": "~1.1.2",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.4.0",
+    "protractor": "^5.4.2",
     "ts-node": "~7.0.0",
-    "tslint": "^5.11.0",
+    "tslint": "^5.20.1",
     "typescript": "~3.5.0"
   }
 }

src/typings.d.ts

@@ -1,5 +1,5 @@
+
 declare module '*.svg' {
     const svg: string;
     export default svg;
 }
-