diff --git a/.nvmrc b/.nvmrc index 8d1eec65..83ea3179 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -8.1 \ No newline at end of file +8.8 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 74fa1c2d..e2374281 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ services: - docker language: node_js node_js: -- '8.1' +- '8.8' install: - npm install -g jspm - npm install diff --git a/Dockerfile b/Dockerfile index b0bb929e..1cb5bf4a 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Use following version of Node as the base image -FROM node:8.1 +FROM node:8.8 # Set work directory for run/cmd WORKDIR /app diff --git a/chart/chart.js b/chart/chart.js index af0351b3..ca35a60d 100644 --- a/chart/chart.js +++ b/chart/chart.js @@ -277,38 +277,20 @@ export function getDivisorString(divisor) { } function getContextHtml(item, chartistConfig) { - let axisExplanation = {x: '', y: ''}; - axisExplanation.y = getDivisorString(chartistConfig.yValueDivisor); - - const labels = { - x: item.xAxisLabel, - y: item.yAxisLabel - } - let html = getLegendHtml(item); - var axisNames = new Array('y', 'x'); - if (chartistConfig.horizontalBars) { - axisNames.reverse(); - } - html += `
${labels[axisNames[0]] || ''}${axisExplanation[axisNames[0]]}
`; - if (item.data.x && item.dataSeriesType && item.dataSeriesType.id === 'date') { - if (chartistConfig.horizontalBars) { - html += `
${labels[axisNames[1]] || ''}${axisExplanation[axisNames[1]]}
`; + let chartistContainerMarkup = '
'; + + if (chartistConfig.horizontalBars) { + if (!item.options.hideAxisLabel) { + html += `
${item.xAxisLabel || ''}
`; } - html += '
'; + html += chartistContainerMarkup; } else { - if (chartistConfig.horizontalBars) { - html += ` -
${labels[axisNames[1]] || ''}${axisExplanation[axisNames[1]]}
-
- `; - } else { - html += ` -
-
${labels[axisNames[1]] || ''}${axisExplanation[axisNames[1]]}
- `; + html += chartistContainerMarkup; + if (!item.options.hideAxisLabel) { + html += `
${item.xAxisLabel || ''}
`; } } html += ''; diff --git a/index.html b/index.html index 618324ef..32d86f6d 100755 --- a/index.html +++ b/index.html @@ -3,8 +3,9 @@ - Q Renderer Skeleton + Q Chart + @@ -494,6 +495,7 @@ "prognosisStart": null }, "highlightDataSeries": 1, + "hideAxisLabel": false, "colorOverwrite": [ { "color": "red", diff --git a/package-lock.json b/package-lock.json index e3ded924..350f9294 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@nzz/q-chart", - "version": "1.1.1", + "version": "1.3.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -16,6 +16,13 @@ "requires": { "boom": "5.2.0", "hoek": "4.2.0" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "ajv": { @@ -56,6 +63,13 @@ "requires": { "boom": "5.2.0", "hoek": "4.2.0" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "ansi-regex": { @@ -163,16 +177,78 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "autoprefixer": { - "version": "6.7.7", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", - "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.6.tgz", + "integrity": "sha512-C9yv/UF3X+eJTi/zvfxuyfxmLibYrntpF3qoJYrMeQwgUJOZrZvpJiMG2FMQ3qnhWtF/be4pYONBBw95ZGe3vA==", "requires": { - "browserslist": "1.7.7", - "caniuse-db": "1.0.30000745", + "browserslist": "2.6.1", + "caniuse-lite": "1.0.30000756", "normalize-range": "0.1.2", "num2fraction": "1.2.2", - "postcss": "5.2.18", + "postcss": "6.0.13", "postcss-value-parser": "3.3.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "requires": { + "color-convert": "1.9.0" + } + }, + "browserslist": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.6.1.tgz", + "integrity": "sha512-HBZwVT7ciQB9KlXM3AUMQbnQXtHWPsEUKQTiS0BEFfY5bOrMl94ORaqQD1GyuTGh69ZmYeue9QBqiw219e09eQ==", + "requires": { + "caniuse-lite": "1.0.30000756", + "electron-to-chromium": "1.3.27" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "electron-to-chromium": { + "version": "1.3.27", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz", + "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=" + }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" + }, + "postcss": { + "version": "6.0.13", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz", + "integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==", + "requires": { + "chalk": "2.3.0", + "source-map": "0.6.1", + "supports-color": "4.5.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "requires": { + "has-flag": "2.0.0" + } + } } }, "aws-sign2": { @@ -441,6 +517,13 @@ "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", "requires": { "hoek": "4.2.0" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "brace-expansion": { @@ -508,6 +591,13 @@ "requires": { "boom": "5.2.0", "hoek": "4.2.0" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "camelcase": { @@ -547,6 +637,11 @@ "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000745.tgz", "integrity": "sha1-slmmFzej5IxPtLaxvETt6yZM1CI=" }, + "caniuse-lite": { + "version": "1.0.30000756", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000756.tgz", + "integrity": "sha1-PacBwVIbn6uHAExt58l/pH2+qtI=" + }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -562,6 +657,11 @@ "joi": "10.6.0" }, "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + }, "joi": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/joi/-/joi-10.6.0.tgz", @@ -581,6 +681,13 @@ "integrity": "sha1-Qz4lWQLK9UIz0ShkKcj03xToItU=", "requires": { "hoek": "4.2.0" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "center-align": { @@ -593,13 +700,16 @@ } }, "chai": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz", - "integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz", + "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=", "requires": { "assertion-error": "1.0.2", - "deep-eql": "0.1.3", - "type-detect": "1.0.0" + "check-error": "1.0.2", + "deep-eql": "3.0.1", + "get-func-name": "2.0.0", + "pathval": "1.1.0", + "type-detect": "4.0.3" } }, "chalk": { @@ -622,9 +732,14 @@ } }, "chance": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/chance/-/chance-1.0.11.tgz", - "integrity": "sha512-PK8Zmz6kJAkwwJuiTZvjcFX11/H+BvVd2r8dnHrDRXmOLoUHh4Hxiv+YyYTcT7sdFzP9LhMS3O3C/7f+7gSQ2g==" + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/chance/-/chance-1.0.12.tgz", + "integrity": "sha512-W99uMuboG5CT1iToDmizEH6yQYqICzZnrSRbbXPuJErzFWLPaoiEDvwnKbESjDo/8st1n3pyh70VBMmfqPmf+Q==" + }, + "check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=" }, "chownr": { "version": "1.0.1", @@ -826,6 +941,21 @@ "postcss-unique-selectors": "2.0.2", "postcss-value-parser": "3.3.0", "postcss-zindex": "2.2.0" + }, + "dependencies": { + "autoprefixer": { + "version": "6.7.7", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", + "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", + "requires": { + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000745", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + } + } } }, "csso": { @@ -880,18 +1010,11 @@ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, "deep-eql": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz", - "integrity": "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", "requires": { - "type-detect": "0.1.1" - }, - "dependencies": { - "type-detect": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz", - "integrity": "sha1-C6XsKohWQORw6k6FBZcZANrFiCI=" - } + "type-detect": "4.0.3" } }, "deep-extend": { @@ -915,9 +1038,9 @@ "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, "deref": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/deref/-/deref-0.6.4.tgz", - "integrity": "sha1-vVqW1F2+0wEbuBvfaN31S+jhvU4=", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/deref/-/deref-0.7.1.tgz", + "integrity": "sha512-XSRDBknHtbTPqrLwZyqZ8Cr7kRE3vhyVnizbYeIkgZUQHr54u6QMRXGOoYwxoEgy0Xw5dPCXirHtGHFPYm4IwQ==", "requires": { "deep-extend": "0.4.2" } @@ -971,9 +1094,9 @@ } }, "enjoi": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/enjoi/-/enjoi-2.2.3.tgz", - "integrity": "sha1-jlHxmiTNcJ3HQBVzcOFkQtDSFMw=", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/enjoi/-/enjoi-2.2.4.tgz", + "integrity": "sha1-Ax8bc7Mk2eG4yjq273md7I2BkG8=", "requires": { "core-util-is": "1.0.2", "joi": "9.2.0" @@ -1104,9 +1227,9 @@ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "faker": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/faker/-/faker-3.0.1.tgz", - "integrity": "sha1-w2J4zUI/PFN1vCcEZqIjSFwOe7I=" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/faker/-/faker-4.1.0.tgz", + "integrity": "sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=" }, "fast-deep-equal": { "version": "1.0.0", @@ -1272,6 +1395,11 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=" }, + "get-func-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", + "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=" + }, "get-stdin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", @@ -1404,6 +1532,11 @@ "topo": "2.0.2" }, "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + }, "isemail": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.0.0.tgz", @@ -1482,6 +1615,11 @@ "requires": { "hoek": "4.2.0" } + }, + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" } } }, @@ -1500,6 +1638,11 @@ "joi": "10.6.0" }, "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + }, "joi": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/joi/-/joi-10.6.0.tgz", @@ -1514,9 +1657,9 @@ } }, "hoek": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", - "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-5.0.1.tgz", + "integrity": "sha512-sZ2Et6jQxNCSShCUlPqzLNVD5bjWQxrCE6Bi4pgxcWaqIGk6dwdWszcJTn1qwrQLRwflxTaxfDX+QU3kioDuvw==" }, "home-or-tmp": { "version": "2.0.0", @@ -1586,6 +1729,11 @@ "lru-cache": "4.1.1" }, "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + }, "joi": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/joi/-/joi-10.6.0.tgz", @@ -1639,6 +1787,13 @@ "boom": "5.2.0", "cryptiles": "3.1.2", "hoek": "4.2.0" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "is-absolute": { @@ -1838,8 +1993,15 @@ "hoek": "4.2.0", "isemail": "2.2.1", "items": "2.1.1", - "moment": "2.18.1", + "moment": "2.19.1", "topo": "2.0.2" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "js-base64": { @@ -1878,14 +2040,15 @@ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-schema-faker": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/json-schema-faker/-/json-schema-faker-0.4.3.tgz", - "integrity": "sha512-t/e7JzYLopEg67SksHoCue8cErIue3ZBCAYjvj9dSbR7RyIcaHgkF7911hGy5oZVobIssKVqodM94nI6p4gD/w==", + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/json-schema-faker/-/json-schema-faker-0.4.6.tgz", + "integrity": "sha512-kbonsaY+tokCl4bcDohTaObTAPZBuzkKzVkv45rZ5p3TD0wvN6aL6QoXUzZ86A/+ooPPWg71FXAnk06LnhoICw==", "requires": { - "chance": "1.0.11", - "deref": "0.6.4", - "faker": "3.0.1", - "randexp": "0.4.6" + "chance": "1.0.12", + "deref": "0.7.1", + "faker": "4.1.0", + "randexp": "0.4.6", + "tslib": "1.8.0" } }, "json-schema-traverse": { @@ -2300,6 +2463,13 @@ "requires": { "hoek": "4.2.0", "mime-db": "1.30.0" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "minimatch": { @@ -2374,9 +2544,9 @@ } }, "moment": { - "version": "2.18.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz", - "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=" + "version": "2.19.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz", + "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc=" }, "ms": { "version": "2.0.0", @@ -2405,6 +2575,13 @@ "requires": { "hoek": "4.2.0", "vise": "2.0.2" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "node-gyp": { @@ -2726,6 +2903,11 @@ "pinkie-promise": "2.0.1" } }, + "pathval": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", + "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=" + }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -2741,6 +2923,13 @@ "content": "3.0.6", "hoek": "4.2.0", "nigel": "2.0.2" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "pify": { @@ -2771,6 +2960,11 @@ "joi": "10.6.0" }, "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + }, "joi": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/joi/-/joi-10.6.0.tgz", @@ -3603,6 +3797,11 @@ "joi": "10.6.0" }, "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + }, "joi": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/joi/-/joi-10.6.0.tgz", @@ -3632,6 +3831,13 @@ "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=", "requires": { "hoek": "4.2.0" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "sort-keys": { @@ -3716,6 +3922,11 @@ "joi": "10.6.0" }, "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + }, "joi": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/joi/-/joi-10.6.0.tgz", @@ -3742,14 +3953,6 @@ "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "requires": { - "safe-buffer": "5.1.1" - } - }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -3760,6 +3963,14 @@ "strip-ansi": "3.0.1" } }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", @@ -3799,6 +4010,13 @@ "hoek": "4.2.0", "pez": "2.1.5", "wreck": "12.5.1" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "supports-color": { @@ -3810,9 +4028,9 @@ } }, "svelte": { - "version": "1.40.2", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-1.40.2.tgz", - "integrity": "sha512-mtHSNwMlHNL4x2Mr9kPrnlDjV+9br+EfP2KmHvpan6WkzoTK1eO53azBocsM3RYUIdWvAii1ffnYbXOPfmYlXA==" + "version": "1.41.2", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-1.41.2.tgz", + "integrity": "sha512-KlL8oOJ/VEzqRXBXvsug0Yfdyv8AELDY3XJbMp7q+sL/bobEIkT4UmNXd1zZq3txebLh1ntzqPVhnmb4IaXmxQ==" }, "svgo": { "version": "0.7.2", @@ -3923,6 +4141,13 @@ "integrity": "sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=", "requires": { "hoek": "4.2.0" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "tough-cookie": { @@ -3981,6 +4206,11 @@ "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" }, + "tslib": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz", + "integrity": "sha512-ymKWWZJST0/CkgduC2qkzjMOWr4bouhuURNXCn/inEX0L57BnRG6FhX76o7FOnsjHazCjfU2LKeSrlS2sIKQJg==" + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -3996,9 +4226,9 @@ "optional": true }, "type-detect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz", - "integrity": "sha1-diIXzAbbJY7EiQihKY6LlRIejqI=" + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.3.tgz", + "integrity": "sha1-Dj8mcLRAmbC0bChNE2p+9Jx0wuo=" }, "uglify-js": { "version": "2.8.29", @@ -4079,6 +4309,13 @@ "integrity": "sha1-awjo+0y3bjpQzW3Q7DczjoEaDTk=", "requires": { "hoek": "4.2.0" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "walker": { @@ -4156,6 +4393,13 @@ "requires": { "boom": "5.2.0", "hoek": "4.2.0" + }, + "dependencies": { + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + } } }, "xtend": { diff --git a/package.json b/package.json index 93d5c45b..f46b292f 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nzz/q-chart", - "version": "1.2.0", + "version": "1.3.0", "description": "Q Chart", "keywords": [ "storytelling", @@ -32,21 +32,21 @@ }, "dependencies": { "array2d": "0.0.5", - "autoprefixer": "^6.7.7", - "chai": "^3.5.0", + "autoprefixer": "^7.1.6", + "chai": "^4.1.2", "cssnano": "^3.10.0", - "enjoi": "^2.2.3", + "enjoi": "^2.2.4", "hapi": "^16.6.2", - "hoek": "^4.1.1", + "hoek": "^5.0.1", "inert": "^4.1.0", - "json-schema-faker": "^0.4.0", + "json-schema-faker": "^0.4.6", "jspm": "^0.17.0-beta.41", "mocha": "^3.2.0", "node-sass": "^4.5.3", "postcss-import": "^11.0.0", - "svelte": "^1.40.2", + "svelte": "^1.41.2", "systemjs": "0.19.47", - "systemjs-builder": "^0.16.4" + "systemjs-builder": "0.16.4" }, "jspm": { "name": "@nzz/q-chart", diff --git a/resources/schema.json b/resources/schema.json index a21ae6c1..aec7fd5e 100755 --- a/resources/schema.json +++ b/resources/schema.json @@ -80,6 +80,11 @@ } } }, + "hideAxisLabel": { + "title": "Achsenbeschriftung ausblenden", + "type": "boolean", + "default": false + }, "barOptions": { "title": "Balkendiagramm Optionen", "type": "object", @@ -128,7 +133,7 @@ }, "properties": { "interval": { - "title": "Angezeigtes Interval", + "title": "Angezeigtes Intervall", "type": "string", "default": "year", "enum": ["year", "quarter", "month", "day", "hour"], diff --git a/routes/health.js b/routes/health.js new file mode 100644 index 00000000..a1e59dba --- /dev/null +++ b/routes/health.js @@ -0,0 +1,10 @@ +module.exports = { + path: '/health', + method: 'GET', + config: { + tags: ['api'] + }, + handler: (request, reply) => { + reply('ok'); + } +} \ No newline at end of file diff --git a/routes/routes.js b/routes/routes.js index a5bf8828..2f20c0bf 100755 --- a/routes/routes.js +++ b/routes/routes.js @@ -4,5 +4,6 @@ module.exports = [ require('./script.js'), require('./schema.js'), require('./option-availability.js'), - require('./dynamic-enum.js') + require('./dynamic-enum.js'), + require('./health.js') ]