make separate component for pageContent

web/src/app/[...url]/page.tsx

@@ -1,9 +1,9 @@
 import { graphql } from "@/gql";
 import { GenericFragment } from "@/gql/graphql";
 import { getClient } from "@/app/client";
-import { Blocks } from "@/components/blocks/Blocks";
 import { notFound } from "next/navigation";
 import { PageHeader } from "@/components/general/PageHeader";
+import { PageContent } from "@/components/general/PageContent";
 
 export const dynamicParams = false;
 
@@ -76,7 +76,7 @@ export default async function Page({ params }: { params: { url: string[] } }) {
   return (
     <main className="site-main" id="main">
       <PageHeader heading={page.title} lead={page.lead} />
-      <Blocks blocks={page.body} />
+      <PageContent blocks={page.body} />
     </main>
   );
 }

web/src/app/aktuelt/[slug]/page.tsx

@@ -1,7 +1,7 @@
 import { getClient } from "@/app/client";
-import { Blocks } from "@/components/blocks/Blocks";
 import { Breadcrumb } from "@/components/general/Breadcrumb";
 import { ImageFigure } from "@/components/general/Image";
+import { PageContent } from "@/components/general/PageContent";
 import { graphql } from "@/gql";
 import { NewsFragment } from "@/gql/graphql";
 import { formatDate, formatExtendedDateTime } from "@/lib/date";
@@ -71,9 +71,7 @@ export default async function Page({ params }: { params: { slug: string } }) {
           />
         )}
       </section>
-      <section className="pageContent">
+      <PageContent blocks={news.body} />
-        <Blocks blocks={news.body} />
-      </section>
     </main>
   );
 }

web/src/app/arrangementer/[slug]/page.tsx

@@ -1,8 +1,8 @@
 import { getClient } from "@/app/client";
-import { Blocks } from "@/components/blocks/Blocks";
 import { EventDetails } from "@/components/events/EventDetails";
 import { EventHeader } from "@/components/events/EventHeader";
 import { BgPig } from "@/components/general/BgPig";
+import { PageContent } from "@/components/general/PageContent";
 import { graphql } from "@/gql";
 import { EventFragment } from "@/gql/graphql";
 import { getEventPig } from "@/lib/event";
@@ -55,9 +55,7 @@ export default async function Page({ params }: { params: { slug: string } }) {
       <main className="site-main" id="main">
         <EventHeader event={event} />
         <EventDetails event={event} />
-        <section className="pageContent">
+        <PageContent blocks={event.body} />
-          <Blocks blocks={event.body} />
-        </section>
       </main>
       {eventPig && <BgPig type={eventPig} color="white" />}
     </>

web/src/app/foreninger/[slug]/page.tsx

@@ -1,8 +1,8 @@
 import { getClient } from "@/app/client";
-import { Blocks } from "@/components/blocks/Blocks";
 import { Breadcrumb } from "@/components/general/Breadcrumb";
 import Icon from "@/components/general/Icon";
 import { Image } from "@/components/general/Image";
+import { PageContent } from "@/components/general/PageContent";
 import { graphql } from "@/gql";
 import { AssociationFragment } from "@/gql/graphql";
 import Link from "next/link";
@@ -73,9 +73,7 @@ export default async function Page({ params }: { params: { slug: string } }) {
           />
         )}
       </section>
-      <section className="pageContent">
+      <PageContent blocks={association.body} />
-        <Blocks blocks={association.body} />
-      </section>
     </main>
   );
 }

web/src/app/foreninger/page.tsx

@@ -2,9 +2,9 @@ import { graphql } from "@/gql";
 import { AssociationFragment, AssociationIndexFragment } from "@/gql/graphql";
 import { getClient } from "@/app/client";
 import { AssociationList } from "@/components/associations/AssociationList";
-import { Blocks } from "@/components/blocks/Blocks";
 import Link from "next/link";
 import { PageHeader } from "@/components/general/PageHeader";
+import { PageContent } from "@/components/general/PageContent";
 
 const AssociationIndexDefinition = graphql(`
   fragment AssociationIndex on AssociationIndex {
@@ -60,7 +60,7 @@ export default async function Page() {
   return (
     <main className="site-main" id="main">
       <PageHeader heading={index.title} lead={index.lead} />
-      {index.body && <Blocks blocks={index.body} />}
+      {index.body && <PageContent blocks={index.body} />}
       <AssociationList associations={associations} heading="Foreninger og utvalg" />
     </main>
   );

web/src/app/kontakt/page.tsx

@@ -1,8 +1,8 @@
 import { graphql } from "@/gql";
 import { ContactIndexFragment } from "@/gql/graphql";
 import { getClient } from "@/app/client";
-import { Blocks } from "@/components/blocks/Blocks";
 import { PageHeader } from "@/components/general/PageHeader";
+import { PageContent } from "@/components/general/PageContent";
 
 const ContactIndexDefinition = graphql(`
   fragment ContactIndex on ContactIndex {
@@ -32,7 +32,7 @@ export default async function Page() {
   return (
     <main className="site-main" id="main">
       <PageHeader heading={index.title} lead={index.lead} />
-      {index.body && <Blocks blocks={index.body} />}
+      {index.body && <PageContent blocks={index.body} />}
     </main>
   );
 }

web/src/app/lokaler/[slug]/page.tsx

@@ -1,8 +1,8 @@
 import { getClient } from "@/app/client";
-import { Blocks } from "@/components/blocks/Blocks";
 import { ImageSliderBlock } from "@/components/blocks/ImageSliderBlock";
 import { Breadcrumb } from "@/components/general/Breadcrumb";
 import { Image } from "@/components/general/Image";
+import { PageContent } from "@/components/general/PageContent";
 import { NeufMap } from "@/components/venues/NeufMap";
 import { VenueInfo } from "@/components/venues/VenueInfo";
 import { graphql } from "@/gql";
@@ -107,7 +107,7 @@ export default async function Page({ params }: { params: { slug: string } }) {
         <Breadcrumb link="/utleie" text="Lokale" />
         <h1 className="page-title">{venue.title}</h1>
       </div>
-      <Blocks blocks={venue.body} />
+      <PageContent blocks={venue.body} />
       <VenueInfo venue={venue} />
       <NeufMap venueSlug={venue.slug} />
     </main>

web/src/app/lokaler/page.tsx

@@ -3,7 +3,7 @@ import { VenueFragment, VenueIndexFragment } from "@/gql/graphql";
 import { getClient } from "@/app/client";
 import { VenueList } from "@/components/venues/VenueList";
 import { PageHeader } from "@/components/general/PageHeader";
-import { Blocks } from "@/components/blocks/Blocks";
+import { PageContent } from "@/components/general/PageContent";
 
 const VenueIndexDefinition = graphql(`
   fragment VenueIndex on VenueIndex {
@@ -64,7 +64,7 @@ export default async function Page() {
   return (
     <main className="site-main" id="main">
       <PageHeader heading={index.title} lead={index.lead} />
-      <Blocks blocks={index.body} />
+      <PageContent blocks={index.body} />
       <VenueList venues={venues} />
     </main>
   );

web/src/app/utleie/page.tsx

@@ -4,7 +4,7 @@ import { getClient } from "@/app/client";
 import { VenueList } from "@/components/venues/VenueList";
 import { PageHeader } from "@/components/general/PageHeader";
 import { BgPig } from "@/components/general/BgPig";
-import { Blocks } from "@/components/blocks/Blocks";
+import { PageContent } from "@/components/general/PageContent";
 
 const VenueRentalIndexDefinition = graphql(`
   fragment VenueRentalIndex on VenueRentalIndex {
@@ -42,7 +42,7 @@ export default async function Page() {
     <>
       <main className="site-main" id="main">
         <PageHeader heading={index.title} lead={index.lead} />
-        {index.body && <Blocks blocks={index.body} />}
+        {index.body && <PageContent blocks={index.body} />}
         <VenueList venues={bookableVenues} heading="Våre lokaler" />
       </main>
       <BgPig type="key" />

web/src/components/blocks/Blocks.tsx

@@ -13,68 +13,64 @@ import { ContactEntityBlock } from "./ContactEntityBlock";
 import { NeufAddressSectionBlock } from "./NeufAddressSectionBlock";
 import { OpeningHoursSectionBlock } from "./OpeningHoursSectionBlock";
 
-export const Blocks = ({ blocks }: any) => {
+export const Blocks = ({ blocks, pageContent }: { blocks: any, pageContent?: boolean }) => {
   const sections = blocks.filter(
     (block: any) => block?.__typename === "PageSectionBlock"
   );
 
-  return (
+  return blocks.map((block: any) => {
-    <div className="blockContent">
+    switch (block?.blockType) {
-      {blocks.map((block: any) => {
+      case "RichTextBlock":
-        switch (block?.blockType) {
+        return <RichTextBlock block={block} />;
-          case "RichTextBlock":
+        break;
-            return <RichTextBlock block={block} />;
+      case "ImageWithTextBlock":
-            break;
+        return <ImageWithTextBlock block={block} />;
-          case "ImageWithTextBlock":
+        break;
-            return <ImageWithTextBlock block={block} />;
+        case "EmbedBlock":
-            break;
+          return <EmbedBlock block={block} />;
-            case "EmbedBlock":
+          break;
-              return <EmbedBlock block={block} />;
+      case "ImageSliderBlock":
-              break;
+        return <ImageSliderBlock block={block} pageContent />;
-          case "ImageSliderBlock":
+        break;
-            return <ImageSliderBlock block={block} />;
+      case "HorizontalRuleBlock":
-            break;
+        return <HorizontalRuleBlock block={block} />;
-          case "HorizontalRuleBlock":
+        break;
-            return <HorizontalRuleBlock block={block} />;
+      case "FeaturedBlock":
-            break;
+        return <FeaturedBlock block={block} />;
-          case "FeaturedBlock":
+        break;
-            return <FeaturedBlock block={block} />;
+      case "AccordionBlock":
-            break;
+        return <AccordionBlock block={block} />;
-          case "AccordionBlock":
+        break;
-            return <AccordionBlock block={block} />;
+      case "FactBoxBlock":
-            break;
+        return <FactBoxBlock block={block} />;
-          case "FactBoxBlock":
+        break;
-            return <FactBoxBlock block={block} />;
+      case "PageSectionBlock":
-            break;
+        return <PageSectionBlock block={block} />;
-          case "PageSectionBlock":
+        break;
-            return <PageSectionBlock block={block} />;
+      case "PageSectionNavigationBlock":
-            break;
+        return <PageSectionNavigationBlock sections={sections} />;
-          case "PageSectionNavigationBlock":
+        break;
-            return <PageSectionNavigationBlock sections={sections} />;
+      case "ContactSectionBlock":
-            break;
+        return <ContactSectionBlock block={block} />;
-          case "ContactSectionBlock":
+        break;
-            return <ContactSectionBlock block={block} />;
+      case "ContactSubsectionBlock":
-            break;
+        return <ContactSubsectionBlock block={block} />;
-          case "ContactSubsectionBlock":
+        break;
-            return <ContactSubsectionBlock block={block} />;
+      case "ContactListBlock":
-            break;
+        return <ContactListBlock block={block} />;
-          case "ContactListBlock":
+        break;
-            return <ContactListBlock block={block} />;
+      case "ContactEntityBlock":
-            break;
+        return <ContactEntityBlock block={block} />;
-          case "ContactEntityBlock":
+        break;
-            return <ContactEntityBlock block={block} />;
+      case "NeufAddressSectionBlock":
-            break;
+        return <NeufAddressSectionBlock />;
-          case "NeufAddressSectionBlock":
+        break;
-            return <NeufAddressSectionBlock />;
+      case "OpeningHoursSectionBlock":
-            break;
+        return <OpeningHoursSectionBlock />;
-          case "OpeningHoursSectionBlock":
+        break;
-            return <OpeningHoursSectionBlock />;
+      default:
-            break;
+        console.log("unsupported block", block);
-          default:
+        return <div>Unsupported block type {block?.blockType}</div>;
-            console.log("unsupported block", block);
+    }
-            return <div>Unsupported block type {block?.blockType}</div>;
+  });
-        }
-      })}
-    </div>
-  )
 };

web/src/components/blocks/ImageSliderBlock.tsx

@@ -14,12 +14,14 @@ import "./swiper.scss";
 export const ImageSliderBlock = ({
   block,
   hero,
+  pageContent
 }: {
   block: ImageSliderBlockType | any;
   hero?: boolean;
+  pageContent?: boolean;
 }) => {
   return (
-    <div className={styles.imageSliderBlock} data-hero={hero}>
+    <div className={styles.imageSliderBlock} data-hero={hero} data-pageContent={pageContent}>
       <Swiper
         pagination={{
           type: "fraction",

web/src/components/blocks/imageSliderBlock.module.scss

@@ -43,7 +43,13 @@
   }
 
   &:last-child {
-    margin-bottom: calc(var(--spacing-section-bottom)*-1);
+    margin-bottom: 0;
+  }
+
+  &[data-pageContent]{
+    &:last-child {
+      margin-bottom: calc(var(--spacing-section-bottom)*-1);
+    }
   }
 
   &[data-hero] {

web/src/components/general/PageContent.tsx

@@ -0,0 +1,10 @@
+import { Blocks } from "@/components/blocks/Blocks";
+import styles from './pageContent.module.scss';
+
+export const PageContent = ({ blocks }: any) => {
+  return (
+    <div className={styles.pageContent}>
+      <Blocks blocks={blocks} pageContent />
+    </div>
+  )
+};

web/src/components/general/accordion.module.scss

@@ -52,10 +52,6 @@
 .accordionContent {
   padding: var(--spacing-m) 0 var(--spacing-s);
   display: none;
-
-  >div {
-    padding-bottom: 0;
-  }
 }
 
 .icon {

web/src/components/general/pageContent.module.scss

@@ -0,0 +1,3 @@
+.pageContent {
+  padding-bottom: var(--spacing-section-bottom);
+}