@openstack_dev/gatsby-theme-marketing-oif-core 1.0.9 → 1.0.11

package/gatsby-browser.js

@@ -1,5 +1,3 @@
-import ReduxWrapper from "./src/state/ReduxWrapper";
+import { ReduxWrapperWithCacheProvider } from "./src/state/ReduxWrapper";
 
-export const wrapRootElement = ReduxWrapper;
-
-export const onClientEntry = () => {};
+export const wrapRootElement = ReduxWrapperWithCacheProvider;

package/gatsby-ssr.js

@@ -1,7 +1,12 @@
+import * as React from "react";
 import { JSDOM } from "jsdom";
 import { XMLHttpRequest } from "xmlhttprequest";
-import ReduxWrapper from "./src/state/ReduxWrapper";
+import { renderToString } from "react-dom/server";
+import { CacheProvider } from "@emotion/react";
+import createEmotionServer from "@emotion/server/create-instance";
+import { ReduxWrapper } from "./src/state/ReduxWrapper";
 import { HeadComponents } from "./src/components/head-components";
+import createEmotionCache from "./src/utils/createEmotionCache";
 
 export const onRenderBody = ({ setHeadComponents }) => {
   if (process.env.NODE_ENV === "production") {
@@ -9,6 +14,32 @@ export const onRenderBody = ({ setHeadComponents }) => {
   }
 };
 
+export const replaceRenderer = ({
+  bodyComponent,
+  setHeadComponents,
+  replaceBodyHTMLString,
+}) => {
+  const cache = createEmotionCache();
+  const { extractCriticalToChunks } = createEmotionServer(cache);
+
+  const emotionStyles = extractCriticalToChunks(
+    renderToString(<CacheProvider value={cache}>{bodyComponent}</CacheProvider>),
+  );
+
+  setHeadComponents(
+    emotionStyles.styles.map((style) => (
+      <style
+        data-emotion={`${style.key} ${style.ids.join(" ")}`}
+        key={style.key}
+        dangerouslySetInnerHTML={{ __html: style.css }}
+      />
+    )),
+  );
+
+  // render the result from `extractCritical`
+  replaceBodyHTMLString(emotionStyles.html);
+};
+
 export const wrapRootElement = ReduxWrapper;
 
 // build enabler polyfills

package/netlify-config.yaml

@@ -0,0 +1,75 @@
+headers:
+  - for: /*
+redirects:
+  - from: /marketplace/*
+    to: /marketplace/
+  - from: /themes/*
+    to: /themes/
+  - from: /navbar/*
+    to: /navbar/
+  - from: /framework/*
+    to: /framework/
+  - from: /googlemaps/*
+    to: /googlemaps/
+  - from: /node_modules/*
+    to: /node_modules/
+  - from: /maps_images/*
+    to: /maps_images/
+  - from: /use-cases/*
+    to: /use-cases/
+  - from: /software/*
+    to: /software/
+  - from: /openstack-map/*
+    to: /openstack-map/
+  - from: /surveys/*
+    to: /surveys/
+  - from: /user-survey/*
+    to: /user-survey/
+  - from: /blog/*
+    to: /blog/
+  - from: /marketing/*
+    to: /marketing/
+  - from: /summit/*
+    to: /summit/
+  - from: /brand/*
+    to: /brand/
+  - from: /community/*
+    to: /community/
+  - from: /events/*
+    to: /events/
+  - from: /ptg/*
+    to: /ptg/
+  - from: /videos/*
+    to: /videos/
+  - from: /summit-video-app/*
+    to: /summit-video-app/
+  - from: /news/*
+    to: /summit-video-app/
+  - from: /favicon/*
+    to: /favicon/
+  - from: /errors_pages/*
+    to: /errors_pages/
+  - from: /speaker_bureau/*
+    to: /speaker_bureau/
+  - from: /coa/*
+    to: /coa/
+  - from: /learn/*
+    to: /learn/
+  - from: /Security/*
+    to: /Security/
+  - from: /OpenStackIdAuthenticator/*
+    to: /OpenStackIdAuthenticator/
+  - from: /profile/*
+    to: /profile/
+  - from: /userprofile/*
+    to: /userprofile/
+  - from: /registration/*
+    to: /registration/
+  - from: /legal/*
+    to: /legal/
+  - from: /ICLA/*
+    to: /ICLA/
+  - from: /marketplaceadmin/*
+    to: /marketplaceadmin/
+  - from: /api/*
+    to: /api/

package/netlify.toml

@@ -0,0 +1,258 @@
+
+    [[headers]]
+      # Define which paths this specific [[headers]] block will cover.
+      for = "/*"
+        [headers.values]
+          Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI"
+
+    [[redirects]]
+      from = "/marketplace/*"
+      to = "https://devbranch.openstack.org/marketplace/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/themes/*"
+      to = "https://devbranch.openstack.org/themes/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/navbar/*"
+      to = "https://devbranch.openstack.org/navbar/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/framework/*"
+      to = "https://devbranch.openstack.org/framework/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/googlemaps/*"
+      to = "https://devbranch.openstack.org/googlemaps/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/node_modules/*"
+      to = "https://devbranch.openstack.org/node_modules/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/maps_images/*"
+      to = "https://devbranch.openstack.org/maps_images/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/use-cases/*"
+      to = "https://devbranch.openstack.org/use-cases/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/software/*"
+      to = "https://devbranch.openstack.org/software/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/openstack-map/*"
+      to = "https://devbranch.openstack.org/openstack-map/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/surveys/*"
+      to = "https://devbranch.openstack.org/surveys/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/user-survey/*"
+      to = "https://devbranch.openstack.org/user-survey/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/blog/*"
+      to = "https://devbranch.openstack.org/blog/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/marketing/*"
+      to = "https://devbranch.openstack.org/marketing/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/summit/*"
+      to = "https://devbranch.openstack.org/summit/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/brand/*"
+      to = "https://devbranch.openstack.org/brand/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/community/*"
+      to = "https://devbranch.openstack.org/community/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/events/*"
+      to = "https://devbranch.openstack.org/events/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/ptg/*"
+      to = "https://devbranch.openstack.org/ptg/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/videos/*"
+      to = "https://devbranch.openstack.org/videos/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/summit-video-app/*"
+      to = "https://devbranch.openstack.org/summit-video-app/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/news/*"
+      to = "https://devbranch.openstack.org/summit-video-app/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/favicon/*"
+      to = "https://devbranch.openstack.org/favicon/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/errors_pages/*"
+      to = "https://devbranch.openstack.org/errors_pages/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/speaker_bureau/*"
+      to = "https://devbranch.openstack.org/speaker_bureau/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/coa/*"
+      to = "https://devbranch.openstack.org/coa/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/learn/*"
+      to = "https://devbranch.openstack.org/learn/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/Security/*"
+      to = "https://devbranch.openstack.org/Security/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/OpenStackIdAuthenticator/*"
+      to = "https://devbranch.openstack.org/OpenStackIdAuthenticator/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/profile/*"
+      to = "https://devbranch.openstack.org/profile/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/userprofile/*"
+      to = "https://devbranch.openstack.org/userprofile/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/registration/*"
+      to = "https://devbranch.openstack.org/registration/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/legal/*"
+      to = "https://devbranch.openstack.org/legal/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/ICLA/*"
+      to = "https://devbranch.openstack.org/ICLA/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/marketplaceadmin/*"
+      to = "https://devbranch.openstack.org/marketplaceadmin/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}
+
+    [[redirects]]
+      from = "/api/*"
+      to = "https://devbranch.openstack.org/api/:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic b3BlbnN0YWNrOlF1YWNrZXI", X-From = "netlify", X-Forwarded-Host = "main--oif-marketing-site-dev.netlify.app"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openstack_dev/gatsby-theme-marketing-oif-core",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Base theme for Marketing Sites",
   "author": "smarcet",
   "keywords": [
@@ -10,8 +10,8 @@
     "clean": "find . -name \"node_modules\" -type d -prune -exec rm -rf '{}' + && yarn && yarn gatsby-clean",
     "gatsby-clean": "gatsby clean",
     "start": "npm run develop",
-    "build": "NODE_ENV=production NODE_OPTIONS=--max-old-space-size=10240 cross-env node --trace-warnings node_modules/.bin/gatsby build --log-pages",
-    "develop": "NODE_OPTIONS=--max-old-space-size=8192 npm run gatsby-clean && node --trace-warnings node_modules/.bin/gatsby develop --S -H 0.0.0.0",
+    "build": "NODE_ENV=production node redirection-rules.js && NODE_ENV=production NODE_OPTIONS=--max-old-space-size=10240 cross-env node redirection-rules.js && node --trace-warnings node_modules/.bin/gatsby build --log-pages",
+    "develop": "NODE_ENV=development node redirection-rules.js && NODE_OPTIONS=--max-old-space-size=8192 npm run gatsby-clean && node --trace-warnings node_modules/.bin/gatsby develop --S -H 0.0.0.0",
     "format": "prettier --trailing-comma es5 --no-semi --single-quote --write \"{gatsby-*.js,src/**/*.js}\"",
     "prepare": "husky",
     "lint": "eslint src",
@@ -24,7 +24,10 @@
   "dependencies": {
     "@emotion/cache": "^11.11.0",
     "@emotion/react": "^11.11.4",
+    "@emotion/server": "^11.11.0",
+    "@emotion/styled": "^11.11.5",
     "@fortawesome/fontawesome-free": "^6.5.2",
+    "@loadable/component": "^5.16.4",
     "@mui/icons-material": "^5.15.15",
     "@mui/material": "^5.15.15",
     "@ncwidgets/file-relation": "^0.8.0",
@@ -84,6 +87,7 @@
     "image-size": "^1.0.1",
     "immutability-helper": "2.9.1",
     "immutable": "^5.0.0-beta.5",
+    "js-yaml": "^4.1.0",
     "jsdom": "^16.2.2",
     "lodash": "^4.17.19",
     "lz-string": "^1.4.4",
@@ -110,6 +114,7 @@
     "react-iframe-comm": "^1.2.2",
     "react-immutable-proptypes": "^2.2.0",
     "react-laag": "^2.0.5",
+    "react-loadable-visibility": "^3.0.2",
     "react-medium-image-zoom": "^4.3.5",
     "react-redux": "^7.2.6",
     "react-rte": "^0.16.3",

package/redirection-rules.js

@@ -0,0 +1,86 @@
+const fs = require("fs");
+const yaml = require("js-yaml");
+
+require("dotenv").config({
+  path: `.env.${process.env.NODE_ENV}`,
+});
+
+const NodeType = {
+  Header: "header",
+  Route: "route",
+};
+
+const tomlNodeExists = (formerToml, nodeType, route) => {
+  const key = nodeType === NodeType.Header ? "for" : "from";
+  const escapedRoute = route.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const regex = new RegExp(`${key}[\\s]*=[\\s]*"${escapedRoute}"`, "g");
+  return regex.test(formerToml);
+};
+
+const buildRedirectionRules = () => {
+  const yamlFilePath = `${__dirname}/netlify-config.yaml`;
+  const tomlFilePath = `${__dirname}/netlify.toml`;
+
+  const authToken = process.env.REDIRECTION_RULE_HEADER_AUTH_TOKEN;
+  const forwardedHost = process.env.REDIRECTION_RULE_HEADER_X_FORWARDED_HOST;
+  const redirectionHost = process.env.REDIRECTION_RULE_HOST;
+
+  const netlifyConfig = yaml.load(fs.readFileSync(yamlFilePath, "utf8"));
+
+  let formerToml = null;
+  let appendMode = false;
+
+  if (fs.existsSync(tomlFilePath)) {
+    formerToml = fs.readFileSync(tomlFilePath, { encoding: "utf8", flag: "r" });
+    appendMode = true;
+  }
+
+  let netlifyToml = "";
+
+  for (let i = 0; i < netlifyConfig.headers.length; i++) {
+    const header = netlifyConfig.headers[i];
+
+    if (formerToml && tomlNodeExists(formerToml, NodeType.Header, header.for)) continue;
+
+    netlifyToml += `
+    [[headers]]
+      # Define which paths this specific [[headers]] block will cover.
+      for = "${header.for}"
+        [headers.values]
+          Authorization = "Basic ${authToken}"\n`;
+  }
+
+  for (let i = 0; i < netlifyConfig.redirects.length; i++) {
+    const redirect = netlifyConfig.redirects[i];
+
+    if (formerToml && tomlNodeExists(formerToml, NodeType.Route, redirect.from)) continue;
+
+    netlifyToml += `
+    [[redirects]]
+      from = "${redirect.from}"
+      to = "${redirectionHost}${redirect.to}:splat"
+      status = 200
+      force = true
+      headers = {Authorization = "Basic ${authToken}", X-From = "netlify", X-Forwarded-Host = "${forwardedHost}"}\n`;
+  }
+
+  if (!appendMode) {
+    console.log("Creating netlify.toml...");
+    fs.writeFileSync(tomlFilePath, netlifyToml, (err) => {
+      if (err) {
+        console.error("Could not write netlify.toml file", err);
+        throw err;
+      }
+    });
+  } else {
+    console.log("Appending data to netlify.toml...");
+    fs.appendFile(tomlFilePath, netlifyToml, (err) => {
+      if (err) {
+        console.error("Could not append data to netlify.toml file", err);
+        throw err;
+      }
+    });
+  }
+};
+
+buildRedirectionRules();

package/src/components/Layout.js

@@ -1,40 +1,39 @@
 import React from "react";
 import PropTypes from "prop-types";
 import CssBaseline from "@mui/material/CssBaseline";
-import { CacheProvider } from "@emotion/react";
 import { ThemeProvider } from "@mui/material/styles";
+import loadable from "@loadable/component";
 import Footer from "./Footer";
 import SponsoredProjectsNav from "./SponsoredProjectsNav";
 import SubscribeForm from "./SubscribeForm";
 import AnnouncementBanner from "./AnnouncementBanner";
 import Header from "./Header";
-import Navbar from "./Navbar";
 import theme from "../theme";
+import NavBarPlaceholder from "./Navbar/placeholder";
 
-import createEmotionCache from "../utils/createEmotionCache";
-
-const cache = createEmotionCache();
+const Navbar = loadable(() => import("./Navbar"), {
+  ssr: false,
+  fallback: <NavBarPlaceholder />,
+});
 
 function Layout({ children }) {
   return (
-    <CacheProvider value={cache}>
-      <ThemeProvider theme={theme}>
-        <CssBaseline />
+    <ThemeProvider theme={theme}>
+      <CssBaseline />
+      <div>
+        <SponsoredProjectsNav />
+        <Navbar />
         <div>
-          <SponsoredProjectsNav />
-          <Navbar />
-          <div>
-            <Header />
-            <AnnouncementBanner />
-            <main id="content-wrapper">
-              {children}
-              <SubscribeForm />
-            </main>
-            <Footer />
-          </div>
+          <Header />
+          <AnnouncementBanner />
+          <main id="content-wrapper">
+            {children}
+            <SubscribeForm />
+          </main>
+          <Footer />
         </div>
-      </ThemeProvider>
-    </CacheProvider>
+      </div>
+    </ThemeProvider>
   );
 }
 

package/src/components/Navbar/index.js

@@ -77,6 +77,7 @@ function Navbar({ isLoggedUser, member }) {
     <nav role="navigation">
       <Script
         src={`${getEnvVariable(SEARCH_WIDGET_BASE_URL)}/widget/embed.min.js`}
+        onLoad={() => console.log("Script loaded")}
       />
       <AppBar
         position="static"

package/src/components/Navbar/placeholder.js

@@ -0,0 +1,20 @@
+import * as React from "react";
+import AppBar from "@mui/material/AppBar";
+import { Container } from "@mui/material";
+import styles from "./index.module.scss";
+
+function NavBarPlaceholder() {
+  return (
+    <nav role="navigation">
+      <AppBar
+        position="static"
+        className={styles.navbar}
+        sx={{ backgroundColor: "#fff", boxShadow: "none" }}
+      >
+        <Container maxWidth="xl" />
+      </AppBar>
+    </nav>
+  );
+}
+
+export default NavBarPlaceholder;

package/src/content/site-settings/index.json

@@ -1 +1 @@
-{ "staticJsonFilesBuildTime": [], "lastBuild": 1713949648791 }
+{ "staticJsonFilesBuildTime": [], "lastBuild": 1713964554954 }

package/src/state/ReduxWrapper.js

@@ -1,9 +1,11 @@
 import * as React from "react";
 import { Provider } from "react-redux";
 import { PersistGate } from "redux-persist/integration/react";
+import { CacheProvider } from "@emotion/react";
 import { store, persistor } from "./store";
+import createEmotionCache from "../utils/createEmotionCache";
 
-function ReduxWrapper({ element }) {
+export function ReduxWrapper({ element }) {
   return (
     <Provider store={store}>
       <PersistGate persistor={persistor}>{() => element}</PersistGate>
@@ -11,4 +13,13 @@ function ReduxWrapper({ element }) {
   );
 }
 
-export default ReduxWrapper;
+export function ReduxWrapperWithCacheProvider({ element }) {
+  const cache = createEmotionCache();
+  return (
+    <CacheProvider value={cache}>
+      <Provider store={store}>
+        <PersistGate persistor={persistor}>{() => element}</PersistGate>
+      </Provider>
+    </CacheProvider>
+  );
+}