package-lock.json

@@ -1318,7 +1318,6 @@
       "version": "6.6.2",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz",
       "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==",
-      "dev": true,
       "requires": {
         "fast-deep-equal": "^2.0.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -1617,7 +1616,6 @@
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
       "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
       "requires": {
         "safer-buffer": "~2.1.0"
       }
@@ -1663,8 +1661,7 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -1700,8 +1697,7 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "atob": {
       "version": "2.1.2",
@@ -1726,14 +1722,12 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-      "dev": true
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
     "babel-code-frame": {
       "version": "6.26.0",
@@ -1959,7 +1953,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
       "requires": {
         "tweetnacl": "^0.14.3"
       }
@@ -2383,8 +2376,7 @@
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "chalk": {
       "version": "2.4.1",
@@ -2657,10 +2649,9 @@
       }
     },
     "combined-stream": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
-      "dev": true,
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -2894,8 +2885,7 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
       "version": "5.2.1",
@@ -3062,7 +3052,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -3224,8 +3213,7 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegates": {
       "version": "1.0.0",
@@ -3373,7 +3361,6 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
       "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
@@ -4154,14 +4141,12 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
     },
     "fast-diff": {
       "version": "1.1.2",
@@ -4171,8 +4156,7 @@
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -4366,14 +4350,12 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.6",
@@ -5070,7 +5052,6 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -5243,31 +5224,15 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
       "version": "5.1.3",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
       "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
       "requires": {
         "ajv": "^6.5.5",
         "har-schema": "^2.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.5.5",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz",
-          "integrity": "sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        }
       }
     },
     "has-ansi": {
@@ -5495,7 +5460,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -6087,8 +6051,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -6139,8 +6102,7 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "istanbul": {
       "version": "0.4.5",
@@ -6472,8 +6434,7 @@
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
     "jsesc": {
       "version": "1.3.0",
@@ -6490,20 +6451,17 @@
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json3": {
       "version": "3.3.3",
@@ -6526,7 +6484,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -7219,14 +7176,12 @@
     "mime-db": {
       "version": "1.37.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
-      "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==",
-      "dev": true
+      "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
     },
     "mime-types": {
       "version": "2.1.21",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
       "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
-      "dev": true,
       "requires": {
         "mime-db": "~1.37.0"
       }
@@ -8012,8 +7967,7 @@
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
     },
     "object-assign": {
       "version": "4.1.1",
@@ -8606,8 +8560,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pify": {
       "version": "3.0.0",
@@ -8970,10 +8923,9 @@
       "dev": true
     },
     "psl": {
-      "version": "1.1.29",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
-      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==",
-      "dev": true
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz",
+      "integrity": "sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA=="
     },
     "public-encrypt": {
       "version": "4.0.3",
@@ -9013,8 +8965,7 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "q": {
       "version": "1.4.1",
@@ -9031,8 +8982,7 @@
     "qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
     },
     "querystring": {
       "version": "0.2.0",
@@ -9373,7 +9323,6 @@
       "version": "2.88.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
       "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -9523,8 +9472,7 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -9538,8 +9486,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass-graph": {
       "version": "2.2.4",
@@ -10387,10 +10334,9 @@
       "dev": true
     },
     "sshpk": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz",
-      "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==",
-      "dev": true,
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
       "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -11024,7 +10970,6 @@
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
       "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-      "dev": true,
       "requires": {
         "psl": "^1.1.24",
         "punycode": "^1.4.1"
@@ -11033,8 +10978,7 @@
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
         }
       }
     },
@@ -11177,7 +11121,6 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -11185,8 +11128,7 @@
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
     },
     "type-check": {
       "version": "0.3.2",
@@ -11354,7 +11296,6 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -11439,8 +11380,7 @@
     "uuid": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-      "dev": true
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -11471,7 +11411,6 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",

package.json

@@ -80,6 +80,7 @@
     "ngx-toastr": "^9.1.1",
     "owl.carousel": "^2.3.4",
     "popper.js": "^1.14.7",
+    "request": "^2.88.0",
     "rxjs": "~6.3.3",
     "rxjs-compat": "^6.3.3",
     "script-loader": "^0.7.2",

src/app/External-Page/more-news/more-news.component.ts

@@ -68,6 +68,7 @@ export class MoreNewsComponent implements OnInit {
    // /change page 
    onPageChange(pagenationNumber) {
     this.spinner.show();
+    this.currentPage = pagenationNumber;
     this.http.get(this.authSer.pathApi + '/get_reports_list/1/' + this.currentPage + '/' + this.perPagePagenation + '/internal').subscribe(
       (responce) => {
         console.log(responce);
@@ -79,6 +80,7 @@ export class MoreNewsComponent implements OnInit {
             this.dataPagesNews[i].description_en = this.dataPagesNews[i].description_en.substring(0,200) + '......';
           }
         }
+        this.spinner.hide();
       },
       (error) => {
         console.log(error);      

src/app/Internal-Page/news-pages/news-pages.component.ts

@@ -59,26 +59,29 @@ export class NewsPagesComponent implements OnInit {
 
   }
 
-      // /change page 
-      onPageChange(pagenationNumber) {
-        this.spinner.show();
-        this.http.get(this.authSer.pathApi + '/reports_list_gate/' + this.currentPage + '/' + this.perPagePagenation + '/internal').subscribe(
-          (responce) => {
-            console.log(responce);
-            this.dataPagesNews = responce['reports'];
-            this.count = responce['count'];
-            for(let i = 0 ; i < this.dataPagesNews.length ; i++) {
-              if(this.dataPagesNews[i].description.length > 60) {
-                this.dataPagesNews[i].description = this.dataPagesNews[i].description.substring(0,200) + '........' ;
-                this.dataPagesNews[i].description_en = this.dataPagesNews[i].description_en.substring(0,200) + '......';
-              }
-            }
-          },
-          (error) => {
-            console.log(error);      
+  // /change page 
+  onPageChange(pagenationNumber) {
+    this.spinner.show();
+    console.log(pagenationNumber);
+    this.currentPage = pagenationNumber;
+    this.http.get(this.authSer.pathApi + '/reports_list_gate/' + this.currentPage + '/' + this.perPagePagenation + '/internal').subscribe(
+      (responce) => {
+        console.log(responce);
+        this.dataPagesNews = responce['reports'];
+        this.count = responce['count'];
+        for(let i = 0 ; i < this.dataPagesNews.length ; i++) {
+          if(this.dataPagesNews[i].description.length > 60) {
+            this.dataPagesNews[i].description = this.dataPagesNews[i].description.substring(0,200) + '........' ;
+            this.dataPagesNews[i].description_en = this.dataPagesNews[i].description_en.substring(0,200) + '......';
           }
-        )
-      };
+        }
+        this.spinner.hide();
+      },
+      (error) => {
+        console.log(error);      
+      }
+    )
+  };
 
   onGetNew(id) {
     this.router.navigate(['InternalPage/news/' + id])

src/app/dashboard/living_system_reports/living-system-reports/living-system-reports.component.css

@@ -14,7 +14,6 @@
     direction: rtl;
     font-family: 'Cairo', sans-serif;
 }
-
 input,select {
     font-size: 12px; 
     background-color: #fff;

src/app/dashboard/living_system_reports/living-system-reports/living-system-reports.component.html

@@ -8,8 +8,8 @@
             </ul>
           </div>
       </div>
-      <div class="containerContent-w">
-          <div class="row">
+      <div class="containerContent-w" id="print-section">
+          <div class="row printClass">
             <div class="col-12 col-md-4">
 
                 <div class="form-group">
@@ -25,7 +25,7 @@
                   </div>
             </div>   
            </div>
-           <div class="row fit-filter-style" *ngIf="showFilters">
+           <div class="row fit-filter-style printClass" *ngIf="showFilters">
               <div class="col-12 col-sm-3 col-md-3 col-lg-3">
                 <div class="form-group">
                   <span class="spanSelect-w" style="margin-right:10px;">
@@ -64,15 +64,15 @@
                 </div>
               </div>   
            </div>
-           <div class="row" *ngIf="reportValue == 3 && showSearchBtn " style="justify-content: center; margin-top: 50px">
+           <div class="row printClass" *ngIf="reportValue == 3 && showSearchBtn " style="justify-content: center; margin-top: 50px">
             <input type="text" placeholder="{{placeholder}}" class="form-control numberReport-s" [(ngModel)]="searchValue" style="width: 25%"/>
            </div>
-           <div class="row fit-filter-style" *ngIf="showSearchBtn ">
+           <div class="row fit-filter-style printClass" *ngIf="showSearchBtn ">
               <button class="btn btn-success buttonS" (click)="onSearch()" style="margin-left: 2%;">أبحث</button>            
           </div>
 
           <div class="col-12" *ngIf="fristReport">
-              <h2 class="title"> وحدات متسكنة</h2>
+              <h2 class="title table-title"> وحدات متسكنة</h2>
             <div class="row">
               <div class="col-12">
                  <div class="wrapper">
@@ -96,14 +96,14 @@
                     </table>
 
                     <div class="col-12" *ngIf="this.assigned_count == 0" >
-                        <h2 class="title"> لا يوجد بيانات لعرضها </h2>
+                        <h2 class="title nothingToShow"> لا يوجد بيانات لعرضها </h2>
                     </div>
                   </div>
                 </div>
             </div>
           </div>
           <div class="col-12" *ngIf="fristReport">
-              <h2 class="title"> وحدات الفارغة</h2>
+              <h2 class="title table-title"> وحدات الفارغة</h2>
             <div class="row">
               <div class="col-12">
                  <div class="wrapper">
@@ -127,14 +127,14 @@
                     </table>
 
                     <div class="col-12" *ngIf="this.empty_count == 0" >
-                        <h2 class="title"> لا يوجد بيانات لعرضها </h2>
+                        <h2 class="title nothingToShow"> لا يوجد بيانات لعرضها </h2>
                     </div>
                   </div>
                 </div>
             </div>
           </div>
           <div class="col-12" *ngIf="secondReport">
-              <h2 class="title">  بيانات السكان</h2>
+              <h2 class="title table-title">  بيانات السكان</h2>
             <div class="row">
               <div class="col-12">
                  <div class="wrapper">
@@ -160,14 +160,14 @@
                     </table>
 
                     <div class="col-12" *ngIf="employees.length == 0" >
-                        <h2 class="title"> لا يوجد بيانات لعرضها </h2>
+                        <h2 class="title nothingToShow"> لا يوجد بيانات لعرضها </h2>
                     </div>
                   </div>
                 </div>
             </div>
           </div>
           <div class="col-12" *ngIf="thirdReport">
-              <h2 class="title"> بيانات الموظف</h2>
+              <h2 class="title table-title"> بيانات الموظف</h2>
             <div class="row">
               <div class="col-12">
                  <div class="wrapper">
@@ -198,7 +198,7 @@
             </div>
           </div>
           <div class="col-12" *ngIf="thirdReport">
-              <h2 class="title">  طلبات الموظف </h2>
+              <h2 class="title table-title">  طلبات الموظف </h2>
             <div class="row">
               <div class="col-12">
                  <div class="wrapper">
@@ -222,14 +222,14 @@
                     </table>
 
                     <div class="col-12" *ngIf="requests.length == 0" >
-                        <h2 class="title"> لا يوجد بيانات لعرضها </h2>
+                        <h2 class="title nothingToShow"> لا يوجد بيانات لعرضها </h2>
                     </div>
                   </div>
                 </div>
             </div>
           </div>
           <div class="col-12" *ngIf="thirdReport">
-              <h2 class="title"> بيانات الوحدة</h2>
+              <h2 class="title table-title"> بيانات الوحدة</h2>
             <div class="row">
               <div class="col-12">
                  <div class="wrapper">
@@ -261,7 +261,7 @@
             </div>
           </div>
           <div class="col-12" *ngIf="fourthReport">
-            <h2 class="title">  بيانات الوحدة</h2>
+            <h2 class="title table-title">  بيانات الوحدة</h2>
           <div class="row">
             <div class="col-12">
                <div class="wrapper">
@@ -291,7 +291,7 @@
           </div>
         </div>
         <div class="col-12" *ngIf="fourthReport">
-          <h2 class="title">  بيانات العهد</h2>
+          <h2 class="title table-title">  بيانات العهد</h2>
         <div class="row">
           <div class="col-12">
              <div class="wrapper">
@@ -313,7 +313,7 @@
                 </table>
 
                 <div class="col-12" *ngIf="units2.length == 0" >
-                    <h2 class="title"> لا يوجد بيانات لعرضها </h2>
+                    <h2 class="title nothingToShow"> لا يوجد بيانات لعرضها </h2>
                 </div>
               </div>
             </div>
@@ -321,7 +321,7 @@
       </div>
 
 
-          <div class="col-12" *ngIf="fristReport || secondReport || thirdReport || fourthReport">
+          <div class="col-12 printClass" *ngIf="fristReport || secondReport || thirdReport || fourthReport">
               <button class="btn btn-success" style="float: right; margin: 10px 0;" (click)="onPrint()">طباعه</button> 
             </div>
       </div>

src/app/dashboard/living_system_reports/living-system-reports/living-system-reports.component.ts

@@ -27,7 +27,7 @@ export class LivingSystemReportsComponent implements OnInit {
   employee: any;
   unit: any;
   placeholder: string;
- 
+  reportName: string;
 
   complex_list = [];
   building_types = [];
@@ -43,13 +43,13 @@ export class LivingSystemReportsComponent implements OnInit {
 
   isComplex: boolean = false;
   isBuildingType: boolean = false;
+  isUnit: boolean = false;
   showFilters: boolean = false;
   showSearchBtn: boolean = false;
   fristReport: boolean = false;
   secondReport: boolean = false;
   thirdReport:boolean = false;
   fourthReport: boolean = false;
-  isUnit: boolean = false;
   
 
 
@@ -201,6 +201,12 @@ unitNum(event){
   getReport(event){
     this.reportValue = event
     this.showFilters = true;
+    this.housing_complex_id = 'all';
+
+    this.isComplex = false;
+    this.isBuildingType = false;
+    this.isUnit = false;
+    this.showSearchBtn = false;
     this.building_types = [];
     this.buildings = [];
     this.assigned_units = [];
@@ -213,11 +219,14 @@ unitNum(event){
       this.secondReport = false;
       this.thirdReport = false;
       this.fourthReport = false;
+      this.reportName ='الوحدات الساكنيه'
     }
     if(this.reportValue == 2){
       this.fristReport = false;
       this.thirdReport = false;
       this.fourthReport = false;
+      this.reportName ='تقرير السكان في المحمع و المباني'
+
     }
     if(this.reportValue == 3 ){
       this.fristReport = false;
@@ -225,6 +234,8 @@ unitNum(event){
       this.fourthReport = false;
       this.placeholder = 'ادخل رقم هوية الموظف'
       this.searchValue = '';
+      this.reportName ='تقرير ساكن'
+
     }
     if(this.reportValue == 4 ){
       this.fristReport = false;
@@ -232,6 +243,8 @@ unitNum(event){
       this.thirdReport = false;
       this.placeholder = 'ادخل رقم او كود الوحدة'
       this.searchValue = '';
+      this.reportName ='تقرير العهد'
+
     }
   }
 
@@ -321,102 +334,202 @@ unitNum(event){
     
   }
 
- //print function 
- onPrint() {
-  window.print();
+  onPrint(): void {
+    let printContents, popupWin;
+    printContents = document.getElementById('print-section').innerHTML;
+    popupWin = window.open('', '_blank', 'top=0,left=0,height=100%,width=auto');
+    popupWin.document.open();
+    popupWin.document.write(`
+      <html>
+        <head>
+          <title>Print tab</title>
+          <style>
+          .row{
+            display: flex;
+            flex-wrap: wrap;
+            margin-right: -15px;
+            margin-left: -15px;
+          }
+          .col-6{
+            float: right;
+            flex: 0 0 50%;
+            max-width: 50%
+          }
+          .col-12{
+            flex-basis: 0;
+            flex-grow: 1;
+            max-width: 100%;
+          }
+          table {
+            font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+            border-collapse: collapse;
+            width: 100%;
+            direction: rtl;
+            text-align: center;
+            
+          }
+          
+          table td, table th {
+            border: 1px solid #ddd;
+            padding: 8px;
+          }
+          
+          table tr:nth-child(even){background-color: #f2f2f2;}
+          
+          table tr:hover {background-color: #ddd;}
+          
+          table th {
+            padding-top: 12px;
+            padding-bottom: 12px;
+            text-align: center;
+            background-color: #4CAF50;
+            color: white;
+
+          }
+          .d3{
+            font-size: 15px;
+            padding-left: 10px;
+            width: 25%;
+            text-align: center;
+            direction: rtl;
+            margin-left: 20px;
+          }
+          v3{
+            direction: rtl;              
+          }
+          .printClass{
+            display: none;
+           }
+           .nothingToShow{
+             text-align: center;
+           }
+           .table-title{
+               text-align: right;
+               margin-right:5px;
+           }
+            </style>
+          </head>
+          <body onload="window.print();window.close()">
+            <div class="row">
+              <div class="col-6" style="float: left">
+               <img class="logo1" src="../../assets/image/logo2.png" style="width: 130px;float: left; margin-left: 20px;">
+              </div>
+              <div class="col-6" style="float: right">
+                <img  class="logo2" src="../../assets/image/logo1.png" style="width: 200px;float: right; margin-right: 20px;">
+              </div>
+             </div>
+             <div class="row">
+               <div class="col-12" style="width:100%;text-align: center">
+                 <h1>تقرير السكن </h1>
+               </div>
+              </div>
+                
+              <div class="row">
+                <div class="col-12">
+                     ${printContents}
+                  </div>
+               </div>
+            </body>
+      </html>`
+    );
+    popupWin.document.close();
 }
-  //print function
-//   onPrint(): void {
-//     let printContents, popupWin;
-//     printContents = document.getElementById('print-section').innerHTML;
-//     popupWin = window.open('', '_blank', 'top=0,left=0,height=100%,width=auto');
-//     popupWin.document.open();
-//     popupWin.document.write(`
-//       <html>
-//         <head>
-//           <title>تقرير المركبات الموجوده</title>
-//           <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"> </link>
-//           <style>
-//           .row{
-//             display: flex;
-//             flex-wrap: wrap;
-//             margin-right: -15px;
-//             margin-left: -15px;
-//           }
-//           .col-6{
-//             float: right;
-//             flex: 0 0 50%;
-//             max-width: 50%
-//           }
-//           .col-12{
-//             flex-basis: 0;
-//             flex-grow: 1;
-//             max-width: 100%;
-//           }
-//           table {
-//             font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-//             border-collapse: collapse;
-//             width: 100%;
-//             direction: rtl;
-//             text-align: center;
+//  //print function 
+//  onPrint() {
+//   window.print();
+// }
+//   //print function
+// //   onPrint(): void {
+// //     let printContents, popupWin;
+// //     printContents = document.getElementById('print-section').innerHTML;
+// //     popupWin = window.open('', '_blank', 'top=0,left=0,height=100%,width=auto');
+// //     popupWin.document.open();
+// //     popupWin.document.write(`
+// //       <html>
+// //         <head>
+// //           <title>تقرير المركبات الموجوده</title>
+// //           <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"> </link>
+// //           <style>
+          // .row{
+          //   display: flex;
+          //   flex-wrap: wrap;
+          //   margin-right: -15px;
+          //   margin-left: -15px;
+          // }
+          // .col-6{
+          //   float: right;
+          //   flex: 0 0 50%;
+          //   max-width: 50%
+          // }
+          // .col-12{
+          //   flex-basis: 0;
+          //   flex-grow: 1;
+          //   max-width: 100%;
+          // }
+          // table {
+          //   font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+          //   border-collapse: collapse;
+          //   width: 100%;
+          //   direction: rtl;
+          //   text-align: center;
             
-//           }
+          // }
           
-//           table td, table th {
-//             border: 1px solid #ddd;
-//             padding: 8px;
-//           }
+          // table td, table th {
+          //   border: 1px solid #ddd;
+          //   padding: 8px;
+          // }
           
-//           table tr:nth-child(even){background-color: #f2f2f2;}
+          // table tr:nth-child(even){background-color: #f2f2f2;}
           
-//           table tr:hover {background-color: #ddd;}
+          // table tr:hover {background-color: #ddd;}
           
-//           table th {
-//             padding-top: 12px;
-//             padding-bottom: 12px;
-//             text-align: center;
-//             background-color: #4CAF50;
-//             color: white;
-
-//           }
-//           .d3{
-//             font-size: 15px;
-//             padding-left: 10px;
-//             width: 25%;
-//             text-align: center;
-//             direction: rtl;
-//             margin-left: 20px;
-//           }
-//           v3{
-//             direction: rtl;              
-//           }
-//           </style>
-//         </head>
-//        <body onload="window.print();window.close()">
-//        <div class="row">
-//         <div class="col-6" style="float: left">
-//          <img class="logo1" src="../../assets/image/logo2.png" style="width: 130px;float: left; margin-left: 20px;">
-//         </div>
-//       <div class="col-6" style="float: right">
-//           <img  class="logo2" src="../../assets/image/logo1.png" style="width: 200px;float: right; margin-right: 20px;">
-//        </div>
-//       </div>
-//       <div class="row">
-//         <div class="col-12" style="width:100%;text-align: center">
-//           <h1>تقرير حركة المركبات </h1>
-//         </div>
-//       </div>
+          // table th {
+          //   padding-top: 12px;
+          //   padding-bottom: 12px;
+          //   text-align: center;
+          //   background-color: #4CAF50;
+          //   color: white;
+
+          // }
+          // .d3{
+          //   font-size: 15px;
+          //   padding-left: 10px;
+          //   width: 25%;
+          //   text-align: center;
+          //   direction: rtl;
+          //   margin-left: 20px;
+          // }
+          // v3{
+          //   direction: rtl;              
+          // }
+// //           </style>
+// //         </head>
+// //        <body onload="window.print();window.close()">
+      //  <div class="row">
+      //   <div class="col-6" style="float: left">
+      //    <img class="logo1" src="../../assets/image/logo2.png" style="width: 130px;float: left; margin-left: 20px;">
+      //   </div>
+      // <div class="col-6" style="float: right">
+      //     <img  class="logo2" src="../../assets/image/logo1.png" style="width: 200px;float: right; margin-right: 20px;">
+      //  </div>
+      // </div>
+      // <div class="row">
+      //   <div class="col-12" style="width:100%;text-align: center">
+      //     <h1>تقرير حركة المركبات </h1>
+      //   </div>
+      // </div>
     
-//    <div class="row">
-//    <div class="col-12">
-//    ${printContents}
-//    </div>
-// </div>
-//     </body>
-//       </html>`
-//     );
-//     popupWin.document.close();
-// }
+// //    <div class="row">
+// //    <div class="col-12">
+// //    ${printContents}
+// //    </div>
+// // </div>
+// //     </body>
+// //       </html>`
+// //     );
+// //     popupWin.document.close();
+// // }
 
 
 }

src/app/shared/auth-service.service.ts

@@ -50,8 +50,11 @@ export class AuthServiceService {
   showArabicIcon:boolean;
   showEnglishIcon:boolean;
 
+  // pathApi: string = 'http://10.93.50.2/kfmc_back_end/index.php/api';
+  // pathImg: string = "http://10.93.50.2/kfmc_back_end/public/";
   pathApi: string = 'http://kfmc.info/back_end/api';
   pathImg: string = "http://kfmc.info/back_end/public/";
+  
   myInnerHeight = window.innerHeight;
   imgSrc: string =  '../../assets/image/avatar.png'; //page profile default
   iconImg: string = '../../assets/image/Group 92.png';