Merge branch 'release-1.0.44' into main

hackforla · Feb 28, 2021 · 892bf78 · 892bf78
2 parents ce22689 + 5c0578e
commit 892bf78
Show file tree

Hide file tree

Showing 137 changed files with 5,734 additions and 24,580 deletions.
diff --git a/client/.env b/client/.env
@@ -1,3 +1,3 @@
-REACT_APP_TENANT_ID=1   
+REACT_APP_TENANT_ID=1
 REACT_APP_MAPBOX_TOKEN=pk.eyJ1IjoibHVjYXNob21lciIsImEiOiJjazFqcnRjcm0wNmZ1M2JwZXg2eDFzMXd3In0.yYpkKLrFCxF-qyBfZH1a8w
 REACT_APP_TAMU_GEOSERVICES_API_KEY=5c141ed805794a7a9562c22c090a71cb
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "foodoasis-client",
   "description": "React Client for Food Oasis",
-  "version": "1.0.43",
+  "version": "1.0.44",
   "author": "Hack for LA",
   "license": "GPL-2.0",
   "private": true,

diff --git a/client/public/index.html b/client/public/index.html
@@ -3,10 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta
-      name="viewport"
-      content="minimum-scale=1, initial-scale=1"
-    />
+    <meta name="viewport" content="minimum-scale=1, initial-scale=1" />
     <!-- <meta
       name="viewport"
       content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no"
@@ -19,7 +16,10 @@
     <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. " />
+    <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. "
+    />
     <meta property="og:locale" content="en_US" />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/favicon.ico" />
     <link
@@ -46,8 +46,10 @@
       html,
       #body,
       #root {
-        height: 100%;
-        min-height: 100%;
+        height: 100vh;
+        min-height: 100vh;
+        width: 100vw;
+        min-width: 100vw;
         margin: 0;
       }
     </style>
@@ -66,31 +68,30 @@
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
 
-
     <!-- Insert these scripts at the bottom of the HTML, but before you use any Firebase services -->
 
-  <!-- Firebase App (the core Firebase SDK) is always required and must be listed first -->
-  <script src="https://www.gstatic.com/firebasejs/7.24.0/firebase-app.js"></script>
+    <!-- Firebase App (the core Firebase SDK) is always required and must be listed first -->
+    <script src="https://www.gstatic.com/firebasejs/7.24.0/firebase-app.js"></script>
 
-  <!-- If you enabled Analytics in your project, add the Firebase SDK for Analytics -->
-  <script src="https://www.gstatic.com/firebasejs/7.24.0/firebase-analytics.js"></script>
+    <!-- If you enabled Analytics in your project, add the Firebase SDK for Analytics -->
+    <script src="https://www.gstatic.com/firebasejs/7.24.0/firebase-analytics.js"></script>
 
-  <script>
-    // Your web app's Firebase configuration
-    // For Firebase JS SDK v7.20.0 and later, measurementId is optional
-    var firebaseConfig = {
-      apiKey: "AIzaSyD9P_FtD1_6A3UefslE-DouTjAnjvv89fw",
-      authDomain: "hack-for-la-firebase-project.firebaseapp.com",
-      databaseURL: "https://hack-for-la-firebase-project.firebaseio.com",
-      projectId: "hack-for-la-firebase-project",
-      storageBucket: "hack-for-la-firebase-project.appspot.com",
-      messagingSenderId: "901423769273",
-      appId: "1:901423769273:web:9f2954b9ba134d7e8f1d68",
-      measurementId: "G-BX2932LS6Y"
-    };
-    // Initialize Firebase
-    firebase.initializeApp(firebaseConfig);
-    firebase.analytics();
-  </script>
+    <script>
+      // Your web app's Firebase configuration
+      // For Firebase JS SDK v7.20.0 and later, measurementId is optional
+      var firebaseConfig = {
+        apiKey: "AIzaSyD9P_FtD1_6A3UefslE-DouTjAnjvv89fw",
+        authDomain: "hack-for-la-firebase-project.firebaseapp.com",
+        databaseURL: "https://hack-for-la-firebase-project.firebaseio.com",
+        projectId: "hack-for-la-firebase-project",
+        storageBucket: "hack-for-la-firebase-project.appspot.com",
+        messagingSenderId: "901423769273",
+        appId: "1:901423769273:web:9f2954b9ba134d7e8f1d68",
+        measurementId: "G-BX2932LS6Y",
+      };
+      // Initialize Firebase
+      firebase.initializeApp(firebaseConfig);
+      firebase.analytics();
+    </script>
   </body>
 </html>
diff --git a/client/src/App.js b/client/src/App.js
@@ -6,19 +6,20 @@ import {
   Redirect,
 } from "react-router-dom";
 import { makeStyles, ThemeProvider } from "@material-ui/core/styles";
-import { Grid } from "@material-ui/core";
+import { Grid, CssBaseline } from "@material-ui/core";
 import theme from "theme/materialUI";
 import { logout } from "services/account-service";
 import { tenantId, defaultCoordinates } from "helpers/Configuration";
 
 // Components
-import { UserContext } from "components/user-context";
-import Toast from "components/Toast";
-import Header from "components/Header";
-import VerificationAdmin from "components/Verification/VerificationAdmin";
-import VerificationDashboard from "components/Verification/VerificationDashboard";
-import SecurityAdminDashboard from "components/SecurityAdminDashboard/SecurityAdminDashboard";
-import OrganizationEdit from "components/Verification/OrganizationEdit";
+import { UserContext } from "contexts/user-context";
+import Toast from "components/UI/Toast";
+import Header from "components/Layout/Header";
+import HeaderHome from "components/Layout/HeaderHome";
+import VerificationAdmin from "components/Admin/VerificationAdmin";
+import VerificationDashboard from "components/Admin/VerificationDashboard";
+import SecurityAdminDashboard from "components/Account/SecurityAdminDashboard/SecurityAdminDashboard";
+import OrganizationEdit from "components/Admin/OrganizationEdit";
 import Donate from "components/StaticPages/Donate";
 import About from "components/StaticPages/About";
 import Faq from "components/StaticPages/Faq";
@@ -31,18 +32,21 @@ import FaqHI from "components/StaticPagesHI/Faq";
 import DonatePDX from "components/StaticPagesPDX/Donate";
 import AboutPDX from "components/StaticPagesPDX/About";
 import FaqPDX from "components/StaticPagesPDX/Faq";
-import Resources from "components/Resources";
-import Register from "components/Register";
-import Login from "components/Login";
-import ForgotPassword from "components/ForgotPassword";
-import ResetPassword from "components/ResetPassword";
-import ConfirmEmail from "components/ConfirmEmail";
-import FaqEdit from "components/FaqEdit";
-import FaqAdd from "components/FaqAdd";
-import Home from "containers/Home";
-import Results from "components/Results/ResultsContainer";
-import Suggestion from "components/Suggestion";
-import ImportFile from "components/ImportFile";
+import DonateMCK from "components/StaticPagesMCK/Donate";
+import AboutMCK from "components/StaticPagesMCK/About";
+import FaqMCK from "components/StaticPagesMCK/Faq";
+import Resources from "components/Layout/Resources";
+import Register from "components/Account/Register";
+import Login from "components/Account/Login";
+import ForgotPassword from "components/Account/ForgotPassword";
+import ResetPassword from "components/Account/ResetPassword";
+import ConfirmEmail from "components/Account/ConfirmEmail";
+import FaqEdit from "components/Faq/FaqEdit";
+import FaqAdd from "components/Faq/FaqAdd";
+import Home from "components/FoodSeeker/Home";
+import Results from "components/FoodSeeker/ResultsContainer";
+import Suggestion from "components/FoodSeeker/Suggestion";
+import ImportFile from "components/Admin/ImportOrganizations/ImportFile";
 import newTheme from "./theme/newTheme";
 
 const useStyles = makeStyles({
@@ -88,6 +92,8 @@ function App() {
     longitude: defaultCoordinates.lon,
   });
 
+  const [browserLocation, setBrowserLocation] = useState(false);
+
   useEffect(() => {
     const imgNum = Math.floor(Math.random() * (21 - 1)) + 1;
     const backgroundImage = `url("/landing-page/${imgNum}.jpg")`;
@@ -104,9 +110,48 @@ function App() {
     } else {
       setUser(JSON.parse(storedJson));
     }
-  }, [user, userCoordinates]);
+  }, [user]);
 
   useEffect(() => {
+    const fetchLocation = () => {
+      let userCoordinates = { latitude: null, longitude: null };
+      if (navigator.geolocation) {
+        navigator.geolocation.getCurrentPosition(
+          (position) => {
+            if (position) {
+              const userCoordinates = {
+                latitude: position.coords.latitude,
+                longitude: position.coords.longitude,
+              };
+              setUserCoordinates(userCoordinates);
+              setBrowserLocation(true);
+            }
+          },
+          (error) => {
+            // Ususally because user has blocked location
+            console.log(`Getting browser location failed: ${error.message}`);
+            const userCoordinates = {
+              latitude: defaultCoordinates.lat,
+              longitude: defaultCoordinates.lon,
+            };
+            setUserCoordinates(userCoordinates);
+            setBrowserLocation(false);
+          }
+        );
+      } else {
+        console.log(
+          "Browser does not support getting users location - using default location for area"
+        );
+        const userCoordinates = {
+          latitude: defaultCoordinates.lat,
+          longitude: defaultCoordinates.lon,
+        };
+        setUserCoordinates(userCoordinates);
+        setBrowserLocation(false);
+      }
+
+      return userCoordinates;
+    };
     fetchLocation();
   }, []);
 
@@ -120,66 +165,48 @@ function App() {
     setUser(user);
   };
 
-  const fetchLocation = () => {
-    let userCoordinates = { latitude: null, longitude: null };
-    if (navigator.geolocation) {
-      navigator.geolocation.getCurrentPosition(
-        (position) => {
-          if (position) {
-            const userCoordinates = {
-              latitude: position.coords.latitude,
-              longitude: position.coords.longitude,
-            };
-            setUserCoordinates(userCoordinates);
-          }
-        },
-        (error) => {
-          console.log(`Getting browser location failed: ${error.message}`);
-          const userCoordinates = {
-            latitude: defaultCoordinates.lat,
-            longitude: defaultCoordinates.lon,
-          };
-          setUserCoordinates(userCoordinates);
-        }
-      );
-    } else {
-      // If browser location permission is denied, the request is
-      // "successful", but the result is null coordinates.
-      console.log("Enable location permission to use location-based features.");
-    }
-
-    return userCoordinates;
-  };
-
   const classes = useStyles();
 
   return (
     <UserContext.Provider value={user}>
       <ThemeProvider theme={theme}>
+        <CssBaseline />
         <Router>
           <Grid
             container
             direction="column"
             wrap="nowrap"
             alignContent="stretch"
-            //justify="stretch"
             spacing={0}
             classes={{
               container: classes.app,
             }}
           >
-            <Header user={user} setUser={onLogin} setToast={setToast} />
+            <Switch>
+              <Route exact path="/">
+                <HeaderHome user={user} setUser={onLogin} setToast={setToast} />
+              </Route>
+              <Route>
+                <Header user={user} setUser={onLogin} setToast={setToast} />
+              </Route>
+            </Switch>
             <Switch className={classes.mainContent}>
               <Route exact path="/">
                 <div
                   className={classes.homeWrapper}
                   style={{ backgroundImage: bgImg }}
                 >
-                  <Home
-                    userCoordinates={userCoordinates}
-                    origin={origin}
-                    setOrigin={setOrigin}
-                  />
+                  <div
+                    className={classes.homeWrapper}
+                    style={{ backgroundImage: bgImg }}
+                  >
+                    <Home
+                      userCoordinates={userCoordinates}
+                      origin={origin}
+                      setOrigin={setOrigin}
+                      browserLocation={browserLocation}
+                    />
+                  </div>
                 </div>
               </Route>
               {/* 
@@ -194,6 +221,7 @@ function App() {
                   origin={origin}
                   setOrigin={setOrigin}
                   setToast={setToast}
+                  browserLocation={browserLocation}
                 />
               </Route>
               <Route path="/suggestion">
@@ -260,7 +288,9 @@ function App() {
                 <ResetPassword setToast={setToast} />
               </Route>
               <Route path="/donate">
-                {tenantId === 4 ? (
+                {tenantId === 5 ? (
+                  <DonateMCK />
+                ) : tenantId === 4 ? (
                   <DonatePDX />
                 ) : tenantId === 3 ? (
                   <DonateHI />
@@ -271,7 +301,9 @@ function App() {
                 )}
               </Route>
               <Route path="/about">
-                {tenantId === 4 ? (
+                {tenantId === 5 ? (
+                  <AboutMCK />
+                ) : tenantId === 4 ? (
                   <AboutPDX />
                 ) : tenantId === 3 ? (
                   <AboutHI />
@@ -282,7 +314,9 @@ function App() {
                 )}
               </Route>
               <Route exact path="/faqs">
-                {tenantId === 4 ? (
+                {tenantId === 5 ? (
+                  <FaqMCK />
+                ) : tenantId === 4 ? (
                   <FaqPDX />
                 ) : tenantId === 3 ? (
                   <FaqHI />

diff --git a/client/src/components/ConfirmEmail.js → ...nt/src/components/Account/ConfirmEmail.js b/client/src/components/ConfirmEmail.js → ...nt/src/components/Account/ConfirmEmail.js
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import Footer from "./Footer";
+import Footer from "../Layout/Footer";
 import { Redirect, withRouter } from "react-router-dom";
 import {
   withStyles,
@@ -10,7 +10,7 @@ import {
   TextField,
   Typography,
 } from "@material-ui/core";
-import * as accountService from "../services/account-service";
+import * as accountService from "../../services/account-service";
 import EmailOutlinedIcon from "@material-ui/icons/EmailOutlined";
 
 const styles = (theme) => ({

diff --git a/client/src/components/ForgotPassword.js → .../src/components/Account/ForgotPassword.js b/client/src/components/ForgotPassword.js → .../src/components/Account/ForgotPassword.js
@@ -3,7 +3,7 @@ import { withRouter } from "react-router-dom";
 import { withStyles } from "@material-ui/core";
 import { Formik } from "formik";
 import * as Yup from "yup";
-import * as accountService from "../services/account-service";
+import * as accountService from "../../services/account-service";
 import {
   Avatar,
   Button,
@@ -15,7 +15,7 @@ import {
   Typography,
 } from "@material-ui/core";
 import LockOutlinedIcon from "@material-ui/icons/LockOutlined";
-import Footer from "./Footer";
+import Footer from "../Layout/Footer";
 
 const styles = (theme) => ({
   "@global": {

diff --git a/client/src/components/Login.js → client/src/components/Account/Login.js b/client/src/components/Login.js → client/src/components/Account/Login.js
@@ -1,5 +1,5 @@
 import React from "react";
-import Footer from "./Footer";
+import Footer from "../Layout/Footer";
 import { withRouter } from "react-router-dom";
 import {
   withStyles,

diff --git a/client/src/components/Logout.js → client/src/components/Account/Logout.js b/client/src/components/Logout.js → client/src/components/Account/Logout.js