From 8a0d067716a22840adf9d685988994aedc356bad Mon Sep 17 00:00:00 2001
From: Barsnes <tobias.barsnes@digdir.no>
Date: Wed, 12 Jun 2024 12:09:40 +0200
Subject: [PATCH] post layouts

---
 .../Layout => (frontpage)}/layout.module.css        |  0
 .../blog-layout.tsx => (frontpage)/layout.tsx}      |  4 +++-
 .../app/bloggen/{ => (frontpage)}/page.mdx          |  5 ++---
 .../page.mdx                                        |  5 ++---
 .../app/bloggen/2024/altinn-studio/page.mdx         |  5 ++---
 .../app/bloggen/2024/bachelor-temavelger/page.mdx   |  5 ++---
 .../app/bloggen/2024/fluid-typography/page.mdx      |  5 ++---
 apps/storefront/app/bloggen/2024/layout.tsx         |  5 -----
 apps/storefront/app/bloggen/2024/v1rc1/page.mdx     |  5 ++---
 .../bloggen/_components}/Figures.tsx                |  0
 .../_components/PostLayout/PostLayout.module.css}   |  0
 .../bloggen/_components/PostLayout/PostLayout.tsx}  | 13 ++++++-------
 apps/storefront/app/bloggen/_components/index.ts    |  3 ++-
 apps/storefront/layouts/index.tsx                   |  1 -
 14 files changed, 23 insertions(+), 33 deletions(-)
 rename apps/storefront/app/bloggen/{_components/Layout => (frontpage)}/layout.module.css (100%)
 rename apps/storefront/app/bloggen/{_components/Layout/blog-layout.tsx => (frontpage)/layout.tsx} (87%)
 rename apps/storefront/app/bloggen/{ => (frontpage)}/page.mdx (93%)
 delete mode 100644 apps/storefront/app/bloggen/2024/layout.tsx
 rename apps/storefront/{layouts/BlogArticleLayout/components => app/bloggen/_components}/Figures.tsx (100%)
 rename apps/storefront/{layouts/BlogArticleLayout/BlogArticleLayout.module.css => app/bloggen/_components/PostLayout/PostLayout.module.css} (100%)
 rename apps/storefront/{layouts/BlogArticleLayout/BlogArticleLayout.tsx => app/bloggen/_components/PostLayout/PostLayout.tsx} (89%)

diff --git a/apps/storefront/app/bloggen/_components/Layout/layout.module.css b/apps/storefront/app/bloggen/(frontpage)/layout.module.css
similarity index 100%
rename from apps/storefront/app/bloggen/_components/Layout/layout.module.css
rename to apps/storefront/app/bloggen/(frontpage)/layout.module.css
diff --git a/apps/storefront/app/bloggen/_components/Layout/blog-layout.tsx b/apps/storefront/app/bloggen/(frontpage)/layout.tsx
similarity index 87%
rename from apps/storefront/app/bloggen/_components/Layout/blog-layout.tsx
rename to apps/storefront/app/bloggen/(frontpage)/layout.tsx
index e3850e95ee..01fd35daf7 100644
--- a/apps/storefront/app/bloggen/_components/Layout/blog-layout.tsx
+++ b/apps/storefront/app/bloggen/(frontpage)/layout.tsx
@@ -9,7 +9,7 @@ import {
 
 import classes from './layout.module.css';
 
-export const Layout = ({ children }: { children: React.ReactNode }) => {
+const Layout = ({ children }: { children: React.ReactNode }) => {
   return (
     <div>
       <Banner color='red'>
@@ -29,3 +29,5 @@ export const Layout = ({ children }: { children: React.ReactNode }) => {
     </div>
   );
 };
+
+export default Layout;
diff --git a/apps/storefront/app/bloggen/page.mdx b/apps/storefront/app/bloggen/(frontpage)/page.mdx
similarity index 93%
rename from apps/storefront/app/bloggen/page.mdx
rename to apps/storefront/app/bloggen/(frontpage)/page.mdx
index 4dc0591de3..5963815da1 100644
--- a/apps/storefront/app/bloggen/page.mdx
+++ b/apps/storefront/app/bloggen/(frontpage)/page.mdx
@@ -1,10 +1,9 @@
 import { PencilIcon } from '@navikt/aksel-icons';
 
 import { Meta } from '@components';
-import { Layout } from '@blog';
-import { BlogCard } from './_components';
+import { BlogCard } from '../_components';
 
-export default ({ children }) => <Layout>{children}</Layout>;
+export default ({ children }) => <>{children}</>;
 
 <Meta
   title='Bloggen'
diff --git a/apps/storefront/app/bloggen/2023/derfor-trenger-vi-et-felles-designsystem/page.mdx b/apps/storefront/app/bloggen/2023/derfor-trenger-vi-et-felles-designsystem/page.mdx
index cac8b1661d..82d0974154 100644
--- a/apps/storefront/app/bloggen/2023/derfor-trenger-vi-et-felles-designsystem/page.mdx
+++ b/apps/storefront/app/bloggen/2023/derfor-trenger-vi-et-felles-designsystem/page.mdx
@@ -1,9 +1,8 @@
-import { BlogArticleLayout } from '@layouts';
 import { ResponsiveIframe, Image } from '@components';
-import { Contributors } from '../../_components';
+import { Contributors, PostLayout } from '../../_components';
 
 export default ({ children }) => (
-  <BlogArticleLayout
+  <PostLayout
     content={children}
     heading='Derfor trenger vi et felles designsystem'
     ingress='Høsten 2023 arrangerte vi en åpen presentasjon og mini-workshop om felles designsystem. Over 200 deltok og vi fikk 440 tilbakemeldinger på gevinster og utfordringer.'
diff --git a/apps/storefront/app/bloggen/2024/altinn-studio/page.mdx b/apps/storefront/app/bloggen/2024/altinn-studio/page.mdx
index b726451295..289ce80368 100644
--- a/apps/storefront/app/bloggen/2024/altinn-studio/page.mdx
+++ b/apps/storefront/app/bloggen/2024/altinn-studio/page.mdx
@@ -1,11 +1,10 @@
 import { Card, CardContent } from '@digdir/designsystemet-react';
 
-import { BlogArticleLayout } from '@layouts';
 import { Image } from '@components';
-import { Contributors } from '../../_components';
+import { Contributors, PostLayout } from '../../_components';
 
 export default ({ children }) => (
-  <BlogArticleLayout
+  <PostLayout
     content={children}
     heading='Hvordan Altinn Studio bruker Designsystemet'
     ingress='Altinn Studio benytter seg av Designsystemet ved hjelp av fasademønsteret. Lær mer om hvordan!'
diff --git a/apps/storefront/app/bloggen/2024/bachelor-temavelger/page.mdx b/apps/storefront/app/bloggen/2024/bachelor-temavelger/page.mdx
index 71fd9644ce..8111362a16 100644
--- a/apps/storefront/app/bloggen/2024/bachelor-temavelger/page.mdx
+++ b/apps/storefront/app/bloggen/2024/bachelor-temavelger/page.mdx
@@ -1,9 +1,8 @@
-import { BlogArticleLayout } from '@layouts';
 import { ResponsiveIframe } from '@components';
-import { Contributors } from '../../_components';
+import { Contributors, PostLayout } from '../../_components';
 
 export default ({ children }) => (
-  <BlogArticleLayout
+  <PostLayout
     content={children}
     heading='Temabygger som bacheloroppgave'
     ingress='Hvordan kan vi gjøre det enklere å ta i bruk Designsystemet? Det har blitt utforsket i en bacheloroppgave!'
diff --git a/apps/storefront/app/bloggen/2024/fluid-typography/page.mdx b/apps/storefront/app/bloggen/2024/fluid-typography/page.mdx
index 39a9c50dfe..801bfd56ef 100644
--- a/apps/storefront/app/bloggen/2024/fluid-typography/page.mdx
+++ b/apps/storefront/app/bloggen/2024/fluid-typography/page.mdx
@@ -1,9 +1,8 @@
-import { BlogArticleLayout } from '@layouts';
 import { ResponsiveIframe, Image } from '@components';
-import { Contributors } from '../../_components';
+import { Contributors, PostLayout } from '../../_components';
 
 export default ({ children }) => (
-  <BlogArticleLayout
+  <PostLayout
     content={children}
     heading='Dynamiske tekst-størrelser og hvorfor vi gikk bort fra det'
     ingress='Det er mulig å bruke dynamiske tekst-størrelser uten breakpoints, men det medfører noen ulemper.  '
diff --git a/apps/storefront/app/bloggen/2024/layout.tsx b/apps/storefront/app/bloggen/2024/layout.tsx
deleted file mode 100644
index d9ed30af4d..0000000000
--- a/apps/storefront/app/bloggen/2024/layout.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-const Layout = ({ children }: { children: React.ReactNode }) => {
-  return <>{children}</>;
-};
-
-export default Layout;
diff --git a/apps/storefront/app/bloggen/2024/v1rc1/page.mdx b/apps/storefront/app/bloggen/2024/v1rc1/page.mdx
index ebea531d8d..b76d8b019b 100644
--- a/apps/storefront/app/bloggen/2024/v1rc1/page.mdx
+++ b/apps/storefront/app/bloggen/2024/v1rc1/page.mdx
@@ -1,11 +1,10 @@
 import { Link } from '@digdir/designsystemet-react';
 
-import { BlogArticleLayout } from '@layouts';
+import { PostLayout, Contributors } from '../../_components';
 import { ResponsiveIframe, CodeSnippet } from '@components';
-import { Contributors } from '../../_components';
 
 export default ({ children }) => (
-  <BlogArticleLayout
+  <PostLayout
     content={children}
     heading='Dette kommer i V1!'
     ingress='Vi nærmer oss den første versjonen av Designsystemet uten betamerke! Versjon 1 skal være mer stabil, mer fleksibel og støtte flerdimensjonal tematisering.'
diff --git a/apps/storefront/layouts/BlogArticleLayout/components/Figures.tsx b/apps/storefront/app/bloggen/_components/Figures.tsx
similarity index 100%
rename from apps/storefront/layouts/BlogArticleLayout/components/Figures.tsx
rename to apps/storefront/app/bloggen/_components/Figures.tsx
diff --git a/apps/storefront/layouts/BlogArticleLayout/BlogArticleLayout.module.css b/apps/storefront/app/bloggen/_components/PostLayout/PostLayout.module.css
similarity index 100%
rename from apps/storefront/layouts/BlogArticleLayout/BlogArticleLayout.module.css
rename to apps/storefront/app/bloggen/_components/PostLayout/PostLayout.module.css
diff --git a/apps/storefront/layouts/BlogArticleLayout/BlogArticleLayout.tsx b/apps/storefront/app/bloggen/_components/PostLayout/PostLayout.tsx
similarity index 89%
rename from apps/storefront/layouts/BlogArticleLayout/BlogArticleLayout.tsx
rename to apps/storefront/app/bloggen/_components/PostLayout/PostLayout.tsx
index cb296be692..4757c8ce29 100644
--- a/apps/storefront/layouts/BlogArticleLayout/BlogArticleLayout.tsx
+++ b/apps/storefront/app/bloggen/_components/PostLayout/PostLayout.tsx
@@ -1,12 +1,11 @@
-'use client';
 import type * as React from 'react';
 import { Heading, Ingress, Paragraph } from '@digdir/designsystemet-react';
 
-import { Container, MdxContent, Image, Meta } from '../../components';
-import { Link } from '../../components/Link/Link';
+import { Container, MdxContent, Image, Meta } from '../../../../components';
+import { Link } from '../../../../components/Link/Link';
+import { Figures } from '../Figures';
 
-import classes from './BlogArticleLayout.module.css';
-import { Figures } from './components/Figures';
+import classes from './PostLayout.module.css';
 
 type BlogArticleLayoutProps = {
   content: React.ReactNode;
@@ -22,7 +21,7 @@ type BlogArticleLayoutProps = {
 
 const FIGURE_COUNT = 4;
 
-const BlogArticleLayout = ({
+const PostLayout = ({
   content,
   heading,
   ingress,
@@ -104,4 +103,4 @@ const BlogArticleLayout = ({
   );
 };
 
-export { BlogArticleLayout };
+export { PostLayout };
diff --git a/apps/storefront/app/bloggen/_components/index.ts b/apps/storefront/app/bloggen/_components/index.ts
index cc6b206d8b..ddda5345d0 100644
--- a/apps/storefront/app/bloggen/_components/index.ts
+++ b/apps/storefront/app/bloggen/_components/index.ts
@@ -1,3 +1,4 @@
 export { BlogCard } from './Card/BlogCard';
 export { Contributors } from './Contributors/Contributors';
-export { Layout } from './Layout/blog-layout';
+export { PostLayout } from './PostLayout/PostLayout';
+export { Figures } from './Figures';
diff --git a/apps/storefront/layouts/index.tsx b/apps/storefront/layouts/index.tsx
index 3c39f67755..006668e54b 100644
--- a/apps/storefront/layouts/index.tsx
+++ b/apps/storefront/layouts/index.tsx
@@ -3,4 +3,3 @@ export * from './PageLayout/PageLayout';
 export * from './MenuPageLayout/MenuPageLayout';
 export * from './NavPageLayout/NavPageLayout';
 export * from './NavMenuPageLayout/NavMenuPageLayout';
-export * from './BlogArticleLayout/BlogArticleLayout';