diff --git a/package-lock.json b/package-lock.json index 3b0fb71..d30dda3 100755 --- a/package-lock.json +++ b/package-lock.json @@ -2,6 +2,7 @@ "name": "queenslanguagemap", "version": "0.0.1", "lockfileVersion": 1, + "requires": true, "dependencies": { "@types/node": { "version": "8.0.52", @@ -10,16 +11,29 @@ }, "accepts": { "version": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", - "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=" + "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", + "requires": { + "mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", + "negotiator": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz" + } }, "ajv": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=" + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } }, "align-text": { "version": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=" + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "requires": { + "kind-of": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "longest": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "repeat-string": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz" + } }, "amdefine": { "version": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", @@ -28,7 +42,10 @@ "apache-crypt": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/apache-crypt/-/apache-crypt-1.2.1.tgz", - "integrity": "sha1-1vxyqm0n2ZyVqU/RiNcx7v/6Zjw=" + "integrity": "sha1-1vxyqm0n2ZyVqU/RiNcx7v/6Zjw=", + "requires": { + "unix-crypt-td-js": "1.0.0" + } }, "apache-md5": { "version": "1.1.2", @@ -51,7 +68,10 @@ }, "async": { "version": "https://registry.npmjs.org/async/-/async-2.1.4.tgz", - "integrity": "sha1-LSFgx3iAMuTdbL4lAvH5osj2zeQ=" + "integrity": "sha1-LSFgx3iAMuTdbL4lAvH5osj2zeQ=", + "requires": { + "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + } }, "asynckit": { "version": "0.4.0", @@ -76,7 +96,10 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", - "optional": true + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } }, "bcryptjs": { "version": "2.4.3", @@ -90,6 +113,18 @@ "body-parser": { "version": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz", "integrity": "sha1-+IkqvI+eYn1Crtr7yma/WrmRBO4=", + "requires": { + "bytes": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", + "content-type": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz", + "debug": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", + "depd": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", + "http-errors": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz", + "iconv-lite": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz", + "on-finished": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "qs": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "raw-body": "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz", + "type-is": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz" + }, "dependencies": { "debug": { "version": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", @@ -108,7 +143,10 @@ "boom": { "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=" + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "requires": { + "hoek": "2.16.3" + } }, "bson": { "version": "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz", @@ -133,20 +171,41 @@ }, "center-align": { "version": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=" + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "requires": { + "align-text": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "lazy-cache": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz" + } }, "cheerio": { "version": "1.0.0-rc.2", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz", - "integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=" + "integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=", + "requires": { + "css-select": "1.2.0", + "dom-serializer": "0.1.0", + "entities": "1.1.1", + "htmlparser2": "3.9.2", + "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "parse5": "3.0.3" + } }, "clean-css": { "version": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.26.tgz", - "integrity": "sha1-VTI7NE/zvO5oSi6sgck9+Ppz3us=" + "integrity": "sha1-VTI7NE/zvO5oSi6sgck9+Ppz3us=", + "requires": { + "commander": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", + "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz" + } }, "cliui": { "version": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=" + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "requires": { + "center-align": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "right-align": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "wordwrap": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz" + } }, "co": { "version": "4.6.0", @@ -156,11 +215,17 @@ "combined-stream": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=" + "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "requires": { + "delayed-stream": "1.0.0" + } }, "commander": { "version": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", - "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=" + "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "requires": { + "graceful-readlink": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz" + } }, "content-disposition": { "version": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", @@ -176,7 +241,11 @@ }, "cookie-parser": { "version": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz", - "integrity": "sha1-D+MfoZ0AC5X0qt8fU/3CuKIDuqU=" + "integrity": "sha1-D+MfoZ0AC5X0qt8fU/3CuKIDuqU=", + "requires": { + "cookie": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "cookie-signature": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" + } }, "cookie-signature": { "version": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", @@ -189,11 +258,18 @@ "cryptiles": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=" + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "requires": { + "boom": "2.10.1" + } }, "css": { "version": "https://registry.npmjs.org/css/-/css-1.0.8.tgz", - "integrity": "sha1-k4aBHKgrzMnuf7WnMrHioxfIo+c=" + "integrity": "sha1-k4aBHKgrzMnuf7WnMrHioxfIo+c=", + "requires": { + "css-parse": "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz", + "css-stringify": "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz" + } }, "css-parse": { "version": "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz", @@ -202,7 +278,13 @@ "css-select": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", - "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=" + "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", + "requires": { + "boolbase": "1.0.0", + "css-what": "2.1.0", + "domutils": "1.5.1", + "nth-check": "1.0.1" + } }, "css-stringify": { "version": "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz", @@ -216,7 +298,13 @@ "csv": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/csv/-/csv-1.1.1.tgz", - "integrity": "sha1-2ZUtWbH5ZKevvN2ATWgYpzGZpHc=" + "integrity": "sha1-2ZUtWbH5ZKevvN2ATWgYpzGZpHc=", + "requires": { + "csv-generate": "1.0.0", + "csv-parse": "1.2.1", + "csv-stringify": "1.0.4", + "stream-transform": "0.1.2" + } }, "csv-generate": { "version": "1.0.0", @@ -231,12 +319,18 @@ "csv-stringify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-1.0.4.tgz", - "integrity": "sha1-vBi6ua1M7zGV/SV5gLWLR5xC0+U=" + "integrity": "sha1-vBi6ua1M7zGV/SV5gLWLR5xC0+U=", + "requires": { + "lodash.get": "4.4.2" + } }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "1.0.0" + }, "dependencies": { "assert-plus": { "version": "1.0.0", @@ -247,7 +341,10 @@ }, "debug": { "version": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", - "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=" + "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "requires": { + "ms": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" + } }, "decamelize": { "version": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", @@ -270,6 +367,10 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "requires": { + "domelementtype": "1.1.3", + "entities": "1.1.1" + }, "dependencies": { "domelementtype": { "version": "1.1.3", @@ -286,18 +387,28 @@ "domhandler": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", - "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=" + "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", + "requires": { + "domelementtype": "1.3.0" + } }, "domutils": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=" + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "requires": { + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" + } }, "ecc-jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", - "optional": true + "optional": true, + "requires": { + "jsbn": "0.1.1" + } }, "ee-first": { "version": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -327,6 +438,36 @@ "express": { "version": "https://registry.npmjs.org/express/-/express-4.15.3.tgz", "integrity": "sha1-urZdDwOqgMNYQIly/HAPkWlEtmI=", + "requires": { + "accepts": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", + "array-flatten": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "content-disposition": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", + "content-type": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz", + "cookie": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "cookie-signature": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "debug": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", + "depd": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", + "encodeurl": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "escape-html": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "etag": "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz", + "finalhandler": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz", + "fresh": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz", + "merge-descriptors": "1.0.1", + "methods": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "on-finished": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "parseurl": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "path-to-regexp": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "proxy-addr": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz", + "qs": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "range-parser": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "send": "https://registry.npmjs.org/send/-/send-0.15.3.tgz", + "serve-static": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz", + "setprototypeof": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", + "statuses": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "type-is": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", + "utils-merge": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", + "vary": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz" + }, "dependencies": { "debug": { "version": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", @@ -350,6 +491,15 @@ "finalhandler": { "version": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz", "integrity": "sha1-70fneVDpmXgOhgIqVg4yF+DQzIk=", + "requires": { + "debug": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", + "encodeurl": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "escape-html": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "on-finished": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "parseurl": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "statuses": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "unpipe": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" + }, "dependencies": { "debug": { "version": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", @@ -368,7 +518,12 @@ "form-data": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=" + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz" + } }, "forwarded": { "version": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz", @@ -382,6 +537,9 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "1.0.0" + }, "dependencies": { "assert-plus": { "version": "1.0.0", @@ -402,12 +560,22 @@ "har-validator": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", - "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=" + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } }, "hawk": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=" + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } }, "hoek": { "version": "2.16.3", @@ -421,21 +589,46 @@ "htmlparser2": { "version": "3.9.2", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", - "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=" + "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", + "requires": { + "domelementtype": "1.3.0", + "domhandler": "2.4.1", + "domutils": "1.5.1", + "entities": "1.1.1", + "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz" + } }, "http-auth": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/http-auth/-/http-auth-3.2.3.tgz", - "integrity": "sha1-Y2hCtx1uHyyY26Ca9UQXof74thw=" + "integrity": "sha1-Y2hCtx1uHyyY26Ca9UQXof74thw=", + "requires": { + "apache-crypt": "1.2.1", + "apache-md5": "1.1.2", + "bcryptjs": "2.4.3", + "uuid": "3.1.0" + } }, "http-errors": { "version": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz", - "integrity": "sha1-X4uO2YrKVFZWv1cplzh/kEpyIlc=" + "integrity": "sha1-X4uO2YrKVFZWv1cplzh/kEpyIlc=", + "requires": { + "depd": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", + "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "setprototypeof": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", + "statuses": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz" + } }, "http-signature": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=" + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.0", + "sshpk": "1.13.1" + } }, "iconv-lite": { "version": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz", @@ -475,6 +668,18 @@ "jade": { "version": "https://registry.npmjs.org/jade/-/jade-1.11.0.tgz", "integrity": "sha1-nIDlOMEtP7lcjZu5VZ+gzAQEBf0=", + "requires": { + "character-parser": "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz", + "clean-css": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.26.tgz", + "commander": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz", + "constantinople": "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz", + "jstransformer": "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz", + "mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "transformers": "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz", + "uglify-js": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.28.tgz", + "void-elements": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", + "with": "https://registry.npmjs.org/with/-/with-4.0.3.tgz" + }, "dependencies": { "acorn": { "version": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz", @@ -510,7 +715,7 @@ "version": "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz", "integrity": "sha1-eq4pqQPRls+glz2IXT5HlH7Ndqs=", "requires": { - "is-promise": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", + "is-promise": "2.1.0", "promise": "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz" } }, @@ -551,7 +756,10 @@ "json-stable-stringify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=" + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "requires": { + "jsonify": "0.0.0" + } }, "json-stringify-safe": { "version": "5.0.1", @@ -567,6 +775,12 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=", + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.0.2", + "json-schema": "0.2.3", + "verror": "1.3.6" + }, "dependencies": { "assert-plus": { "version": "1.0.0", @@ -581,7 +795,10 @@ }, "kind-of": { "version": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=" + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz" + } }, "lazy-cache": { "version": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", @@ -623,7 +840,10 @@ }, "mime-types": { "version": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", - "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=" + "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", + "requires": { + "mime-db": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz" + } }, "minimist": { "version": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", @@ -631,19 +851,45 @@ }, "mkdirp": { "version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=" + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "requires": { + "minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" + } }, "mongodb": { "version": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.28.tgz", - "integrity": "sha1-2P9FdUNm4Dlz+iWb9PEUR4WNplc=" + "integrity": "sha1-2P9FdUNm4Dlz+iWb9PEUR4WNplc=", + "requires": { + "es6-promise": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz", + "mongodb-core": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.12.tgz", + "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz" + } }, "mongodb-core": { "version": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.12.tgz", - "integrity": "sha1-FTEZJRG8Fu8WCsauDMRndv/YRR0=" + "integrity": "sha1-FTEZJRG8Fu8WCsauDMRndv/YRR0=", + "requires": { + "bson": "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz", + "require_optional": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz" + } }, "mongoose": { "version": "https://registry.npmjs.org/mongoose/-/mongoose-4.10.4.tgz", "integrity": "sha1-uaCgM3JeXCnv2e77RofRNxlWx7Y=", + "requires": { + "async": "https://registry.npmjs.org/async/-/async-2.1.4.tgz", + "bson": "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz", + "hooks-fixed": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-2.0.0.tgz", + "kareem": "https://registry.npmjs.org/kareem/-/kareem-1.4.1.tgz", + "mongodb": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.27.tgz", + "mpath": "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz", + "mpromise": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.5.tgz", + "mquery": "https://registry.npmjs.org/mquery/-/mquery-2.3.1.tgz", + "ms": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "muri": "https://registry.npmjs.org/muri/-/muri-1.2.1.tgz", + "regexp-clone": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz", + "sliced": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz" + }, "dependencies": { "mongodb": { "version": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.27.tgz", @@ -666,7 +912,14 @@ }, "morgan": { "version": "https://registry.npmjs.org/morgan/-/morgan-1.8.2.tgz", - "integrity": "sha1-eErHc05KRTqcbm6GgKkyknXItoc=" + "integrity": "sha1-eErHc05KRTqcbm6GgKkyknXItoc=", + "requires": { + "basic-auth": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz", + "debug": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "depd": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", + "on-finished": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "on-headers": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz" + } }, "mpath": { "version": "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz", @@ -679,6 +932,12 @@ "mquery": { "version": "https://registry.npmjs.org/mquery/-/mquery-2.3.1.tgz", "integrity": "sha1-mrNnSXFIAP8LtTpoHOS8TV8HyHs=", + "requires": { + "bluebird": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz", + "debug": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "regexp-clone": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz", + "sliced": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz" + }, "dependencies": { "sliced": { "version": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz", @@ -701,7 +960,10 @@ "nth-check": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", - "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=" + "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", + "requires": { + "boolbase": "1.0.0" + } }, "oauth-sign": { "version": "0.8.2", @@ -710,7 +972,10 @@ }, "on-finished": { "version": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=" + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "requires": { + "ee-first": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" + } }, "on-headers": { "version": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", @@ -719,7 +984,10 @@ "parse5": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz", - "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==" + "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==", + "requires": { + "@types/node": "8.0.52" + } }, "parseurl": { "version": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", @@ -740,7 +1008,11 @@ }, "proxy-addr": { "version": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz", - "integrity": "sha1-J+VF9pYKRKYn2bREZ+NcG2tM4vM=" + "integrity": "sha1-J+VF9pYKRKYn2bREZ+NcG2tM4vM=", + "requires": { + "forwarded": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz", + "ipaddr.js": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz" + } }, "punycode": { "version": "1.4.1", @@ -757,11 +1029,25 @@ }, "raw-body": { "version": "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz", - "integrity": "sha1-mUl2z2pQlqQRYoQEkvC9xdbn+5Y=" + "integrity": "sha1-mUl2z2pQlqQRYoQEkvC9xdbn+5Y=", + "requires": { + "bytes": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", + "iconv-lite": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz", + "unpipe": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" + } }, "readable-stream": { "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz", - "integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE=" + "integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE=", + "requires": { + "buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", + "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", + "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + } }, "regexp-clone": { "version": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz", @@ -774,11 +1060,39 @@ "request": { "version": "2.81.0", "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", - "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=" + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.6.0", + "uuid": "3.1.0" + } }, "require_optional": { "version": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz", - "integrity": "sha1-UqhhN6hJco62ClVTNhf4+RT1mr8=" + "integrity": "sha1-UqhhN6hJco62ClVTNhf4+RT1mr8=", + "requires": { + "resolve-from": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", + "semver": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz" + } }, "resolve-from": { "version": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", @@ -786,7 +1100,10 @@ }, "right-align": { "version": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=" + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "requires": { + "align-text": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz" + } }, "safe-buffer": { "version": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz", @@ -799,6 +1116,21 @@ "send": { "version": "https://registry.npmjs.org/send/-/send-0.15.3.tgz", "integrity": "sha1-UBP5+ZAj31DRvZiSwZ4979HVMwk=", + "requires": { + "debug": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", + "depd": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", + "destroy": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "encodeurl": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "escape-html": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "etag": "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz", + "fresh": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz", + "http-errors": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz", + "mime": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", + "ms": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "on-finished": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "range-parser": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "statuses": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz" + }, "dependencies": { "debug": { "version": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", @@ -812,6 +1144,13 @@ "serve-favicon": { "version": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.3.tgz", "integrity": "sha1-WYaxewUCZCtkHCH4GLGszjICXSM=", + "requires": { + "etag": "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz", + "fresh": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz", + "ms": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "parseurl": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz" + }, "dependencies": { "safe-buffer": { "version": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", @@ -821,7 +1160,13 @@ }, "serve-static": { "version": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz", - "integrity": "sha1-n0uhni8wMMVH+K+ZEHg47DjVseI=" + "integrity": "sha1-n0uhni8wMMVH+K+ZEHg47DjVseI=", + "requires": { + "encodeurl": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "escape-html": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "parseurl": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "send": "https://registry.npmjs.org/send/-/send-0.15.3.tgz" + } }, "setprototypeof": { "version": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", @@ -834,16 +1179,32 @@ "sntp": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=" + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "requires": { + "hoek": "2.16.3" + } }, "source-map": { "version": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=" + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "requires": { + "amdefine": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz" + } }, "sshpk": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, "dependencies": { "assert-plus": { "version": "1.0.0", @@ -863,7 +1224,10 @@ }, "string_decoder": { "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", - "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=" + "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=", + "requires": { + "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz" + } }, "stringstream": { "version": "0.0.5", @@ -873,11 +1237,19 @@ "tough-cookie": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", - "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=" + "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", + "requires": { + "punycode": "1.4.1" + } }, "transformers": { "version": "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz", "integrity": "sha1-XSPLNVYd2F3Gf7hIIwm0fVPM6ac=", + "requires": { + "css": "https://registry.npmjs.org/css/-/css-1.0.8.tgz", + "promise": "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz", + "uglify-js": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz" + }, "dependencies": { "is-promise": { "version": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz", @@ -901,7 +1273,6 @@ "version": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz", "integrity": "sha1-puAqcNg5eSuXgEiLe4sYTAlcmcc=", "requires": { - "optimist": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz" } } @@ -910,7 +1281,10 @@ "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=" + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz" + } }, "tweetnacl": { "version": "0.14.5", @@ -920,11 +1294,20 @@ }, "type-is": { "version": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", - "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=" + "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=", + "requires": { + "media-typer": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz" + } }, "uglify-js": { "version": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.28.tgz", "integrity": "sha1-4zUDLfm7INy5GPFkWJ1a9H84g0o=", + "requires": { + "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "uglify-to-browserify": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "yargs": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz" + }, "dependencies": { "source-map": { "version": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", @@ -966,7 +1349,10 @@ "verror": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", - "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=" + "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", + "requires": { + "extsprintf": "1.0.2" + } }, "void-elements": { "version": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", @@ -982,7 +1368,13 @@ }, "yargs": { "version": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=" + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "requires": { + "camelcase": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "cliui": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "decamelize": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "window-size": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz" + } } } } diff --git a/views/index.jade b/views/index.jade index 55114fb..a675f62 100755 --- a/views/index.jade +++ b/views/index.jade @@ -1,6 +1,6 @@ extends layout -block content - +block content + #container-main #list-container.shadow @@ -12,7 +12,7 @@ block content span(id="search-icon" class="fa fa-search" aria-hidden="true") td input(id="searchString-input" type='text' autofocus) - + div.filter-inputs #input-slider #slider-range-container @@ -20,31 +20,31 @@ block content #slider-labels #slider-label-left extinct #slider-label-right healthy - #listlegend-target + #listlegend-target #langlist-status.shadow #langlist-status-texttarget input(type="button" onClick="resetFilters()" value="reset").button-fullwidth #langlist-target - + #overlay-target #drawing-container.drawing-wide #about-link - a(onClick="updateAboutCard()") about + a(onClick="updateAboutCard()") about #map-title h1 Beyond the Census: Languages of Queens #map-target - + #detail-container.hidden.shadow #lang-content svg(id="globe-target" viewBox="0 0 240 240" class="hidden") - - + + // script starts here script(type='text/javascript'). - + // main state variable // contains entire dataset loaded from DB, filtered group, single highlighted language var state = { @@ -70,9 +70,9 @@ block content // old: from pums person basequery: '../individual', queryarray: [false, false, false], - querystring: './individual/false/false/false' + querystring: './individual/false/false/false' } - + var input = { 'filterstring': '', 'filtertype': 'langname', @@ -87,14 +87,14 @@ block content countries: [], neighborhoods: [], selected: {} - }, + }, zoomInitial = 11.75, mapCenter = [40.68658, -73.8099], queensBounds = [[40.35,-74.33],[40.85,-73.2]] ; - //path, + //path, //transform; - + var map = new L.Map('map-target', { center: mapCenter, zoom: zoomInitial, @@ -102,22 +102,29 @@ block content maxZoom: 18, maxBounds: queensBounds, maxBoundsViscosity: 0.2, - zoomSnap: 0.25, - zoomControl: true, + zoomSnap: 0.25, + zoomControl: true, attributionControl: false }) - Tangram.leafletLayer({ scene: '../scene.yaml' }).addTo(map); // adds tangram basemap layer for leaflet + + // Commenting out Tangram layer due to Mapzen shutdown + //Tangram.leafletLayer({ scene: '../scene.yaml' }).addTo(map); // adds tangram basemap layer for leaflet + + // Add custom basemap from mapbox + var light = L.tileLayer('https://api.mapbox.com/styles/v1/sidl/cjcumjncp0slx2smuxth9rexq/tiles/256/{z}/{x}/{y}?access_token=pk.eyJ1Ijoic2lkbCIsImEiOiJkOGM1ZDc0ZTc5NGY0ZGM4MmNkNWIyMmIzNDBkMmZkNiJ9.Qn36nbIqgMc4V0KEhb4iEw' + ).addTo(map); + L.svg({ padding: 0 }).addTo(map); // makes the overlay layer for the map - - + + // initialize main d3 map layer var mapLayer = d3.select('#map-target').select('svg'); mapLayer.attr("id", "map-svg-main") .raise() - .attr('pointer-events', 'auto'); - + .attr('pointer-events', 'auto'); + init(); - + // runs once on page load function init() { // build slider @@ -129,8 +136,8 @@ block content 'min': [ 0 ], 'max': [ 10 ] } - }); - + }); + updateData( input.filtertype, input.filterstring, state.filters.endangermentRange, () => { applyFilters(); drawQueensOutline(); @@ -138,109 +145,109 @@ block content drawDotMap(); }); } - + d3.select('#loading') .classed('hidden', true); - + // event listeners d3.select('#searchString-input') .on('input', function () { state.filters.searchString = d3.select(this).property('value'); applyFilters(); }); - + d3.select('#filter-endangerment') .on('input', function() { input.endangerment = d3.select(this).property('value'); // update endangerment value }) - - + + d3.select('#underlay-dropdown') .on('input', function() { input.underlay = d3.select(this).property('value'); console.log(input.underlay); drawUnderlay(); }) - + d3.select('#show-about-content') .on('click', function() { d3.select('#about-content') .classed('hidden', false); d3.select('#show-about-content') - .classed('hidden', true); + .classed('hidden', true); }) - + d3.select('#hide-about-content') .on('click', function() { d3.select('#about-content') .classed('hidden', true); d3.select('#show-about-content') - .classed('hidden', false); + .classed('hidden', false); }) - + var showNeighborhoodsBox = d3.select('#showNeighborhoods') .on('click', function() { let status = showNeighborhoodsBox.node().checked; - d3.selectAll('.map.nbd').classed('hidden', !status); + d3.selectAll('.map.nbd').classed('hidden', !status); }) - + var showInstitutionsBox = d3.select('#showInstitutions') .on('click', function() { let status = showInstitutionsBox.node().checked; - d3.selectAll('.map.inst').classed('hidden', !status); + d3.selectAll('.map.inst').classed('hidden', !status); }) - + var showLabelsBox = d3.select('#showLabels') .on('click', function() { let status = showLabelsBox.node().checked; d3.selectAll('text').classed('hidden', !status) - }) - + }) + d3.select('#langlist-target').on('scroll', () => { clearOverlay(); }) - - + + window.addEventListener('resize', () => { clearOverlay(); - + }) - + d3.select(window) .on('scroll', () => { - }) + }) state.ui.endangermentSlider.on('set', function(){ state.filters.endangermentRange = [10 - this.get()[1], 10 - this.get()[0]]; applyFilters(); }); - function resetMap() { + function resetMap() { map.flyTo(mapCenter, zoomInitial); - d3.selectAll('.nbd-otln').attr('stroke', 'transparent') + d3.selectAll('.nbd-otln').attr('stroke', 'transparent') removeUnderlay() } - + function showAllLangs() { d3.selectAll('.lang').classed('maplang-hidden', false).classed('listlang-hidden', false) } function hideAllLangs() { d3.selectAll('.lang').classed('maplang-hidden', true).classed('listlang-hidden', true) } - + function hideDetails() { d3.select('#detail-container').classed('hidden', true) clearOverlay(); mapUnHighlight(); } - - + + updateStory(state.querystring); - + d3.select('#loadStory').on('click', () => { updateStory(state.querystring); }) - + var hideUSbornCheckBox = d3.select('#hideUSborn').on('click', () => { updateQueryString( hideUSbornCheckBox.node().checked, 0 ) }) @@ -251,9 +258,9 @@ block content updateQueryString( hideSpanishCheckBox.node().checked, 2 ) }) var hideLabelsCheckBox = d3.select('#hideCheckbox').on('click', () => { - + }) - + function updateStory(q) { d3.json(q, (json) => { var person = d3.select('#person-content') @@ -264,27 +271,27 @@ block content .data(json.story) .enter() .append('p') - .text((d, i) => {return d}) + .text((d, i) => {return d}) }) } - + function updateQueryString(value, position) { state.queryarray[position] = value; state.querystring = state.basequery + '/' + state.queryarray.toString().replace(/,/g , '/'); } - + // reset all UI elements function resetUI() { state.ui.endangermentSlider.reset(); clearSearchForm(); hideDetails(); } - + function clearSearchForm() { var e = document.getElementById("searchString-input"); e.value = ''; } - + function clearOverlay() { d3.select('#overlay-target').selectAll('*').remove(); }