Merge pull request #1888 from codeforboston/main

Deploy to PROD 8/6/25

Author: Mephistic

.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

@@ -17,6 +17,7 @@ interface CardTitleProps {
   isUserMatch?: boolean
   type?: string
   userRole?: string
+  isNewsfeed?: string
 }
 
 export const CardTitle = (props: CardTitleProps) => {
@@ -29,7 +30,8 @@ export const CardTitle = (props: CardTitleProps) => {
     isUserMatch,
     subheader,
     type,
-    userRole
+    userRole,
+    isNewsfeed
   } = props
 
   return (
@@ -44,14 +46,18 @@ export const CardTitle = (props: CardTitleProps) => {
           subheader={subheader}
           type={type}
         />
-        <CardTitleFollowing
-          billId={billId}
-          header={header}
-          subheader={subheader}
-          isBillMatch={isBillMatch}
-          isUserMatch={isUserMatch}
-          type={type}
-        />
+        {isNewsfeed ? (
+          <CardTitleFollowing
+            billId={billId}
+            header={header}
+            subheader={subheader}
+            isBillMatch={isBillMatch}
+            isUserMatch={isUserMatch}
+            type={type}
+          />
+        ) : (
+          <></>
+        )}
       </CardBootstrap.Body>
     </CardBootstrap.Body>
   )

components/Card/CardTitle.tsx

@@ -1,6 +1,7 @@
 import { Row, Col } from "../bootstrap"
 import Image from "react-bootstrap/Image"
 import styled from "styled-components"
+import { useTranslation } from "next-i18next"
 
 const StyledImage = styled(Image)`
   width: 12.5rem;
@@ -27,9 +28,9 @@ const WritingContent = () => (
   <Row className="align-items-center">
     <Col xs={12} md={8} lg={{ span: 7, offset: 1 }}>
       <p>
-        You can submit your thoughts on a bill to the Committee hearing it
-        before the date of their public hearing. This website, the MAPLE
-        platform, focuses on this mechanism.
+        {useTranslation("learnComponents").t(
+          "communicating.testifyInWriting.content"
+        )}
       </p>
     </Col>
     <Col md={4} lg={3}>
@@ -58,8 +59,9 @@ const OralContent = () => (
       lg={{ span: 7, order: 1 }}
     >
       <p>
-        You can attend a public hearing for a bill of interest to you and sign
-        up for a slot to speak before the Committee.
+        {useTranslation("learnComponents").t(
+          "communicating.testifyOrally.content"
+        )}
       </p>
     </Col>
   </Row>
@@ -69,12 +71,9 @@ const WriteOrCallContent = () => (
   <Row className="align-items-center">
     <Col xs={12} md={8} lg={{ span: 7, offset: 1 }}>
       <p>
-        You can contact your legislators any time by looking up their contact
-        information on the MA Legislature website. Your voice will probably
-        carry the most weight with the House and Senate representatives of your
-        own district, but you are free to contact Committee Chairs or any other
-        member of the legislature with your opinions. You could request a
-        meeting in person.
+        {useTranslation("learnComponents").t(
+          "communicating.writeOrCall.content"
+        )}
       </p>
     </Col>
     <Col md={4} lg={3}>

components/CommunicatingWithLegislators/CommunicatingWithLegislatorsContent.tsx

@@ -82,7 +82,7 @@ export default function ProfileSettingsModal({
 
   const handleToggleNotifications = async () => {
     if (notifications === "None") {
-      setNotifications("Monthly")
+      setNotifications("Weekly")
     } else {
       setNotifications("None")
     }

components/EditProfilePage/ProfileSettingsModal.tsx

@@ -11,6 +11,7 @@ import CustomDropdown, {
   CustomDropdownProps
 } from "components/Footer/CustomFooterDropdown"
 import { FooterContainer } from "./FooterContainer"
+import { NEWSLETTER_SIGNUP_URL } from "components/common"
 
 export type PageFooterProps = {
   children?: any
@@ -282,7 +283,7 @@ const PageFooter = (props: PageFooterProps) => {
           {t("legal.disclaimer")}
           {" - "}
           <a
-            href="https://cdn.forms-content.sg-form.com/d049f1ab-b547-11ee-9605-72ceb6b6e337"
+            href={NEWSLETTER_SIGNUP_URL}
             style={{ color: "white" }}
             target="_blank"
             rel="noopener noreferrer"

components/Footer/Footer.tsx

@@ -6,6 +6,7 @@ import ScrollTrackingItem from "../ScrollTrackEffect/ScrollTrackerItem"
 import styles from "./HeroHeader.module.css"
 import { useTranslation } from "next-i18next"
 import { capitalize } from "lodash"
+import { NEWSLETTER_SIGNUP_URL, TRAINING_CALENDAR_URL } from "../common"
 
 const HeroHeader = ({ authenticated }) => {
   const { t } = useTranslation("common")
@@ -59,7 +60,7 @@ const HeroHeader = ({ authenticated }) => {
                   <p>
                     {t("newcomer")}{" "}
                     <a
-                      href="https://calendar.google.com/calendar/embed?src=998f62323926f0b0076e7f578d3ca72b1bc94c4efa2f24be57b11f52b1b88595%40group.calendar.google.com&ctz=America%2FNew_York"
+                      href={TRAINING_CALENDAR_URL}
                       style={{ color: "white" }}
                       target="_blank"
                       rel="noopener noreferrer"
@@ -70,7 +71,7 @@ const HeroHeader = ({ authenticated }) => {
                   </p>
                   <p>
                     <a
-                      href="https://cdn.forms-content.sg-form.com/d049f1ab-b547-11ee-9605-72ceb6b6e337"
+                      href={NEWSLETTER_SIGNUP_URL}
                       style={{ color: "white" }}
                       target="_blank"
                       rel="noopener noreferrer"

components/HeroHeader/HeroHeader.js

@@ -181,15 +181,15 @@ const CommunicatingWithLegislators = () => {
           </h1>
           <p className={"ms-1 fs-4"}>{t("communicating.intro")}</p>
 
-          <CommWithLegCard title={t("communicating.testifyInWriting")}>
+          <CommWithLegCard title={t("communicating.testifyInWriting.title")}>
             <WritingContent />
           </CommWithLegCard>
 
-          <CommWithLegCard title={t("communicating.testifyOrally")}>
+          <CommWithLegCard title={t("communicating.testifyOrally.title")}>
             <OralContent />
           </CommWithLegCard>
 
-          <CommWithLegCard title={t("communicating.writeOrCall")}>
+          <CommWithLegCard title={t("communicating.writeOrCall.title")}>
             <WriteOrCallContent />
           </CommWithLegCard>
         </Col>

components/LearnTestimonyComponents/LearnComponents.tsx

@@ -144,16 +144,14 @@ export default function Newsfeed() {
     const [settingsModal, setSettingsModal] = useState<"show" | null>(null)
     const [notifications, setNotifications] = useState<
       "Weekly" | "Monthly" | "None"
-    >(notificationFrequency ? notificationFrequency : "Monthly")
+    >(notificationFrequency ? notificationFrequency : "Weekly")
     const [isProfilePublic, setIsProfilePublic] = useState<false | true>(
       isPublic ? isPublic : false
     )
 
     const onSettingsModalOpen = () => {
       setSettingsModal("show")
-      setNotifications(
-        notificationFrequency ? notificationFrequency : "Monthly"
-      )
+      setNotifications(notificationFrequency ? notificationFrequency : "Weekly")
       setIsProfilePublic(isPublic ? isPublic : false)
     }
 
@@ -230,6 +228,7 @@ export default function Newsfeed() {
                             testimonyId={element.testimonyId}
                             type={element.type}
                             userRole={element.userRole}
+                            isNewsfeed={"enable newsfeed specific subheading"}
                           />
                         </div>
                       ))}