Skip to content

Commit e38519c

Browse files
committed
Merge branch 'main' of https://github.com/kiminkim724/maple into 1698-upgrade-node-20
2 parents 478dcba + 3dab1ba commit e38519c

File tree

86 files changed

+816
-1021
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+816
-1021
lines changed

.all-contributorsrc

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,60 @@
677677
"contributions": [
678678
"code"
679679
]
680+
},
681+
{
682+
"login": "chiroptical",
683+
"name": "Barry Moore",
684+
"avatar_url": "https://avatars.githubusercontent.com/u/3086255?v=4",
685+
"profile": "https://chiroptical.dev",
686+
"contributions": [
687+
"code"
688+
]
689+
},
690+
{
691+
"login": "ekambains",
692+
"name": "ekambains",
693+
"avatar_url": "https://avatars.githubusercontent.com/u/182202895?v=4",
694+
"profile": "http://www.ekambains.com",
695+
"contributions": [
696+
"code"
697+
]
698+
},
699+
{
700+
"login": "gracezhang89",
701+
"name": "Grace Zhang",
702+
"avatar_url": "https://avatars.githubusercontent.com/u/67801289?v=4",
703+
"profile": "https://www.grace-zhang.com/",
704+
"contributions": [
705+
"code"
706+
]
707+
},
708+
{
709+
"login": "jicruz96",
710+
"name": "J.I. Cruz",
711+
"avatar_url": "https://avatars.githubusercontent.com/u/58642383?v=4",
712+
"profile": "http://jicruz.com",
713+
"contributions": [
714+
"code"
715+
]
716+
},
717+
{
718+
"login": "peterschiller",
719+
"name": "Peter Schiller",
720+
"avatar_url": "https://avatars.githubusercontent.com/u/57169063?v=4",
721+
"profile": "https://github.com/peterschiller",
722+
"contributions": [
723+
"code"
724+
]
725+
},
726+
{
727+
"login": "yasminekarni",
728+
"name": "yasminekarni",
729+
"avatar_url": "https://avatars.githubusercontent.com/u/47721405?v=4",
730+
"profile": "https://github.com/yasminekarni",
731+
"contributions": [
732+
"code"
733+
]
680734
}
681735
],
682736
"commitType": "docs"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Build and Deploy to Firebase
2525
uses: w9jds/[email protected]
2626
with:
27-
args: deploy --force --only firestore,functions,storage
27+
args: deploy --force --only firestore,functions:maple,storage
2828
env:
2929
GCP_SA_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
3030
ASSEMBLY_API_KEY: ${{ secrets.ASSEMBLY_API_KEY }}

.github/workflows/deploy-prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Build and Deploy to Firebase
1919
uses: w9jds/[email protected]
2020
with:
21-
args: deploy --force --only firestore,functions,storage
21+
args: deploy --force --only firestore,functions:maple,storage
2222
env:
2323
GCP_SA_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
2424
ASSEMBLY_API_KEY: ${{ secrets.ASSEMBLY_API_KEY }}

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,9 @@ build-storybook.log
8080

8181
/token
8282

83-
cert.txt
83+
cert.txt
84+
85+
# vscode
86+
87+
# lets each user define their own vscode settings
88+
.vscode/settings.json

.vscode/launch.json

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
11
{
2-
// Use IntelliSense to learn about possible attributes.
3-
// Hover to view descriptions of existing attributes.
4-
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
2+
// adapted from https://nextjs.org/docs/app/guides/debugging#debugging-with-vs-code
53
"version": "0.2.0",
64
"configurations": [
75
{
8-
"name": "Launch Program",
9-
"program": "${workspaceFolder}/app.js",
6+
"name": "Run and Debug MAPLE",
7+
"type": "node",
108
"request": "launch",
9+
"runtimeExecutable": "yarn",
10+
"runtimeArgs": [
11+
"dev"
12+
],
13+
"env": {
14+
"NODE_OPTIONS": "--inspect"
15+
},
16+
"console": "integratedTerminal",
1117
"skipFiles": [
1218
"<node_internals>/**"
1319
],
14-
"type": "node"
15-
},
16-
{
17-
"name": "Launch in VSCode (with TypeScript)",
18-
"type": "node",
19-
"request": "launch",
20-
"program": "/Users/mrigank/maple/functions/src/notifications/index.ts", // Replace with path to your main entry point (e.g., "index.js")
21-
"sourceMaps": true
20+
"sourceMaps": true,
21+
"serverReadyAction": {
22+
"action": "debugWithChrome",
23+
"killOnServerStop": true,
24+
"pattern": "- Local:.+(https?://.+)",
25+
"uriFormat": "%s",
26+
"webRoot": "${workspaceFolder}"
27+
}
2228
}
2329
]
24-
}
30+
}

.vscode/settings.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

README.md

Lines changed: 25 additions & 17 deletions
Large diffs are not rendered by default.

components/AdditionalResources.tsx

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
import { Container } from "react-bootstrap"
2+
import { useTranslation, Trans } from "next-i18next"
3+
import * as links from "components/links"
4+
5+
const AdditionalResources = () => {
6+
const content = [
7+
{
8+
i18nKey: "find_legislator",
9+
href: "https://malegislature.gov/Search/FindMyLegislator"
10+
},
11+
{
12+
i18nKey: "legislative_doc",
13+
href: "https://www.mass.gov/doc/the-legislative-process-0/download"
14+
},
15+
{
16+
i18nKey: "legal_services",
17+
href: "https://www.masslegalservices.org/content/legislative-process-massachusetts-0"
18+
}
19+
]
20+
const { t } = useTranslation("learnComponents")
21+
22+
return (
23+
<Container fluid="md" className="mt-3">
24+
<h1 className="fs-1 fw-bold text-center text-black">
25+
{t("legislative.additional_resources")}
26+
</h1>
27+
<p className="fs-4 mx-5 my-3">{t("legislative.resources_intro")}</p>
28+
29+
{content.map(({ i18nKey, href }) => (
30+
<div
31+
key={i18nKey}
32+
className="m-4 py-2 px-4 text-bg-light rounded-4 d-flex align-items-center align-items-sm-start"
33+
>
34+
<div className="d-flex flex-0 justify-content-xs-center p-4">
35+
<p className="fs-4">
36+
<Trans
37+
t={t}
38+
i18nKey={`legislative.${i18nKey}`}
39+
components={[<links.External href={href} key={i18nKey} />]}
40+
/>
41+
</p>
42+
</div>
43+
</div>
44+
))}
45+
</Container>
46+
)
47+
}
48+
49+
export default AdditionalResources

components/AdditionalResources/AdditionalResources.tsx

Lines changed: 0 additions & 79 deletions
This file was deleted.

components/AdditionalResources/AdditionalResourcesCard.tsx

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)