Merge with main

.github/ISSUE_TEMPLATE/a---bug-report.md

@@ -43,5 +43,5 @@ A clear and concise description of what the bug is, who it affects, how it affec
 #### Device configuration
 - Device: [e.g. type of smartphone, tablet, desktop computer]
 - OS version: [e.g. iOS, Android version #]
-- Browser [e.g. Chrome, Firefox, Safari, etc.]
-- Browser version [e.g. 22]
+- Browser: [e.g. Chrome, Firefox, Safari, etc.]
+- Browser version: [e.g. 22]

README.md

@@ -1,16 +1,25 @@
 # Food Oasis
 
-Food Oasis is a web application that provides information about food pantries and meal programs to food seekers in Los Angeles County. It is currently deployed to http://foodoasis.la.
+Food Oasis is a community-driven platform dedicated to ensuring everyone has access to food pantries and meal programs when they need them most. Operating across several regions, including Los Angeles County, The Hawaiian Islands, Santa Barbara County, and McKinney, TX. The web application bridges the gap between individuals and essential food assistance services, creating a supportive network within various communities.
 
-It is a project of Hack for LA, which, in turn, is a brigade of Code for America.
+- [la.foodoasis.net](https://la.foodoasis.net/) or [foodoasis.la](https://foodoasis.la/) - Los Angeles County
+- [hi.foodoasis.net](https://hi.foodoasis.net/) - The Hawaiian Islands
+- [sb.foodoasis.net](https://sb.foodoasis.net/) - Santa Barbara County
+- [mck.foodoasis.net](https://mck.foodoasis.net/) - McKinney, TX
 
-# How to contribute
+The codebase is fully open source, licensed under the [GNU General Public License (GPL) Version 2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html). This project is a proud initiative of [Hack for LA](https://www.hackforla.org/), under [Civic Tech Structure](https://www.civictechstructure.org/).
 
-- Join the team - check out hackforla.org
-- Volunteer to help validate and maintain pantry and meal program information with LAWorks on Saturdays from 10am - 12pm at: https://us02web.zoom.us/j/89392237549
-- Provide UX/UI design support.
-- Help us with usability testing.
-- Help us with marketing to relevant community members.
-- To contribute as a developer, refer to our [Developer Instructions](https://github.com/hackforla/food-oasis/wiki/Developers)
+## How to contribute
 
-Please see the [Food Oasis Wiki](https://github.com/hackforla/food-oasis/wiki) for detailed information.
+Join us in making a difference:
+
+1. **Start by Onboarding:** Complete the [Hack for LA Onboarding](https://www.hackforla.org/getting-started). Joining is free!
+2. **Joining the Team:** Read the [onboarding section of our Wiki](https://github.com/hackforla/food-oasis/wiki/Joining-the-Team).
+3. **Volunteer Opportunities:**
+     - Validate and maintain pantry and meal program data.
+     - Provide UX/UI design support.
+     - Assist with usability testing.
+     - Engage in marketing to connect with community members.
+     - Contribute as a developer (see [Developer Instructions](https://github.com/hackforla/food-oasis/wiki/Developers) for guidance).
+
+For more details, visit the [Food Oasis Wiki](https://github.com/hackforla/food-oasis/wiki).

client/package.json

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

client/public/index.html

@@ -57,31 +57,29 @@
         background-color: rgba(0, 0, 0, 0.5);
         box-shadow: 0 0 1px rgba(255, 255, 255, 0.5);
       }
+      #home-loading-spinner {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height: 100vh;
+      }
+      .spinner {
+        border: 4px solid rgba(0, 0, 0, 0.1);
+        width: 36px;
+        height: 36px;
+        border-radius: 50%;
+        border-left-color: #09f;
+        animation: spin 1s ease infinite;
+      }
+      @keyframes spin {
+        0% {
+          transform: rotate(0deg);
+        }
+        100% {
+          transform: rotate(360deg);
+        }
+      }
     </style>
-    <script type="text/javascript">
-      (function (e, t, n, r, i, s, o) {
-        e["StormlyObject"] = i;
-        (e[i] =
-          e[i] ||
-          function () {
-            (e[i].q = e[i].q || []).push(arguments);
-          }),
-          (s = t.createElement(n)),
-          (o = t.getElementsByTagName(n)[0]);
-        s.async = 1;
-        s.src = r;
-        o.parentNode.insertBefore(s, o);
-      })(
-        window,
-        document,
-        "script",
-        "//cdn.stormly.com/assets/tracking/t.js",
-        "stormly"
-      );
-      stormly("create", "d6f56047e6527499d8e4854b8db2f5f49", {
-        anonymizeIP: false,
-      });
-    </script>
     <script type="text/javascript">
       if (
         window.___location.hostname === "la.foodoasis.net" ||
@@ -104,43 +102,10 @@
   </head>
   <body id="body">
     <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      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>
-
-    <!-- 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",
-        measurementId: "G-8J47DL7ERE",
-      };
-      // Initialize Firebase
-      firebase.initializeApp(firebaseConfig);
-      firebase.analytics();
-    </script>
+    <div id="root">
+      <div id="home-loading-spinner">
+        <div class="spinner"></div>
+      </div>
+    </div>
   </body>
 </html>

client/public/sitemap.xml

@@ -19,9 +19,9 @@
       <loc>https://foodoasis.la/suggestion</loc>
    </url>
    <url>
-      <loc>https://foodoasis.la/login</loc>
+      <loc>https://foodoasis.la/admin/login</loc>
    </url>
    <url>
-      <loc>https://foodoasis.la/register</loc>
+      <loc>https://foodoasis.la/admin/register</loc>
    </url>
 </urlset>