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 pull request #349 from mikecao/dev

Browse Source 
v1.4.0
This commit is contained in:
Mike Cao 2020-11-02 20:07:20 -08:00 committed by GitHub
commit c881751e4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 678 additions and 440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/metrics/RealtimeLog.js
View File

@ -101,6 +101,7 @@ export default function RealtimeLog({ data, websites }) {
os, os,
country, country,
device, device,
website_id,
}) { }) {
if (event_type) { if (event_type) {
return ( return (
@ -110,7 +111,17 @@ export default function RealtimeLog({ data, websites }) {
); );
} }
if (view_id) { if (view_id) {
return url; const domain = getWebsite({ website_id });
return (
<a
className={styles.link}
href={`//${domain}${url}`}
target="_blank"
rel="noreferrer noopener"
>
{url}
</a>
);
} }
if (session_id) { if (session_id) {
return ( return (

9
components/metrics/RealtimeLog.module.css
View File

@ -44,3 +44,12 @@
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
} }
.row .link {
color: var(--gray900);
text-decoration: none;
}
.row .link:hover {
color: var(--primary400);
}

8
components/settings/LanguageButton.js
View File

@ -16,13 +16,7 @@ export default function LanguageButton() {
return ( return (
<> <>
<Head> <Head>
{locale === 'zh-CN' && ( {(locale === 'zh-CN' || locale === 'zh-TW') && (
<link
href="https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@400;500;700&display=swap"
rel="stylesheet"
/>
)}
{locale === 'zh-TW' && (
<link <link
href="https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@400;500;700&display=swap" href="https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@400;500;700&display=swap"
rel="stylesheet" rel="stylesheet"

52
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "umami", "name": "umami",
"version": "1.2.0", "version": "1.4.0",
"description": "A simple, fast, website analytics alternative to Google Analytics. ", "description": "A simple, fast, website analytics alternative to Google Analytics. ",
"author": "Mike Cao <mike@mikecao.com>", "author": "Mike Cao <mike@mikecao.com>",
"license": "MIT", "license": "MIT",
@ -56,11 +56,11 @@
} }
}, },
"dependencies": { "dependencies": {
"@prisma/client": "2.9.0", "@prisma/client": "2.10.1",
"@reduxjs/toolkit": "^1.4.0", "@reduxjs/toolkit": "^1.4.0",
"bcrypt": "^5.0.0", "bcrypt": "^5.0.0",
"chalk": "^4.1.0", "chalk": "^4.1.0",
"chart.js": "^2.9.3", "chart.js": "^2.9.4",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"cookie": "^0.4.1", "cookie": "^0.4.1",
"cors": "^2.8.5", "cors": "^2.8.5",
@ -68,24 +68,24 @@
"date-fns-tz": "^1.0.12", "date-fns-tz": "^1.0.12",
"detect-browser": "^5.2.0", "detect-browser": "^5.2.0",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"formik": "^2.2.0", "formik": "^2.2.1",
"immer": "^7.0.9", "immer": "^7.0.14",
"is-localhost-ip": "^1.4.0", "is-localhost-ip": "^1.4.0",
"isbot-fast": "^1.2.0", "isbot-fast": "^1.2.0",
"jose": "^2.0.2", "jose": "^2.0.3",
"maxmind": "^4.3.0", "maxmind": "^4.3.1",
"moment-timezone": "^0.5.31", "moment-timezone": "^0.5.31",
"next": "^9.5.5", "next": "^10.0.0",
"prompts": "2.3.2", "prompts": "2.4.0",
"react": "^16.13.1", "react": "^17.0.1",
"react-dom": "^16.13.1", "react-dom": "^17.0.1",
"react-intl": "^5.8.4", "react-intl": "^5.8.8",
"react-redux": "^7.2.1", "react-redux": "^7.2.2",
"react-simple-maps": "^2.1.2", "react-simple-maps": "^2.3.0",
"react-spring": "^8.0.27", "react-spring": "^8.0.27",
"react-tooltip": "^4.2.10", "react-tooltip": "^4.2.10",
"react-use-measure": "^2.0.2", "react-use-measure": "^2.0.2",
"react-window": "^1.8.5", "react-window": "^1.8.6",
"redux": "^4.0.5", "redux": "^4.0.5",
"redux-thunk": "^2.3.0", "redux-thunk": "^2.3.0",
"request-ip": "^2.1.3", "request-ip": "^2.1.3",
@ -96,31 +96,31 @@
"uuid": "^8.3.1" "uuid": "^8.3.1"
}, },
"devDependencies": { "devDependencies": {
"@formatjs/cli": "^2.13.2", "@formatjs/cli": "^2.13.5",
"@prisma/cli": "2.9.0", "@prisma/cli": "2.10.1",
"@rollup/plugin-buble": "^0.21.3", "@rollup/plugin-buble": "^0.21.3",
"@rollup/plugin-node-resolve": "^9.0.0", "@rollup/plugin-node-resolve": "^10.0.0",
"@rollup/plugin-replace": "^2.3.3", "@rollup/plugin-replace": "^2.3.4",
"@svgr/webpack": "^5.4.0", "@svgr/webpack": "^5.4.0",
"cross-env": "^7.0.2", "cross-env": "^7.0.2",
"del": "^6.0.0", "del": "^6.0.0",
"dotenv-cli": "^4.0.0", "dotenv-cli": "^4.0.0",
"eslint": "^7.11.0", "eslint": "^7.12.1",
"eslint-config-prettier": "^6.12.0", "eslint-config-prettier": "^6.15.0",
"eslint-plugin-prettier": "^3.1.3", "eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-react": "^7.21.4", "eslint-plugin-react": "^7.21.5",
"eslint-plugin-react-hooks": "^4.1.2", "eslint-plugin-react-hooks": "^4.2.0",
"extract-react-intl-messages": "^4.1.1", "extract-react-intl-messages": "^4.1.1",
"husky": "^4.3.0", "husky": "^4.3.0",
"lint-staged": "^10.4.0", "lint-staged": "^10.5.1",
"loadtest": "5.1.0", "loadtest": "5.1.0",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"postcss-flexbugs-fixes": "^4.2.1", "postcss-flexbugs-fixes": "^4.2.1",
"postcss-import": "^12.0.1", "postcss-import": "^13.0.0",
"postcss-preset-env": "^6.7.0", "postcss-preset-env": "^6.7.0",
"prettier": "^2.1.2", "prettier": "^2.1.2",
"prettier-eslint": "^11.0.0", "prettier-eslint": "^11.0.0",
"rollup": "^2.30.0", "rollup": "^2.33.0",
"rollup-plugin-hashbang": "^2.2.2", "rollup-plugin-hashbang": "^2.2.2",
"rollup-plugin-terser": "^7.0.2", "rollup-plugin-terser": "^7.0.2",
"stylelint": "^13.7.2", "stylelint": "^13.7.2",

1
public/country/cs-CZ.json Normal file
View File

File diff suppressed because one or more lines are too long

1
public/country/zh-TW.json Normal file
View File

File diff suppressed because one or more lines are too long

4
styles/index.css
View File

@ -20,6 +20,10 @@ body {
font-family: 'Noto Sans SC', sans-serif !important; font-family: 'Noto Sans SC', sans-serif !important;
} }
.zh-TW {
font-family: 'Noto Sans SC', sans-serif !important;
}
.ja-JP { .ja-JP {
font-family: 'Noto Sans JP', sans-serif !important; font-family: 'Noto Sans JP', sans-serif !important;
} }

2
tracker/index.js
View File

@ -6,6 +6,7 @@ import { removeTrailingSlash } from '../lib/url';
screen: { width, height }, screen: { width, height },
navigator: { language }, navigator: { language },
location: { hostname, pathname, search }, location: { hostname, pathname, search },
localStorage,
sessionStorage, sessionStorage,
document, document,
history, history,
@ -24,6 +25,7 @@ import { removeTrailingSlash } from '../lib/url';
const domains = attr('data-domains'); const domains = attr('data-domains');
const disableTracking = const disableTracking =
localStorage.getItem('umami.disabled') ||
(dnt && doNotTrack()) || (dnt && doNotTrack()) ||
(domains && (domains &&
!domains !domains

1028
yarn.lock
View File

File diff suppressed because it is too large Load Diff