Merge branch 'release-1.0.90'

Author: entrotech

.github/workflows/deployFullstackToDockerHub.yaml

@@ -10,7 +10,7 @@ on:
       - published
 jobs:
   fullstack:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Build and push Full-Stack Container to Docker Hub
     steps:
       - name: Checkout repo

.github/workflows/deployWebAPIOnlyToDockerHub.yaml

@@ -11,7 +11,7 @@ on:
       - published
 jobs:
   webapi:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Build and push Web API Container to Docker Hub
     steps:
       - name: Checkout repo

.github/workflows/developToHeroku.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: akhileshns/[email protected] # This is the action

.github/workflows/mainToHeroku.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: akhileshns/[email protected] # This is the action

.github/workflows/viteToHeroku.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: akhileshns/[email protected] # This is the action

client/.prettierrc.js renamed to client/.prettierrc.cjs

@@ -1,7 +1,7 @@
 {
   "name": "foodoasis-client",
   "description": "React Client for Food Oasis",
-  "version": "1.0.89",
+  "version": "1.0.90",
   "author": "Hack for LA",
   "license": "GPL-2.0",
   "private": true,

client/package-lock.json

@@ -21,13 +21,6 @@ function App() {
     analytics.postEvent("visitAppComponent");
   }, []);
 
-  // const [snackbarOpen, setSnackbarOpen] = useState(false);
-  // const [snackbarMessage, setSnackbarMessage] = useState("");
-
-  // const handleCloseSnackbar = () => {
-  //   setSnackbarOpen(false);
-  // };
-
   return (
     <HelmetProvider>
       <CssBaseline />

client/package.json

@@ -7,6 +7,9 @@ import { Navigate, Outlet, Route, Routes } from "react-router-dom";
 import Fallback from "./components/Fallback";
 import PrivateRoute from "./components/PrivateRoute";
 import Toast from "components/UI/Toast";
+import {
+  useWidget,
+} from "./appReducer";
 
 const VerificationAdmin = lazy(() =>
   import("components/Admin/VerificationAdmin")
@@ -196,6 +199,7 @@ export default function AppRoutes() {
 }
 
 function AppWrapper() {
+    const isWidget = useWidget();
   return (
     <Grid
       container
@@ -211,7 +215,7 @@ function AppWrapper() {
         overflowX: "hidden",
       }}
     >
-      <Header />
+      {isWidget ? null : <Header />}
       <Outlet />
       <Toast />
     </Grid>