diff --git a/components/layout.js b/components/layout.js index c3880bd3..9024686b 100644 --- a/components/layout.js +++ b/components/layout.js @@ -18,7 +18,7 @@ export default function Layout({ title, children }) { async defer data-website-id="865234ad-6a92-11e7-8846-b05adad3f099" - src="/umami.js" + src="http://umami.is/umami.js" /> )} diff --git a/package.json b/package.json index 6d79f61c..1f768b5b 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ }, "dependencies": { "@prisma/client": "2.2.2", + "chart.js": "^2.9.3", "classnames": "^2.2.6", "date-fns": "^2.14.0", "detect-browser": "^5.1.1", diff --git a/pages/api/collect.js b/pages/api/collect.js index f200cd07..1c9334bf 100644 --- a/pages/api/collect.js +++ b/pages/api/collect.js @@ -12,5 +12,7 @@ export default async (req, res) => { } } + res.setHeader('Access-Control-Allow-Origin', '*'); + res.status(200).json({ status: values.valid }); }; diff --git a/pages/api/session.js b/pages/api/session.js index 55238a5d..9e1cf2f1 100644 --- a/pages/api/session.js +++ b/pages/api/session.js @@ -30,5 +30,7 @@ export default async (req, res) => { }; } + res.setHeader('Access-Control-Allow-Origin', '*'); + res.status(200).json(result); }; diff --git a/scripts/umami/index.js b/scripts/umami/index.js index 4d871323..e48a969e 100644 --- a/scripts/umami/index.js +++ b/scripts/umami/index.js @@ -14,7 +14,10 @@ const { function post(url, params) { return fetch(url, { method: 'post', - mode: 'no-cors', + cache: 'no-cache', + headers: { + 'Content-Type': 'application/json', + }, body: JSON.stringify(params), }).then(res => res.json()); } diff --git a/yarn.lock b/yarn.lock index b86e2c6a..57f2bac5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2294,6 +2294,29 @@ chardet@^0.7.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== +chart.js@^2.9.3: + version "2.9.3" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.3.tgz#ae3884114dafd381bc600f5b35a189138aac1ef7" + integrity sha512-+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw== + dependencies: + chartjs-color "^2.1.0" + moment "^2.10.2" + +chartjs-color-string@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71" + integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A== + dependencies: + color-name "^1.0.0" + +chartjs-color@^2.1.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0" + integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w== + dependencies: + chartjs-color-string "^0.6.0" + color-convert "^1.9.3" + chokidar@^2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" @@ -2447,7 +2470,7 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.9.0, color-convert@^1.9.1: +color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -5246,6 +5269,11 @@ mkdirp@^1.0.3: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== +moment@^2.10.2: + version "2.27.0" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d" + integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ== + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"