Skip to content

Commit 78a4d4c

Browse files
kristoivkristoiv
committed
Bytt ut Helmet til en maintained versjon som fikser feil. Fiks heading-level. Ikke dobbelt anchors. Ikke header inne i paragraf.
1 parent d55ca0e commit 78a4d4c

File tree

7 files changed

+81
-91
lines changed

7 files changed

+81
-91
lines changed

‎client/package-lock.json‎

Lines changed: 39 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"react": "^18.2.0",
2424
"react-dom": "^18.2.0",
2525
"react-error-boundary": "^3.1.4",
26-
"react-helmet": "^6.1.0",
26+
"react-helmet-async": "^2.0.3",
2727
"react-hook-form": "^7.34.2",
2828
"react-i18next": "^11.18.4",
2929
"react-router-dom": "^6.3.0",

‎client/src/App.tsx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import {Heading} from '@navikt/ds-react'
2-
import {ErrorBoundary} from 'react-error-boundary'
3-
import {useTranslation} from 'react-i18next'
4-
import {Route, Routes} from 'react-router-dom'
5-
import {AvtaleKvittering} from './avtale/AvtaleKvittering'
6-
import {OppdaterAvtale} from './avtale/OppdaterAvtale'
7-
import {OpprettAvtale} from './avtale/OpprettAvtale'
8-
import {Banner} from './components/Banner'
9-
import {isHttpError} from './error'
10-
import {Feilside} from './Feilside'
11-
import {Virksomheter} from './virksomhet/Virksomheter'
12-
import {Helmet} from "react-helmet";
13-
import {GodtaBruksvilkår} from "./avtale/GodtaBruksvilkår";
14-
import {BruksvilkårKvittering} from "./avtale/BruksvilkårKvittering";
15-
import Breadcrumbs from "./components/Breadcrumbs";
1+
import { Heading } from '@navikt/ds-react'
2+
import { ErrorBoundary } from 'react-error-boundary'
3+
import { useTranslation } from 'react-i18next'
4+
import { Route, Routes } from 'react-router-dom'
5+
import { AvtaleKvittering } from './avtale/AvtaleKvittering'
6+
import { OppdaterAvtale } from './avtale/OppdaterAvtale'
7+
import { OpprettAvtale } from './avtale/OpprettAvtale'
8+
import { Banner } from './components/Banner'
9+
import { isHttpError } from './error'
10+
import { Feilside } from './Feilside'
11+
import { Virksomheter } from './virksomhet/Virksomheter'
12+
import { Helmet } from 'react-helmet-async'
13+
import { GodtaBruksvilkår } from './avtale/GodtaBruksvilkår'
14+
import { BruksvilkårKvittering } from './avtale/BruksvilkårKvittering'
15+
import Breadcrumbs from './components/Breadcrumbs'
1616

1717
export function App() {
1818
const {t} = useTranslation()

‎client/src/avtale/Bruksvilkår.tsx‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
import {BodyLong, Heading, Panel} from '@navikt/ds-react'
2-
import {useTranslation} from 'react-i18next'
1+
import { BodyLong, Heading, Panel } from '@navikt/ds-react'
2+
import { useTranslation } from 'react-i18next'
3+
import React from 'react'
34
import nb from './nb_utvidet_avtale.json'
4-
import React from "react";
55
import nn from './nn_utvidet_avtale.json'
66

77
export function Bruksvilkår() {
88
const {
99
i18n: {language},
1010
} = useTranslation()
11+
1112
const avtale = language === 'nn' ? nn : nb
1213

1314
return (
@@ -18,21 +19,19 @@ export function Bruksvilkår() {
1819
{`${index + 1}. ${overskrift}`}
1920
</Heading>
2021
{avsnitt.map((t, index) => (
21-
<BodyLong key={index} spacing>
22-
<>
23-
{t.overskrift &&
24-
<Heading size="xsmall" level="4">
25-
{t.overskrift}
26-
</Heading>
27-
}
22+
<div key={index}>
23+
{t.overskrift &&
24+
<Heading size="xsmall" level="4">
25+
{t.overskrift}
26+
</Heading>
27+
}
28+
<BodyLong spacing>
2829
{t.tekst}
2930
{t.lenke &&
3031
<a href={t.lenke}>{t.lenke}</a>
3132
}
32-
</>
33-
</BodyLong>
34-
35-
33+
</BodyLong>
34+
</div>
3635
))}
3736
</div>
3837
))}

‎client/src/avtale/GodtaBruksvilkår.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export function GodtaBruksvilkår() {
4848
{t('avtale.utvidet_avtale_tittel')}
4949
</Heading>
5050
<Avstand marginTop={5} marginBottom={5}>
51-
<Heading level="2" size="small">
51+
<Heading level="3" size="small">
5252
{virksomhet.navn}
5353
</Heading>
5454
<BodyShort size="small">

‎client/src/avtale/OppdaterAvtale.tsx‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,13 @@ export function OppdaterAvtale() {
7070
{t('last.ned')}
7171
<DownloadIcon title="a11y-title" fontSize="1.5rem" style={{marginLeft: '0.25rem'}}/>
7272
</AppLink>
73-
7473
</LastNedKnapp>
7574
</Avtalerad>
7675

77-
7876
{virksomhet.bruksvilkår && (
7977
<>
8078
<hr style={{width: '100%'}}/>
8179
<Avtalerad>
82-
8380
<Avtaleboks>
8481
<div style={{maxWidth: '100%'}}>
8582
<BodyShort size="medium">
@@ -96,39 +93,29 @@ export function OppdaterAvtale() {
9693
Last ned
9794
<DownloadIcon title="a11y-title" fontSize="1.5rem" style={{marginLeft: '0.25rem'}}/>
9895
</AppLink>
99-
10096
</LastNedKnapp>
10197
</Avtalerad>
10298
</>
10399
)}
104-
105-
106100
</Avtalecontainer>
107101

108-
109102
{!virksomhet.bruksvilkår && (
110-
111103
<BruksvilkårBoks>
112104
<PennIkon/>
113105
<Heading level="2" size="small" style={{maxWidth: '70%'}}>
114106
{t('avtale.utvidet_avtale_tittel')}
115107
</Heading>
116-
<LastNedKnapp
117-
onClick={() => {
108+
<LastNedKnapp>
109+
<AppLink href={`/godta-bruksvilkar/${virksomhet.orgnr}`} onClick={(it) => {
118110
logSkjemaStartet(virksomhet.orgnr, skjemanavn.SKJEMANAVN_OPPRETT_UTVIDET)
119-
navigate(`/godta-bruksvilkar/${virksomhet.orgnr}`)
120-
}}
121-
>
122-
<div style={{display: 'flex', alignItems: 'center', cursor: "pointer"}}>
111+
}} style={{textDecoration: "none", cursor: "pointer"}}>
123112
{t('avtale.se_bruksvilkar')}
124-
<ChevronRightIcon title="a11y-title"/>
125-
</div>
126-
113+
<ChevronRightIcon />
114+
</AppLink>
127115
</LastNedKnapp>
128116
</BruksvilkårBoks>
129117
)}
130118

131-
132119
<Kontaktinformasjon>
133120
<Heading level="2" size="small" spacing>
134121
{t('avtale.endre_kontaktinformasjon')}
@@ -222,7 +209,7 @@ const BruksvilkårBoks = styled.div`
222209
margin: var(--a-spacing-2) 0;
223210
`
224211

225-
const LastNedKnapp = styled.a`
212+
const LastNedKnapp = styled.div`
226213
display: flex;
227214
color: var(--a-blue-600);
228215
padding: var(--a-spacing-4);

‎client/src/main.tsx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { baseUrl, http } from './http'
1010
import './i18n'
1111
import { initMSW } from './mocks/initMSW'
1212
import { initAmplitude } from './utils/amplitude'
13+
import { HelmetProvider } from 'react-helmet-async'
1314

1415
const swrConfig: SWRConfiguration = {
1516
async fetcher(url: string) {
@@ -27,9 +28,11 @@ initMSW().then(() => {
2728
<React.StrictMode>
2829
<GlobalStyle />
2930
<SWRConfig value={swrConfig}>
30-
<BrowserRouter basename={baseUrl()}>
31-
<App />
32-
</BrowserRouter>
31+
<HelmetProvider>
32+
<BrowserRouter basename={baseUrl()}>
33+
<App />
34+
</BrowserRouter>
35+
</HelmetProvider>
3336
</SWRConfig>
3437
</React.StrictMode>
3538
)

0 commit comments

Comments
 (0)