Merge branch 'cherry-pick-bd2848fc' into 'release/v0.26'

MRM-8999' hotfix release 26 See merge request mashroom/frontend/main-next!1694

Merge branch 'cherry-pick-bd2848fc' into 'release/v0.26'
b3e5b0d4 · Dmitry Olyenyov · 9825092d · 6d1ea8db · b3e5b0d4 · b3e5b0d4
Commit b3e5b0d4 authored 2 years ago by Dmitry Olyenyov
--- a/src/features/public/components/alternative-to-openrent/pages/index.tsx
+++ b/src/features/public/components/alternative-to-openrent/pages/index.tsx
+import { NextPage } from "next";
+import Head from "next/head";
+import React from "react";
+
+import CookiePopUp from "@/features/cookies-popup/CookiePopUp";
+import NewPagesFooter from "@/features/public/ui/molecules/NewPagesFooter";
+import { Header } from "@/features/public/ui/organisms/Header";
+
 import { makeGenericServicePageGetStaticProps } from "../../../ui/templates/GenericServicePageTemplate";
+import MainContent from "../organisms/MainContent";
+import TableContent from "../organisms/TableContent";
+import { PageBlocks } from "../types";
+import css from "./index.module.css";

 export const getStaticProps = makeGenericServicePageGetStaticProps(
  "alternative-to-open-rent"
 );
-
-export { default } from "../../../ui/templates/GenericServicePageTemplate";
+type Props = {
+  page: { acf: PageBlocks };
+};
+const MashroomVsOpenrentPage: NextPage<Props> = ({ page }) => {
+  const blocks = page.acf;
+  return (
+    <>
+      <Head>
+        <title>
+          Alternative to OpenRent and other online lettings agents | Mashroom
+        </title>
+        <meta content={blocks.meta_description} name="description" />
+      </Head>
+      <div className={css.containerTop}>
+        <div className={css.bgTop}>
+          <Header />
+          <MainContent blocks={blocks} />
+        </div>
+      </div>
+      <div className={css.containerBottom}>
+        <TableContent blocks={blocks} />
+        <NewPagesFooter />
+      </div>
+      <CookiePopUp />
+    </>
+  );
+};
+export default MashroomVsOpenrentPage;
--- a/src/features/public/ui/templates/GenericServicePageTemplate/index.tsx
+++ b/src/features/public/ui/templates/GenericServicePageTemplate/index.tsx
@@ -30,7 +30,9 @@ const GenericServicePageTemplate = ({
  title,
  content,
  footer,
-}: Props) => (
+}: Props) => {
+  console.log("🚀 ~ file: index.tsx ~ line 34 ~ page", page);
+  return (
    <div className={css.container}>
      {page && (
        <ServicePageTemplate
@@ -59,6 +61,7 @@ const GenericServicePageTemplate = ({
      )}
    </div>
  );
+};

 export default GenericServicePageTemplate;