From 33c609c8862edef5e4a3094fd75c94fdeacc46e6 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 16 Apr 2023 17:13:18 +0200 Subject: [PATCH] chore: Linter warnings --- sites/dev/components/layouts/bare.mjs | 1 - sites/dev/components/layouts/docs.mjs | 6 --- sites/dev/pages/[...mdxslug].mjs | 2 +- sites/org/components/header/index.mjs | 11 ----- sites/org/components/layouts/bare.mjs | 1 - sites/org/components/layouts/docs.mjs | 6 --- .../components/navigation/sections-menu.mjs | 4 +- sites/org/hooks/use-navigation.mjs | 5 +- sites/org/pages/account/index.mjs | 4 +- .../confirm/emailchange/[...confirmation].mjs | 10 ++-- .../confirm/signin/[...confirmation].mjs | 3 +- sites/org/pages/docs/[...mdxslug].mjs | 2 +- sites/org/pages/docs/index.mjs | 3 +- sites/org/pages/profile.mjs | 3 +- sites/org/pages/signin/index.mjs | 2 - sites/org/pages/signup/index.mjs | 3 +- sites/shared/components/account/apikeys.mjs | 2 +- sites/shared/components/account/consent.mjs | 2 +- sites/shared/components/account/control.mjs | 2 +- sites/shared/components/account/profile.mjs | 9 +--- sites/shared/components/account/reload.mjs | 3 +- sites/shared/components/breadcrumbs.mjs | 20 ++++---- sites/shared/components/footer/index.mjs | 49 +++++++++---------- sites/shared/components/mdx/prev-next.mjs | 8 ++- .../shared/components/modal/locale-picker.mjs | 3 -- .../shared/components/modal/theme-picker.mjs | 9 ++-- sites/shared/components/navigation/aside.mjs | 1 - .../shared/components/navigation/primary.mjs | 1 - .../shared/components/wrappers/auth/index.mjs | 1 - sites/shared/hooks/use-app.mjs | 2 +- sites/shared/hooks/use-theme.mjs | 20 +------- sites/shared/prebuild/navigation.mjs | 1 - 32 files changed, 67 insertions(+), 132 deletions(-) diff --git a/sites/dev/components/layouts/bare.mjs b/sites/dev/components/layouts/bare.mjs index 55d7c918a88..bd1231076a1 100644 --- a/sites/dev/components/layouts/bare.mjs +++ b/sites/dev/components/layouts/bare.mjs @@ -1,4 +1,3 @@ -import { useRouter } from 'next/router' import { AsideNavigation } from 'shared/components/navigation/aside.mjs' export const ns = [] diff --git a/sites/dev/components/layouts/docs.mjs b/sites/dev/components/layouts/docs.mjs index 69f0ce18855..6467abeb2d5 100644 --- a/sites/dev/components/layouts/docs.mjs +++ b/sites/dev/components/layouts/docs.mjs @@ -1,12 +1,6 @@ -// Hooks -import { useRouter } from 'next/router' // Components -import Link from 'next/link' import { AsideNavigation } from 'shared/components/navigation/aside.mjs' -import { ThemePicker } from 'shared/components/theme-picker/index.mjs' import { Breadcrumbs } from 'shared/components/breadcrumbs.mjs' -import { HomeIcon } from 'shared/components/icons.mjs' -import { useState, useEffect } from 'react' export const ns = [] diff --git a/sites/dev/pages/[...mdxslug].mjs b/sites/dev/pages/[...mdxslug].mjs index 784169e050e..323875907d0 100644 --- a/sites/dev/pages/[...mdxslug].mjs +++ b/sites/dev/pages/[...mdxslug].mjs @@ -6,7 +6,7 @@ import { mdxLoader } from 'shared/mdx/loader.mjs' import { serverSideTranslations } from 'next-i18next/serverSideTranslations' // Components import Head from 'next/head' -import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { PageWrapper } from 'shared/components/wrappers/page.mjs' import { MdxWrapper } from 'shared/components/wrappers/mdx.mjs' import { TocWrapper } from 'shared/components/wrappers/toc.mjs' import { HelpUs } from 'site/components/help-us.mjs' diff --git a/sites/org/components/header/index.mjs b/sites/org/components/header/index.mjs index 99ace6f229b..bbb929ce976 100644 --- a/sites/org/components/header/index.mjs +++ b/sites/org/components/header/index.mjs @@ -1,16 +1,8 @@ import { useState, useEffect } from 'react' -import { ThemePicker, ns as themeNs } from 'shared/components/theme-picker/index.mjs' -import { LocalePicker, ns as localeNs } from 'shared/components/locale-picker/index.mjs' import { - CloseIcon, CommunityIcon, DesignIcon, - DiscordIcon, DocsIcon, - GithubIcon, - HeartIcon, - HelpIcon, - HomeIcon, MenuIcon, RssIcon, SearchIcon, @@ -20,14 +12,11 @@ import { I18nIcon, } from 'shared/components/icons.mjs' import { Ribbon } from 'shared/components/ribbon.mjs' -import { WordMark } from 'shared/components/wordmark.mjs' import Link from 'next/link' import { useTranslation } from 'next-i18next' import { ModalThemePicker } from 'shared/components/modal/theme-picker.mjs' import { ModalLocalePicker } from 'shared/components/modal/locale-picker.mjs' -import { Search, ns as searchNs } from 'site/components/search.mjs' import { ModalMenu } from 'site/components/navigation/modal-menu.mjs' -import { ModalWrapper } from 'shared/components/wrappers/modal.mjs' export const ns = [...new Set(['header', ...themeNs, ...localeNs])] diff --git a/sites/org/components/layouts/bare.mjs b/sites/org/components/layouts/bare.mjs index 55d7c918a88..bd1231076a1 100644 --- a/sites/org/components/layouts/bare.mjs +++ b/sites/org/components/layouts/bare.mjs @@ -1,4 +1,3 @@ -import { useRouter } from 'next/router' import { AsideNavigation } from 'shared/components/navigation/aside.mjs' export const ns = [] diff --git a/sites/org/components/layouts/docs.mjs b/sites/org/components/layouts/docs.mjs index 693bfea56ea..4bf39859de0 100644 --- a/sites/org/components/layouts/docs.mjs +++ b/sites/org/components/layouts/docs.mjs @@ -1,12 +1,6 @@ -// Hooks -import { useRouter } from 'next/router' // Components -import Link from 'next/link' import { AsideNavigation, ns as navNs } from 'shared/components/navigation/aside.mjs' -import { ThemePicker } from 'shared/components/theme-picker/index.mjs' import { Breadcrumbs } from 'shared/components/breadcrumbs.mjs' -import { HomeIcon } from 'shared/components/icons.mjs' -import { useState, useEffect } from 'react' export const ns = navNs diff --git a/sites/org/components/navigation/sections-menu.mjs b/sites/org/components/navigation/sections-menu.mjs index 163927c005a..7d38ce0553a 100644 --- a/sites/org/components/navigation/sections-menu.mjs +++ b/sites/org/components/navigation/sections-menu.mjs @@ -1,5 +1,5 @@ import Link from 'next/link' -import { icons, isActive, ns as sectionsNs } from 'shared/components/navigation/primary.mjs' +import { icons, ns as sectionsNs } from 'shared/components/navigation/primary.mjs' import { useTranslation } from 'next-i18next' import orderBy from 'lodash.orderby' import { colors } from 'site/components/header/index.mjs' @@ -14,8 +14,6 @@ export const SectionsMenu = ({ app }) => { const sortableSections = app.state.sections.map((s) => ({ ...s, o: s.o ? s.o : s.t })) const output = [] for (const page of orderBy(sortableSections, ['o', 't'])) { - const act = isActive(page.s, app.state.slug) - const item = ( { +const sitePages = (t = false) => { // Handle t not being present if (!t) t = (string) => string const pages = { @@ -96,12 +96,11 @@ const createSections = (nav) => { export const useNavigation = (path = [], locale = 'en') => { const { t } = useTranslation(ns) - const nav = { ...pbn[locale], ...sitePages(locale, t) } + const nav = { ...pbn[locale], ...sitePages(t) } // Creat crumbs array const crumbs = createCrumbs(path, nav) const sections = createSections(nav) - const pages = sitePages(locale) return { path, diff --git a/sites/org/pages/account/index.mjs b/sites/org/pages/account/index.mjs index 9693df32a09..efbb13ab45d 100644 --- a/sites/org/pages/account/index.mjs +++ b/sites/org/pages/account/index.mjs @@ -8,7 +8,7 @@ import { PageWrapper } from 'shared/components/wrappers/page.mjs' import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' // Translation namespaces used on this page -const namespaces = ['account', ...authNs] +const ns = ['account', ...authNs] /* * Some things should never generated as SSR @@ -41,7 +41,7 @@ export default AccountPage export async function getStaticProps({ locale }) { return { props: { - ...(await serverSideTranslations(locale)), + ...(await serverSideTranslations(locale, ns)), page: { path: ['account'], }, diff --git a/sites/org/pages/confirm/emailchange/[...confirmation].mjs b/sites/org/pages/confirm/emailchange/[...confirmation].mjs index fce65b6e6dc..18a76cb6c82 100644 --- a/sites/org/pages/confirm/emailchange/[...confirmation].mjs +++ b/sites/org/pages/confirm/emailchange/[...confirmation].mjs @@ -36,12 +36,12 @@ const ConfirmSignUpPage = (props) => { // Async inside useEffect requires this approach const confirmEmail = async () => { app.startLoading() - const result = await backend.loadConfirmation({ id, check }) - if (result?.result === 'success' && result.confirmation) { - const result = await backend.updateAccount({ + const confirmation = await backend.loadConfirmation({ id, check }) + if (confirmation?.result === 'success' && confirmation.confirmation) { + const result2 = await backend.updateAccount({ confirm: 'emailchange', - confirmation: result.confirmation.id, - check: result.confirmation.check, + confirmation: confirmation.confirmation.id, + check: confirmation.confirmation.check, }) if (result.success) { setAccount(result.data.account) diff --git a/sites/org/pages/confirm/signin/[...confirmation].mjs b/sites/org/pages/confirm/signin/[...confirmation].mjs index 36cba38ddf1..dd35ea4e4e3 100644 --- a/sites/org/pages/confirm/signin/[...confirmation].mjs +++ b/sites/org/pages/confirm/signin/[...confirmation].mjs @@ -10,7 +10,6 @@ import Link from 'next/link' // Components import { PageWrapper } from 'shared/components/wrappers/page.mjs' import { BareLayout } from 'site/components/layouts/bare.mjs' -import { WelcomeWrapper } from 'site/components/wrappers/welcome.mjs' import { Spinner } from 'shared/components/spinner.mjs' import { Robot } from 'shared/components/robot/index.mjs' import { FlexButtonText } from 'site/components/buttons/flex-button-text.mjs' @@ -46,7 +45,7 @@ const Wrapper = ({ app, t, children }) => ( ) const ConfirmSignInPage = (props) => { - const account = ({ setAccount, setToken } = useAccount()) + const { setAccount, setToken } = useAccount() const app = useApp(props) const backend = useBackend() const { t } = useTranslation(ns) diff --git a/sites/org/pages/docs/[...mdxslug].mjs b/sites/org/pages/docs/[...mdxslug].mjs index a81ce8443e7..49e8cde8820 100644 --- a/sites/org/pages/docs/[...mdxslug].mjs +++ b/sites/org/pages/docs/[...mdxslug].mjs @@ -78,7 +78,7 @@ export default MdxPage */ export async function getStaticProps({ params, locale }) { const path = ['docs', ...params.mdxslug] - const { mdx, intro, toc, frontmatter } = await mdxLoader( + const { mdx, intro, toc } = await mdxLoader( locale, 'org', ['docs', ...params.mdxslug].join('/'), diff --git a/sites/org/pages/docs/index.mjs b/sites/org/pages/docs/index.mjs index 87f0c243f44..57fce9be4e7 100644 --- a/sites/org/pages/docs/index.mjs +++ b/sites/org/pages/docs/index.mjs @@ -5,7 +5,6 @@ import Head from 'next/head' import { serverSideTranslations } from 'next-i18next/serverSideTranslations' import { mdxLoader } from 'shared/mdx/loader.mjs' import { jargon } from 'site/jargon.mjs' -import { mdxPaths } from 'site/prebuild/mdx.paths.mjs' import mdxMeta from 'site/prebuild/mdx.js' // Components import { MdxWrapper } from 'shared/components/wrappers/mdx.mjs' @@ -77,7 +76,7 @@ export default MdxPage * To learn more, see: https://nextjs.org/docs/basic-features/data-fetching */ export async function getStaticProps({ locale }) { - const { mdx, intro, toc, frontmatter } = await mdxLoader(locale, 'org', 'docs', jargon[locale]) + const { mdx, intro, toc } = await mdxLoader(locale, 'org', 'docs', jargon[locale]) return { props: { diff --git a/sites/org/pages/profile.mjs b/sites/org/pages/profile.mjs index 72faa741f2e..f2e1f956a9d 100644 --- a/sites/org/pages/profile.mjs +++ b/sites/org/pages/profile.mjs @@ -31,9 +31,8 @@ const DynamicAccountProfile = dynamic( const AccountPage = (props) => { const app = useApp(props) - const { account, token } = useAccount() + const { account } = useAccount() const { t } = useTranslation(namespaces) - const crumbs = [[t('profile'), 'profile']] return ( diff --git a/sites/org/pages/signin/index.mjs b/sites/org/pages/signin/index.mjs index bdf130e349a..7b2dd257971 100644 --- a/sites/org/pages/signin/index.mjs +++ b/sites/org/pages/signin/index.mjs @@ -8,7 +8,6 @@ import { useToast } from 'shared/hooks/use-toast.mjs' import { useRouter } from 'next/router' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { validateEmail, validateTld } from 'shared/utils.mjs' // Components import Link from 'next/link' import { PageWrapper } from 'shared/components/wrappers/page.mjs' @@ -71,7 +70,6 @@ const SignInPage = (props) => { const [signInFailed, setSignInFailed] = useState(false) const [magicLinkSent, setMagicLinkSent] = useState(false) - const updatePassword = (evt) => setPassword(evt.target.value) const clearUsername = () => app.setUsername(false) useEffect(() => { diff --git a/sites/org/pages/signup/index.mjs b/sites/org/pages/signup/index.mjs index 061941c70be..51866beed48 100644 --- a/sites/org/pages/signup/index.mjs +++ b/sites/org/pages/signup/index.mjs @@ -13,8 +13,7 @@ import { BareLayout } from 'site/components/layouts/bare.mjs' import { SusiWrapper } from 'site/components/wrappers/susi.mjs' import { Robot } from 'shared/components/robot/index.mjs' import { EmailValidButton } from 'site/components/buttons/email-valid-button.mjs' -import { ButtonText } from '../signin/index.mjs' -import { EmailIcon, LeftIcon, RightIcon, WarningIcon, HelpIcon } from 'shared/components/icons.mjs' +import { LeftIcon, HelpIcon } from 'shared/components/icons.mjs' import { ModalWrapper } from 'shared/components/wrappers/modal.mjs' // Translation namespaces used on this page diff --git a/sites/shared/components/account/apikeys.mjs b/sites/shared/components/account/apikeys.mjs index 42d194317b4..23de9b09727 100644 --- a/sites/shared/components/account/apikeys.mjs +++ b/sites/shared/components/account/apikeys.mjs @@ -266,7 +266,7 @@ const Apikey = ({ apikey, t, account, backend, keyAdded, app }) => { } export const Apikeys = ({ app }) => { - const { account, setAccount, token } = useAccount() + const { account, token } = useAccount() const backend = useBackend(token) const { t } = useTranslation(ns) const toast = useToast() diff --git a/sites/shared/components/account/consent.mjs b/sites/shared/components/account/consent.mjs index 9b6e33fa976..74d2d8324ba 100644 --- a/sites/shared/components/account/consent.mjs +++ b/sites/shared/components/account/consent.mjs @@ -39,7 +39,7 @@ const Checkbox = ({ value, setter, label, children = null }) => ( ) export const ConsentSettings = ({ app, title = false }) => { - const { account, setAccount, token } = useAccount() + const { account, token } = useAccount() const backend = useBackend(token) const toast = useToast() const { t } = useTranslation(ns) diff --git a/sites/shared/components/account/control.mjs b/sites/shared/components/account/control.mjs index af31ce527be..de942212cca 100644 --- a/sites/shared/components/account/control.mjs +++ b/sites/shared/components/account/control.mjs @@ -12,7 +12,7 @@ import { ContinueButton } from 'site/components/buttons/continue-button.mjs' export const ns = ['account', 'toast'] export const ControlSettings = ({ app, title = false, welcome = false }) => { - const { account, setAccount, token } = useAccount() + const { account, token } = useAccount() const backend = useBackend(token) const toast = useToast() const { t } = useTranslation(ns) diff --git a/sites/shared/components/account/profile.mjs b/sites/shared/components/account/profile.mjs index e5a3e31024e..422a6de53c2 100644 --- a/sites/shared/components/account/profile.mjs +++ b/sites/shared/components/account/profile.mjs @@ -2,7 +2,6 @@ import { useTranslation } from 'next-i18next' // Hooks import { useAccount } from 'shared/hooks/use-account.mjs' -import { useBackend } from 'shared/hooks/use-backend.mjs' // Components import Link from 'next/link' import Markdown from 'react-markdown' @@ -31,13 +30,7 @@ const Avatar = ({ img, app = false }) => ( ) export const AccountProfile = ({ app }) => { - const { account, setAccount, token } = useAccount() - const { t } = useTranslation(ns) - - const toggleModal = () => { - if (modal) setModal(false) - else setModal() - } + const { account } = useAccount() if (!account) return null diff --git a/sites/shared/components/account/reload.mjs b/sites/shared/components/account/reload.mjs index 9bed574013c..e48a3c83eda 100644 --- a/sites/shared/components/account/reload.mjs +++ b/sites/shared/components/account/reload.mjs @@ -1,5 +1,4 @@ // Dependencies -import { useState } from 'react' import { useTranslation } from 'next-i18next' // Hooks import { useAccount } from 'shared/hooks/use-account.mjs' @@ -11,7 +10,7 @@ import { BackToAccountButton } from './shared.mjs' export const ns = ['account', 'toast'] export const ReloadAccount = ({ app, title = false }) => { - const { account, setAccount, token } = useAccount() + const { setAccount, token } = useAccount() const backend = useBackend(token) const { t } = useTranslation(ns) const toast = useToast() diff --git a/sites/shared/components/breadcrumbs.mjs b/sites/shared/components/breadcrumbs.mjs index cdc61c285a6..54700dbcfbc 100644 --- a/sites/shared/components/breadcrumbs.mjs +++ b/sites/shared/components/breadcrumbs.mjs @@ -11,17 +11,15 @@ export const Breadcrumbs = ({ crumbs, title }) => {crumbs.map((crumb) => ( - <> -
  • - - -
    • - +
  • + + +
    • ))} ) : null diff --git a/sites/shared/components/footer/index.mjs b/sites/shared/components/footer/index.mjs index 466a083c7d1..06e9f3ef60e 100644 --- a/sites/shared/components/footer/index.mjs +++ b/sites/shared/components/footer/index.mjs @@ -1,37 +1,32 @@ -import { useTranslation } from 'next-i18next' import { Ribbon } from 'shared/components/ribbon.mjs' -import { WordMark, colors } from 'shared/components/wordmark.mjs' +import { WordMark } from 'shared/components/wordmark.mjs' import { SocialIcons } from 'shared/components/social/icons.mjs' import { Sponsors, ns as sponsorsNs } from 'shared/components/sponsors/index.mjs' import { FreeSewingIcon } from 'shared/components/icons.mjs' export const ns = ['footer', ...sponsorsNs] -export const Footer = ({ app }) => { - const { t } = useTranslation(ns) +export const Footer = ({ app }) => ( +
    + - return ( -
    - - -
    - -
    - -
    -

    - Come for the sewing patterns -
    - Stay for the community -

    +
    + +
    +
    +

    + Come for the sewing patterns +
    + Stay for the community +

    +
    -
    - -
    +
    + +
    -
    - -
    -
    - ) -} +
    + +
    +
    +) diff --git a/sites/shared/components/mdx/prev-next.mjs b/sites/shared/components/mdx/prev-next.mjs index cf6f810a678..4cf0e741b17 100644 --- a/sites/shared/components/mdx/prev-next.mjs +++ b/sites/shared/components/mdx/prev-next.mjs @@ -2,6 +2,7 @@ import get from 'lodash.get' import orderBy from 'lodash.orderby' import Link from 'next/link' import { LeftIcon, RightIcon } from 'shared/components/icons.mjs' +import { Popout } from 'shared/components/popout.mjs' // helper method to order nav entries const order = (obj) => orderBy(obj, ['__order', '__title'], ['asc', 'asc']) @@ -96,10 +97,15 @@ const renderNext = (node) => ) export const PrevNext = ({ app }) => { - return

    fixme: prevnext

    return (
    {renderPrevious(previous(app))} + +
    Not yet implemented
    +

    + Fix it in site/shared/components/mdx/prev-next.mjs +

    +     {renderNext(next(app))}
    ) diff --git a/sites/shared/components/modal/locale-picker.mjs b/sites/shared/components/modal/locale-picker.mjs index 0f374dd793e..960c04cc0cb 100644 --- a/sites/shared/components/modal/locale-picker.mjs +++ b/sites/shared/components/modal/locale-picker.mjs @@ -1,11 +1,8 @@ // Dependencies -import { Fragment } from 'react' import { useRouter } from 'next/router' import { useTranslation } from 'next-i18next' -import { Popover, Transition } from '@headlessui/react' import Link from 'next/link' // Components -import { I18nIcon, DownIcon } from 'shared/components/icons.mjs' import { ModalWrapper } from 'shared/components/wrappers/modal.mjs' // Languages import en from 'site/public/locales/en/locales.json' diff --git a/sites/shared/components/modal/theme-picker.mjs b/sites/shared/components/modal/theme-picker.mjs index a8031a41ee1..058b3f30b30 100644 --- a/sites/shared/components/modal/theme-picker.mjs +++ b/sites/shared/components/modal/theme-picker.mjs @@ -1,5 +1,4 @@ import themes from 'shared/themes/index.js' -import { ThemeIcon, DownIcon } from 'shared/components/icons.mjs' import { useTranslation } from 'next-i18next' import { useTheme } from 'shared/hooks/use-theme.mjs' import { ModalWrapper } from 'shared/components/wrappers/modal.mjs' @@ -15,7 +14,7 @@ export const ModalThemePicker = ({ app, iconOnly = false, bottom = false }) => {

    {t('themes:chooseYourTheme')}

    {Object.keys(themes).map((theme) => ( -
    +
    diff --git a/sites/shared/components/navigation/aside.mjs b/sites/shared/components/navigation/aside.mjs index ba82b10e35c..4d231711f2d 100644 --- a/sites/shared/components/navigation/aside.mjs +++ b/sites/shared/components/navigation/aside.mjs @@ -1,5 +1,4 @@ import { MainSections, ActiveSection, ns as navNs } from './primary.mjs' -import Link from 'next/link' export const ns = navNs diff --git a/sites/shared/components/navigation/primary.mjs b/sites/shared/components/navigation/primary.mjs index 7d81535ced7..18c050f18f1 100644 --- a/sites/shared/components/navigation/primary.mjs +++ b/sites/shared/components/navigation/primary.mjs @@ -1,6 +1,5 @@ import Link from 'next/link' import orderBy from 'lodash.orderby' -import get from 'lodash.get' import { CommunityIcon, DesignIcon, diff --git a/sites/shared/components/wrappers/auth/index.mjs b/sites/shared/components/wrappers/auth/index.mjs index 449285b471b..7db075bafc8 100644 --- a/sites/shared/components/wrappers/auth/index.mjs +++ b/sites/shared/components/wrappers/auth/index.mjs @@ -1,6 +1,5 @@ import Link from 'next/link' import { useTranslation } from 'next-i18next' -import { Loader } from 'shared/components/loader.mjs' import { useAccount } from 'shared/hooks/use-account.mjs' export const ns = ['auth'] diff --git a/sites/shared/hooks/use-app.mjs b/sites/shared/hooks/use-app.mjs index 719e2fa15fd..0ce9e49fae9 100644 --- a/sites/shared/hooks/use-app.mjs +++ b/sites/shared/hooks/use-app.mjs @@ -24,7 +24,7 @@ export function useApp(props = {}) { if (!path) throw 'You MUST pass a page.path prop to the useApp hook' - const reportError = useBugsnag(props?.bugsnag) + const reportError = useBugsnag(bugsnag) const navState = useNavigation(path) // React state diff --git a/sites/shared/hooks/use-theme.mjs b/sites/shared/hooks/use-theme.mjs index cff5f957106..5aaca4a7345 100644 --- a/sites/shared/hooks/use-theme.mjs +++ b/sites/shared/hooks/use-theme.mjs @@ -1,4 +1,3 @@ -import { useEffect } from 'react' import createPersistedState from 'use-persisted-state' const usePersistedTheme = createPersistedState('fs-theme') @@ -12,21 +11,4 @@ const preferredTheme = () => { return prefersDarkMode ? 'dark' : 'light' } -export const useTheme = () => { - // (persisted) State (saved to local storage) - const [theme, setTheme] = usePersistedTheme(preferredTheme) - - //useEffect(() => { - // // set the default theme based on user prefence - // if (theme === undefined) { - // const prefersDarkMode = - // typeof window !== 'undefined' && typeof window.matchMedia === 'function' - // ? window.matchMedia(`(prefers-color-scheme: dark`).matches - // : undefined - - // setTheme(prefersDarkMode ? 'dark' : 'light') - // } - //}, [theme, setTheme]) - - return [theme, setTheme] -} +export const useTheme = () => usePersistedTheme(preferredTheme) diff --git a/sites/shared/prebuild/navigation.mjs b/sites/shared/prebuild/navigation.mjs index 5aa19a47386..397a6ab305d 100644 --- a/sites/shared/prebuild/navigation.mjs +++ b/sites/shared/prebuild/navigation.mjs @@ -8,7 +8,6 @@ const future = new Date('10-12-2026').getTime() // We need to load the translation for blog + showcase const loadTranslation = (locale) => { - const file = `${folders.shared}/navigation/sections.${locale}.yaml` let data try { data = loadYaml(`${folders.shared}/navigation/sections.${locale}.yaml`, false)