@openstack_dev/gatsby-theme-marketing-oif-core 1.0.6 → 1.0.7

package/gatsby-browser.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openstack_dev/gatsby-theme-marketing-oif-core",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Base theme for Marketing Sites",
   "author": "smarcet",
   "keywords": [

package/src/components/Layout.js

@@ -1,27 +1,33 @@
 import React from "react";
 import PropTypes from "prop-types";
+import CssBaseline from "@mui/material/CssBaseline";
+import { ThemeProvider } from "@mui/material/styles";
 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";
 
 function Layout({ children }) {
   return (
-    <div>
-      <SponsoredProjectsNav />
-      <Navbar />
+    <ThemeProvider theme={theme}>
+      <CssBaseline />
       <div>
-        <Header />
-        <AnnouncementBanner />
-        <main id="content-wrapper">
-          {children}
-          <SubscribeForm />
-        </main>
-        <Footer />
+        <SponsoredProjectsNav />
+        <Navbar />
+        <div>
+          <Header />
+          <AnnouncementBanner />
+          <main id="content-wrapper">
+            {children}
+            <SubscribeForm />
+          </main>
+          <Footer />
+        </div>
       </div>
-    </div>
+    </ThemeProvider>
   );
 }
 

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

@@ -1 +1 @@
-{ "staticJsonFilesBuildTime": [], "lastBuild": 1713847296425 }
+{ "staticJsonFilesBuildTime": [], "lastBuild": 1713848863370 }

package/src/state/ReduxWrapper.js

@@ -1,10 +1,7 @@
 import * as React from "react";
 import { Provider } from "react-redux";
 import { PersistGate } from "redux-persist/integration/react";
-import { ThemeProvider } from "@mui/material/styles";
-import CssBaseline from "@mui/material/CssBaseline";
 import { store, persistor } from "./store";
-import theme from "../theme";
 
 const onBeforeLift = () => {
   const params = new URLSearchParams(window.location.search);
@@ -25,17 +22,4 @@ function ReduxWrapper({ element }) {
   );
 }
 
-export function ReduxWrapperWithTheme({ element }) {
-  return (
-    <Provider store={store}>
-      <PersistGate onBeforeLift={onBeforeLift} persistor={persistor}>
-        <ThemeProvider theme={theme}>
-          <CssBaseline />
-          {() => element}
-        </ThemeProvider>
-      </PersistGate>
-    </Provider>
-  );
-}
-
 export default ReduxWrapper;