-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Oppgradering av dependencies * Refaktorering og redesign av hovedmenyen * Installer Tailwind CSS * Tweak marginer * Grønn bakgrunn i skjemasteg * Bruk Zod for automagisk schemavalidering * Endre StegMedNavigasjon.tsx for å reflektere endringer i NAV-kontor-gyldighets-testen * Generalisere NedetidPanel.tsx Co-authored-by: André Rognaldsen <[email protected]>
- Loading branch information
1 parent
e530c7e
commit abfa929
Showing
55 changed files
with
14,768 additions
and
15,634 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| @navikt:registry=https://npm.pkg.github.com | ||
| @navikt:registry=https://npm.pkg.github.com | ||
| legacy-peer-deps=true |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| import {Alert} from "@navikt/ds-react"; | ||
| import {FormattedMessage} from "react-intl"; | ||
| import * as React from "react"; | ||
| import {useSelector} from "react-redux"; | ||
| import {State} from "../../digisos/redux/reducers"; | ||
|
|
||
| type NetetidPanelType = "infoside" | "ettersendelse" | "avbryt"; | ||
|
|
||
| const NedetidPanelMessageID: Record<NetetidPanelType, string> = { | ||
| infoside: "nedetid.alertstripe.infoside", | ||
| ettersendelse: "nedetid.alertstripe.ettersendelse", | ||
| avbryt: "nedetid.alertstripe.avbryt", | ||
| }; | ||
|
|
||
| // Vis nedetid-varsel om det er satt | ||
| export const NedetidPanel = ({varselType}: {varselType: NetetidPanelType}) => { | ||
| const {isNedetid, isPlanlagtNedetid, nedetidStartText, nedetidSluttText} = | ||
| useSelector((state: State) => state.soknad).nedetid || {}; | ||
|
|
||
| const messageId = NedetidPanelMessageID[varselType]; | ||
|
|
||
| if (isNedetid) | ||
| return ( | ||
| <Alert variant="error" style={{justifyContent: "center"}}> | ||
| <FormattedMessage | ||
| id={messageId} | ||
| values={{ | ||
| nedetidstart: nedetidStartText, | ||
| nedetidslutt: nedetidSluttText, | ||
| }} | ||
| /> | ||
| </Alert> | ||
| ); | ||
|
|
||
| if (isPlanlagtNedetid) | ||
| return ( | ||
| <Alert variant="info" style={{justifyContent: "center"}}> | ||
| <FormattedMessage | ||
| id={messageId} | ||
| values={{ | ||
| nedetidstart: nedetidStartText, | ||
| nedetidslutt: nedetidSluttText, | ||
| }} | ||
| /> | ||
| </Alert> | ||
| ); | ||
|
|
||
| return null; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| import * as React from "react"; | ||
| import {FormattedMessage} from "react-intl"; | ||
| import {Link, Panel} from "@navikt/ds-react"; | ||
| import AppBanner from "../../nav-soknad/components/appHeader/AppHeader"; | ||
| import {Information} from "@navikt/ds-icons"; | ||
| import {Innholdstittel} from "nav-frontend-typografi"; | ||
|
|
||
| const IkkeTilgangInformasjon = () => ( | ||
| <div> | ||
| <AppBanner /> | ||
| <div className={"py-24 px-4"}> | ||
| <Panel border className={"max-w-2xl mx-auto"}> | ||
| <Innholdstittel className={"flex items-center gap-4 pb-4"}> | ||
| <Information /> | ||
| <FormattedMessage id={"informasjon.ikketilgang.bruker.tittel"} /> | ||
| </Innholdstittel> | ||
|
|
||
| <FormattedMessage | ||
| id="informasjon.ikketilgang.bruker.tekst.v2" | ||
| values={{ | ||
| a: (msg) => ( | ||
| <Link href="https://www.nav.no/person/personopplysninger/#ditt-nav-kontor" target="_blank"> | ||
| {msg} | ||
| </Link> | ||
| ), | ||
| }} | ||
| /> | ||
| </Panel> | ||
| </div> | ||
| </div> | ||
| ); | ||
|
|
||
| export default IkkeTilgangInformasjon; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| import * as React from "react"; | ||
| import {useSelector} from "react-redux"; | ||
| import {useIntl} from "react-intl"; | ||
| import {getIntlTextOrKey} from "../../nav-soknad/utils"; | ||
| import IkkeTilgang from "./IkkeTilgang"; | ||
| import {skjulToppMeny} from "../../nav-soknad/utils/domUtils"; | ||
| import AppBanner from "../../nav-soknad/components/appHeader/AppHeader"; | ||
| import {State} from "../redux/reducers"; | ||
| import {useTitle} from "../../nav-soknad/hooks/useTitle"; | ||
| import {NedetidPanel} from "../../components/common/NedetidPanel"; | ||
| import {NySoknadPanel} from "./paneler/NySoknad"; | ||
| import {PabegynteSoknaderPanel} from "./paneler/PabegynteSoknader"; | ||
| import {EttersendDokuPanel} from "./paneler/EttersendDokuPanel"; | ||
| import {filterAndSortPabegynteSoknader} from "./paneler/pabegynteSoknaderUtils"; | ||
|
|
||
| const Informasjon = () => { | ||
| const harTilgang: boolean = !!useSelector((state: State) => state.soknad.tilgang?.harTilgang); | ||
| useTitle(getIntlTextOrKey(useIntl(), "applikasjon.sidetittel")); | ||
| const pabegynteSoknader = filterAndSortPabegynteSoknader( | ||
| useSelector((state: State) => state.soknad.pabegynteSoknader), | ||
| new Date() | ||
| ); | ||
|
|
||
| React.useEffect(() => { | ||
| skjulToppMeny(); | ||
| }, []); | ||
|
|
||
| if (!harTilgang) return <IkkeTilgang />; | ||
|
|
||
| return ( | ||
| <div className={"bg-green-500/20"}> | ||
| <AppBanner /> | ||
| <NedetidPanel varselType={"infoside"} /> | ||
| <div className="max-w-3xl mx-auto space-y-5 lg:py-24"> | ||
| <NySoknadPanel antallPabegynteSoknader={pabegynteSoknader.length} /> | ||
| <PabegynteSoknaderPanel pabegynteSoknader={pabegynteSoknader} /> | ||
| <EttersendDokuPanel /> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default Informasjon; |
File renamed without changes.
8 changes: 4 additions & 4 deletions
8
...n/BehandlingAvPersonopplysningerModal.tsx → ...r/BehandlingAvPersonopplysningerModal.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import Ekspanderbartpanel from "nav-frontend-ekspanderbartpanel"; | ||
| import {Attachment} from "@navikt/ds-icons"; | ||
| import {Heading, Link} from "@navikt/ds-react"; | ||
| import {getInnsynUrl} from "../../../nav-soknad/utils/rest-utils"; | ||
| import React from "react"; | ||
|
|
||
| export const EttersendDokuPanel = () => ( | ||
| <Ekspanderbartpanel | ||
| tittel={ | ||
| <div className="flex items-center px-4 py-2"> | ||
| <div className={"rounded-full bg-green-500/40 p-3 mr-5 tw-hidden lg:block"}> | ||
| <Attachment className={"w-9 h-9"} /> | ||
| </div> | ||
| <Heading level="2" size="small"> | ||
| Send dokumentasjon til en innsendt søknad | ||
| </Heading> | ||
| </div> | ||
| } | ||
| > | ||
| <div className={"pl-24"}> | ||
| Dokumentasjon kan sendes til søknader du har sendt inn tidligere. | ||
| <ul className={"list-disc list-inside py-5"}> | ||
| <li> | ||
| Gå til listen over <Link href={getInnsynUrl()}>dine sosialhjelpssøknader</Link> | ||
| </li> | ||
| <li>Åpne søknaden du ønsker å ettersende dokumenter til</li> | ||
| <li>Last opp dokumentene du skal ettersende under “dine vedlegg”</li> | ||
| </ul> | ||
| </div> | ||
| </Ekspanderbartpanel> | ||
| ); |
Oops, something went wrong.