m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-11-15 17:55:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into analytics

Browse Source
This commit is contained in:
Mike Cao 2022-12-12 20:51:12 -08:00
commit da49543b91
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -84,7 +84,7 @@
"maxmind": "^4.3.6", "maxmind": "^4.3.6",
"moment-timezone": "^0.5.35", "moment-timezone": "^0.5.35",
"next": "^12.3.1", "next": "^12.3.1",
"next-basics": "^0.23.0", "next-basics": "^0.24.0",
"node-fetch": "^3.2.8", "node-fetch": "^3.2.8",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",

4
pages/api/collect.ts
View File

@ -35,9 +35,7 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
let { url } = payload; let { url } = payload;
// Validate eventData is JSON // Validate eventData is JSON
const valid = eventData && typeof eventData === 'object' && !Array.isArray(eventData); if (eventData && !(typeof eventData === 'object' && !Array.isArray(eventData))) {
if (!valid) {
return badRequest(res, 'Event Data must be in the form of a JSON Object.'); return badRequest(res, 'Event Data must be in the form of a JSON Object.');
} }

4
styles/index.css
View File

@ -13,8 +13,8 @@ body {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
color: var(--base800); color: var(--font-color100);
background: var(--base100); background: var(--background200);
} }
.zh-CN { .zh-CN {

8
yarn.lock
View File

@ -5445,10 +5445,10 @@ natural-compare@^1.4.0:
resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
next-basics@^0.23.0: next-basics@^0.24.0:
version "0.23.0" version "0.24.0"
resolved "https://registry.yarnpkg.com/next-basics/-/next-basics-0.23.0.tgz#6ccc4b5f3cd87550b07d280c2a3bdee26f557912" resolved "https://registry.yarnpkg.com/next-basics/-/next-basics-0.24.0.tgz#21ebd34276b3a957b1f6c644de494cc1a17953ea"
integrity sha512-AwKipMFkxS84ZKFDVSo8ZHXoOVzF2sPZp21pgtGlqf9aUmj48+QtxdM6ZnJVRg8Savf48ENjeYzeiu5I8Z4l/w== integrity sha512-N0wABIkzFpDIoxSEyeLZ8wNENLhcQtPqEY/mKLzpNfr4x4bQ0c5qnXEtrNEftWeQt0osjiuL5yFlnXOOQgTHpQ==
dependencies: dependencies:
base-x "^4.0.0" base-x "^4.0.0"
bcryptjs "^2.4.3" bcryptjs "^2.4.3"