Merge branch 'release-1.0.25' into main

app/services/sendgrid-service.js

@@ -17,7 +17,7 @@ const sendRegistrationConfirmation = async (
     </p>
     <p>
       Thank you for registering with Food Oasis! 
-      Please take a moment to verify your account by clicking the link bellow.
+      Please take a moment to verify your account by clicking the link below.
     <br>
     </p>
     <table border="0" cellpadding="0" cellspacing="0" style="border-spacing:0;background-color: #336699;border:1px solid #353535; border-radius: 5px;margin-left: auto;margin-right: auto;">
@@ -57,7 +57,7 @@ const sendResetPasswordConfirmation = async (
       Hello,
     </p>
     <p>
-      Your Food Oasis password can be reset by clicking the link bellow.
+      Your Food Oasis password can be reset by clicking the link below.
     </p>
     <table border="0" cellpadding="0" cellspacing="0" style="border-spacing:0;background-color: #336699;border:1px solid #353535; border-radius: 5px;margin-left: auto;margin-right: auto;">
       <tr>

client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "food-oasis-client",
   "description": "React Client for Food Oasis",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "author": "Hack for LA",
   "license": "GPL-2.0",
   "private": true,

client/public/index.html

@@ -16,7 +16,7 @@
       name="description"
       content="Food Oasis is an application that helps eliminate food waste by connecting donors and food outlets."
     />
-    <meta property="og:title" content="Food Oasis Los Angeles" />
+    <meta property="og:title" content="Food Oasis" />
     <meta property="og:url" content="https://foodoasis.la/" />
     <meta property="og:image" content="%PUBLIC_URL%/favicon.ico" />
     <meta property="og:description" content="Food Oasis LA is a Hack for LA project that aims to provide verified information about free food resources, such as address, location, phone number, etc. to food seekers in the LA county area and to help them find resources near them by visualizing all of these organizations on one map. " />

client/src/App.js

@@ -20,6 +20,9 @@ import Faq from "components/StaticPages/Faq";
 import DonateCA from "components/StaticPagesCA/Donate";
 import AboutCA from "components/StaticPagesCA/About";
 import FaqCA from "components/StaticPagesCA/Faq";
+import DonateHI from "components/StaticPagesHI/Donate";
+import AboutHI from "components/StaticPagesHI/About";
+import FaqHI from "components/StaticPagesHI/Faq";
 import Resources from "components/Resources";
 import Register from "components/Register";
 import Login from "components/Login";
@@ -32,6 +35,7 @@ import Home from "containers/Home";
 import Results from "components/Results/ResultsContainer";
 import Suggestion from "components/Suggestion";
 import newTheme from "./theme/newTheme";
+import { defaultCoordinates } from "./helpers/Configuration";
 
 const useStyles = makeStyles({
   app: (props) => ({
@@ -73,8 +77,8 @@ function App() {
   const [toast, setToast] = useState({ message: "" });
   const [bgImg, setBgImg] = useState("");
   const [origin, setOrigin] = useState({
-    latitude: 34.0522,
-    longitude: -118.2437,
+    latitude: defaultCoordinates.lat,
+    longitude: defaultCoordinates.lon,
   });
 
   useEffect(() => {
@@ -125,8 +129,8 @@ function App() {
         (error) => {
           console.log(`Getting browser location failed: ${error.message}`);
           const userCoordinates = {
-            latitude: 34.0522,
-            longitude: -118.2437,
+            latitude: defaultCoordinates.lat,
+            longitude: defaultCoordinates.lon,
           };
           setUserCoordinates(userCoordinates);
         }
@@ -239,13 +243,31 @@ function App() {
                 <ResetPassword setToast={setToast} />
               </Route>
               <Route path="/donate">
-                {tenantId === 2 ? <DonateCA /> : <Donate />}
+                {tenantId === 3 ? (
+                  <DonateHI />
+                ) : tenantId === 2 ? (
+                  <DonateCA />
+                ) : (
+                  <Donate />
+                )}
               </Route>
               <Route path="/about">
-                {tenantId === 2 ? <AboutCA /> : <About />}
+                {tenantId === 3 ? (
+                  <AboutHI />
+                ) : tenantId === 2 ? (
+                  <AboutCA />
+                ) : (
+                  <About />
+                )}
               </Route>
               <Route exact path="/faqs">
-                {tenantId === 2 ? <FaqCA /> : <Faq />}
+                {tenantId === 3 ? (
+                  <FaqHI />
+                ) : tenantId === 2 ? (
+                  <FaqCA />
+                ) : (
+                  <Faq />
+                )}
               </Route>
             </Switch>
             <Toast toast={toast} setToast={setToast} />

client/src/components/Menu.js

@@ -83,6 +83,7 @@ export default function Menu(props) {
     <>
       <Divider />
       <MenuItemLink
+        to="/"
         key="logout"
         text="Logout"
         onClick={() => logout(setUser, setToast, history)}

client/src/components/Results/ResultsContainer.js

@@ -5,6 +5,7 @@ import { Grid } from "@material-ui/core";
 import { useOrganizationBests } from "hooks/useOrganizationBests";
 import useCategoryIds from "hooks/useCategoryIds";
 import { isMobile } from "helpers";
+import { defaultCoordinates } from "../../helpers/Configuration";
 
 import Filters from "./ResultsFilters";
 import List from "./ResultsList";
@@ -78,14 +79,14 @@ export default function ResultsContainer(props) {
       ? JSON.parse(storage.origin).latitude
       : userCoordinates
       ? userCoordinates.latitude
-      : 34.07872,
+      : defaultCoordinates.lat,
     longitude: userSearch
       ? userSearch.longitude
       : storage.origin
       ? JSON.parse(storage.origin).longitude
       : userCoordinates
       ? userCoordinates.longitude
-      : -118.243328,
+      : defaultCoordinates.lon,
   };
 
   const [radius, setRadius] = useState(