diff --git a/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleBento.tsx b/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleBento.tsx
index 349e0eb2dd..fb530f8e7c 100644
--- a/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleBento.tsx
+++ b/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleBento.tsx
@@ -27,15 +27,22 @@ function ArticleBento({ name, results }) {
content={results[0].ingress}
innholdstype={results[0].innholdstype}
undertema={results[0].undertema}
+ slug={results[0].slug}
/>
diff --git a/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleCard.tsx b/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleCard.tsx
index da44bcb6d3..43b896cd46 100644
--- a/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleCard.tsx
+++ b/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleCard.tsx
@@ -10,12 +10,14 @@ const trunc = (text, num_chars) => {
export const ArticleCard = ({
title,
content,
+ slug,
main = false,
innholdstype,
undertema,
}: {
title: string;
content: string;
+ slug: any; // TODO: types
main?: boolean;
innholdstype?: string;
undertema?: string;
@@ -37,7 +39,7 @@ export const ArticleCard = ({
-
-
- {title}
-
+
+
+
+ {title}
+
+
+
{main ? trunc(content, 770) : trunc(content, 100)}
- {undertema && {undertema}}
- {innholdstype && {innholdstype}}
+ {undertema && (
+
+ {undertema}
+
+ )}
+ {innholdstype && (
+
+ {innholdstype}
+
+ )}
diff --git a/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleGrid.tsx b/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleGrid.tsx
index 38ecf355d6..233ab4d170 100644
--- a/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleGrid.tsx
+++ b/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleGrid.tsx
@@ -35,6 +35,9 @@ function ArticleGrid({ name, results }) {
key={idx}
title={article.heading}
content={article.ingress}
+ innholdstype={article.innholdstype}
+ undertema={article.undertema}
+ slug={article.slug}
/>
))}
diff --git a/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleList.tsx b/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleList.tsx
index 86cb1c39fd..cc563f4621 100644
--- a/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleList.tsx
+++ b/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleList.tsx
@@ -5,9 +5,7 @@ function ArticleList({ results }) {
if (!results || results.length === 0) {
return null;
}
- console.log("### ", { results });
- // TODO: filter results into two lists (popular and latest)
const popular = results.slice(0, 3);
const latest = results.slice(3);
diff --git a/aksel.nav.no/website/pages/gp/index.tsx b/aksel.nav.no/website/pages/gp/index.tsx
index bb81fc7d2f..802c3c1e59 100644
--- a/aksel.nav.no/website/pages/gp/index.tsx
+++ b/aksel.nav.no/website/pages/gp/index.tsx
@@ -20,9 +20,9 @@ const query = groq`
heading,
ingress ,
"undertema": undertema[]->title,
- "innholdstype": innholdstype->title
+ "innholdstype": innholdstype->title,
+ slug
}
-}
`;
export const getServerSideProps: GetServerSideProps = async (