Merge branch 'dev' of https://github.com/umami-software/umami into dev

# Conflicts:
#	pages/api/account/index.js

pages/api/websites/[id]/events.js

@@ -0,0 +1,36 @@
+import moment from 'moment-timezone';
+import { getEventMetrics } from 'queries';
+import { ok, badRequest, methodNotAllowed, unauthorized } from 'next-basics';
+import { allowQuery } from 'lib/auth';
+import { useCors } from 'lib/middleware';
+
+const unitTypes = ['year', 'month', 'hour', 'day'];
+
+export default async (req, res) => {
+  if (req.method === 'GET') {
+    await useCors(req, res);
+
+    if (!(await allowQuery(req))) {
+      return unauthorized(res);
+    }
+
+    const { id, start_at, end_at, unit, tz, url, event_name } = req.query;
+
+    if (!moment.tz.zone(tz) || !unitTypes.includes(unit)) {
+      return badRequest(res);
+    }
+
+    const websiteId = +id;
+    const startDate = new Date(+start_at);
+    const endDate = new Date(+end_at);
+
+    const events = await getEventMetrics(websiteId, startDate, endDate, tz, unit, {
+      url,
+      event_name,
+    });
+
+    return ok(res, events);
+  }
+
+  return methodNotAllowed(res);
+};