Merge pull request #1432 from codeforboston/main

2/6/24 Merge from Main -> Prod

.github/actions/setup-repo/action.yml

@@ -4,7 +4,7 @@ inputs:
   node-version:
     description: "Version used by actions/setup-node"
     required: true
-    default: "16"
+    default: "18"
   yarn-version:
     description: "Version of Yarn used to install dependencies"
     required: true

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

@@ -22,7 +22,7 @@ jobs:
       - name: Setup Build Environment
         uses: ./.github/actions/setup-repo
       - name: Build and Deploy to Firebase
-        uses: w9jds/firebase-action@v12.9.0
+        uses: w9jds/firebase-action@v13.0.2
         with:
           args: deploy --force --only firestore,functions,storage
         env:

.github/workflows/deploy-prod.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup Build Environment
         uses: ./.github/actions/setup-repo
       - name: Build and Deploy to Firebase
-        uses: w9jds/firebase-action@v12.9.0
+        uses: w9jds/firebase-action@v13.0.2
         with:
           args: deploy --force --only firestore,functions,storage
         env:

.prettierignore

@@ -10,4 +10,6 @@ exportedTestData
 dist.yml
 analysis/data
 dist
-*.handlebars
+*.handlebars
+coverage
+storybook-static

.storybook/main.js

@@ -6,17 +6,18 @@ module.exports = {
     "../stories/**/*.stories.mdx",
     "../stories/**/*.stories.@(js|jsx|ts|tsx)"
   ],
+
   addons: [
     "@storybook/addon-links",
     "@storybook/addon-essentials",
-    "@storybook/addon-interactions",
-    "storybook-addon-next",
-    "storybook-addon-designs"
+    "@storybook/addon-interactions"
   ],
-  framework: "@storybook/react",
-  core: {
-    builder: "@storybook/builder-webpack5"
+
+  framework: {
+    name: "@storybook/nextjs",
+    options: {}
   },
+
   webpackFinal: async (config, { configType }) => {
     config.module.rules.push({
       test: /\.handlebars$/,
@@ -25,5 +26,10 @@ module.exports = {
     config.resolve.fallback = { fs: false, path: false }
     return config
   },
-  staticDirs: ["../public", "../stories/assets"]
+
+  staticDirs: ["../public", "../stories/assets"],
+
+  docs: {
+    autodocs: false
+  }
 }

.storybook/preview.js

@@ -17,6 +17,44 @@ export const parameters = {
       color: /(background|color)$/i,
       date: /Date$/
     }
+  },
+  options: {
+    storySort: {
+      order: [
+        "Atoms",
+        "Molecules",
+        "Organisms",
+        [
+          "Page Elements",
+          "Profile",
+          "Edit Profile",
+          "Bill Detail",
+          "Education",
+          "Newsfeed"
+        ],
+        "Pages",
+        "*",
+        "unused"
+      ],
+      method: "alphabetical"
+    }
+  },
+  backgrounds: {
+    default: "medium",
+    values: [
+      {
+        name: "light",
+        value: "#ffffff"
+      },
+      {
+        name: "dark",
+        value: "#000000"
+      },
+      {
+        name: "medium",
+        value: "#f4f4f4"
+      }
+    ]
   }
 }
 

.tool-versions

@@ -1 +1 @@
-nodejs 16.18.0
+nodejs 18.17.0

components/AboutSectionInfoCard/AboutInfoCard.tsx

@@ -10,7 +10,7 @@ export type AboutInfoCardProps = {
 export default function AboutInfoCard({ title, bodytext }: AboutInfoCardProps) {
   return (
     <Col className="my-3">
-      <Card className="h-100">
+      <Card className="h-100 bg-white">
         <Card.Header
           as="h3"
           className={`text-center align-self-center text-white rounded-0 ${styles.cardHeader}`}

components/AdditionalResources/AdditionalResourcesCard.tsx

@@ -0,0 +1,19 @@
+import { Card } from "../bootstrap"
+// import { Card } from "../Card/Card"
+import { FC, PropsWithChildren } from "react"
+import { CardProps } from "react-bootstrap"
+
+const AdditionalResourcesCard: FC<PropsWithChildren<CardProps>> = ({
+  children,
+  ...rest
+}) => {
+  return (
+    <Card
+      className={`m-4 py-2 px-4 text-bg-light rounded-4 d-flex align-items-center align-items-sm-start`}
+    >
+      {children}
+    </Card>
+  )
+}
+
+export default AdditionalResourcesCard

components/AdditionalResources/AdditionalResourcesCardContent.tsx

@@ -0,0 +1,13 @@
+import { FC, PropsWithChildren } from "react"
+
+const AdditionalResourcesCardContent: FC<PropsWithChildren<{}>> = ({
+  children
+}) => {
+  return (
+    <div className={`d-flex flex-0 justify-content-xs-center p-4 `}>
+      <p className={`fs-4`}>{children}</p>
+    </div>
+  )
+}
+
+export default AdditionalResourcesCardContent

components/AlertCard/AlertCard.tsx

@@ -1,9 +1,7 @@
 import { CardTitle } from "components/Card"
+import { Timestamp } from "firebase/firestore"
 import { Card as MapleCard } from "../Card/Card"
 import { AlertCardBody } from "./AlertCardBody"
-import { Timestamp } from "firebase/firestore"
-import styles from "./AlertCard.module.css"
-import OrgPriorityCardStories from "stories/billDetail/OrgPriorityCard.stories"
 
 export const AlertCard = (props: {
   header: string

components/Card/Card.tsx

@@ -1,7 +1,5 @@
-import clsx from "clsx"
 import { ReactElement, useState } from "react"
 import CardBootstrap from "react-bootstrap/Card"
-import styles from "./Card.module.css"
 import { CardListItems, ListItem } from "./CardListItem"
 import { CardTitle } from "./CardTitle"
 import { SeeMore } from "./SeeMore"
@@ -60,7 +58,7 @@ export const Card = (CardProps: CardProps) => {
     body
   ) : bodyText ? (
     <CardBootstrap.Body>
-      <CardBootstrap.Text className={styles.body}>
+      <CardBootstrap.Text className="fs-base fw-lighter lh-sm">
         {bodyText}
       </CardBootstrap.Text>
     </CardBootstrap.Body>
@@ -92,7 +90,7 @@ export const Card = (CardProps: CardProps) => {
   const shown = showAll ? allItems : allItems.slice(0, initialRowCount)
 
   return (
-    <CardBootstrap className={clsx(className, styles.container)}>
+    <CardBootstrap className={`bg-white overflow-hidden rounded-3`}>
       {headerContent}
       {<CardListItems items={shown} />}
       {bodyContent}