Merge pull request #1877 from codeforboston/main

Merge to PROD 7/31/25 (With Copy Tweak)

Author: Mephistic

.all-contributorsrc

@@ -677,6 +677,51 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "chiroptical",
+      "name": "Barry Moore",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3086255?v=4",
+      "profile": "https://chiroptical.dev",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ekambains",
+      "name": "ekambains",
+      "avatar_url": "https://avatars.githubusercontent.com/u/182202895?v=4",
+      "profile": "http://www.ekambains.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "gracezhang89",
+      "name": "Grace Zhang",
+      "avatar_url": "https://avatars.githubusercontent.com/u/67801289?v=4",
+      "profile": "https://www.grace-zhang.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jicruz96",
+      "name": "J.I. Cruz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/58642383?v=4",
+      "profile": "http://jicruz.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "peterschiller",
+      "name": "Peter Schiller",
+      "avatar_url": "https://avatars.githubusercontent.com/u/57169063?v=4",
+      "profile": "https://github.com/peterschiller",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "commitType": "docs"

.github/workflows/deploy-backend-dev.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Build and Deploy to Firebase
         uses: w9jds/firebase-action@v13.0.2
         with:
-          args: deploy --force --only firestore,functions,storage
+          args: deploy --force --only firestore,functions:maple,storage
         env:
           GCP_SA_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
           ASSEMBLY_API_KEY: ${{ secrets.ASSEMBLY_API_KEY }}

.github/workflows/deploy-prod.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Build and Deploy to Firebase
         uses: w9jds/firebase-action@v13.0.2
         with:
-          args: deploy --force --only firestore,functions,storage
+          args: deploy --force --only firestore,functions:maple,storage
         env:
           GCP_SA_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
           ASSEMBLY_API_KEY: ${{ secrets.ASSEMBLY_API_KEY }}

README.md

@@ -0,0 +1,49 @@
+import { Container } from "react-bootstrap"
+import { useTranslation, Trans } from "next-i18next"
+import * as links from "components/links"
+
+const AdditionalResources = () => {
+  const content = [
+    {
+      i18nKey: "find_legislator",
+      href: "https://malegislature.gov/Search/FindMyLegislator"
+    },
+    {
+      i18nKey: "legislative_doc",
+      href: "https://www.mass.gov/doc/the-legislative-process-0/download"
+    },
+    {
+      i18nKey: "legal_services",
+      href: "https://www.masslegalservices.org/content/legislative-process-massachusetts-0"
+    }
+  ]
+  const { t } = useTranslation("learnComponents")
+
+  return (
+    <Container fluid="md" className="mt-3">
+      <h1 className="fs-1 fw-bold text-center text-black">
+        {t("legislative.additional_resources")}
+      </h1>
+      <p className="fs-4 mx-5 my-3">{t("legislative.resources_intro")}</p>
+
+      {content.map(({ i18nKey, href }) => (
+        <div
+          key={i18nKey}
+          className="m-4 py-2 px-4 text-bg-light rounded-4 d-flex align-items-center align-items-sm-start"
+        >
+          <div className="d-flex flex-0 justify-content-xs-center p-4">
+            <p className="fs-4">
+              <Trans
+                t={t}
+                i18nKey={`legislative.${i18nKey}`}
+                components={[<links.External href={href} key={i18nKey} />]}
+              />
+            </p>
+          </div>
+        </div>
+      ))}
+    </Container>
+  )
+}
+
+export default AdditionalResources

components/AdditionalResources.tsx

@@ -25,6 +25,7 @@ import {
 } from "./StyledEditProfileComponents"
 import { TestimoniesTab } from "./TestimoniesTab"
 import { useFlags } from "components/featureFlags"
+import LoginPage from "components/Login/login"
 import { PendingUpgradeBanner } from "components/PendingUpgradeBanner"
 
 const tabTitle = ["about-you", "testimonies", "following"] as const
@@ -39,14 +40,18 @@ export default function EditProfile({
   const uid = user?.uid
   const result = useProfile()
 
-  if (result.loading) {
+  if (result.loading && uid) {
     return (
       <Row>
         <Spinner animation="border" className="mx-auto" />
       </Row>
     )
   }
 
+  if (result.loading) {
+    return <LoginPage />
+  }
+
   if (result?.profile && uid) {
     return (
       <EditProfileForm
@@ -57,8 +62,6 @@ export default function EditProfile({
       />
     )
   }
-
-  // Todo add error handling/404 page?
 }
 
 export function EditProfileForm({

components/AdditionalResources/AdditionalResources.tsx

@@ -4,7 +4,7 @@
     "qAndA": [
       {
         "question": "Is MAPLE associated with the state legislature or government?",
-        "answer": "No. MAPLE is a non-profit initiative of the 501(c)(3), the Open Collective Foundation, and supported by Partners in Democracy. MAPLE is not affiliated or supported by the Massachusetts legislature or government."
+        "answer": "No - MAPLE is a non-profit initiative of Partners in Democracy - Education, a 501c(3). MAPLE is an independent project, not affiliated with the Massachusetts legislature."
       },
       {
         "question": "What is MAPLE trying to accomplish?",