From 53c23a280b09b6a071a256b41c8a01d8e54a3742 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Wed, 16 Sep 2020 21:55:32 -0700 Subject: [PATCH] Added router navigation for settings and details. --- components/WebsiteDetails.js | 67 +++++++++++------------- components/WebsiteDetails.module.css | 6 +-- components/common/NavMenu.js | 32 +++++++++++ components/common/NavMenu.module.css | 20 +++++++ components/common/UserButton.js | 3 ++ components/layout/MenuLayout.js | 26 +++++---- components/layout/MenuLayout.module.css | 19 ++----- components/settings/Settings.js | 20 ++++--- lang/de-DE.json | 3 ++ lang/en-US.json | 3 ++ lang/es-MX.json | 3 ++ lang/fr-FR.json | 3 ++ lang/ja-JP.json | 3 ++ lang/mn-MN.json | 3 ++ lang/nl-NL.json | 3 ++ lang/ru-RU.json | 3 ++ lang/tr-TR.json | 3 ++ lang/zh-CN.json | 3 ++ pages/settings/accounts.js | 3 ++ pages/{settings.js => settings/index.js} | 0 pages/settings/profile.js | 3 ++ 21 files changed, 156 insertions(+), 73 deletions(-) create mode 100644 components/common/NavMenu.js create mode 100644 components/common/NavMenu.module.css create mode 100644 pages/settings/accounts.js rename pages/{settings.js => settings/index.js} (100%) create mode 100644 pages/settings/profile.js diff --git a/components/WebsiteDetails.js b/components/WebsiteDetails.js index 3a933638..4604227e 100644 --- a/components/WebsiteDetails.js +++ b/components/WebsiteDetails.js @@ -1,5 +1,6 @@ import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; +import { useRouter } from 'next/router'; import classNames from 'classnames'; import WebsiteChart from 'components/metrics/WebsiteChart'; import WorldMap from 'components/common/WorldMap'; @@ -19,12 +20,28 @@ import EventsChart from './metrics/EventsChart'; import useFetch from 'hooks/useFetch'; import Loading from 'components/common/Loading'; +const views = { + url: PagesTable, + referrer: ReferrersTable, + browser: BrowsersTable, + os: OSTable, + device: DevicesTable, + country: CountriesTable, + event: EventsTable, +}; + export default function WebsiteDetails({ websiteId }) { + const router = useRouter(); const { data } = useFetch(`/api/website/${websiteId}`); const [chartLoaded, setChartLoaded] = useState(false); const [countryData, setCountryData] = useState(); const [eventsData, setEventsData] = useState(); - const [expand, setExpand] = useState(); + const { + query: { id, view }, + } = router; + const path = `/website/${id.join('/')}`; + + console.log({ router }); const BackButton = () => (