From d0ca0819c6bc0ab209585ca1be37f60d3adf3b6b Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Sun, 30 Aug 2020 15:29:31 -0700 Subject: [PATCH] Added useFetch hook. Updated database check. --- components/WebsiteDetails.js | 18 ++------- components/WebsiteList.js | 14 ++----- components/metrics/ActiveUsers.js | 24 +++--------- components/metrics/EventsChart.js | 52 ++++++++++---------------- components/metrics/MetricsBar.js | 27 ++++++------- components/metrics/MetricsTable.js | 35 +++++++---------- components/metrics/WebsiteChart.js | 35 +++++++---------- components/settings/AccountSettings.js | 16 ++------ components/settings/WebsiteSettings.js | 14 ++----- hooks/useFetch.js | 39 +++++++++++++++++++ lib/constants.js | 47 ++++++++++------------- lib/queries.js | 20 +--------- pages/share/[...id].js | 38 ++++--------------- scripts/copy-db-schema.js | 4 +- 14 files changed, 146 insertions(+), 237 deletions(-) create mode 100644 hooks/useFetch.js diff --git a/components/WebsiteDetails.js b/components/WebsiteDetails.js index 60367050..61e740e5 100644 --- a/components/WebsiteDetails.js +++ b/components/WebsiteDetails.js @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import React, { useState } from 'react'; import classNames from 'classnames'; import WebsiteChart from 'components/metrics/WebsiteChart'; import WorldMap from 'components/common/WorldMap'; @@ -7,7 +7,6 @@ import WebsiteHeader from 'components/metrics/WebsiteHeader'; import MenuLayout from 'components/layout/MenuLayout'; import Button from 'components/common/Button'; import { getDateRange } from 'lib/date'; -import { get } from 'lib/web'; import Arrow from 'assets/arrow-right.svg'; import styles from './WebsiteDetails.module.css'; import PagesTable from './metrics/PagesTable'; @@ -18,15 +17,16 @@ import DevicesTable from './metrics/DevicesTable'; import CountriesTable from './metrics/CountriesTable'; import EventsTable from './metrics/EventsTable'; import EventsChart from './metrics/EventsChart'; +import useFetch from '../hooks/useFetch'; export default function WebsiteDetails({ websiteId, defaultDateRange = '7day' }) { - const [data, setData] = useState(); const [chartLoaded, setChartLoaded] = useState(false); const [countryData, setCountryData] = useState(); const [eventsData, setEventsData] = useState(); - const [dateRange, setDateRange] = useState(getDateRange(defaultDateRange)); const [expand, setExpand] = useState(); + const [dateRange, setDateRange] = useState(getDateRange(defaultDateRange)); const { startDate, endDate, unit } = dateRange; + const { data } = useFetch(`/api/website/${websiteId}`, { websiteId }); const BackButton = () => (