From 80d3bf6ab3dbfaa113bef1c4336d9a13ac3ec019 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Tue, 11 Jul 2023 19:28:01 -0700 Subject: [PATCH 1/2] Fixed method. --- hooks/useLanguageNames.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/useLanguageNames.js b/hooks/useLanguageNames.js index aa5cbe39..ff59e93d 100644 --- a/hooks/useLanguageNames.js +++ b/hooks/useLanguageNames.js @@ -1,6 +1,6 @@ import { useState, useEffect } from 'react'; import { useRouter } from 'next/router'; -import { get } from 'next-basics'; +import { httpGet } from 'next-basics'; import enUS from 'public/intl/language/en-US.json'; const languageNames = { @@ -12,7 +12,7 @@ export function useLanguageNames(locale) { const { basePath } = useRouter(); async function loadData(locale) { - const data = await get(`${basePath}/intl/language/${locale}.json`); + const { data } = await httpGet(`${basePath}/intl/language/${locale}.json`); if (data) { languageNames[locale] = data; From 5eea66aa53731fc02099bc7db868983fa5fd5bfe Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Tue, 11 Jul 2023 19:33:34 -0700 Subject: [PATCH 2/2] Hide links on share page. --- components/pages/websites/WebsiteDetailsPage.js | 5 ++++- components/pages/websites/WebsiteHeader.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/components/pages/websites/WebsiteDetailsPage.js b/components/pages/websites/WebsiteDetailsPage.js index e6545ae2..9e0519b2 100644 --- a/components/pages/websites/WebsiteDetailsPage.js +++ b/components/pages/websites/WebsiteDetailsPage.js @@ -1,4 +1,5 @@ import { Loading } from 'react-basics'; +import { useRouter } from 'next/router'; import Page from 'components/layout/Page'; import WebsiteChart from 'components/pages/websites/WebsiteChart'; import FilterTags from 'components/metrics/FilterTags'; @@ -11,6 +12,8 @@ import { WebsiteMetricsBar } from './WebsiteMetricsBar'; export default function WebsiteDetailsPage({ websiteId }) { const { data: website, isLoading, error } = useWebsite(websiteId); + const { pathname } = useRouter(); + const showLinks = !pathname.includes('/share/'); const { query: { view, url, referrer, os, browser, device, country, region, city, title }, @@ -18,7 +21,7 @@ export default function WebsiteDetailsPage({ websiteId }) { return ( - +