Fix the conflict and merge w main

Author: HuanFengYeh

.all-contributorsrc

@@ -704,6 +704,24 @@
       "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/[email protected]
         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/[email protected]
         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 }}

.gitignore

@@ -80,4 +80,9 @@ build-storybook.log
 
 /token
 
-cert.txt
+cert.txt
+
+# vscode
+
+# lets each user define their own vscode settings
+.vscode/settings.json

.vscode/launch.json

@@ -1,24 +1,30 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    // adapted from https://nextjs.org/docs/app/guides/debugging#debugging-with-vs-code
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Program",
-            "program": "${workspaceFolder}/app.js",
+            "name": "Run and Debug MAPLE",
+            "type": "node",
             "request": "launch",
+            "runtimeExecutable": "yarn",
+            "runtimeArgs": [
+                "dev"
+            ],
+            "env": {
+                "NODE_OPTIONS": "--inspect"
+            },
+            "console": "integratedTerminal",
             "skipFiles": [
                 "<node_internals>/**"
             ],
-            "type": "node"
-        },
-        {
-            "name": "Launch in VSCode (with TypeScript)",
-            "type": "node",
-            "request": "launch",
-            "program": "/Users/mrigank/maple/functions/src/notifications/index.ts",  // Replace with path to your main entry point (e.g., "index.js")
-            "sourceMaps": true
+            "sourceMaps": true,
+            "serverReadyAction": {
+                "action": "debugWithChrome",
+                "killOnServerStop": true,
+                "pattern": "- Local:.+(https?://.+)",
+                "uriFormat": "%s",
+                "webRoot": "${workspaceFolder}"
+            }
         }
     ]
-}
+}

.vscode/settings.json

@@ -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