FIX: page layout

Co-authored-by: andregroseth <[email protected]>
navikt · Dec 8, 2023 · 2b7e3fb · 2b7e3fb
1 parent 72777ef
commit 2b7e3fb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/apps/frontend/src/components/admin/CodeList/CodelistPage.tsx b/apps/frontend/src/components/admin/CodeList/CodelistPage.tsx
@@ -12,6 +12,7 @@ import { Helmet } from 'react-helmet'
 import { Button, Heading, Loader, Select } from '@navikt/ds-react'
 import { PlusIcon } from '@navikt/aksel-icons'
 import CustomizedBreadcrumbs from '../../common/CustomizedBreadcrumbs'
+import { PageLayout } from '../../scaffold/Page'
 
 const CodeListPage = () => {
   const params = useParams<{ listname?: string }>()
@@ -59,14 +60,10 @@ const CodeListPage = () => {
   }
 
   return (
-    <div role="main" id="content" className="w-full">
-      <div className="flex-1 justify-start flex">
-        <CustomizedBreadcrumbs currentPage="Administrering av kodeverk" />
-      </div>
-      <Helmet>
-        <meta charSet="utf-8" />
-        <title>{listname ? listname : 'Velg kodeverk'} </title>
-      </Helmet>
+    <PageLayout
+      pageTitle={listname ? listname : 'Velg kodeverk'}
+      currentPage="Administrering av kodeverk"
+    >
       <Heading size="medium" level="1">
         Administrering av kodeverk
       </Heading>
@@ -109,7 +106,7 @@ const CodeListPage = () => {
         }}
         submit={handleCreateCodelist}
       />
-    </div>
+    </PageLayout>
   )
 }
 

diff --git a/apps/frontend/src/components/admin/audit/AuditPage.tsx b/apps/frontend/src/components/admin/audit/AuditPage.tsx
@@ -11,6 +11,7 @@ import { intl } from '../../../util/intl/intl'
 import { Helmet } from 'react-helmet'
 import { BodyLong, Heading, TextField } from '@navikt/ds-react'
 import CustomizedBreadcrumbs from '../../common/CustomizedBreadcrumbs'
+import { PageLayout } from '../../scaffold/Page'
 
 const format = (id: string) => _.trim(id, '"')
 
@@ -51,14 +52,10 @@ export const AuditPage = () => {
   useEffect(() => lookupVersion(idSearch), [idSearch])
 
   return (
-    <div role="main" id="content" className="w-full">
-      <div className="flex-1 justify-start flex">
-        <CustomizedBreadcrumbs currentPage="Versjonering" />
-      </div>
-      <Helmet>
-        <meta charSet="utf-8" />
-        <title>Versjonering</title>
-      </Helmet>
+    <PageLayout
+      pageTitle="Versjonering"
+      currentPage="Versjonering" 
+    >
       <Heading size="medium" level="1">
         {intl.audit}
       </Heading>
@@ -78,6 +75,6 @@ export const AuditPage = () => {
       {error && <BodyLong>{_.escape(error)}</BodyLong>}
       {idInput && <AuditView auditLog={auditLog} auditId={params.auditId} loading={loading} viewId={lookupVersion} />}
       <AuditRecentTable show={!idInput} />
-    </div>
+    </PageLayout>
   )
 }