diff --git a/assets/js/dashboard/api.js b/assets/js/dashboard/api.js index e0d407188..cccacbdaf 100644 --- a/assets/js/dashboard/api.js +++ b/assets/js/dashboard/api.js @@ -47,7 +47,7 @@ export function serializeQuery(query, extraQuery=[]) { return '?' + serialize(queryObj) } -export function get(url, query, ...extraQuery) { +export function get(url, query={}, ...extraQuery) { const headers = SHARED_LINK_AUTH ? {'X-Shared-Link-Auth': SHARED_LINK_AUTH} : {} url = url + serializeQuery(query, extraQuery) return fetch(url, {signal: abortController.signal, headers: headers}) diff --git a/assets/js/dashboard/site-switcher.js b/assets/js/dashboard/site-switcher.js index b1366f958..3269f2f64 100644 --- a/assets/js/dashboard/site-switcher.js +++ b/assets/js/dashboard/site-switcher.js @@ -27,6 +27,8 @@ export default class SiteSwitcher extends React.Component { } populateSites() { + if (!this.props.loggedIn) return; + fetch('/api/sites') .then( response => { if (!response.ok) { throw response } diff --git a/assets/js/dashboard/stats/current-visitors.js b/assets/js/dashboard/stats/current-visitors.js index 7c2b7ce32..cd71f998a 100644 --- a/assets/js/dashboard/stats/current-visitors.js +++ b/assets/js/dashboard/stats/current-visitors.js @@ -1,4 +1,5 @@ import React from 'react'; +import * as api from '../api' import { Link } from 'react-router-dom' import { countFilters } from '../query'; @@ -14,11 +15,7 @@ export default class CurrentVisitors extends React.Component { } updateCount() { - return fetch(`/api/stats/${encodeURIComponent(this.props.site.domain)}/current-visitors`) - .then( response => { - if (!response.ok) { throw response } - return response.json() - }) + return api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/current-visitors`) .then((res) => this.setState({currentVisitors: res})) }