release: 2024-02-27 (#1130)

.env.example

@@ -5,22 +5,44 @@
 ###############
 
 
-DATABASE_URL=postgres://user:password@localhost:5432
-NEXTAUTH_SECRET=someRandomString
+DATABASE_URL=postgres://user:password@localhost:5432/inreach
+DB_DIRECT_URL=$DATABASE_URL
+SNAPLET_TARGET_DATABASE_URL=$DATABASE_URL
 NEXTAUTH_URL=http://localhost:3000
+NEXTAUTH_SECRET=					# generate with `openssl rand -base64 32`
+SESSION_SECRET=						# generate with `openssl rand -base64 32`
+
+KV_URL="redis://localhost"
+KV_REST_API_URL="http://localhost:8079"
+KV_REST_API_TOKEN="7fkVoJi4o/NtjkBTCVPXg4jSC/9Ib6H/ZCmUZfcy0IQ="
+KV_REST_API_READ_ONLY_TOKEN="7fkVoJi4o/NtjkBTCVPXg4jSC/9Ib6H/ZCmUZfcy0IQ="
+
 
 COGNITO_ACCESS_KEY=
 COGNITO_SECRET=
 COGNITO_CLIENT_ID=
 COGNITO_CLIENT_SECRET=
 
 GOOGLE_PLACES_API_KEY=
+NEXT_PUBLIC_GOOGLE_MAPS_API=$GOOGLE_PLACES_API_KEY
 
-S3_ACCESS_KEY=
-S3_SECRET=
+NEXT_PUBLIC_GA_MEASUREMENT_ID=''
 
-REDIS_URL=redis://:password@localhost:6379
+# Vercel edge config
+EDGE_CONFIG=
+
+## Storybook Figma Plugin
+##
+## Generate on figma.com
+## Go to User menu (your name, top left corner) -> Settings -> Personal access tokens
+## Generate new token with these settings:
+## - Name: "Storybook plugin"
+## - Expiration: "No expiration"
+## - Scopes:
+##   - "File content": "Read-only"
+##   - "Comments": "No access"
+##   - "Dev resources": "Read-only"
+##   - "Webhooks": "No access"
+
+STORYBOOK_FIGMA_ACCESS_TOKEN=
 
-###############
-# InReach Web #
-###############

.npmrc

@@ -12,3 +12,4 @@ dedupe-peer-dependents=true
 # git-branch-lockfile=true
 # merge-git-branch-lockfiles-branch-pattern[]=${VERCEL_GIT_COMMIT_REF:-dev}
 # merge-git-branch-lockfiles-branch-pattern[]=main
+enable-pre-post-scripts=true

InReach.code-workspace

@@ -7,16 +7,18 @@
 			"dsznajder.es7-react-js-snippets",
 			"editorconfig.editorconfig",
 			"esbenp.prettier-vscode",
-			"lokalise.i18n-ally",
 			"mattpocock.ts-error-translator",
 			"melmass.vscode-mono-workspace",
-			"mintlify.document",
 			"ms-playwright.playwright",
 			"ms-vsliveshare.vsliveshare",
 			"prisma.prisma",
-			"riccardoforina.storybook-helper",
 			"unifiedjs.vscode-mdx",
-			"yzhang.markdown-all-in-one",
+			"aaron-bond.better-comments",
+			"codeium.codeium",
+			"usernamehw.errorlens",
+			"figma.figma-vscode-extension",
+			"yoavbls.pretty-ts-errors",
+			"quick-lint.quick-lint-js",
 		],
 	},
 	"folders": [
@@ -212,47 +214,12 @@
 			"**/*.code-search": true,
 			"pnpm-lock.yaml": true,
 		},
-		"i18n-ally.annotationInPlace": false,
-		"i18n-ally.defaultNamespace": "common",
-		"i18n-ally.displayLanguage": "en",
-		"i18n-ally.enabledParsers": ["js", "json", "ts"],
-		"i18n-ally.extract.autoDetect": true,
-		"i18n-ally.extract.ignored": [
-			"1px solid ${theme.colorScheme === 'dark' ? theme.colors.dark[5] : theme.colors.gray[2]}",
-			"${theme.spacing.md}px ${theme.spacing.md}px",
-			"0 ${theme.spacing.sm}px",
-		],
-		"i18n-ally.extract.ignoredByFiles": {
-			"../../packages/ui/.storybook/i18next.ts": ["*"],
-			"**/packages/db/**/*.ts": ["*"],
-		},
-		"i18n-ally.extract.keygenStrategy": "slug",
-		"i18n-ally.extract.keygenStyle": "kebab-case",
-		"i18n-ally.extract.keyMaxLength": 150,
-		"i18n-ally.extract.targetPickingStrategy": "most-similar",
-		"i18n-ally.fullReloadOnChanged": true,
-		"i18n-ally.ignoredLocales": ["!en"],
-		"i18n-ally.keystyle": "nested",
-		"i18n-ally.localesPaths": ["public/locales"],
-		"i18n-ally.namespace": true,
-		"i18n-ally.pathMatcher": "{locale}/{namespace}.json",
-		"i18n-ally.review.enabled": false,
-		"i18n-ally.review.gutters": false,
-		"i18n-ally.showFlags": true,
-		"i18n-ally.sortKeys": true,
-		"i18n-ally.sourceLanguage": "en",
-		"i18n-ally.tabStyle": "tab",
 		"json.format.enable": true,
 		"json.validate.enable": true,
 		"markdownlint.config": {
 			"MD033": false,
 		},
 		"prettier.resolveGlobalModules": false,
-		"sonarlint.connectedMode.project": {
-			"connectionId": "InReach",
-			"projectKey": "weareinreach_InReach",
-		},
-		"tms.stringsCompletionFileExtensions": "ts,tsx,json",
 		"typescript.preferences.importModuleSpecifier": "non-relative",
 		"typescript.tsdk": "✨ InReach (root)/node_modules/typescript/lib",
 		"typescript.enablePromptUseWorkspaceTsdk": true,
@@ -285,19 +252,6 @@
 				"autoAttachChildProcesses": true,
 				"restart": true,
 			},
-			{
-				"disableNetworkCache": true,
-				"name": "Launch Brave",
-				"port": 9222,
-				"request": "launch",
-				"runtimeArgs": ["--user-data-dir=/Users/joe/.brave-dev-profile"],
-				"runtimeExecutable": "/Applications/Brave Browser.app/Contents/MacOS/Brave Browser",
-				"type": "chrome",
-				"url": "http://localhost:3000",
-				"userDataDir": true,
-				"webRoot": "${workspaceFolder}",
-				"sourceMaps": true,
-			},
 			{
 				"command": "pnpm dev",
 				"name": "pnpm dev",

README.md

@@ -56,7 +56,7 @@
 
 **InReach** is the world’s first tech platform matching LGBTQ+ people facing persecution and discrimination with safe, verified resources.
 
-The InReach App is available on web (desktop and mobile), and native iOS and Android. Over 9,000 services across the U.S. are currently listed, with new verified services added every day by trained volunteers. InReach’s open-source technology instantly matches LGBTQ+ people in need with independently verified safe housing, medical and mental health care, immigration and other legal help, meal assistance, education and employment, translation, community and spiritual support, and more critical services. InReach is a comprehensive, digital one-stop-shop for all intersectional community needs, with listed verified services for LGBTQ+ asylum seekers, refugees and other immigrants, BIPOC communities, transgender folks, youth and caregivers, and more. The InReach App is free for everyone – including lawyers, case managers, social workers, and other service providers and community organizations searching for affirming resource referrals for LGBTQ+ clients. 
+The InReach App is available on web (desktop and mobile), and native iOS and Android. Over 9,000 services across the U.S. are currently listed, with new verified services added every day by trained volunteers. InReach’s open-source technology instantly matches LGBTQ+ people in need with independently verified safe housing, medical and mental health care, immigration and other legal help, meal assistance, education and employment, translation, community and spiritual support, and more critical services. InReach is a comprehensive, digital one-stop-shop for all intersectional community needs, with listed verified services for LGBTQ+ asylum seekers, refugees and other immigrants, BIPOC communities, transgender folks, youth and caregivers, and more. The InReach App is free for everyone – including lawyers, case managers, social workers, and other service providers and community organizations searching for affirming resource referrals for LGBTQ+ clients.
 
 <!-- <details>
 <summary>Screenshots</summary>
@@ -84,6 +84,8 @@ The InReach App is available on web (desktop and mobile), and native iOS and And
 
 ### Prerequisites
 
+#### pnpm
+
 This project uses [`pnpm`](https://pnpm.io/) to manage packages. To install, run the command:
 
 ```bash
@@ -92,6 +94,10 @@ npm -g install pnpm
 
 or follow the instructions on [pnpm's installation page](https://pnpm.io/installation).
 
+#### Docker
+
+Docker (& docker compose) are used for local databases. Instructions to install Docker [can be found here](https://docs.docker.com/get-docker/)
+
 ### Installation
 
 To install the required packages & dependencies:
@@ -104,20 +110,25 @@ pnpm install
 
 ```bash
 InReach/
+├── @types/                       # Shared TypeScript types/overrides
 ├── apps/
 │   ├── app/                      # InReach Application
 │   └── web/                      # InReach Main Site
 ├── docker/                       # Docker compose file for local DB instance
+├── lambdas/
+│   ├── cognito-messaging/        # AWS Lambda to generate Cognito emails
+│   └── cognito-user-migrate/     # AWS Lambda for user migration
 ├── packages/
+│   ├── analytics/                # Analytic event handling
 │   ├── api/                      # tRPC API route definitions
 │   ├── auth/                     # NextAuth settings
-│   ├── aws-user-migrate/         # AWS Lambda for user migration
 │   ├── config/                   # Other shared configs
+│   ├── crowdin/                  # Crowdin API/OTA
 │   ├── db/                       # Prisma DB schema & other db scripts
+│   ├── env/                      # Environment variable validation
 │   ├── eslint-config/            # Custom ESlint configuration
-│   ├── i18next-crowdin-backend/  # Crowdin plugin for translation delivery
-│   ├── types/                    # Shared TypeScript types
-│   └── ui/                       # React components shared between apps
+│   ├── ui/                       # React components shared between apps
+│   └── util/                     # Misc utility scripts/modules
 └── patches/                      # Patched npm packages
 ```
 

apps/app/package.json

@@ -8,7 +8,9 @@
 		"build": "next build",
 		"build:prebuild": "SKIP_ENV_VALIDATION=true tsx ./lib/prebuild.ts",
 		"clean:node": "rm -rf ./node_modules/ || true && rm -rf ./.next || true",
-		"dev": "next dev",
+		"predev": "pnpm -w docker:up",
+		"dev": "pnpm with-env next dev",
+		"postdev": "pnpm -w docker:down",
 		"dev:verbose": "NEXT_VERBOSE=1 next dev",
 		"format": "prettier --write --ignore-unknown .",
 		"generate:all": "tsx ./lib/generate.ts",
@@ -58,7 +60,7 @@
 		"@trpc/react-query": "10.45.1",
 		"@trpc/server": "10.45.1",
 		"@vercel/analytics": "1.2.2",
-		"@vercel/edge-config": "1.0.2",
+		"@vercel/edge-config": "1.1.0",
 		"@vercel/kv": "1.0.1",
 		"@vercel/speed-insights": "1.0.10",
 		"@weareinreach/analytics": "workspace:*",
@@ -113,17 +115,17 @@
 		"@types/gtag.js": "0.0.19",
 		"@types/luxon": "3.4.2",
 		"@types/node": "20.11.20",
-		"@types/react": "18.2.58",
+		"@types/react": "18.2.59",
 		"@types/react-dom": "18.2.19",
 		"@types/umami": "0.1.5",
-		"@typescript-eslint/eslint-plugin": "7.0.2",
-		"@typescript-eslint/parser": "7.0.2",
+		"@typescript-eslint/eslint-plugin": "7.1.0",
+		"@typescript-eslint/parser": "7.1.0",
 		"@weareinreach/config": "workspace:*",
 		"@weareinreach/eslint-config": "0.100.0",
 		"@welldone-software/why-did-you-render": "8.0.1",
 		"commander": "12.0.0",
 		"dotenv": "16.4.5",
-		"eslint": "8.56.0",
+		"eslint": "8.57.0",
 		"eslint-plugin-i18next": "6.0.3",
 		"i18next-hmr": "3.0.4",
 		"listr2": "8.0.2",