diff --git a/packages/nextjs/src/components/_common/lenkeliste/Lenkeliste.tsx b/packages/nextjs/src/components/_common/lenkeliste/Lenkeliste.tsx index 142478cfb..d14ab99d1 100644 --- a/packages/nextjs/src/components/_common/lenkeliste/Lenkeliste.tsx +++ b/packages/nextjs/src/components/_common/lenkeliste/Lenkeliste.tsx @@ -4,8 +4,6 @@ import { LinkProps } from 'types/link-props'; import { LenkeStandalone } from 'components/_common/lenke/lenkeStandalone/LenkeStandalone'; import { EditorHelp } from 'components/_editor-only/editorHelp/EditorHelp'; import { classNames } from 'utils/classnames'; -import { usePageContentProps } from 'store/pageContext'; -import { translator } from 'translations'; import style from './Lenkeliste.module.scss'; @@ -25,8 +23,6 @@ type Props = { }; export const Lenkeliste = ({ tittel, lenker, listType, className }: Props) => { - const { language } = usePageContentProps(); - const getLabel = translator('linkList', language); const headingId = `heading-linklist-${useId()}`; if (!lenker || lenker.length === 0) { @@ -34,11 +30,7 @@ export const Lenkeliste = ({ tittel, lenker, listType, className }: Props) => { } return ( - + ); }; diff --git a/packages/nextjs/src/components/_common/overview-filters/OverViewFilterBase/OverviewFilterBase.tsx b/packages/nextjs/src/components/_common/overview-filters/OverViewFilterBase/OverviewFilterBase.tsx index 0b03502f9..c2d5c3908 100644 --- a/packages/nextjs/src/components/_common/overview-filters/OverViewFilterBase/OverviewFilterBase.tsx +++ b/packages/nextjs/src/components/_common/overview-filters/OverViewFilterBase/OverviewFilterBase.tsx @@ -29,36 +29,33 @@ export const OverviewFilterBase = ({ options, }: Props) => { const { language } = usePageContentProps(); - const translations = translator('overview', language)(type); const optionsTranslations = translator(type, language) as (key: Type) => string; return ( -
+
{translations['choose']} - -
+ + {options.map((option) => { + const optionLabel = optionsTranslations(option); + + return ( + selectionCallback(option)} + aria-label={`${translations['ariaItemExplanation']} ${optionLabel}`} + className={styles.filterButton} + checkmark={false} + selected={selected === option} + key={option} + > + {optionLabel} + + ); + })} + + ); }; diff --git a/packages/nextjs/src/components/_common/relatedSituations/RelatedSituations.tsx b/packages/nextjs/src/components/_common/relatedSituations/RelatedSituations.tsx index eaaf800b5..7127d14b7 100644 --- a/packages/nextjs/src/components/_common/relatedSituations/RelatedSituations.tsx +++ b/packages/nextjs/src/components/_common/relatedSituations/RelatedSituations.tsx @@ -37,14 +37,14 @@ export const RelatedSituations = ({ relatedSituations, title, description }: Pro
{actualTitle && ( {actualTitle} )} - + {actualDescription}
    diff --git a/packages/nextjs/src/components/layouts/index-page/front-page/FrontPageAreaNavigation.tsx b/packages/nextjs/src/components/layouts/index-page/front-page/FrontPageAreaNavigation.tsx index 6ddb900f5..52db39534 100644 --- a/packages/nextjs/src/components/layouts/index-page/front-page/FrontPageAreaNavigation.tsx +++ b/packages/nextjs/src/components/layouts/index-page/front-page/FrontPageAreaNavigation.tsx @@ -34,53 +34,49 @@ type Props = { export const FrontPageAreaNavigation = ({ content }: Props) => { const { areasHeader, navigationRefs = [] } = content.data; - const audience = getAudience(content.data.audience); - const cardType = audienceCardType[audience]; return ( -
    +
    {areasHeader} - -
    + } + + const illustration = getIllustrationFromProps(page); + + return ( +
  • + +
  • + ); + })} +
+
); }; diff --git a/packages/nextjs/src/components/parts/filters-menu/FiltersMenuPart.tsx b/packages/nextjs/src/components/parts/filters-menu/FiltersMenuPart.tsx index 3486f55ab..07493745f 100644 --- a/packages/nextjs/src/components/parts/filters-menu/FiltersMenuPart.tsx +++ b/packages/nextjs/src/components/parts/filters-menu/FiltersMenuPart.tsx @@ -101,13 +101,13 @@ export const FiltersMenuPart = ({ config, path }: PartComponentProps +
{title && ( {title} )} - + {description || ''} ) => { const { shortcuts, title: sectionTitle } = config; - const { language } = usePageContentProps(); if (!shortcuts || shortcuts.length === 0) { return ; } - const getLabel = translator('frontPage', language); return ( -
+
{sectionTitle && ( {sectionTitle} @@ -64,31 +60,29 @@ export const FrontpagePersonShortcutsPart = ({
{ // Hardkoder ikonene istedenfor å legge de inn i Enonic da det // kun er her vi bruker ikoner - <> - {href.includes('saksbehandlingstider') && ( - - )} - {href.includes('utbetalingsdatoer') && ( - - )} - {href.includes('satser') && ( - - )} - {href.includes('soknader') && ( - - )} - {href.includes('ettersende') && ( - - )} - } + {href.includes('saksbehandlingstider') && ( + + )} + {href.includes('utbetalingsdatoer') && ( + + )} + {href.includes('satser') && ( + + )} + {href.includes('soknader') && ( + + )} + {href.includes('ettersende') && ( + + )}
{title}
diff --git a/packages/nextjs/src/components/parts/frontpage-shortcuts/FrontpageShortcutsPart.tsx b/packages/nextjs/src/components/parts/frontpage-shortcuts/FrontpageShortcutsPart.tsx index dc07530be..2c4a604ef 100644 --- a/packages/nextjs/src/components/parts/frontpage-shortcuts/FrontpageShortcutsPart.tsx +++ b/packages/nextjs/src/components/parts/frontpage-shortcuts/FrontpageShortcutsPart.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import { translator } from 'translations'; import { Heading } from 'components/_common/headers/Heading'; import { EditorHelp } from 'components/_editor-only/editorHelp/EditorHelp'; import { classNames } from 'utils/classnames'; @@ -44,13 +43,11 @@ export const FrontpageShortcutsPart = ({ return ; } - const language = pageProps.language; const audience = getAudience(pageProps.data?.audience); const threeCols = shortcuts.length % 3 === 0; - const getLabel = translator('frontPage', language); return ( - +
); };