diff --git a/.nais/dev.yml b/.nais/dev.yml index 136c1409..16d80180 100644 --- a/.nais/dev.yml +++ b/.nais/dev.yml @@ -1,6 +1,6 @@ ingress: - - "https://arbeidsplassen.intern.dev.nav.no/personbruker" - - "https://cv.ansatt.dev.nav.no/personbruker" + - "https://arbeidsplassen.intern.dev.nav.no/min-cv" + - "https://www.ansatt.dev.nav.no/min-cv" next_public_environment: "dev" pam_cv_api_audience: "dev-gcp:teampam:pam-cv-api-gcp" pam_eures_cv_eksport_audience: "dev-gcp:teampam:pam-eures-cv-eksport" diff --git a/.nais/nais.yml b/.nais/nais.yml index 1ea21307..9fd72803 100644 --- a/.nais/nais.yml +++ b/.nais/nais.yml @@ -9,10 +9,10 @@ spec: image: {{ image }} port: 8095 liveness: - path: /personbruker/api/internal/isAlive + path: /min-cv/api/internal/isAlive initialDelay: 10 readiness: - path: /personbruker/api/internal/isReady + path: /min-cv/api/internal/isReady initialDelay: 10 replicas: min: 2 @@ -38,7 +38,7 @@ spec: enabled: true prometheus: enabled: true - path: /personbruker/api/internal/metrics + path: /min-cv/api/internal/metrics ingresses: {{#each ingress as |url|}} - {{url}} diff --git a/.nais/prod.yml b/.nais/prod.yml index bc63a519..e2971295 100644 --- a/.nais/prod.yml +++ b/.nais/prod.yml @@ -1,5 +1,5 @@ ingress: - - "https://arbeidsplassen.nav.no/personbruker" + - "https://www.nav.no/min-cv" next_public_environment: "prod" pam_cv_api_audience: "prod-gcp:teampam:pam-cv-api-gcp" pam_eures_cv_eksport_audience: "prod-gcp:teampam:pam-eures-cv-eksport" diff --git a/README.md b/README.md index 3bb60129..47bad08f 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ $ npm run setup_dependencies # Starter docker-containere for wonderwall, redis o $ npm run dev # Kjører dev ``` -Da kan du nå applikasjonen med innlogging på [http://localhost:3000/personbruker](http://localhost:3000/personbruker). Bruk testbruker `04010100653`. +Da kan du nå applikasjonen med innlogging på [http://localhost:3000/min-cv](http://localhost:3000/min-cv). Bruk testbruker `04010100653`. > [!TIP] > Selve applikasjonen kjører på http://localhost:3001, men siden alle requester må routes gjennom Wonderwall som kjører på port 3000 vil det fortsatt være https://localhost:3000 som gjelder @@ -55,7 +55,7 @@ For å kunne hente @navikt-pakker via npm er du nødt til å gjøre følgende: ### Teste i safari -Safari har strengere regler enn andre browsere for å sette cookies for localhost, og derfor fungerer vanligvis ikke wonderwall med Safari. Dersom man vil teste i safari må man gå inn i `docker-compose.yml` og fjerne "#" fremst i linja +Safari har strengere regler enn andre browsere for å sette cookies for localhost, og derfor fungerer vanligvis ikke wonderwall med Safari. Dersom man vil teste i safari må man gå inn i `docker-compose.yml` og fjerne "#" fremst i følgende linje ``` # --cookie.secure=false # Fjern '#' på denne linjen for å kunne bruke wonderwall i safari diff --git a/docker-compose.yml b/docker-compose.yml index cf60bd6f..c16847ce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: --upstream-host=docker.host:3001 --log-level=info --bind-address=0.0.0.0:3000 - --ingress=http://localhost:3000/personbruker + --ingress=http://localhost:3000/min-cv --openid.well-known-url=http://host.docker.internal:8237/idporten/.well-known/openid-configuration --openid.client-id=local-idporten-client-id --openid.post-logout-redirect-uri=http://localhost:3000/ diff --git a/mocks/mirage.js b/mocks/mirage.js index f41d3b94..eeaad481 100644 --- a/mocks/mirage.js +++ b/mocks/mirage.js @@ -6,7 +6,7 @@ import { samtykkeEuresMock } from "./samtykkeEuresMock"; import { arbeidsforholdMock } from "./arbeidsforholdMock"; createServer({ - namespace: "/personbruker", + namespace: "/min-cv", logging: false, routes() { this.get("/api/samtykke/eures", samtykkeEuresMock); diff --git a/next.config.mjs b/next.config.mjs index d95dc47d..c5351191 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -1,6 +1,6 @@ /** @type {import("next").NextConfig} */ const nextConfig = { - basePath: "/personbruker", + basePath: "/min-cv", output: "standalone", webpack: (config, options) => { config.resolve.alias["fs"] = "pdfkit/js/virtual-fs.js"; diff --git a/package.json b/package.json index 3202d02e..ac2d1a43 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "scripts": { - "dev": "DEV_URL=http://localhost:3000/personbruker next dev -p 3001", + "dev": "DEV_URL=http://localhost:3000/min-cv next dev -p 3001", "build": "next build", "start": "next start", "test": "jest --passWithNoTests", diff --git a/src/app/_common/components/Feilside.jsx b/src/app/_common/components/Feilside.jsx index 323d3984..26aac3c1 100644 --- a/src/app/_common/components/Feilside.jsx +++ b/src/app/_common/components/Feilside.jsx @@ -49,7 +49,7 @@ export const FeilsideÅrsak = Object.freeze({ tekst: "Du er ikke logget inn. Min CV er en innlogget tjeneste. Vennligst logg inn, eller gå tilbake til Nav.no.", }, LOGGET_UT: { - tittel: "Du er blitt logget ut", + tittel: "Du har blitt logget ut", tekst: "Du har blitt logget ut på grunn av inaktivitet. Vennligst logg inn igjen, eller gå tilbake til Nav.no.", }, }); diff --git a/src/app/_common/components/HeaderPanel.jsx b/src/app/_common/components/HeaderPanel.jsx index 8b2fe068..e7832864 100644 --- a/src/app/_common/components/HeaderPanel.jsx +++ b/src/app/_common/components/HeaderPanel.jsx @@ -2,7 +2,7 @@ import { BodyShort, Box, Detail, Heading, Hide, HStack, Show, Skeleton, Tag, VSt import { formatterFullDatoMedFallback } from "@/app/_common/utils/stringUtils"; import { usePerson } from "@/app/_common/hooks/swr/usePerson"; -function HeaderPanel({ title = "Din CV", visTag = true }) { +function HeaderPanel({ title = "Min CV", visTag = true }) { const { personalia } = usePerson(); const navn = personalia ? `${personalia?.fornavn} ${personalia?.etternavn}`.toUpperCase() : null; diff --git a/src/app/_common/hooks/swr/useBekreftTidligereCv.js b/src/app/_common/hooks/swr/useBekreftTidligereCv.js index f24496d9..3746813a 100644 --- a/src/app/_common/hooks/swr/useBekreftTidligereCv.js +++ b/src/app/_common/hooks/swr/useBekreftTidligereCv.js @@ -20,10 +20,7 @@ export const useBekreftTidligereCv = () => { return true; }; - const { data, error, isLoading } = useSWR( - bekreft ? `/personbruker/api/samtykke/bekreft_tidligere_cv` : null, - fetcher, - ); + const { data, error, isLoading } = useSWR(bekreft ? `/min-cv/api/samtykke/bekreft_tidligere_cv` : null, fetcher); if (data === true) setBekreft(false); diff --git a/src/app/_common/hooks/swr/useCv.js b/src/app/_common/hooks/swr/useCv.js index b1853105..1890bba4 100644 --- a/src/app/_common/hooks/swr/useCv.js +++ b/src/app/_common/hooks/swr/useCv.js @@ -5,7 +5,7 @@ import { getAPI } from "@/app/_common/utils/fetchUtils"; import { useErInnlogget } from "@/app/_common/hooks/swr/useErInnlogget"; import { usePerson } from "@/app/_common/hooks/swr/usePerson"; -export const CV_KEY = "/personbruker/api/cv"; +export const CV_KEY = "/min-cv/api/cv"; export const useCv = () => { const { erInnlogget } = useErInnlogget(); diff --git a/src/app/_common/hooks/swr/useErInnlogget.js b/src/app/_common/hooks/swr/useErInnlogget.js index af789051..9e382d69 100644 --- a/src/app/_common/hooks/swr/useErInnlogget.js +++ b/src/app/_common/hooks/swr/useErInnlogget.js @@ -21,7 +21,7 @@ export const useErInnlogget = () => { throw error; }; - const { data, error, isLoading } = useSWR("/personbruker/api/isAuthenticated", fetcher, { + const { data, error, isLoading } = useSWR("/min-cv/api/isAuthenticated", fetcher, { refreshInterval: 60 * 1000, }); diff --git a/src/app/_common/hooks/swr/useHentArbeidsforhold.js b/src/app/_common/hooks/swr/useHentArbeidsforhold.js index 2389007c..354b926f 100644 --- a/src/app/_common/hooks/swr/useHentArbeidsforhold.js +++ b/src/app/_common/hooks/swr/useHentArbeidsforhold.js @@ -40,7 +40,7 @@ export const useHentArbeidsforhold = ({ oppdateringLaster, triggerOppdatering }) return data; }; - const { data, error, isLoading } = useSWR(skalHenteData ? `/personbruker/api/arbeidsforhold` : null, fetcher); + const { data, error, isLoading } = useSWR(skalHenteData ? `/min-cv/api/arbeidsforhold` : null, fetcher); return { aaregSuksess: !!data && !error, diff --git a/src/app/_common/hooks/swr/useHentEuresSamtykke.js b/src/app/_common/hooks/swr/useHentEuresSamtykke.js index 85ca92a3..9a414adf 100644 --- a/src/app/_common/hooks/swr/useHentEuresSamtykke.js +++ b/src/app/_common/hooks/swr/useHentEuresSamtykke.js @@ -5,7 +5,7 @@ import { simpleApiRequest } from "@/app/_common/utils/fetchUtils"; export const useHentEuresSamtykke = () => { const fetcher = async (url) => (await simpleApiRequest(url, "GET")).ok; - const { data, error, isLoading } = useSWR(`/personbruker/api/samtykke/eures`, fetcher); + const { data, error, isLoading } = useSWR(`/min-cv/api/samtykke/eures`, fetcher); return { delerEures: data, diff --git a/src/app/_common/hooks/swr/useOppdaterPersonaliaNoCache.js b/src/app/_common/hooks/swr/useOppdaterPersonaliaNoCache.js index d174ee6f..70a02d87 100644 --- a/src/app/_common/hooks/swr/useOppdaterPersonaliaNoCache.js +++ b/src/app/_common/hooks/swr/useOppdaterPersonaliaNoCache.js @@ -31,7 +31,7 @@ export const useOppdaterPersonaliaNoCache = () => { } }; - const url = "personbruker/api/personalia"; + const url = "/min-cv/api/personalia"; const { trigger, data, error, isMutating } = useSWRMutation(url, fetcher, { revalidate: false }); const triggerOppdatering = (body) => trigger({ body }); diff --git a/src/app/_common/hooks/swr/useOppdaterSettHjemmel.js b/src/app/_common/hooks/swr/useOppdaterSettHjemmel.js index 0de19091..04da0c95 100644 --- a/src/app/_common/hooks/swr/useOppdaterSettHjemmel.js +++ b/src/app/_common/hooks/swr/useOppdaterSettHjemmel.js @@ -22,7 +22,7 @@ export const useOppdaterSettHjemmel = (skalOppdatere) => { return true; }; - const { data, error, isLoading } = useSWR(skalOppdatere ? `/personbruker/api/samtykke` : null, fetcher); + const { data, error, isLoading } = useSWR(skalOppdatere ? `/min-cv/api/samtykke` : null, fetcher); return { settHjemmelSuksess: data, diff --git a/src/app/_common/hooks/swr/usePerson.js b/src/app/_common/hooks/swr/usePerson.js index 33570fb7..beacefd0 100644 --- a/src/app/_common/hooks/swr/usePerson.js +++ b/src/app/_common/hooks/swr/usePerson.js @@ -4,7 +4,7 @@ import useSWR from "swr"; import { getAPI } from "@/app/_common/utils/fetchUtils"; import { useErInnlogget } from "@/app/_common/hooks/swr/useErInnlogget"; -export const PERSON_KEY = "/personbruker/api/person"; +export const PERSON_KEY = "/min-cv/api/person"; export const usePerson = () => { const { erInnlogget } = useErInnlogget(); diff --git a/src/app/_common/hooks/swr/useTypeahead.js b/src/app/_common/hooks/swr/useTypeahead.js index fea16c23..929db93e 100644 --- a/src/app/_common/hooks/swr/useTypeahead.js +++ b/src/app/_common/hooks/swr/useTypeahead.js @@ -58,7 +58,7 @@ export const useTypeahead = (type, visningsfelt, forhåndshentet, alleredeValgte const skalHente = type === TypeaheadEnum.SPRÅK || typeaheadverdi?.length >= 2; const query = type !== TypeaheadEnum.SPRÅK ? encodeURIComponent(typeaheadverdi) : ""; - const url = skalHente ? `/personbruker/api/typeahead/${type}/${query}` : null; + const url = skalHente ? `/min-cv/api/typeahead/${type}/${query}` : null; const { data, error, isLoading } = useSWR(url, fetcher, { fallbackData: [] }); diff --git "a/src/app/_common/utils/dekorat\303\270r.js" "b/src/app/_common/utils/dekorat\303\270r.js" index 992f3284..2a14f4ea 100644 --- "a/src/app/_common/utils/dekorat\303\270r.js" +++ "b/src/app/_common/utils/dekorat\303\270r.js" @@ -13,8 +13,8 @@ const dekoratørProps = { url: "/minside", }, { - title: "Din CV", - url: "/personbruker", + title: "Min CV", + url: "/min-cv", }, ], }, diff --git a/src/app/layout.jsx b/src/app/layout.jsx index 1e4b3667..4a51e593 100644 --- a/src/app/layout.jsx +++ b/src/app/layout.jsx @@ -17,7 +17,7 @@ async function RootLayout({ children }) { return (
-