mirror of
https://github.com/kremalicious/umami.git
synced 2024-11-15 17:55:08 +01:00
Merge branch 'dev' of https://github.com/mikecao/umami into dev
This commit is contained in:
commit
8eb597ff72
@ -32,7 +32,9 @@ export default function Dashboard() {
|
||||
return (
|
||||
<Page>
|
||||
<PageHeader>
|
||||
<div>Dashboard</div>
|
||||
<div>
|
||||
<FormattedMessage id="label.dashboard" defaultMessage="Dashboard" />
|
||||
</div>
|
||||
<DashboardSettingsButton />
|
||||
</PageHeader>
|
||||
<WebsiteList websites={data} showCharts={showCharts} limit={max} />
|
||||
|
@ -5,14 +5,14 @@ import useApi from './useApi';
|
||||
export default function useFetch(url, options = {}, update = []) {
|
||||
const [response, setResponse] = useState();
|
||||
const [error, setError] = useState();
|
||||
const [loading, setLoadiing] = useState(false);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [count, setCount] = useState(0);
|
||||
const { get } = useApi();
|
||||
const { params = {}, headers = {}, disabled, delay = 0, interval, onDataLoad } = options;
|
||||
|
||||
async function loadData(params) {
|
||||
try {
|
||||
setLoadiing(true);
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
const time = performance.now();
|
||||
|
||||
@ -32,7 +32,7 @@ export default function useFetch(url, options = {}, update = []) {
|
||||
console.error(e);
|
||||
setError(e);
|
||||
} finally {
|
||||
setLoadiing(false);
|
||||
setLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -51,7 +51,7 @@
|
||||
"label.settings": "Einstellungen",
|
||||
"label.share-url": "Freigabe-URL",
|
||||
"label.single-day": "Ein Tag",
|
||||
"label.theme": "Theme",
|
||||
"label.theme": "Thema",
|
||||
"label.this-month": "Diesen Monat",
|
||||
"label.this-week": "Diese Woche",
|
||||
"label.this-year": "Dieses Jahr",
|
||||
@ -92,7 +92,7 @@
|
||||
"metrics.countries": "Länder",
|
||||
"metrics.device.desktop": "Desktop",
|
||||
"metrics.device.laptop": "Laptop",
|
||||
"metrics.device.mobile": "Mobiltelefon",
|
||||
"metrics.device.mobile": "Handy",
|
||||
"metrics.device.tablet": "Tablet",
|
||||
"metrics.devices": "Geräte",
|
||||
"metrics.events": "Ereignisse",
|
||||
|
Loading…
Reference in New Issue
Block a user