Merge branch 'release-1.0.36' into main

hackforla · Jan 12, 2021 · 092d0fe · 092d0fe
2 parents bbcc9d1 + 23e92e8
commit 092d0fe
Show file tree

Hide file tree

Showing 54 changed files with 6,674 additions and 308 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,60 +1,60 @@
-{
-  "name": "food-oasis-client",
-  "description": "React Client for Food Oasis",
-  "version": "1.0.35",
-  "author": "Hack for LA",
-  "license": "GPL-2.0",
-  "private": true,
-  "proxy": "http://localhost:5000",
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
-  },
-  "dependencies": {
-    "@date-io/moment": "^1.3.13",
-    "@material-ui/core": "^4.9.12",
-    "@material-ui/icons": "^4.9.1",
-    "@material-ui/lab": "^4.0.0-alpha.51",
-    "@material-ui/pickers": "^3.2.10",
-    "axios": "^0.19.2",
-    "classnames": "^2.2.6",
-    "debounce-fn": "^3.0.1",
-    "dotenv": "^8.2.0",
-    "downshift": "^4.0.4",
-    "esri-loader": "^2.14.0",
-    "formik": "^2.1.4",
-    "i18next": "^17.3.1",
-    "i18next-browser-languagedetector": "^4.1.1",
-    "i18next-xhr-backend": "^3.2.0",
-    "js-file-download": "^0.4.12",
-    "moment": "2.24.0",
-    "query-string": "^6.12.1",
-    "react": "^16.13.1",
-    "react-data-grid": "^6.1.0",
-    "react-dom": "^16.13.1",
-    "react-gtm-module": "^2.0.11",
-    "react-i18next": "^10.13.2",
-    "react-map-gl": "^5.2.5",
-    "react-proptypes": "^1.0.0",
-    "react-quill": "^1.3.5",
-    "react-router-dom": "^5.1.2",
-    "react-scripts": "^4.0.1",
-    "react-spinners": "^0.6.1",
-    "yup": "^0.27.0"
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "devDependencies": {}
-}
+{
+  "name": "food-oasis-client",
+  "description": "React Client for Food Oasis",
+  "version": "1.0.36",
+  "author": "Hack for LA",
+  "license": "GPL-2.0",
+  "private": true,
+  "proxy": "http://localhost:5000",
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
+  },
+  "dependencies": {
+    "@date-io/moment": "^1.3.13",
+    "@material-ui/core": "^4.9.12",
+    "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "^4.0.0-alpha.51",
+    "@material-ui/pickers": "^3.2.10",
+    "axios": "^0.21.1",
+    "classnames": "^2.2.6",
+    "debounce-fn": "^3.0.1",
+    "dotenv": "^8.2.0",
+    "downshift": "^4.0.4",
+    "esri-loader": "^2.14.0",
+    "formik": "^2.1.4",
+    "i18next": "^17.3.1",
+    "i18next-browser-languagedetector": "^4.1.1",
+    "i18next-xhr-backend": "^3.2.0",
+    "js-file-download": "^0.4.12",
+    "moment": "2.24.0",
+    "query-string": "^6.12.1",
+    "react": "^16.13.1",
+    "react-data-grid": "^6.1.0",
+    "react-dom": "^16.13.1",
+    "react-gtm-module": "^2.0.11",
+    "react-i18next": "^10.13.2",
+    "react-map-gl": "^5.2.5",
+    "react-proptypes": "^1.0.0",
+    "react-quill": "^1.3.5",
+    "react-router-dom": "^5.1.2",
+    "react-scripts": "^4.0.1",
+    "react-spinners": "^0.6.1",
+    "yup": "^0.27.0"
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  },
+  "devDependencies": {}
+}
diff --git a/client/src/App.js b/client/src/App.js
@@ -17,12 +17,18 @@ import OrganizationEdit from "components/Verification/OrganizationEdit";
 import Donate from "components/StaticPages/Donate";
 import About from "components/StaticPages/About";
 import Faq from "components/StaticPages/Faq";
+import DonateLA from "components/StaticPagesLA/Donate";
+import AboutLA from "components/StaticPagesLA/About";
+import FaqLA from "components/StaticPagesLA/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 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";
@@ -242,28 +248,40 @@ function App() {
                 <ResetPassword setToast={setToast} />
               </Route>
               <Route path="/donate">
-                {tenantId === 3 ? (
+                {tenantId === 4 ? (
+                  <DonatePDX />
+                ) : tenantId === 3 ? (
                   <DonateHI />
                 ) : tenantId === 2 ? (
                   <DonateCA />
+                ) : tenantId === 1 ? (
+                  <DonateLA />
                 ) : (
                   <Donate />
                 )}
               </Route>
               <Route path="/about">
-                {tenantId === 3 ? (
+                {tenantId === 4 ? (
+                  <AboutPDX />
+                ) : tenantId === 3 ? (
                   <AboutHI />
                 ) : tenantId === 2 ? (
                   <AboutCA />
+                ) : tenantId === 1 ? (
+                  <AboutLA />
                 ) : (
                   <About />
                 )}
               </Route>
               <Route exact path="/faqs">
-                {tenantId === 3 ? (
+                {tenantId === 4 ? (
+                  <FaqPDX />
+                ) : tenantId === 3 ? (
                   <FaqHI />
                 ) : tenantId === 2 ? (
                   <FaqCA />
+                ) : tenantId === 1 ? (
+                  <FaqLA />
                 ) : (
                   <Faq />
                 )}

diff --git a/client/src/components/StaticPages/Faq.js b/client/src/components/StaticPages/Faq.js
@@ -195,8 +195,10 @@ const About = () => {
             <dd>
               <a href="/register">Enter your info here</a>, and look out for a
               confirmation email from{" "}
-              <a href="mailto:[email protected]">[email protected]</a>.
-              Follow the instructions on the email.
+              <a href="mailto:[email protected]">
+                [email protected]
+              </a>
+              . Follow the instructions on the email.
             </dd>
           </dl>
         </section>

diff --git a/client/src/components/StaticPagesCA/Faq.js b/client/src/components/StaticPagesCA/Faq.js
@@ -194,8 +194,10 @@ const About = () => {
             <dd>
               <a href="/register">Enter your info here</a>, and look out for a
               confirmation email from{" "}
-              <a href="mailto:[email protected]">[email protected]</a>.
-              Follow the instructions on the email.
+              <a href="mailto:[email protected]">
+                [email protected]
+              </a>
+              . Follow the instructions on the email.
             </dd>
           </dl>
         </section>