From 674a57c524c044a50a2825fe12076832f99bb070 Mon Sep 17 00:00:00 2001 From: Joe Karow <58997957+JoeKarow@users.noreply.github.com> Date: Wed, 11 Oct 2023 18:37:57 -0400 Subject: [PATCH] release: 2023-10-11 (#833) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * sync main -> dev (#801) * update base branch * copy bundle analysis config to apps/app/package.json * chore(ui): update all non-major dependencies (#802) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@types/react-dom](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/react-dom) ([source](https://togithub.com/DefinitelyTyped/DefinitelyTyped)) | [`18.2.7` -> `18.2.8`](https://renovatebot.com/diffs/npm/@types%2freact-dom/18.2.7/18.2.8) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@types%2freact-dom/18.2.8?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@types%2freact-dom/18.2.8?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@types%2freact-dom/18.2.7/18.2.8?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@types%2freact-dom/18.2.7/18.2.8?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [libphonenumber-js](https://gitlab.com/catamphetamine/libphonenumber-js) | [`1.10.44` -> `1.10.45`](https://renovatebot.com/diffs/npm/libphonenumber-js/1.10.44/1.10.45) | [![age](https://developer.mend.io/api/mc/badges/age/npm/libphonenumber-js/1.10.45?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/libphonenumber-js/1.10.45?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/libphonenumber-js/1.10.44/1.10.45?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/libphonenumber-js/1.10.44/1.10.45?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [type-fest](https://togithub.com/sindresorhus/type-fest) | [`4.3.1` -> `4.3.2`](https://renovatebot.com/diffs/npm/type-fest/4.3.1/4.3.2) | [![age](https://developer.mend.io/api/mc/badges/age/npm/type-fest/4.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/type-fest/4.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/type-fest/4.3.1/4.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/type-fest/4.3.1/4.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
catamphetamine/libphonenumber-js (libphonenumber-js) ### [`v1.10.45`](https://gitlab.com/catamphetamine/libphonenumber-js/compare/v1.10.44...v1.10.45) [Compare Source](https://gitlab.com/catamphetamine/libphonenumber-js/compare/v1.10.44...v1.10.45)
sindresorhus/type-fest (type-fest) ### [`v4.3.2`](https://togithub.com/sindresorhus/type-fest/releases/tag/v4.3.2) [Compare Source](https://togithub.com/sindresorhus/type-fest/compare/v4.3.1...v4.3.2) - `Jsonify`: Fix handling of nested objects with only a `name` property ([#​691](https://togithub.com/sindresorhus/type-fest/issues/691)) [`5351533`](https://togithub.com/sindresorhus/type-fest/commit/5351533)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/weareinreach/InReach). PR-URL: https://github.com/weareinreach/InReach/pull/802 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(workflows): update github/codeql-action digest to ddccb87 (#803) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github/codeql-action](https://togithub.com/github/codeql-action) | action | digest | `6a28655` -> `ddccb87` | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/weareinreach/InReach). PR-URL: https://github.com/weareinreach/InReach/pull/803 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(auth): update all non-major dependencies (#804) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@aws-sdk/client-cognito-identity-provider](https://togithub.com/aws/aws-sdk-js-v3/tree/main/clients/client-cognito-identity-provider) ([source](https://togithub.com/aws/aws-sdk-js-v3)) | [`3.418.0` -> `3.421.0`](https://renovatebot.com/diffs/npm/@aws-sdk%2fclient-cognito-identity-provider/3.418.0/3.421.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@aws-sdk%2fclient-cognito-identity-provider/3.421.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@aws-sdk%2fclient-cognito-identity-provider/3.421.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@aws-sdk%2fclient-cognito-identity-provider/3.418.0/3.421.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@aws-sdk%2fclient-cognito-identity-provider/3.418.0/3.421.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [@types/google.maps](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/google.maps) ([source](https://togithub.com/DefinitelyTyped/DefinitelyTyped)) | [`3.54.1` -> `3.54.2`](https://renovatebot.com/diffs/npm/@types%2fgoogle.maps/3.54.1/3.54.2) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@types%2fgoogle.maps/3.54.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@types%2fgoogle.maps/3.54.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@types%2fgoogle.maps/3.54.1/3.54.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@types%2fgoogle.maps/3.54.1/3.54.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [superjson](https://togithub.com/blitz-js/superjson) | [`1.13.1` -> `1.13.3`](https://renovatebot.com/diffs/npm/superjson/1.13.1/1.13.3) | [![age](https://developer.mend.io/api/mc/badges/age/npm/superjson/1.13.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/superjson/1.13.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/superjson/1.13.1/1.13.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/superjson/1.13.1/1.13.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
aws/aws-sdk-js-v3 (@​aws-sdk/client-cognito-identity-provider) ### [`v3.421.0`](https://togithub.com/aws/aws-sdk-js-v3/blob/HEAD/clients/client-cognito-identity-provider/CHANGELOG.md#34210-2023-09-27) [Compare Source](https://togithub.com/aws/aws-sdk-js-v3/compare/v3.418.0...v3.421.0) ##### Features - **client-cognito-identity-provider:** The UserPoolType Status field is no longer used. ([114788d](https://togithub.com/aws/aws-sdk-js-v3/commit/114788d89a39bf57d2db3da486a105b8ee7537a6))
blitz-js/superjson (superjson) ### [`v1.13.3`](https://togithub.com/blitz-js/superjson/releases/tag/v1.13.3) [Compare Source](https://togithub.com/blitz-js/superjson/compare/v1.13.2...v1.13.3) #### What's Changed - fix a bug with dedupe=true and rereferential equalities. Report by [@​KATT](https://togithub.com/KATT), thank you! [#​253](https://togithub.com/blitz-js/superjson/issues/253) **Full Changelog**: https://github.com/blitz-js/superjson/compare/v1.13.1...v1.13.3 ### [`v1.13.2`](https://togithub.com/blitz-js/superjson/releases/tag/v1.13.2) [Compare Source](https://togithub.com/blitz-js/superjson/compare/v1.13.1...v1.13.2) This was an accidental release. Oops, sorry! No changes to the prior version.
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/weareinreach/InReach). PR-URL: https://github.com/weareinreach/InReach/pull/804 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(ui): update all non-major dependencies to v10.38.5 (#805) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@trpc/client](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`10.38.4` -> `10.38.5`](https://renovatebot.com/diffs/npm/@trpc%2fclient/10.38.4/10.38.5) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@trpc%2fclient/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@trpc%2fclient/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@trpc%2fclient/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@trpc%2fclient/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [@trpc/next](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`10.38.4` -> `10.38.5`](https://renovatebot.com/diffs/npm/@trpc%2fnext/10.38.4/10.38.5) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@trpc%2fnext/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@trpc%2fnext/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@trpc%2fnext/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@trpc%2fnext/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [@trpc/react-query](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`10.38.4` -> `10.38.5`](https://renovatebot.com/diffs/npm/@trpc%2freact-query/10.38.4/10.38.5) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@trpc%2freact-query/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@trpc%2freact-query/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@trpc%2freact-query/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@trpc%2freact-query/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [@trpc/server](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`10.38.4` -> `10.38.5`](https://renovatebot.com/diffs/npm/@trpc%2fserver/10.38.4/10.38.5) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@trpc%2fserver/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@trpc%2fserver/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@trpc%2fserver/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@trpc%2fserver/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
trpc/trpc (@​trpc/client) ### [`v10.38.5`](https://togithub.com/trpc/trpc/releases/tag/v10.38.5) [Compare Source](https://togithub.com/trpc/trpc/compare/v10.38.4...v10.38.5) ##### What's Changed - fix(`server`): sets `TRPCError.name` to `TRPCError` regardless of what bundlers do by [@​dios-david](https://togithub.com/dios-david) & [@​KATT](https://togithub.com/KATT) in [https://github.com/trpc/trpc/pull/4848](https://togithub.com/trpc/trpc/pull/4848) ##### New Contributors - [@​zokins](https://togithub.com/zokins) made their first contribution in [https://github.com/trpc/trpc/pull/4801](https://togithub.com/trpc/trpc/pull/4801) - [@​dios-david](https://togithub.com/dios-david) made their first contribution in [https://github.com/trpc/trpc/pull/4848](https://togithub.com/trpc/trpc/pull/4848) **Full Changelog**: https://github.com/trpc/trpc/compare/v10.38.4...v10.38.5
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/weareinreach/InReach). PR-URL: https://github.com/weareinreach/InReach/pull/805 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * update gitignore * feat: analytics (#807) # Pull Request type Please check the type of change your PR introduces: - [ ] Bugfix - [x] Feature - [ ] Code style update (formatting, renaming) - [ ] Refactoring (no functional changes, no API changes) - [ ] Build-related changes - [ ] Documentation content changes - [ ] Other (please describe): ## What is the current behavior? Issue Number: IN-926 ## What is the new behavior? - - - ## Does this introduce a breaking change? - [ ] Yes - [ ] No ## Other information PR-URL: https://github.com/weareinreach/InReach/pull/807 Co-authored-by: Joe Karow <58997957+JoeKarow@users.noreply.github.com> * update config * update config * fix branch name * update config * manual run * adj lint/format cache * pull before push * bypass cache for prettier * lift up env * use pre-commit hook for crowdin * run prettier after download * update conf * update conf * only commit @ end * skip delete step for l10n_dev * alter path, update name * pin deps, debug prettier * disable cache * temp disable autoupdate * run prettier manually * debug prettier * debug prettier * reenable auto update * chore(workflows): pin tj-actions/verify-changed-files action to 30aa174 (#809) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Joe Karow <58997957+JoeKarow@users.noreply.github.com> * Updated translations from Crowdin * add GA env to build deps * fix(cognito-user-migrate): update all non-major dependencies (#806) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Joe Karow <58997957+JoeKarow@users.noreply.github.com> * fix(app): update all non-major dependencies (#813) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(web): update next.js to v13.5.4 (#815) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(auth): update all non-major dependencies (#814) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(ui): update dependency zod to v3.22.3 [security] (#817) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Updated translations from Crowdin * chore(workflows): update chromaui/action digest to 78b6788 (#818) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * changes for mobile * fix(auth): update all non-major dependencies (#816) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(workflows): update github/codeql-action digest to fdcae64 (#820) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Updated translations from Crowdin * fix(db): update all non-major dependencies (#822) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * temporarily disable cookie banner * disable eslint rule for addon * do not discard lcr data * remove unused eslint * remove corejs * bounce animation * set default close button * create donation button * implement donation modal * lazy loading to reduce bundle * clean up peerdeps * roll back next -> 13.5.3 * prefetch search results page on load * trim unused deps * add donation link to Support page * chore(ui): update all non-major dependencies (#827) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(i18n): Updated translations from Crowdin (#826) Updated translations from Crowdin Co-authored-by: InReach [bot] <108850934+InReach-svc@users.noreply.github.com> * fix label name * generated data * override postcss for CVE-2023-44270 * fix(db): update dependency superjson to v2 (#830) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * release: 2023-10-10 (#825) * sync main -> dev (#801) * update base branch * copy bundle analysis config to apps/app/package.json * chore(ui): update all non-major dependencies (#802) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@types/react-dom](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/react-dom) ([source](https://togithub.com/DefinitelyTyped/DefinitelyTyped)) | [`18.2.7` -> `18.2.8`](https://renovatebot.com/diffs/npm/@types%2freact-dom/18.2.7/18.2.8) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@types%2freact-dom/18.2.8?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@types%2freact-dom/18.2.8?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@types%2freact-dom/18.2.7/18.2.8?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@types%2freact-dom/18.2.7/18.2.8?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [libphonenumber-js](https://gitlab.com/catamphetamine/libphonenumber-js) | [`1.10.44` -> `1.10.45`](https://renovatebot.com/diffs/npm/libphonenumber-js/1.10.44/1.10.45) | [![age](https://developer.mend.io/api/mc/badges/age/npm/libphonenumber-js/1.10.45?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/libphonenumber-js/1.10.45?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/libphonenumber-js/1.10.44/1.10.45?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/libphonenumber-js/1.10.44/1.10.45?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [type-fest](https://togithub.com/sindresorhus/type-fest) | [`4.3.1` -> `4.3.2`](https://renovatebot.com/diffs/npm/type-fest/4.3.1/4.3.2) | [![age](https://developer.mend.io/api/mc/badges/age/npm/type-fest/4.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/type-fest/4.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/type-fest/4.3.1/4.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/type-fest/4.3.1/4.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | ---
catamphetamine/libphonenumber-js (libphonenumber-js) [Compare Source](https://gitlab.com/catamphetamine/libphonenumber-js/compare/v1.10.44...v1.10.45)
sindresorhus/type-fest (type-fest) [Compare Source](https://togithub.com/sindresorhus/type-fest/compare/v4.3.1...v4.3.2) - `Jsonify`: Fix handling of nested objects with only a `name` property ([#​691](https://togithub.com/sindresorhus/type-fest/issues/691)) [`5351533`](https://togithub.com/sindresorhus/type-fest/commit/5351533)
--- 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/weareinreach/InReach). PR-URL: https://github.com/weareinreach/InReach/pull/802 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(workflows): update github/codeql-action digest to ddccb87 (#803) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github/codeql-action](https://togithub.com/github/codeql-action) | action | digest | `6a28655` -> `ddccb87` | --- 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/weareinreach/InReach). PR-URL: https://github.com/weareinreach/InReach/pull/803 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(auth): update all non-major dependencies (#804) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@aws-sdk/client-cognito-identity-provider](https://togithub.com/aws/aws-sdk-js-v3/tree/main/clients/client-cognito-identity-provider) ([source](https://togithub.com/aws/aws-sdk-js-v3)) | [`3.418.0` -> `3.421.0`](https://renovatebot.com/diffs/npm/@aws-sdk%2fclient-cognito-identity-provider/3.418.0/3.421.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@aws-sdk%2fclient-cognito-identity-provider/3.421.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@aws-sdk%2fclient-cognito-identity-provider/3.421.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@aws-sdk%2fclient-cognito-identity-provider/3.418.0/3.421.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@aws-sdk%2fclient-cognito-identity-provider/3.418.0/3.421.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [@types/google.maps](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/google.maps) ([source](https://togithub.com/DefinitelyTyped/DefinitelyTyped)) | [`3.54.1` -> `3.54.2`](https://renovatebot.com/diffs/npm/@types%2fgoogle.maps/3.54.1/3.54.2) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@types%2fgoogle.maps/3.54.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@types%2fgoogle.maps/3.54.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@types%2fgoogle.maps/3.54.1/3.54.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@types%2fgoogle.maps/3.54.1/3.54.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [superjson](https://togithub.com/blitz-js/superjson) | [`1.13.1` -> `1.13.3`](https://renovatebot.com/diffs/npm/superjson/1.13.1/1.13.3) | [![age](https://developer.mend.io/api/mc/badges/age/npm/superjson/1.13.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/superjson/1.13.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/superjson/1.13.1/1.13.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/superjson/1.13.1/1.13.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | ---
aws/aws-sdk-js-v3 (@​aws-sdk/client-cognito-identity-provider) [Compare Source](https://togithub.com/aws/aws-sdk-js-v3/compare/v3.418.0...v3.421.0) - **client-cognito-identity-provider:** The UserPoolType Status field is no longer used. ([114788d](https://togithub.com/aws/aws-sdk-js-v3/commit/114788d89a39bf57d2db3da486a105b8ee7537a6))
blitz-js/superjson (superjson) [Compare Source](https://togithub.com/blitz-js/superjson/compare/v1.13.2...v1.13.3) - fix a bug with dedupe=true and rereferential equalities. Report by [@​KATT](https://togithub.com/KATT), thank you! [#​253](https://togithub.com/blitz-js/superjson/issues/253) **Full Changelog**: https://github.com/blitz-js/superjson/compare/v1.13.1...v1.13.3 [Compare Source](https://togithub.com/blitz-js/superjson/compare/v1.13.1...v1.13.2) This was an accidental release. Oops, sorry! No changes to the prior version.
--- 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/weareinreach/InReach). PR-URL: https://github.com/weareinreach/InReach/pull/804 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(ui): update all non-major dependencies to v10.38.5 (#805) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@trpc/client](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`10.38.4` -> `10.38.5`](https://renovatebot.com/diffs/npm/@trpc%2fclient/10.38.4/10.38.5) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@trpc%2fclient/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@trpc%2fclient/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@trpc%2fclient/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@trpc%2fclient/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [@trpc/next](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`10.38.4` -> `10.38.5`](https://renovatebot.com/diffs/npm/@trpc%2fnext/10.38.4/10.38.5) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@trpc%2fnext/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@trpc%2fnext/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@trpc%2fnext/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@trpc%2fnext/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [@trpc/react-query](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`10.38.4` -> `10.38.5`](https://renovatebot.com/diffs/npm/@trpc%2freact-query/10.38.4/10.38.5) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@trpc%2freact-query/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@trpc%2freact-query/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@trpc%2freact-query/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@trpc%2freact-query/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [@trpc/server](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`10.38.4` -> `10.38.5`](https://renovatebot.com/diffs/npm/@trpc%2fserver/10.38.4/10.38.5) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@trpc%2fserver/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@trpc%2fserver/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@trpc%2fserver/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@trpc%2fserver/10.38.4/10.38.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | ---
trpc/trpc (@​trpc/client) [Compare Source](https://togithub.com/trpc/trpc/compare/v10.38.4...v10.38.5) - fix(`server`): sets `TRPCError.name` to `TRPCError` regardless of what bundlers do by [@​dios-david](https://togithub.com/dios-david) & [@​KATT](https://togithub.com/KATT) in [https://github.com/trpc/trpc/pull/4848](https://togithub.com/trpc/trpc/pull/4848) - [@​zokins](https://togithub.com/zokins) made their first contribution in [https://github.com/trpc/trpc/pull/4801](https://togithub.com/trpc/trpc/pull/4801) - [@​dios-david](https://togithub.com/dios-david) made their first contribution in [https://github.com/trpc/trpc/pull/4848](https://togithub.com/trpc/trpc/pull/4848) **Full Changelog**: https://github.com/trpc/trpc/compare/v10.38.4...v10.38.5
--- 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/weareinreach/InReach). PR-URL: https://github.com/weareinreach/InReach/pull/805 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * update gitignore * feat: analytics (#807) Please check the type of change your PR introduces: - [ ] Bugfix - [x] Feature - [ ] Code style update (formatting, renaming) - [ ] Refactoring (no functional changes, no API changes) - [ ] Build-related changes - [ ] Documentation content changes - [ ] Other (please describe): Issue Number: IN-926 - - - - [ ] Yes - [ ] No PR-URL: https://github.com/weareinreach/InReach/pull/807 Co-authored-by: Joe Karow <58997957+JoeKarow@users.noreply.github.com> * update config * update config * fix branch name * update config * manual run * adj lint/format cache * pull before push * bypass cache for prettier * lift up env * use pre-commit hook for crowdin * run prettier after download * update conf * update conf * only commit @ end * skip delete step for l10n_dev * alter path, update name * pin deps, debug prettier * disable cache * temp disable autoupdate * run prettier manually * debug prettier * debug prettier * reenable auto update * chore(workflows): pin tj-actions/verify-changed-files action to 30aa174 (#809) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Joe Karow <58997957+JoeKarow@users.noreply.github.com> * Updated translations from Crowdin * add GA env to build deps * fix(cognito-user-migrate): update all non-major dependencies (#806) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Joe Karow <58997957+JoeKarow@users.noreply.github.com> * fix(app): update all non-major dependencies (#813) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(web): update next.js to v13.5.4 (#815) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(auth): update all non-major dependencies (#814) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(ui): update dependency zod to v3.22.3 [security] (#817) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Updated translations from Crowdin * chore(workflows): update chromaui/action digest to 78b6788 (#818) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * changes for mobile * fix(auth): update all non-major dependencies (#816) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(workflows): update github/codeql-action digest to fdcae64 (#820) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Updated translations from Crowdin * fix(db): update all non-major dependencies (#822) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * temporarily disable cookie banner * disable eslint rule for addon --------- Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: InReach [bot] <108850934+InReach-svc@users.noreply.github.com> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --------- Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: InReach [bot] <108850934+InReach-svc@users.noreply.github.com> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/workflows/crowdin.yml | 2 +- .nvmrc | 2 +- apps/app/package.json | 21 +- apps/app/public/locales/af/common.json | 6 + apps/app/public/locales/ar/common.json | 6 + apps/app/public/locales/en/common.json | 6 + apps/app/public/locales/es/common.json | 6 + apps/app/public/locales/fa/common.json | 6 + apps/app/public/locales/fr/common.json | 6 + apps/app/public/locales/hi/common.json | 6 + apps/app/public/locales/ht/common.json | 6 + apps/app/public/locales/ja/common.json | 6 + apps/app/public/locales/ko/common.json | 6 + apps/app/public/locales/ko/country.json | 2 +- apps/app/public/locales/ko/gov-dist.json | 568 ++--- apps/app/public/locales/ko/user.json | 2 +- apps/app/public/locales/pl/common.json | 6 + apps/app/public/locales/ps/common.json | 6 + apps/app/public/locales/pt/common.json | 6 + apps/app/public/locales/ru/common.json | 6 + apps/app/public/locales/sw/common.json | 6 + apps/app/public/locales/tl/common.json | 6 + apps/app/public/locales/uk/common.json | 6 + apps/app/public/locales/zh/common.json | 6 + apps/app/src/pages/401.tsx | 5 +- apps/app/src/pages/_app.tsx | 6 + apps/app/src/pages/account/index.tsx | 9 +- apps/app/src/pages/account/reviews.tsx | 12 +- apps/app/src/pages/account/saved.tsx | 9 +- apps/app/src/pages/admin/index.tsx | 2 +- apps/app/src/pages/admin/quicklink/email.tsx | 9 +- apps/app/src/pages/admin/quicklink/index.tsx | 10 +- apps/app/src/pages/admin/quicklink/phone.tsx | 10 +- .../src/pages/admin/quicklink/services.tsx | 10 +- apps/app/src/pages/index.tsx | 9 +- .../src/pages/search/[...params]/index.tsx | 12 +- apps/app/src/pages/search/intl/[country].tsx | 11 +- apps/app/src/pages/suggest.tsx | 10 +- apps/app/src/pages/support/index.tsx | 77 +- apps/web/package.json | 15 +- lambdas/cognito-messaging/package.json | 2 +- lambdas/cognito-user-migrate/package.json | 2 +- package.json | 1 + packages/api/package.json | 4 +- .../api/router/user/mutation.create.schema.ts | 13 +- packages/auth/lib/createUser.ts | 2 - packages/auth/package.json | 8 +- packages/db/generated/languages.ts | 2 +- packages/db/generated/serviceCategory.ts | 6 + packages/db/package.json | 10 +- packages/env/package.json | 2 +- packages/eslint-config/package.json | 8 +- .../components/core/Donate/index.stories.tsx | 14 + packages/ui/components/core/Donate/index.tsx | 238 +++ packages/ui/components/core/UserMenu.tsx | 13 +- packages/ui/components/sections/Footer.tsx | 14 +- packages/ui/modals/SignUp/context.ts | 6 +- packages/ui/modals/SignUp/fields.tsx | 2 +- packages/ui/package.json | 35 +- packages/ui/theme/animation.ts | 7 + packages/ui/theme/common.tsx | 8 +- pnpm-lock.yaml | 1846 +++++++---------- 62 files changed, 1606 insertions(+), 1558 deletions(-) create mode 100644 packages/ui/components/core/Donate/index.stories.tsx create mode 100644 packages/ui/components/core/Donate/index.tsx diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index 34ed8f80eb..600c7dec46 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -114,7 +114,7 @@ jobs: title: 'chore(i18n): Updated translations from Crowdin' labels: | translations - "kodiak: merge.method = 'squash'" + kodiak: merge.method = 'squash' automerge delete-branch: true diff --git a/.nvmrc b/.nvmrc index 02c8b485ed..f6610cade8 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.18.0 +18.18.1 diff --git a/apps/app/package.json b/apps/app/package.json index c5a8e4b7bc..b451ab10ef 100644 --- a/apps/app/package.json +++ b/apps/app/package.json @@ -25,21 +25,16 @@ "dependencies": { "@emotion/react": "11.11.1", "@emotion/server": "11.11.0", - "@hookform/resolvers": "3.3.1", - "@iconify/react": "4.1.1", + "@hookform/resolvers": "3.3.2", "@mantine/carousel": "6.0.21", "@mantine/core": "6.0.21", "@mantine/dates": "6.0.21", - "@mantine/dropzone": "6.0.21", "@mantine/form": "6.0.21", "@mantine/hooks": "6.0.21", "@mantine/modals": "6.0.21", "@mantine/next": "6.0.21", "@mantine/notifications": "6.0.21", "@mantine/nprogress": "6.0.21", - "@mantine/prism": "6.0.21", - "@mantine/spotlight": "6.0.21", - "@mantine/tiptap": "6.0.21", "@mantine/utils": "6.0.21", "@next/bundle-analyzer": "13.5.4", "@opentelemetry/api": "1.6.0", @@ -56,9 +51,6 @@ "@sentry/profiling-node": "1.2.1", "@tanstack/react-query": "4.36.1", "@tanstack/react-table": "8.10.6", - "@tiptap/extension-link": "2.1.11", - "@tiptap/react": "2.1.11", - "@tiptap/starter-kit": "2.1.11", "@trpc/client": "10.40.0", "@trpc/next": "10.40.0", "@trpc/react-query": "10.40.0", @@ -75,7 +67,6 @@ "@weareinreach/ui": "workspace:*", "@weareinreach/util": "workspace:*", "cookies-next": "4.0.0", - "core-js": "3.33.0", "dayjs": "1.11.10", "embla-carousel-autoplay": "7.1.0", "embla-carousel-react": "7.1.0", @@ -90,7 +81,7 @@ "just-compare": "2.3.0", "luxon": "3.4.3", "mantine-react-table": "1.3.3", - "next": "13.5.4", + "next": "13.5.3", "next-auth": "4.23.2", "next-i18next": "14.0.3", "next-seo": "6.1.0", @@ -101,7 +92,7 @@ "react": "18.2.0", "react-dom": "18.2.0", "react-error-boundary": "4.0.11", - "react-hook-consent": "3.3.0", + "react-hook-consent": "3.4.0", "react-hook-form": "7.47.0", "react-hook-form-mantine": "2.0.0", "react-i18next": "13.2.2", @@ -114,12 +105,12 @@ "@tanstack/react-query-devtools": "4.36.1", "@tanstack/react-table-devtools": "8.7.6", "@total-typescript/ts-reset": "0.5.1", - "@types/eslint": "8.44.3", + "@types/eslint": "8.44.4", "@types/gtag.js": "0.0.16", "@types/luxon": "3.3.2", "@types/node": "18.18.4", - "@types/react": "18.2.27", - "@types/react-dom": "18.2.12", + "@types/react": "18.2.28", + "@types/react-dom": "18.2.13", "@types/umami": "0.1.3", "@typescript-eslint/eslint-plugin": "6.7.5", "@typescript-eslint/parser": "6.7.5", diff --git a/apps/app/public/locales/af/common.json b/apps/app/public/locales/af/common.json index 3291f03d6b..8c0a109497 100644 --- a/apps/app/public/locales/af/common.json +++ b/apps/app/public/locales/af/common.json @@ -83,6 +83,11 @@ "website": "Direkte webwerf" }, "disclaimer": "Vrywaring", + "donate": { + "hover": "Donate today to help keep InReach free for everyone", + "popup": "Help keep InReach free for everyone", + "to-inreach": "Donate to InReach 💝" + }, "dont-have-account": "Het u nie 'n rekening nie?", "download-app": "Laai die app af", "edit-profile": "Profiel wysig", @@ -382,6 +387,7 @@ "decline": "Decline", "delete": "Verwyder", "distance": "Afstand", + "donate": "Donate", "email": "E-pos", "home": "Huis", "hours": "Ure", diff --git a/apps/app/public/locales/ar/common.json b/apps/app/public/locales/ar/common.json index 9e9629a2ee..ebdcf52afc 100644 --- a/apps/app/public/locales/ar/common.json +++ b/apps/app/public/locales/ar/common.json @@ -87,6 +87,11 @@ "website": "موقع مباشر" }, "disclaimer": "إخلاء المسؤولية", + "donate": { + "hover": "تبرع اليوم للمساعدة في إبقاء InReach مجانية للجميع", + "popup": "المساعدة على إبقاء InReach مجانية للجميع", + "to-inreach": "تبرع لـ InReach 💝" + }, "dont-have-account": "ليس لديك حساب؟", "download-app": "تحميل تطبيقنا", "edit-profile": "تعديل الملف الشخصي", @@ -386,6 +391,7 @@ "decline": "رفض", "delete": "حذف", "distance": "المسافة", + "donate": "تبرع", "email": "البريد الإلكتروني", "home": "المنزل", "hours": "الساعات", diff --git a/apps/app/public/locales/en/common.json b/apps/app/public/locales/en/common.json index 5f063dd60d..15d981ff8b 100644 --- a/apps/app/public/locales/en/common.json +++ b/apps/app/public/locales/en/common.json @@ -83,6 +83,11 @@ "website": "Direct website" }, "disclaimer": "Disclaimer", + "donate": { + "hover": "Donate today to help keep InReach free for everyone", + "popup": "Help keep InReach free for everyone", + "to-inreach": "Donate to InReach 💝" + }, "dont-have-account": "Don't have an account?", "download-app": "Download the app", "edit-profile": "Edit Profile", @@ -392,6 +397,7 @@ "decline": "Decline", "delete": "Delete", "distance": "Distance", + "donate": "Donate", "email": "Email", "home": "Home", "hours": "Hours", diff --git a/apps/app/public/locales/es/common.json b/apps/app/public/locales/es/common.json index 852c631221..15272b5c76 100644 --- a/apps/app/public/locales/es/common.json +++ b/apps/app/public/locales/es/common.json @@ -83,6 +83,11 @@ "website": "Sitio Web Directo" }, "disclaimer": "Descargo de responsabilidad", + "donate": { + "hover": "Donar hoy para ayudar a mantener el alcance gratuito para todos", + "popup": "Ayuda a mantener el alcance gratuito para todos", + "to-inreach": "Donar para llegar a 💝" + }, "dont-have-account": "¿No tienes una cuenta?", "download-app": "Descarga nuestra aplicación", "edit-profile": "Editar perfil", @@ -382,6 +387,7 @@ "decline": "Rechazar", "delete": "Eliminar", "distance": "Distancia", + "donate": "Donar", "email": "E-mail", "home": "Inicio", "hours": "Horas", diff --git a/apps/app/public/locales/fa/common.json b/apps/app/public/locales/fa/common.json index cd647bd851..42aa340c00 100644 --- a/apps/app/public/locales/fa/common.json +++ b/apps/app/public/locales/fa/common.json @@ -83,6 +83,11 @@ "website": "وب سایت مستقیم" }, "disclaimer": "سلب مسئولیت", + "donate": { + "hover": "Donate today to help keep InReach free for everyone", + "popup": "Help keep InReach free for everyone", + "to-inreach": "Donate to InReach 💝" + }, "dont-have-account": "حساب کاربری ندارید؟", "download-app": "برنامه را بارگیری کنید", "edit-profile": "ویرایش پروفایل", @@ -382,6 +387,7 @@ "decline": "Decline", "delete": "حذف", "distance": "فاصله", + "donate": "Donate", "email": "پست الکترونیک", "home": "صفحه اصلی", "hours": "ساعت", diff --git a/apps/app/public/locales/fr/common.json b/apps/app/public/locales/fr/common.json index 3f578c379a..dddf3befe3 100644 --- a/apps/app/public/locales/fr/common.json +++ b/apps/app/public/locales/fr/common.json @@ -83,6 +83,11 @@ "website": "Site Web direct" }, "disclaimer": "Clause de non-responsabilité", + "donate": { + "hover": "Faire un don aujourd'hui pour aider InReach à rester gratuit pour tout le monde", + "popup": "Aidez InReach gratuitement pour tout le monde", + "to-inreach": "Faire un don à InReach 💝" + }, "dont-have-account": "Vous n'avez pas de compte ?", "download-app": "Télécharger l'application", "edit-profile": "Modifier le profil", @@ -382,6 +387,7 @@ "decline": "Refuser", "delete": "Supprimer", "distance": "Distance", + "donate": "Faire un don", "email": "Courriel", "home": "Page d'accueil", "hours": "Heures", diff --git a/apps/app/public/locales/hi/common.json b/apps/app/public/locales/hi/common.json index 0b366289e5..62bc4a69ba 100644 --- a/apps/app/public/locales/hi/common.json +++ b/apps/app/public/locales/hi/common.json @@ -83,6 +83,11 @@ "website": "डायरेक्ट वेबसाइट" }, "disclaimer": "अस्वीकरण", + "donate": { + "hover": "Donate today to help keep InReach free for everyone", + "popup": "Help keep InReach free for everyone", + "to-inreach": "Donate to InReach 💝" + }, "dont-have-account": "क्या आपके पास अकाउंट नहीं है?", "download-app": "ऐप डाउनलोड करें", "edit-profile": "प्रोफ़ाइल संपादित करें", @@ -382,6 +387,7 @@ "decline": "Decline", "delete": "मिटाएँ", "distance": "दूरी", + "donate": "Donate", "email": "ईमेल", "home": "होम", "hours": "घंटे", diff --git a/apps/app/public/locales/ht/common.json b/apps/app/public/locales/ht/common.json index 88b7cf2b61..df5dd3326e 100644 --- a/apps/app/public/locales/ht/common.json +++ b/apps/app/public/locales/ht/common.json @@ -83,6 +83,11 @@ "website": "Sit entènèt dirèk" }, "disclaimer": "Limit responsabilite nou", + "donate": { + "hover": "Donate today to help keep InReach free for everyone", + "popup": "Help keep InReach free for everyone", + "to-inreach": "Donate to InReach 💝" + }, "dont-have-account": "Pa gen yon kont?", "download-app": "Telechaje app a", "edit-profile": "Edit Profile", @@ -382,6 +387,7 @@ "decline": "Decline", "delete": "Efase", "distance": "Distans", + "donate": "Donate", "email": "Imèl", "home": "Kay", "hours": "Èdtan", diff --git a/apps/app/public/locales/ja/common.json b/apps/app/public/locales/ja/common.json index 56e6b43c60..c584adf55e 100644 --- a/apps/app/public/locales/ja/common.json +++ b/apps/app/public/locales/ja/common.json @@ -82,6 +82,11 @@ "website": "ダイレクトウェブサイト" }, "disclaimer": "免責事項", + "donate": { + "hover": "InReach を誰もが無料で利用できるようにするために今日寄付してください", + "popup": "誰もがInReachを無料に保つのを助ける", + "to-inreach": "InReach :heart_with_ribbonに寄付する" + }, "dont-have-account": "アカウントを持っていない?", "download-app": "アプリをダウンロードする", "edit-profile": "プロフィールを編集", @@ -381,6 +386,7 @@ "decline": "同意しない", "delete": "[削除]", "distance": "距離", + "donate": "寄付", "email": "E メール", "home": "ホーム", "hours": "時間", diff --git a/apps/app/public/locales/ko/common.json b/apps/app/public/locales/ko/common.json index 995deba02d..3fd2e63b8f 100644 --- a/apps/app/public/locales/ko/common.json +++ b/apps/app/public/locales/ko/common.json @@ -82,6 +82,11 @@ "website": "직접 웹사이트" }, "disclaimer": "면책 진술서", + "donate": { + "hover": "InReach를 모두가 무료로 사용할 수 있도록 오늘 기부하세요", + "popup": "InReach를 무료로 사용할 수 있도록 도와주세요", + "to-inreach": "InReach에 기부하십시오 💝" + }, "dont-have-account": "계정이 없으세요?", "download-app": "앱 다운로드", "edit-profile": "프로필 편집하기", @@ -381,6 +386,7 @@ "decline": "거절", "delete": "삭제", "distance": "거리", + "donate": "기부하기", "email": "이메일", "home": "홈", "hours": "시간", diff --git a/apps/app/public/locales/ko/country.json b/apps/app/public/locales/ko/country.json index 975453b6c1..96801e08a5 100644 --- a/apps/app/public/locales/ko/country.json +++ b/apps/app/public/locales/ko/country.json @@ -162,7 +162,7 @@ "demonym_other": "코코스 아일랜더스" }, "CHE": { - "name": "스위스", + "name": "스위철랜드", "demonym_other": "스위스" }, "CHL": { diff --git a/apps/app/public/locales/ko/gov-dist.json b/apps/app/public/locales/ko/gov-dist.json index 064c8fc0f3..5f843bf15b 100644 --- a/apps/app/public/locales/ko/gov-dist.json +++ b/apps/app/public/locales/ko/gov-dist.json @@ -456,7 +456,7 @@ "us-florida-baker-county": "베이커", "us-florida-bay-county": "베이", "us-florida-bradford-county": "브래드퍼드", - "us-florida-brevard-county": "브레바드", + "us-florida-brevard-county": "브러바드", "us-florida-broward-county": "브로워드", "us-florida-calhoun-county": "칼훈", "us-florida-charlotte-county": "샬럿", @@ -472,15 +472,15 @@ "us-florida-franklin-county": "프랭클린", "us-florida-gadsden-county": "개즈던", "us-florida-gilchrist-county": "길크리스트", - "us-florida-glades-county": "빈터", - "us-florida-gulf-county": "만", + "us-florida-glades-county": "글레이즈", + "us-florida-gulf-county": "걸프", "us-florida-hamilton-county": "해밀턴", "us-florida-hardee-county": "하디", "us-florida-hendry-county": "헨드리", "us-florida-hernando-county": "에르난도", "us-florida-highlands-county": "하일랜드", "us-florida-hillsborough-county": "힐즈버러", - "us-florida-holmes-county": "홈즈", + "us-florida-holmes-county": "홈스", "us-florida-indian-river-county": "인디언 리버", "us-florida-jackson-county": "잭슨", "us-florida-jefferson-county": "제퍼슨", @@ -501,33 +501,33 @@ "us-florida-okeechobee-county": "오키초비", "us-florida-orange-county": "주황색", "us-florida-osceola-county": "오세올라", - "us-florida-palm-beach-county": "팜 비치", + "us-florida-palm-beach-county": "팜비치", "us-florida-pasco-county": "파스코", "us-florida-pinellas-county": "피넬라스", "us-florida-polk-county": "포크", "us-florida-putnam-county": "퍼트넘", "us-florida-santa-rosa-county": "산타로사", - "us-florida-sarasota-county": "사라소타", + "us-florida-sarasota-county": "새러소타", "us-florida-seminole-county": "세미놀", "us-florida-st-johns-county": "세인트 존스", - "us-florida-st-lucie-county": "세인트루시", + "us-florida-st-lucie-county": "세인트 루시", "us-florida-sumter-county": "섬터", "us-florida-suwannee-county": "스와니", "us-florida-taylor-county": "테일러", "us-florida-union-county": "유니언", "us-florida-volusia-county": "볼루시아", "us-florida-wakulla-county": "와쿨라", - "us-florida-walton-county": "월튼", + "us-florida-walton-county": "월턴", "us-florida-washington-county": "워싱턴", "us-georgia": "조지아", - "us-georgia-appling-county": "적용", + "us-georgia-appling-county": "애플링", "us-georgia-atkinson-county": "앳킨슨", "us-georgia-bacon-county": "베이컨", "us-georgia-baker-county": "베이커", "us-georgia-baldwin-county": "볼드윈", - "us-georgia-banks-county": "은행", - "us-georgia-barrow-county": "무덤", - "us-georgia-bartow-county": "바토우", + "us-georgia-banks-county": "뱅크스", + "us-georgia-barrow-county": "배로", + "us-georgia-bartow-county": "바토", "us-georgia-ben-hill-county": "벤 힐", "us-georgia-berrien-county": "베리엔", "us-georgia-bibb-county": "비브", @@ -539,40 +539,40 @@ "us-georgia-burke-county": "버크", "us-georgia-butts-county": "버츠", "us-georgia-calhoun-county": "칼훈", - "us-georgia-camden-county": "캠든", + "us-georgia-camden-county": "캠던", "us-georgia-candler-county": "캔들러", "us-georgia-carroll-county": "캐럴", "us-georgia-catoosa-county": "카투사", - "us-georgia-charlton-county": "찰튼", + "us-georgia-charlton-county": "찰턴", "us-georgia-chatham-county": "채텀", "us-georgia-chattahoochee-county": "채터후치", "us-georgia-chattooga-county": "채투가", "us-georgia-cherokee-county": "체로키", "us-georgia-clarke-county": "클라크", "us-georgia-clay-county": "클레이", - "us-georgia-clayton-county": "클레이튼", + "us-georgia-clayton-county": "클레이턴", "us-georgia-clinch-county": "클린치", - "us-georgia-cobb-county": "콥", + "us-georgia-cobb-county": "코브", "us-georgia-coffee-county": "커피", "us-georgia-colquitt-county": "콜킷", "us-georgia-columbia-county": "컬럼비아", - "us-georgia-cook-county": "요리사", + "us-georgia-cook-county": "쿡", "us-georgia-coweta-county": "코웨타", "us-georgia-crawford-county": "크로퍼드", - "us-georgia-crisp-county": "선명합니다", + "us-georgia-crisp-county": "크리스프", "us-georgia-dade-county": "데이드", "us-georgia-dawson-county": "도슨", "us-georgia-decatur-county": "디케이터", "us-georgia-dekalb-county": "디캘브", - "us-georgia-dodge-county": "닷지", + "us-georgia-dodge-county": "도지", "us-georgia-dooly-county": "둘리", "us-georgia-dougherty-county": "도허티", "us-georgia-douglas-county": "더글러스", - "us-georgia-early-county": "일찍", - "us-georgia-echols-county": "반향", + "us-georgia-early-county": "얼리", + "us-georgia-echols-county": "에콜스", "us-georgia-effingham-county": "에핑엄", "us-georgia-elbert-county": "엘버트", - "us-georgia-emanuel-county": "엠마누엘", + "us-georgia-emanuel-county": "에마누엘", "us-georgia-evans-county": "에반스", "us-georgia-fannin-county": "패닌", "us-georgia-fayette-county": "페이엣", @@ -586,22 +586,22 @@ "us-georgia-gordon-county": "고든", "us-georgia-grady-county": "그래디", "us-georgia-greene-county": "그린", - "us-georgia-gwinnett-county": "귀넷", + "us-georgia-gwinnett-county": "그위닛", "us-georgia-habersham-county": "하버샴", "us-georgia-hall-county": "홀", "us-georgia-hancock-county": "핸콕", - "us-georgia-haralson-county": "하랄슨", + "us-georgia-haralson-county": "해럴슨", "us-georgia-harris-county": "해리스", "us-georgia-hart-county": "하트", - "us-georgia-heard-county": "들었다", + "us-georgia-heard-county": "허드", "us-georgia-henry-county": "헨리", "us-georgia-houston-county": "휴스턴", "us-georgia-irwin-county": "어윈", "us-georgia-jackson-county": "잭슨", - "us-georgia-jasper-county": "벽옥", - "us-georgia-jeff-davis-county": "제프 데이비스", + "us-georgia-jasper-county": "재스퍼", + "us-georgia-jeff-davis-county": "제프데이비스", "us-georgia-jefferson-county": "제퍼슨", - "us-georgia-jenkins-county": "젠킨스", + "us-georgia-jenkins-county": "젱킨스", "us-georgia-johnson-county": "존슨", "us-georgia-jones-county": "존스", "us-georgia-lamar-county": "라마", @@ -612,7 +612,7 @@ "us-georgia-lincoln-county": "링컨", "us-georgia-long-county": "롱", "us-georgia-lowndes-county": "론데스", - "us-georgia-lumpkin-county": "럼프킨", + "us-georgia-lumpkin-county": "럼킨", "us-georgia-macon-county": "메이컨", "us-georgia-madison-county": "매디슨", "us-georgia-marion-county": "매리언", @@ -632,18 +632,18 @@ "us-georgia-paulding-county": "폴딩", "us-georgia-peach-county": "피치", "us-georgia-pickens-county": "피켄스", - "us-georgia-pierce-county": "내뚫다", + "us-georgia-pierce-county": "피어스", "us-georgia-pike-county": "파이크", "us-georgia-polk-county": "포크", "us-georgia-pulaski-county": "풀라스키", "us-georgia-putnam-county": "퍼트넘", - "us-georgia-quitman-county": "퀴트먼", + "us-georgia-quitman-county": "키트먼", "us-georgia-rabun-county": "라분", "us-georgia-randolph-county": "랜돌프", - "us-georgia-richmond-county": "리치몬드", + "us-georgia-richmond-county": "리치먼드", "us-georgia-rockdale-county": "록데일", - "us-georgia-schley-county": "슐리", - "us-georgia-screven-county": "스크리븐", + "us-georgia-schley-county": "슬라이", + "us-georgia-screven-county": "스크레번", "us-georgia-seminole-county": "세미놀", "us-georgia-spalding-county": "스폴딩", "us-georgia-stephens-county": "스티븐스", @@ -654,21 +654,21 @@ "us-georgia-tattnall-county": "태트널", "us-georgia-taylor-county": "테일러", "us-georgia-telfair-county": "텔페어", - "us-georgia-terrell-county": "테렐", - "us-georgia-thomas-county": "도마", + "us-georgia-terrell-county": "테럴", + "us-georgia-thomas-county": "토머스", "us-georgia-tift-county": "티프트", "us-georgia-toombs-county": "툼스", - "us-georgia-towns-county": "마을", - "us-georgia-treutlen-county": "트로이틀렌", - "us-georgia-troup-county": "트룹", + "us-georgia-towns-county": "타운스", + "us-georgia-treutlen-county": "트루틀렌", + "us-georgia-troup-county": "트루프", "us-georgia-turner-county": "터너", - "us-georgia-twiggs-county": "트위그스", + "us-georgia-twiggs-county": "트윅스", "us-georgia-union-county": "유니언", "us-georgia-upson-county": "업슨", "us-georgia-walker-county": "워커", - "us-georgia-walton-county": "월튼", + "us-georgia-walton-county": "월턴", "us-georgia-ware-county": "웨어", - "us-georgia-warren-county": "워렌", + "us-georgia-warren-county": "워런", "us-georgia-washington-county": "워싱턴", "us-georgia-wayne-county": "웨인", "us-georgia-webster-county": "웹스터", @@ -678,7 +678,7 @@ "us-georgia-wilcox-county": "윌콕스", "us-georgia-wilkes-county": "윌크스", "us-georgia-wilkinson-county": "윌킨슨", - "us-georgia-worth-county": "가치", + "us-georgia-worth-county": "워스", "us-hawaii": "하와이", "us-hawaii-hawaii-county": "하와이", "us-hawaii-honolulu-county": "호놀룰루", @@ -686,22 +686,22 @@ "us-hawaii-kauai-county": "카우아이", "us-hawaii-maui-county": "마우이", "us-idaho": "아이다호", - "us-idaho-ada-county": "에이다", + "us-idaho-ada-county": "아다", "us-idaho-adams-county": "아담스", - "us-idaho-bannock-county": "배녹", - "us-idaho-bear-lake-county": "베어 레이크", - "us-idaho-benewah-county": "베네와", + "us-idaho-bannock-county": "배넉", + "us-idaho-bear-lake-county": "베어레이크", + "us-idaho-benewah-county": "베너와", "us-idaho-bingham-county": "빙엄", "us-idaho-blaine-county": "블레인", "us-idaho-boise-county": "보이시", "us-idaho-bonner-county": "보너", - "us-idaho-bonneville-county": "보네빌", - "us-idaho-boundary-county": "경계", + "us-idaho-bonneville-county": "본빌", + "us-idaho-boundary-county": "바운더리", "us-idaho-butte-county": "뷰트", "us-idaho-camas-county": "카마스", "us-idaho-canyon-county": "캐니언", - "us-idaho-caribou-county": "순록", - "us-idaho-cassia-county": "카시아", + "us-idaho-caribou-county": "카리부", + "us-idaho-cassia-county": "캐시어", "us-idaho-clark-county": "클라크", "us-idaho-clearwater-county": "클리어워터", "us-idaho-custer-county": "커스터", @@ -713,20 +713,20 @@ "us-idaho-idaho-county": "아이다호", "us-idaho-jefferson-county": "제퍼슨", "us-idaho-jerome-county": "제롬", - "us-idaho-kootenai-county": "코오테나이", + "us-idaho-kootenai-county": "쿠트나이", "us-idaho-latah-county": "라타", - "us-idaho-lemhi-county": "렘히", + "us-idaho-lemhi-county": "레미", "us-idaho-lewis-county": "루이스", "us-idaho-lincoln-county": "링컨", "us-idaho-madison-county": "매디슨", "us-idaho-minidoka-county": "미니도카", - "us-idaho-nez-perce-county": "네즈 페르세", - "us-idaho-oneida-county": "오네이다", + "us-idaho-nez-perce-county": "네즈퍼스", + "us-idaho-oneida-county": "오나이다", "us-idaho-owyhee-county": "오위히", "us-idaho-payette-county": "페이엣", "us-idaho-power-county": "파워", "us-idaho-shoshone-county": "쇼쇼니", - "us-idaho-teton-county": "테톤", + "us-idaho-teton-county": "티턴", "us-idaho-twin-falls-county": "트윈 폴스", "us-idaho-valley-county": "밸리", "us-idaho-washington-county": "워싱턴", @@ -736,24 +736,24 @@ "us-illinois-bond-county": "본드", "us-illinois-boone-county": "분", "us-illinois-brown-county": "브라운", - "us-illinois-bureau-county": "사무실", + "us-illinois-bureau-county": "뷰로", "us-illinois-calhoun-county": "칼훈", "us-illinois-carroll-county": "캐럴", "us-illinois-cass-county": "캐스", - "us-illinois-champaign-county": "평야", - "us-illinois-christian-county": "기독교", + "us-illinois-champaign-county": "섐페인", + "us-illinois-christian-county": "크리스천", "us-illinois-clark-county": "클라크", "us-illinois-clay-county": "클레이", "us-illinois-clinton-county": "클린턴", "us-illinois-coles-county": "콜스", - "us-illinois-cook-county": "요리사", + "us-illinois-cook-county": "쿡", "us-illinois-crawford-county": "크로퍼드", "us-illinois-cumberland-county": "컴벌랜드", "us-illinois-dekalb-county": "디캘브", "us-illinois-dewitt-county": "드윗", "us-illinois-douglas-county": "더글러스", - "us-illinois-dupage-county": "듀페이지", - "us-illinois-edgar-county": "에드가", + "us-illinois-dupage-county": "뒤파제", + "us-illinois-edgar-county": "에드거", "us-illinois-edwards-county": "에드워즈", "us-illinois-effingham-county": "에핑엄", "us-illinois-fayette-county": "페이엣", @@ -770,10 +770,10 @@ "us-illinois-henry-county": "헨리", "us-illinois-iroquois-county": "이로쿼이", "us-illinois-jackson-county": "잭슨", - "us-illinois-jasper-county": "벽옥", + "us-illinois-jasper-county": "재스퍼", "us-illinois-jefferson-county": "제퍼슨", "us-illinois-jersey-county": "저지", - "us-illinois-jo-daviess-county": "조 데이비스", + "us-illinois-jo-daviess-county": "조데이비스", "us-illinois-johnson-county": "존슨", "us-illinois-kane-county": "케인", "us-illinois-kankakee-county": "캔카키", @@ -786,7 +786,7 @@ "us-illinois-livingston-county": "리빙스턴", "us-illinois-logan-county": "로건", "us-illinois-macon-county": "메이컨", - "us-illinois-macoupin-county": "마쿠팽", + "us-illinois-macoupin-county": "마쿠핀", "us-illinois-madison-county": "매디슨", "us-illinois-marion-county": "매리언", "us-illinois-marshall-county": "마셜", @@ -794,8 +794,8 @@ "us-illinois-massac-county": "마삭", "us-illinois-mcdonough-county": "맥도너", "us-illinois-mchenry-county": "맥헨리", - "us-illinois-mclean-county": "맥클린", - "us-illinois-menard-county": "메나드", + "us-illinois-mclean-county": "매클레인", + "us-illinois-menard-county": "머나드", "us-illinois-mercer-county": "머서", "us-illinois-monroe-county": "먼로", "us-illinois-montgomery-county": "몽고메리", @@ -810,11 +810,11 @@ "us-illinois-pulaski-county": "풀라스키", "us-illinois-putnam-county": "퍼트넘", "us-illinois-randolph-county": "랜돌프", - "us-illinois-richland-county": "리치랜드", - "us-illinois-rock-island-county": "락 아일랜드", + "us-illinois-richland-county": "리칠랜드", + "us-illinois-rock-island-county": "록아일랜드", "us-illinois-saline-county": "설린", - "us-illinois-sangamon-county": "상가몬", - "us-illinois-schuyler-county": "슐러", + "us-illinois-sangamon-county": "상거먼", + "us-illinois-schuyler-county": "스카일러", "us-illinois-scott-county": "스콧", "us-illinois-shelby-county": "셸비", "us-illinois-st-clair-county": "세인트 클레어", @@ -822,21 +822,21 @@ "us-illinois-stephenson-county": "스티븐슨", "us-illinois-tazewell-county": "테이즈웰", "us-illinois-union-county": "유니언", - "us-illinois-vermilion-county": "주홍", - "us-illinois-wabash-county": "와바시", - "us-illinois-warren-county": "워렌", + "us-illinois-vermilion-county": "버밀리언", + "us-illinois-wabash-county": "워배시", + "us-illinois-warren-county": "워런", "us-illinois-washington-county": "워싱턴", "us-illinois-wayne-county": "웨인", "us-illinois-white-county": "화이트", "us-illinois-whiteside-county": "화이트사이드", - "us-illinois-will-county": "의지", + "us-illinois-will-county": "윌", "us-illinois-williamson-county": "윌리엄슨", - "us-illinois-winnebago-county": "위네바고", - "us-illinois-woodford-county": "우드포드", + "us-illinois-winnebago-county": "위너베이고", + "us-illinois-woodford-county": "우드퍼드", "us-indiana": "인디애나", "us-indiana-adams-county": "아담스", "us-indiana-allen-county": "앨런", - "us-indiana-bartholomew-county": "바르톨로뮤", + "us-indiana-bartholomew-county": "바솔로뮤", "us-indiana-benton-county": "벤튼", "us-indiana-blackford-county": "블랙포드", "us-indiana-boone-county": "분", @@ -852,11 +852,11 @@ "us-indiana-decatur-county": "디케이터", "us-indiana-dekalb-county": "디캘브", "us-indiana-delaware-county": "델라웨어", - "us-indiana-dubois-county": "뒤부아", + "us-indiana-dubois-county": "두보아", "us-indiana-elkhart-county": "엘크하트", "us-indiana-fayette-county": "페이엣", "us-indiana-floyd-county": "플로이드", - "us-indiana-fountain-county": "분수", + "us-indiana-fountain-county": "파운틴", "us-indiana-franklin-county": "프랭클린", "us-indiana-fulton-county": "풀턴", "us-indiana-gibson-county": "깁슨", @@ -870,16 +870,16 @@ "us-indiana-howard-county": "하워드", "us-indiana-huntington-county": "헌팅턴", "us-indiana-jackson-county": "잭슨", - "us-indiana-jasper-county": "벽옥", + "us-indiana-jasper-county": "재스퍼", "us-indiana-jay-county": "제이", "us-indiana-jefferson-county": "제퍼슨", "us-indiana-jennings-county": "제닝스", "us-indiana-johnson-county": "존슨", "us-indiana-knox-county": "녹스", - "us-indiana-kosciusko-county": "코지우스코", - "us-indiana-lagrange-county": "라그레인지", + "us-indiana-kosciusko-county": "코스키우스코", + "us-indiana-lagrange-county": "라그랜지", "us-indiana-lake-county": "레이크", - "us-indiana-laporte-county": "라포르테", + "us-indiana-laporte-county": "라포트", "us-indiana-lawrence-county": "로렌스", "us-indiana-madison-county": "매디슨", "us-indiana-marion-county": "매리언", @@ -894,11 +894,11 @@ "us-indiana-ohio-county": "오하이오", "us-indiana-orange-county": "주황색", "us-indiana-owen-county": "오언", - "us-indiana-parke-county": "파케", + "us-indiana-parke-county": "파크", "us-indiana-perry-county": "페리", "us-indiana-pike-county": "파이크", "us-indiana-porter-county": "포터", - "us-indiana-posey-county": "포시", + "us-indiana-posey-county": "포지", "us-indiana-pulaski-county": "풀라스키", "us-indiana-putnam-county": "퍼트넘", "us-indiana-randolph-county": "랜돌프", @@ -907,19 +907,19 @@ "us-indiana-scott-county": "스콧", "us-indiana-shelby-county": "셸비", "us-indiana-spencer-county": "스펜서", - "us-indiana-st-joseph-county": "세인트 조셉", + "us-indiana-st-joseph-county": "세인트조지프", "us-indiana-starke-county": "스타크", - "us-indiana-steuben-county": "스튜벤", + "us-indiana-steuben-county": "슈토이벤", "us-indiana-sullivan-county": "설리번", - "us-indiana-switzerland-county": "스위스", + "us-indiana-switzerland-county": "스위철랜드", "us-indiana-tippecanoe-county": "티페카누", "us-indiana-tipton-county": "팁턴", "us-indiana-union-county": "유니언", "us-indiana-vanderburgh-county": "밴더버그", - "us-indiana-vermillion-county": "주홍색", + "us-indiana-vermillion-county": "버밀리언", "us-indiana-vigo-county": "비고", - "us-indiana-wabash-county": "와바시", - "us-indiana-warren-county": "워렌", + "us-indiana-wabash-county": "워배시", + "us-indiana-warren-county": "워런", "us-indiana-warrick-county": "워릭", "us-indiana-washington-county": "워싱턴", "us-indiana-wayne-county": "웨인", @@ -929,7 +929,7 @@ "us-iowa": "아이오와", "us-iowa-adair-county": "어데어", "us-iowa-adams-county": "아담스", - "us-iowa-allamakee-county": "알라마키", + "us-iowa-allamakee-county": "알루무키", "us-iowa-appanoose-county": "아파누스", "us-iowa-audubon-county": "오듀본", "us-iowa-benton-county": "벤튼", @@ -942,13 +942,13 @@ "us-iowa-calhoun-county": "칼훈", "us-iowa-carroll-county": "캐럴", "us-iowa-cass-county": "캐스", - "us-iowa-cedar-county": "삼나무", - "us-iowa-cerro-gordo-county": "세로 고르도", + "us-iowa-cedar-county": "시더", + "us-iowa-cerro-gordo-county": "세로고도", "us-iowa-cherokee-county": "체로키", "us-iowa-chickasaw-county": "치카소", "us-iowa-clarke-county": "클라크", "us-iowa-clay-county": "클레이", - "us-iowa-clayton-county": "클레이튼", + "us-iowa-clayton-county": "클레이턴", "us-iowa-clinton-county": "클린턴", "us-iowa-crawford-county": "크로퍼드", "us-iowa-dallas-county": "댈러스", @@ -958,7 +958,7 @@ "us-iowa-des-moines-county": "디모인", "us-iowa-dickinson-county": "디킨슨", "us-iowa-dubuque-county": "더뷰크", - "us-iowa-emmet-county": "개미", + "us-iowa-emmet-county": "에밋", "us-iowa-fayette-county": "페이엣", "us-iowa-floyd-county": "플로이드", "us-iowa-franklin-county": "프랭클린", @@ -976,17 +976,17 @@ "us-iowa-ida-county": "아이다", "us-iowa-iowa-county": "아이오와", "us-iowa-jackson-county": "잭슨", - "us-iowa-jasper-county": "벽옥", + "us-iowa-jasper-county": "재스퍼", "us-iowa-jefferson-county": "제퍼슨", "us-iowa-johnson-county": "존슨", "us-iowa-jones-county": "존스", - "us-iowa-keokuk-county": "키쿡", - "us-iowa-kossuth-county": "코수트", + "us-iowa-keokuk-county": "키오쿡", + "us-iowa-kossuth-county": "코수스", "us-iowa-lee-county": "리", "us-iowa-linn-county": "린", "us-iowa-louisa-county": "루이자", "us-iowa-lucas-county": "루카스", - "us-iowa-lyon-county": "리옹", + "us-iowa-lyon-county": "라이언", "us-iowa-madison-county": "매디슨", "us-iowa-mahaska-county": "마하스카", "us-iowa-marion-county": "매리언", @@ -996,47 +996,47 @@ "us-iowa-monona-county": "모노나", "us-iowa-monroe-county": "먼로", "us-iowa-montgomery-county": "몽고메리", - "us-iowa-muscatine-county": "무스카틴", - "us-iowa-obrien-county": "오브라이언", + "us-iowa-muscatine-county": "머스카틴", + "us-iowa-obrien-county": "오브리언", "us-iowa-osceola-county": "오세올라", "us-iowa-page-county": "페이지", - "us-iowa-palo-alto-county": "팔로 알토", + "us-iowa-palo-alto-county": "팰로앨토", "us-iowa-plymouth-county": "플리머스", "us-iowa-pocahontas-county": "포카혼타스", "us-iowa-polk-county": "포크", "us-iowa-pottawattamie-county": "포타와타미", - "us-iowa-poweshiek-county": "Poeshiek", - "us-iowa-ringgold-county": "링 골드", - "us-iowa-sac-county": "낭", + "us-iowa-poweshiek-county": "포우쉬크", + "us-iowa-ringgold-county": "링골드", + "us-iowa-sac-county": "색", "us-iowa-scott-county": "스콧", "us-iowa-shelby-county": "셸비", "us-iowa-sioux-county": "수", "us-iowa-story-county": "스토리", - "us-iowa-tama-county": "다마", + "us-iowa-tama-county": "타마", "us-iowa-taylor-county": "테일러", "us-iowa-union-county": "유니언", "us-iowa-van-buren-county": "밴 뷰렌", "us-iowa-wapello-county": "와펠로", - "us-iowa-warren-county": "워렌", + "us-iowa-warren-county": "워런", "us-iowa-washington-county": "워싱턴", "us-iowa-wayne-county": "웨인", "us-iowa-webster-county": "웹스터", - "us-iowa-winnebago-county": "위네바고", - "us-iowa-winneshiek-county": "위네시크", - "us-iowa-woodbury-county": "우드버리", - "us-iowa-worth-county": "가치", + "us-iowa-winnebago-county": "위너베이고", + "us-iowa-winneshiek-county": "위너시크", + "us-iowa-woodbury-county": "우드베리", + "us-iowa-worth-county": "워스", "us-iowa-wright-county": "라이트", "us-kansas": "캔자스", "us-kansas-allen-county": "앨런", "us-kansas-anderson-county": "앤더슨", "us-kansas-atchison-county": "애치슨", - "us-kansas-barber-county": "이발사", - "us-kansas-barton-county": "바튼", + "us-kansas-barber-county": "바버", + "us-kansas-barton-county": "바턴", "us-kansas-bourbon-county": "버번", "us-kansas-brown-county": "브라운", "us-kansas-butler-county": "버틀러", "us-kansas-chase-county": "체이스", - "us-kansas-chautauqua-county": "쇼토쿠아", + "us-kansas-chautauqua-county": "셔토쿼", "us-kansas-cherokee-county": "체로키", "us-kansas-cheyenne-county": "샤이엔", "us-kansas-clark-county": "클라크", @@ -1067,22 +1067,22 @@ "us-kansas-hamilton-county": "해밀턴", "us-kansas-harper-county": "하퍼", "us-kansas-harvey-county": "하비", - "us-kansas-haskell-county": "하스켈", + "us-kansas-haskell-county": "해스켈", "us-kansas-hodgeman-county": "호지먼", "us-kansas-jackson-county": "잭슨", "us-kansas-jefferson-county": "제퍼슨", "us-kansas-jewell-county": "쥬얼", "us-kansas-johnson-county": "존슨", - "us-kansas-kearny-county": "키어니", + "us-kansas-kearny-county": "커니", "us-kansas-kingman-county": "킹맨", "us-kansas-kiowa-county": "카이오와", - "us-kansas-labette-county": "라베트", + "us-kansas-labette-county": "라벳", "us-kansas-lane-county": "레인", "us-kansas-leavenworth-county": "레번워스", "us-kansas-lincoln-county": "링컨", "us-kansas-linn-county": "린", "us-kansas-logan-county": "로건", - "us-kansas-lyon-county": "리옹", + "us-kansas-lyon-county": "라이언", "us-kansas-marion-county": "매리언", "us-kansas-marshall-county": "마셜", "us-kansas-mcpherson-county": "맥퍼슨", @@ -1091,13 +1091,13 @@ "us-kansas-mitchell-county": "미첼", "us-kansas-montgomery-county": "몽고메리", "us-kansas-morris-county": "모리스", - "us-kansas-morton-county": "모튼", + "us-kansas-morton-county": "모턴", "us-kansas-nemaha-county": "네마하", "us-kansas-neosho-county": "네오쇼", "us-kansas-ness-county": "네스", "us-kansas-norton-county": "노턴", - "us-kansas-osage-county": "오사지", - "us-kansas-osborne-county": "오스본", + "us-kansas-osage-county": "오세이지", + "us-kansas-osborne-county": "오즈번", "us-kansas-ottawa-county": "오타와", "us-kansas-pawnee-county": "포니", "us-kansas-phillips-county": "필립스", @@ -1105,10 +1105,10 @@ "us-kansas-pratt-county": "프랫", "us-kansas-rawlins-county": "롤린스", "us-kansas-reno-county": "리노", - "us-kansas-republic-county": "공화국", + "us-kansas-republic-county": "리퍼블릭", "us-kansas-rice-county": "라이스", "us-kansas-riley-county": "라일리", - "us-kansas-rooks-county": "루크스", + "us-kansas-rooks-county": "룩스", "us-kansas-rush-county": "러시", "us-kansas-russell-county": "러셀", "us-kansas-saline-county": "설린", @@ -1116,16 +1116,16 @@ "us-kansas-sedgwick-county": "세지윅", "us-kansas-seward-county": "수어드", "us-kansas-shawnee-county": "쇼니", - "us-kansas-sheridan-county": "셰리던", + "us-kansas-sheridan-county": "셰리든", "us-kansas-sherman-county": "셔먼", "us-kansas-smith-county": "스미스", - "us-kansas-stafford-county": "스태포드", - "us-kansas-stanton-county": "스탠튼", + "us-kansas-stafford-county": "스태퍼드", + "us-kansas-stanton-county": "스탠턴", "us-kansas-stevens-county": "스티븐스", "us-kansas-sumner-county": "섬너", - "us-kansas-thomas-county": "도마", + "us-kansas-thomas-county": "토머스", "us-kansas-trego-county": "트레고", - "us-kansas-wabaunsee-county": "와본시", + "us-kansas-wabaunsee-county": "와바운시", "us-kansas-wallace-county": "월리스", "us-kansas-washington-county": "워싱턴", "us-kansas-wichita-county": "위치토", @@ -1136,18 +1136,18 @@ "us-kentucky-adair-county": "어데어", "us-kentucky-allen-county": "앨런", "us-kentucky-anderson-county": "앤더슨", - "us-kentucky-ballard-county": "발라드", - "us-kentucky-barren-county": "불모의", - "us-kentucky-bath-county": "바스", - "us-kentucky-bell-county": "종", + "us-kentucky-ballard-county": "밸러드", + "us-kentucky-barren-county": "배런", + "us-kentucky-bath-county": "배스", + "us-kentucky-bell-county": "벨", "us-kentucky-boone-county": "분", "us-kentucky-bourbon-county": "버번", "us-kentucky-boyd-county": "보이드", "us-kentucky-boyle-county": "보일", - "us-kentucky-bracken-county": "고사리", - "us-kentucky-breathitt-county": "숨가쁘다", - "us-kentucky-breckinridge-county": "브레킨리지", - "us-kentucky-bullitt-county": "불릿", + "us-kentucky-bracken-county": "브랙큰", + "us-kentucky-breathitt-county": "브리시트", + "us-kentucky-breckinridge-county": "브레킨릿지", + "us-kentucky-bullitt-county": "불리트", "us-kentucky-butler-county": "버틀러", "us-kentucky-caldwell-county": "콜드웰", "us-kentucky-calloway-county": "캘러웨이", @@ -1156,7 +1156,7 @@ "us-kentucky-carroll-county": "캐럴", "us-kentucky-carter-county": "카터", "us-kentucky-casey-county": "케이시", - "us-kentucky-christian-county": "기독교", + "us-kentucky-christian-county": "크리스천", "us-kentucky-clark-county": "클라크", "us-kentucky-clay-county": "클레이", "us-kentucky-clinton-county": "클린턴", @@ -1172,7 +1172,7 @@ "us-kentucky-franklin-county": "프랭클린", "us-kentucky-fulton-county": "풀턴", "us-kentucky-gallatin-county": "갤러틴", - "us-kentucky-garrard-county": "가라드", + "us-kentucky-garrard-county": "개러드", "us-kentucky-grant-county": "그랜트", "us-kentucky-graves-county": "그레이브스", "us-kentucky-grayson-county": "그레이슨", @@ -1180,19 +1180,19 @@ "us-kentucky-greenup-county": "그린업", "us-kentucky-hancock-county": "핸콕", "us-kentucky-hardin-county": "하딘", - "us-kentucky-harlan-county": "할란", + "us-kentucky-harlan-county": "할런", "us-kentucky-harrison-county": "해리슨", "us-kentucky-hart-county": "하트", "us-kentucky-henderson-county": "헨더슨", "us-kentucky-henry-county": "헨리", - "us-kentucky-hickman-county": "힉먼", + "us-kentucky-hickman-county": "히크먼", "us-kentucky-hopkins-county": "홉킨스", "us-kentucky-jackson-county": "잭슨", "us-kentucky-jefferson-county": "제퍼슨", - "us-kentucky-jessamine-county": "자스민", + "us-kentucky-jessamine-county": "제스민", "us-kentucky-johnson-county": "존슨", - "us-kentucky-kenton-county": "켄튼", - "us-kentucky-knott-county": "매듭", + "us-kentucky-kenton-county": "켄턴", + "us-kentucky-knott-county": "노트", "us-kentucky-knox-county": "녹스", "us-kentucky-larue-county": "라루 카운티", "us-kentucky-laurel-county": "로렐", @@ -1204,24 +1204,24 @@ "us-kentucky-lincoln-county": "링컨", "us-kentucky-livingston-county": "리빙스턴", "us-kentucky-logan-county": "로건", - "us-kentucky-lyon-county": "리옹", + "us-kentucky-lyon-county": "라이언", "us-kentucky-madison-county": "매디슨", "us-kentucky-magoffin-county": "마고핀", "us-kentucky-marion-county": "매리언", "us-kentucky-marshall-county": "마셜", "us-kentucky-martin-county": "마틴", "us-kentucky-mason-county": "메이슨", - "us-kentucky-mccracken-county": "맥크라켄", - "us-kentucky-mccreary-county": "맥크리어리", - "us-kentucky-mclean-county": "맥클린", + "us-kentucky-mccracken-county": "매크라켄", + "us-kentucky-mccreary-county": "매크리어리", + "us-kentucky-mclean-county": "매클레인", "us-kentucky-meade-county": "미드", "us-kentucky-menifee-county": "메니피", "us-kentucky-mercer-county": "머서", - "us-kentucky-metcalfe-county": "멧칼프", + "us-kentucky-metcalfe-county": "메트컬프", "us-kentucky-monroe-county": "먼로", "us-kentucky-montgomery-county": "몽고메리", "us-kentucky-morgan-county": "모건", - "us-kentucky-muhlenberg-county": "뮬렌버그", + "us-kentucky-muhlenberg-county": "뮬런버그", "us-kentucky-nelson-county": "넬슨", "us-kentucky-nicholas-county": "니콜라스", "us-kentucky-ohio-county": "오하이오", @@ -1235,7 +1235,7 @@ "us-kentucky-pulaski-county": "풀라스키", "us-kentucky-robertson-county": "로버트슨", "us-kentucky-rockcastle-county": "록캐슬", - "us-kentucky-rowan-county": "마가목", + "us-kentucky-rowan-county": "로완", "us-kentucky-russell-county": "러셀", "us-kentucky-scott-county": "스콧", "us-kentucky-shelby-county": "셸비", @@ -1246,23 +1246,23 @@ "us-kentucky-trigg-county": "트리그", "us-kentucky-trimble-county": "트림블", "us-kentucky-union-county": "유니언", - "us-kentucky-warren-county": "워렌", + "us-kentucky-warren-county": "워런", "us-kentucky-washington-county": "워싱턴", "us-kentucky-wayne-county": "웨인", "us-kentucky-webster-county": "웹스터", "us-kentucky-whitley-county": "휘틀리", "us-kentucky-wolfe-county": "울프", - "us-kentucky-woodford-county": "우드포드", + "us-kentucky-woodford-county": "우드퍼드", "us-louisiana": "루이지애나", "us-louisiana-acadia-county": "아카디아", "us-louisiana-allen-county": "앨런", - "us-louisiana-ascension-county": "승천", - "us-louisiana-assumption-county": "성모 승천", - "us-louisiana-avoyelles-county": "아보엘레스", - "us-louisiana-beauregard-county": "보어가드", + "us-louisiana-ascension-county": "어센션", + "us-louisiana-assumption-county": "어섬션", + "us-louisiana-avoyelles-county": "어보이엘스", + "us-louisiana-beauregard-county": "보러가드", "us-louisiana-bienville-county": "비엔빌", - "us-louisiana-bossier-county": "보시에", - "us-louisiana-caddo-county": "카도", + "us-louisiana-bossier-county": "보저", + "us-louisiana-caddo-county": "캐도", "us-louisiana-calcasieu-county": "칼카슈", "us-louisiana-caldwell-county": "콜드웰", "us-louisiana-cameron-county": "캐머런", @@ -1270,8 +1270,8 @@ "us-louisiana-claiborne-county": "클레이본", "us-louisiana-concordia-county": "콩코디아", "us-louisiana-desoto-county": "데소토", - "us-louisiana-east-baton-rouge-county": "이스트 배턴루지", - "us-louisiana-east-carroll-county": "이스트 캐롤", + "us-louisiana-east-baton-rouge-county": "이스트 배턴 루지", + "us-louisiana-east-carroll-county": "이스트 캐럴", "us-louisiana-east-feliciana-county": "이스트 펠리시아나", "us-louisiana-evangeline-county": "에반젤린", "us-louisiana-franklin-county": "프랭클린", @@ -1281,45 +1281,45 @@ "us-louisiana-jackson-county": "잭슨", "us-louisiana-jefferson-county": "제퍼슨", "us-louisiana-jefferson-davis-county": "제퍼슨 데이비스", - "us-louisiana-la-salle-county": "라 살", + "us-louisiana-la-salle-county": "라살", "us-louisiana-lafayette-county": "라피엣", - "us-louisiana-lafourche-county": "라푸르슈", + "us-louisiana-lafourche-county": "라푸쉐", "us-louisiana-lincoln-county": "링컨", "us-louisiana-livingston-county": "리빙스턴", "us-louisiana-madison-county": "매디슨", "us-louisiana-morehouse-county": "모어하우스", - "us-louisiana-natchitoches-county": "내키토시", + "us-louisiana-natchitoches-county": "내커터시", "us-louisiana-orleans-county": "올리언스", "us-louisiana-ouachita-county": "와치타", - "us-louisiana-plaquemines-county": "플라크 마인", - "us-louisiana-pointe-coupee-county": "포인트 쿠페", - "us-louisiana-rapides-county": "라피데스", + "us-louisiana-plaquemines-county": "플래크마인즈", + "us-louisiana-pointe-coupee-county": "포인트 쿠피", + "us-louisiana-rapides-county": "래피즈", "us-louisiana-red-river-county": "레드 리버", - "us-louisiana-richland-county": "리치랜드", + "us-louisiana-richland-county": "리칠랜드", "us-louisiana-sabine-county": "사빈", - "us-louisiana-st-bernard-county": "세인트 버나드", + "us-louisiana-st-bernard-county": "세인트버나드", "us-louisiana-st-charles-county": "세인트 찰스", "us-louisiana-st-helena-county": "세인트 헬레나", "us-louisiana-st-james-county": "세인트 제임스", - "us-louisiana-st-john-the-baptist-county": "세례자 요한", + "us-louisiana-st-john-the-baptist-county": "세인트 존 더 밥티스트", "us-louisiana-st-landry-county": "세인트 랜드리", "us-louisiana-st-martin-county": "세인트 마틴", "us-louisiana-st-mary-county": "세인트 메리", - "us-louisiana-st-tammany-county": "세인트 태마니", - "us-louisiana-tangipahoa-county": "탕지파호아", - "us-louisiana-tensas-county": "텐사스", - "us-louisiana-terrebonne-county": "떼르본", + "us-louisiana-st-tammany-county": "세인트 태머니", + "us-louisiana-tangipahoa-county": "탕기파호아", + "us-louisiana-tensas-county": "텐자스", + "us-louisiana-terrebonne-county": "테레본", "us-louisiana-union-county": "유니언", - "us-louisiana-vermilion-county": "주홍", - "us-louisiana-vernon-county": "버논", + "us-louisiana-vermilion-county": "버밀리언", + "us-louisiana-vernon-county": "버넌", "us-louisiana-washington-county": "워싱턴", "us-louisiana-webster-county": "웹스터", - "us-louisiana-west-baton-rouge-county": "웨스트 배턴루지", - "us-louisiana-west-carroll-county": "웨스트 캐롤", + "us-louisiana-west-baton-rouge-county": "웨스트 배턴 루지", + "us-louisiana-west-carroll-county": "웨스트 캐럴", "us-louisiana-west-feliciana-county": "웨스트 펠리시아나", "us-louisiana-winn-county": "윈", "us-maine": "메인", - "us-maine-androscoggin-county": "안드로스코긴", + "us-maine-androscoggin-county": "앤드로스코긴", "us-maine-aroostook-county": "아루스투크", "us-maine-cumberland-county": "컴벌랜드", "us-maine-franklin-county": "프랭클린", @@ -1327,59 +1327,59 @@ "us-maine-kennebec-county": "케네벡", "us-maine-knox-county": "녹스", "us-maine-lincoln-county": "링컨", - "us-maine-oxford-county": "옥스포드", + "us-maine-oxford-county": "옥스퍼드", "us-maine-penobscot-county": "페놉스콧", - "us-maine-piscataquis-county": "피스카타키스", + "us-maine-piscataquis-county": "피스카타퀴스", "us-maine-sagadahoc-county": "사가다호크", "us-maine-somerset-county": "서머싯", "us-maine-waldo-county": "왈도", "us-maine-washington-county": "워싱턴", "us-maine-york-county": "요크", "us-maryland": "메릴랜드", - "us-maryland-allegany-county": "알레가니", - "us-maryland-anne-arundel-county": "앤 아룬델", + "us-maryland-allegany-county": "앨러게이니", + "us-maryland-anne-arundel-county": "앤 어런델", "us-maryland-baltimore-city": "볼티모어", "us-maryland-baltimore-county": "볼티모어", - "us-maryland-calvert-county": "칼버트", - "us-maryland-caroline-county": "캐롤라인", + "us-maryland-calvert-county": "캘버트", + "us-maryland-caroline-county": "캐럴라인", "us-maryland-carroll-county": "캐럴", "us-maryland-cecil-county": "세실", "us-maryland-charles-county": "찰스", "us-maryland-dorchester-county": "도체스터", "us-maryland-frederick-county": "프레더릭", "us-maryland-garrett-county": "개릿", - "us-maryland-harford-county": "하포드", + "us-maryland-harford-county": "하퍼드", "us-maryland-howard-county": "하워드", "us-maryland-kent-county": "켄트", "us-maryland-montgomery-county": "몽고메리", - "us-maryland-prince-georges-county": "프린스 조지", - "us-maryland-queen-annes-county": "퀸 앤", + "us-maryland-prince-georges-county": "프린스 조지스", + "us-maryland-queen-annes-county": "퀸 앤스", "us-maryland-somerset-county": "서머싯", "us-maryland-st-marys-county": "세인트 메리스", "us-maryland-talbot-county": "탤벗", "us-maryland-washington-county": "워싱턴", "us-maryland-wicomico-county": "위코미코", "us-maryland-worcester-county": "우스터", - "us-massachusetts": "매사추세츠주", + "us-massachusetts": "매사추세츠", "us-massachusetts-barnstable-county": "반스터블", "us-massachusetts-berkshire-county": "버크셔", - "us-massachusetts-bristol-county": "브리스톨", + "us-massachusetts-bristol-county": "브리스틀", "us-massachusetts-dukes-county": "듀크스", "us-massachusetts-essex-county": "에식스", "us-massachusetts-franklin-county": "프랭클린", - "us-massachusetts-hampden-county": "햄든", + "us-massachusetts-hampden-county": "햄던", "us-massachusetts-hampshire-county": "햄프셔", "us-massachusetts-middlesex-county": "미들섹스", - "us-massachusetts-nantucket-county": "난터켓", + "us-massachusetts-nantucket-county": "낸터킷", "us-massachusetts-norfolk-county": "노퍽", "us-massachusetts-plymouth-county": "플리머스", "us-massachusetts-suffolk-county": "서퍽", "us-massachusetts-worcester-county": "우스터", "us-michigan": "미시간", - "us-michigan-alcona-county": "알코나", - "us-michigan-alger-county": "알제", - "us-michigan-allegan-county": "앨러건", - "us-michigan-alpena-county": "앨피나", + "us-michigan-alcona-county": "앨코나", + "us-michigan-alger-county": "앨저", + "us-michigan-allegan-county": "앨러간", + "us-michigan-alpena-county": "앨피너", "us-michigan-antrim-county": "앤트림", "us-michigan-arenac-county": "아레낙", "us-michigan-baraga-county": "바라가", @@ -1387,19 +1387,19 @@ "us-michigan-bay-county": "베이", "us-michigan-benzie-county": "벤지", "us-michigan-berrien-county": "베리엔", - "us-michigan-branch-county": "분기", + "us-michigan-branch-county": "브랜치", "us-michigan-calhoun-county": "칼훈", "us-michigan-cass-county": "캐스", "us-michigan-charlevoix-county": "샤를부아", - "us-michigan-cheboygan-county": "체보이건", + "us-michigan-cheboygan-county": "쉬보이간", "us-michigan-chippewa-county": "치페와", "us-michigan-clare-county": "클레어", "us-michigan-clinton-county": "클린턴", "us-michigan-crawford-county": "크로퍼드", "us-michigan-delta-county": "델타", "us-michigan-dickinson-county": "디킨슨", - "us-michigan-eaton-county": "이튼", - "us-michigan-emmet-county": "개미", + "us-michigan-eaton-county": "이턴", + "us-michigan-emmet-county": "에밋", "us-michigan-genesee-county": "제네시", "us-michigan-gladwin-county": "글래드윈", "us-michigan-gogebic-county": "고게빅", @@ -1453,7 +1453,7 @@ "us-michigan-schoolcraft-county": "스쿨크래프트", "us-michigan-shiawassee-county": "시아와시", "us-michigan-st-clair-county": "세인트 클레어", - "us-michigan-st-joseph-county": "세인트 조셉", + "us-michigan-st-joseph-county": "세인트조지프", "us-michigan-tuscola-county": "투스콜라", "us-michigan-van-buren-county": "밴 뷰렌", "us-michigan-washtenaw-county": "워시테나우", @@ -1475,11 +1475,11 @@ "us-minnesota-chisago-county": "시카고", "us-minnesota-clay-county": "클레이", "us-minnesota-clearwater-county": "클리어워터", - "us-minnesota-cook-county": "요리사", + "us-minnesota-cook-county": "쿡", "us-minnesota-cottonwood-county": "코튼우드", "us-minnesota-crow-wing-county": "크로우 윙", "us-minnesota-dakota-county": "다코타", - "us-minnesota-dodge-county": "닷지", + "us-minnesota-dodge-county": "도지", "us-minnesota-douglas-county": "더글러스", "us-minnesota-faribault-county": "파리볼트", "us-minnesota-fillmore-county": "필모어", @@ -1501,7 +1501,7 @@ "us-minnesota-lake-of-the-woods-county": "레이크 오브 더 우즈", "us-minnesota-le-sueur-county": "르 쉬에르", "us-minnesota-lincoln-county": "링컨", - "us-minnesota-lyon-county": "리옹", + "us-minnesota-lyon-county": "라이언", "us-minnesota-mahnomen-county": "마노멘", "us-minnesota-marshall-county": "마셜", "us-minnesota-martin-county": "마틴", @@ -1573,12 +1573,12 @@ "us-mississippi-hancock-county": "핸콕", "us-mississippi-harrison-county": "해리슨", "us-mississippi-hinds-county": "하인즈", - "us-mississippi-holmes-county": "홈즈", + "us-mississippi-holmes-county": "홈스", "us-mississippi-humphreys-county": "험프리스", "us-mississippi-issaquena-county": "이사케나", "us-mississippi-itawamba-county": "이타완바", "us-mississippi-jackson-county": "잭슨", - "us-mississippi-jasper-county": "벽옥", + "us-mississippi-jasper-county": "재스퍼", "us-mississippi-jefferson-county": "제퍼슨", "us-mississippi-jefferson-davis-county": "제퍼슨 데이비스", "us-mississippi-jones-county": "존스", @@ -1607,7 +1607,7 @@ "us-mississippi-pike-county": "파이크", "us-mississippi-pontotoc-county": "폰토톡", "us-mississippi-prentiss-county": "프렌티스", - "us-mississippi-quitman-county": "퀴트먼", + "us-mississippi-quitman-county": "키트먼", "us-mississippi-rankin-county": "랭킨", "us-mississippi-scott-county": "스콧", "us-mississippi-sharkey-county": "샤키", @@ -1622,7 +1622,7 @@ "us-mississippi-tunica-county": "튜니카", "us-mississippi-union-county": "유니언", "us-mississippi-walthall-county": "월트홀", - "us-mississippi-warren-county": "워렌", + "us-mississippi-warren-county": "워런", "us-mississippi-washington-county": "워싱턴", "us-mississippi-wayne-county": "웨인", "us-mississippi-webster-county": "웹스터", @@ -1636,7 +1636,7 @@ "us-missouri-atchison-county": "애치슨", "us-missouri-audrain-county": "오드레인", "us-missouri-barry-county": "배리", - "us-missouri-barton-county": "바튼", + "us-missouri-barton-county": "바턴", "us-missouri-bates-county": "베이츠", "us-missouri-benton-county": "벤튼", "us-missouri-bollinger-county": "볼린저", @@ -1645,14 +1645,14 @@ "us-missouri-butler-county": "버틀러", "us-missouri-caldwell-county": "콜드웰", "us-missouri-callaway-county": "캘러웨이", - "us-missouri-camden-county": "캠든", + "us-missouri-camden-county": "캠던", "us-missouri-cape-girardeau-county": "케이프지라도", "us-missouri-carroll-county": "캐럴", "us-missouri-carter-county": "카터", "us-missouri-cass-county": "캐스", - "us-missouri-cedar-county": "삼나무", + "us-missouri-cedar-county": "시더", "us-missouri-chariton-county": "채리턴", - "us-missouri-christian-county": "기독교", + "us-missouri-christian-county": "크리스천", "us-missouri-clark-county": "클라크", "us-missouri-clay-county": "클레이", "us-missouri-clinton-county": "클린턴", @@ -1679,7 +1679,7 @@ "us-missouri-howell-county": "하웰", "us-missouri-iron-county": "다리미", "us-missouri-jackson-county": "잭슨", - "us-missouri-jasper-county": "벽옥", + "us-missouri-jasper-county": "재스퍼", "us-missouri-jefferson-county": "제퍼슨", "us-missouri-johnson-county": "존슨", "us-missouri-knox-county": "녹스", @@ -1706,7 +1706,7 @@ "us-missouri-newton-county": "뉴턴", "us-missouri-nodaway-county": "Nodaway", "us-missouri-oregon-county": "오리건", - "us-missouri-osage-county": "오사지", + "us-missouri-osage-county": "오세이지", "us-missouri-ozark-county": "오자크", "us-missouri-pemiscot-county": "페미스콧", "us-missouri-perry-county": "페리", @@ -1723,7 +1723,7 @@ "us-missouri-reynolds-county": "레이놀즈", "us-missouri-ripley-county": "리플리", "us-missouri-saline-county": "설린", - "us-missouri-schuyler-county": "슐러", + "us-missouri-schuyler-county": "스카일러", "us-missouri-scotland-county": "스코틀랜드", "us-missouri-scott-county": "스콧", "us-missouri-shannon-county": "섀넌", @@ -1739,12 +1739,12 @@ "us-missouri-sullivan-county": "설리번", "us-missouri-taney-county": "태니", "us-missouri-texas-county": "텍사스", - "us-missouri-vernon-county": "버논", - "us-missouri-warren-county": "워렌", + "us-missouri-vernon-county": "버넌", + "us-missouri-warren-county": "워런", "us-missouri-washington-county": "워싱턴", "us-missouri-wayne-county": "웨인", "us-missouri-webster-county": "웹스터", - "us-missouri-worth-county": "가치", + "us-missouri-worth-county": "워스", "us-missouri-wright-county": "라이트", "us-montana": "몬태나", "us-montana-beaverhead-county": "비버헤드", @@ -1788,15 +1788,15 @@ "us-montana-powell-county": "파월", "us-montana-prairie-county": "프레리", "us-montana-ravalli-county": "라발리", - "us-montana-richland-county": "리치랜드", + "us-montana-richland-county": "리칠랜드", "us-montana-roosevelt-county": "루스벨트", "us-montana-rosebud-county": "로즈버드", "us-montana-sanders-county": "샌더스", - "us-montana-sheridan-county": "셰리던", + "us-montana-sheridan-county": "셰리든", "us-montana-silver-bow-county": "실버 보우", "us-montana-stillwater-county": "스틸워터", "us-montana-sweet-grass-county": "스위트 그래스", - "us-montana-teton-county": "테톤", + "us-montana-teton-county": "티턴", "us-montana-toole-county": "툴레", "us-montana-treasure-county": "보물", "us-montana-valley-county": "밸리", @@ -1817,7 +1817,7 @@ "us-nebraska-burt-county": "버트", "us-nebraska-butler-county": "버틀러", "us-nebraska-cass-county": "캐스", - "us-nebraska-cedar-county": "삼나무", + "us-nebraska-cedar-county": "시더", "us-nebraska-chase-county": "체이스", "us-nebraska-cherry-county": "체리", "us-nebraska-cheyenne-county": "샤이엔", @@ -1830,7 +1830,7 @@ "us-nebraska-dawson-county": "도슨", "us-nebraska-deuel-county": "듀엘", "us-nebraska-dixon-county": "딕슨", - "us-nebraska-dodge-county": "닷지", + "us-nebraska-dodge-county": "도지", "us-nebraska-douglas-county": "더글러스", "us-nebraska-dundy-county": "던디", "us-nebraska-fillmore-county": "필모어", @@ -1845,7 +1845,7 @@ "us-nebraska-greeley-county": "그릴리", "us-nebraska-hall-county": "홀", "us-nebraska-hamilton-county": "해밀턴", - "us-nebraska-harlan-county": "할란", + "us-nebraska-harlan-county": "할런", "us-nebraska-hayes-county": "헤이스", "us-nebraska-hitchcock-county": "히치콕", "us-nebraska-holt-county": "잡목 숲", @@ -1873,7 +1873,7 @@ "us-nebraska-pawnee-county": "포니", "us-nebraska-perkins-county": "퍼킨스", "us-nebraska-phelps-county": "펠프스", - "us-nebraska-pierce-county": "내뚫다", + "us-nebraska-pierce-county": "피어스", "us-nebraska-platte-county": "플래트", "us-nebraska-polk-county": "포크", "us-nebraska-red-willow-county": "레드 윌로우", @@ -1884,12 +1884,12 @@ "us-nebraska-saunders-county": "손더스", "us-nebraska-scotts-bluff-county": "스코츠 블러프", "us-nebraska-seward-county": "수어드", - "us-nebraska-sheridan-county": "셰리던", + "us-nebraska-sheridan-county": "셰리든", "us-nebraska-sherman-county": "셔먼", "us-nebraska-sioux-county": "수", - "us-nebraska-stanton-county": "스탠튼", + "us-nebraska-stanton-county": "스탠턴", "us-nebraska-thayer-county": "테이어", - "us-nebraska-thomas-county": "도마", + "us-nebraska-thomas-county": "토머스", "us-nebraska-thurston-county": "서스턴", "us-nebraska-valley-county": "밸리", "us-nebraska-washington-county": "워싱턴", @@ -1908,7 +1908,7 @@ "us-nevada-humboldt-county": "훔볼트", "us-nevada-lander-county": "착륙선", "us-nevada-lincoln-county": "링컨", - "us-nevada-lyon-county": "리옹", + "us-nevada-lyon-county": "라이언", "us-nevada-mineral-county": "미네랄", "us-nevada-nye-county": "나이", "us-nevada-pershing-county": "퍼싱", @@ -1930,7 +1930,7 @@ "us-new-jersey-atlantic-county": "대서양", "us-new-jersey-bergen-county": "베르겐", "us-new-jersey-burlington-county": "벌링턴", - "us-new-jersey-camden-county": "캠든", + "us-new-jersey-camden-county": "캠던", "us-new-jersey-cape-may-county": "케이프 메이", "us-new-jersey-cumberland-county": "컴벌랜드", "us-new-jersey-essex-county": "에식스", @@ -1947,7 +1947,7 @@ "us-new-jersey-somerset-county": "서머싯", "us-new-jersey-sussex-county": "서식스", "us-new-jersey-union-county": "유니언", - "us-new-jersey-warren-county": "워렌", + "us-new-jersey-warren-county": "워런", "us-new-mexico": "뉴멕시코", "us-new-mexico-bernalillo-county": "베르날릴로", "us-new-mexico-catron-county": "캐트론", @@ -1984,12 +1984,12 @@ "us-new-mexico-valencia-county": "발렌시아", "us-new-york": "뉴욕", "us-new-york-albany-county": "올버니", - "us-new-york-allegany-county": "알레가니", + "us-new-york-allegany-county": "앨러게이니", "us-new-york-bronx-county": "브롱크스", "us-new-york-broome-county": "브룸", "us-new-york-cattaraugus-county": "카타라우구스", "us-new-york-cayuga-county": "카유가", - "us-new-york-chautauqua-county": "쇼토쿠아", + "us-new-york-chautauqua-county": "셔토쿼", "us-new-york-chemung-county": "체", "us-new-york-chenango-county": "체낭고", "us-new-york-clinton-county": "클린턴", @@ -2015,7 +2015,7 @@ "us-new-york-nassau-county": "나소", "us-new-york-new-york-county": "뉴욕", "us-new-york-niagara-county": "나이아가라", - "us-new-york-oneida-county": "오네이다", + "us-new-york-oneida-county": "오나이다", "us-new-york-onondaga-county": "오논다가", "us-new-york-ontario-county": "온타리오", "us-new-york-orange-county": "주황색", @@ -2025,21 +2025,21 @@ "us-new-york-putnam-county": "퍼트넘", "us-new-york-queens-county": "퀸즈", "us-new-york-rensselaer-county": "렌셀러", - "us-new-york-richmond-county": "리치몬드", + "us-new-york-richmond-county": "리치먼드", "us-new-york-rockland-county": "록랜드", "us-new-york-saratoga-county": "큰 여행 트렁크", "us-new-york-schenectady-county": "스케넥터디", "us-new-york-schoharie-county": "쇼하리", - "us-new-york-schuyler-county": "슐러", + "us-new-york-schuyler-county": "스카일러", "us-new-york-seneca-county": "세네카", "us-new-york-st-lawrence-county": "세인트 로렌스", - "us-new-york-steuben-county": "스튜벤", + "us-new-york-steuben-county": "슈토이벤", "us-new-york-suffolk-county": "서퍽", "us-new-york-sullivan-county": "설리번", "us-new-york-tioga-county": "티오가", "us-new-york-tompkins-county": "톰킨스", "us-new-york-ulster-county": "얼스터", - "us-new-york-warren-county": "워렌", + "us-new-york-warren-county": "워런", "us-new-york-washington-county": "워싱턴", "us-new-york-wayne-county": "웨인", "us-new-york-westchester-county": "웨스트체스터", @@ -2060,7 +2060,7 @@ "us-north-carolina-burke-county": "버크", "us-north-carolina-cabarrus-county": "카바루스", "us-north-carolina-caldwell-county": "콜드웰", - "us-north-carolina-camden-county": "캠든", + "us-north-carolina-camden-county": "캠던", "us-north-carolina-carteret-county": "카터렛", "us-north-carolina-caswell-county": "캐스웰", "us-north-carolina-catawba-county": "카토바", @@ -2122,10 +2122,10 @@ "us-north-carolina-pitt-county": "피트", "us-north-carolina-polk-county": "포크", "us-north-carolina-randolph-county": "랜돌프", - "us-north-carolina-richmond-county": "리치몬드", + "us-north-carolina-richmond-county": "리치먼드", "us-north-carolina-robeson-county": "로브슨", "us-north-carolina-rockingham-county": "로킹엄", - "us-north-carolina-rowan-county": "마가목", + "us-north-carolina-rowan-county": "로완", "us-north-carolina-rutherford-county": "러더퍼드", "us-north-carolina-sampson-county": "샘슨", "us-north-carolina-scotland-county": "스코틀랜드", @@ -2138,7 +2138,7 @@ "us-north-carolina-union-county": "유니언", "us-north-carolina-vance-county": "밴스", "us-north-carolina-wake-county": "웨이크", - "us-north-carolina-warren-county": "워렌", + "us-north-carolina-warren-county": "워런", "us-north-carolina-washington-county": "워싱턴", "us-north-carolina-watauga-county": "와타우가", "us-north-carolina-wayne-county": "웨인", @@ -2174,21 +2174,21 @@ "us-north-dakota-mchenry-county": "맥헨리", "us-north-dakota-mcintosh-county": "매킨토시", "us-north-dakota-mckenzie-county": "맥켄지", - "us-north-dakota-mclean-county": "맥클린", + "us-north-dakota-mclean-county": "매클레인", "us-north-dakota-mercer-county": "머서", - "us-north-dakota-morton-county": "모튼", + "us-north-dakota-morton-county": "모턴", "us-north-dakota-mountrail-county": "마운틴 레일", "us-north-dakota-nelson-county": "넬슨", "us-north-dakota-oliver-county": "올리버", "us-north-dakota-pembina-county": "펨비나", - "us-north-dakota-pierce-county": "내뚫다", + "us-north-dakota-pierce-county": "피어스", "us-north-dakota-ramsey-county": "램지", "us-north-dakota-ransom-county": "몸값", "us-north-dakota-renville-county": "렌빌", - "us-north-dakota-richland-county": "리치랜드", + "us-north-dakota-richland-county": "리칠랜드", "us-north-dakota-rolette-county": "롤레트", "us-north-dakota-sargent-county": "사전트", - "us-north-dakota-sheridan-county": "셰리던", + "us-north-dakota-sheridan-county": "셰리든", "us-north-dakota-sioux-county": "수", "us-north-dakota-slope-county": "슬로프", "us-north-dakota-stark-county": "스타크", @@ -2211,7 +2211,7 @@ "us-ohio-brown-county": "브라운", "us-ohio-butler-county": "버틀러", "us-ohio-carroll-county": "캐럴", - "us-ohio-champaign-county": "평야", + "us-ohio-champaign-county": "섐페인", "us-ohio-clark-county": "클라크", "us-ohio-clermont-county": "클레르몽", "us-ohio-clinton-county": "클린턴", @@ -2238,7 +2238,7 @@ "us-ohio-henry-county": "헨리", "us-ohio-highland-county": "하일랜드", "us-ohio-hocking-county": "호킹", - "us-ohio-holmes-county": "홈즈", + "us-ohio-holmes-county": "홈스", "us-ohio-huron-county": "휴런", "us-ohio-jackson-county": "잭슨", "us-ohio-jefferson-county": "제퍼슨", @@ -2270,7 +2270,7 @@ "us-ohio-portage-county": "운반", "us-ohio-preble-county": "프레블", "us-ohio-putnam-county": "퍼트넘", - "us-ohio-richland-county": "리치랜드", + "us-ohio-richland-county": "리칠랜드", "us-ohio-ross-county": "로스", "us-ohio-sandusky-county": "샌더스키", "us-ohio-scioto-county": "스키오토", @@ -2283,7 +2283,7 @@ "us-ohio-union-county": "유니언", "us-ohio-van-wert-county": "반 베르트", "us-ohio-vinton-county": "빈튼", - "us-ohio-warren-county": "워렌", + "us-ohio-warren-county": "워런", "us-ohio-washington-county": "워싱턴", "us-ohio-wayne-county": "웨인", "us-ohio-williams-county": "윌리엄스", @@ -2297,7 +2297,7 @@ "us-oklahoma-beckham-county": "베컴", "us-oklahoma-blaine-county": "블레인", "us-oklahoma-bryan-county": "브라이언", - "us-oklahoma-caddo-county": "카도", + "us-oklahoma-caddo-county": "캐도", "us-oklahoma-canadian-county": "캐나다", "us-oklahoma-carter-county": "카터", "us-oklahoma-cherokee-county": "체로키", @@ -2320,7 +2320,7 @@ "us-oklahoma-greer-county": "그리어", "us-oklahoma-harmon-county": "하먼", "us-oklahoma-harper-county": "하퍼", - "us-oklahoma-haskell-county": "하스켈", + "us-oklahoma-haskell-county": "해스켈", "us-oklahoma-hughes-county": "휴즈", "us-oklahoma-jackson-county": "잭슨", "us-oklahoma-jefferson-county": "제퍼슨", @@ -2346,7 +2346,7 @@ "us-oklahoma-okfuskee-county": "옥푸스키", "us-oklahoma-oklahoma-county": "오클라호마", "us-oklahoma-okmulgee-county": "옥멀지", - "us-oklahoma-osage-county": "오사지", + "us-oklahoma-osage-county": "오세이지", "us-oklahoma-ottawa-county": "오타와", "us-oklahoma-pawnee-county": "포니", "us-oklahoma-payne-county": "페인", @@ -2466,14 +2466,14 @@ "us-pennsylvania-tioga-county": "티오가", "us-pennsylvania-union-county": "유니언", "us-pennsylvania-venango-county": "베낭고", - "us-pennsylvania-warren-county": "워렌", + "us-pennsylvania-warren-county": "워런", "us-pennsylvania-washington-county": "워싱턴", "us-pennsylvania-wayne-county": "웨인", "us-pennsylvania-westmoreland-county": "웨스트모어랜드", "us-pennsylvania-wyoming-county": "와이오밍", "us-pennsylvania-york-county": "요크", "us-rhode-island": "로드아일랜드", - "us-rhode-island-bristol-county": "브리스톨", + "us-rhode-island-bristol-county": "브리스틀", "us-rhode-island-kent-county": "켄트", "us-rhode-island-newport-county": "뉴포트", "us-rhode-island-providence-county": "섭리", @@ -2505,7 +2505,7 @@ "us-south-carolina-greenwood-county": "그린우드", "us-south-carolina-hampton-county": "햄튼", "us-south-carolina-horry-county": "호리", - "us-south-carolina-jasper-county": "벽옥", + "us-south-carolina-jasper-county": "재스퍼", "us-south-carolina-kershaw-county": "커쇼", "us-south-carolina-lancaster-county": "랭커스터", "us-south-carolina-laurens-county": "로렌스", @@ -2518,7 +2518,7 @@ "us-south-carolina-oconee-county": "오코니", "us-south-carolina-orangeburg-county": "오렌지버그", "us-south-carolina-pickens-county": "피켄스", - "us-south-carolina-richland-county": "리치랜드", + "us-south-carolina-richland-county": "리칠랜드", "us-south-carolina-saluda-county": "살루다", "us-south-carolina-spartanburg-county": "스파턴버그", "us-south-carolina-sumter-county": "섬터", @@ -2633,7 +2633,7 @@ "us-tennessee-haywood-county": "헤이우드", "us-tennessee-henderson-county": "헨더슨", "us-tennessee-henry-county": "헨리", - "us-tennessee-hickman-county": "힉먼", + "us-tennessee-hickman-county": "히크먼", "us-tennessee-houston-county": "휴스턴", "us-tennessee-humphreys-county": "험프리스", "us-tennessee-jackson-county": "잭슨", @@ -2681,7 +2681,7 @@ "us-tennessee-unicoi-county": "유니코이", "us-tennessee-union-county": "유니언", "us-tennessee-van-buren-county": "밴 뷰렌", - "us-tennessee-warren-county": "워렌", + "us-tennessee-warren-county": "워런", "us-tennessee-washington-county": "워싱턴", "us-tennessee-wayne-county": "웨인", "us-tennessee-weakley-county": "위클리", @@ -2702,7 +2702,7 @@ "us-texas-bastrop-county": "배스트럽", "us-texas-baylor-county": "베일러", "us-texas-bee-county": "꿀벌", - "us-texas-bell-county": "종", + "us-texas-bell-county": "벨", "us-texas-bexar-county": "벡사", "us-texas-blanco-county": "백색 도료", "us-texas-borden-county": "보든", @@ -2792,7 +2792,7 @@ "us-texas-harris-county": "해리스", "us-texas-harrison-county": "해리슨", "us-texas-hartley-county": "하틀리", - "us-texas-haskell-county": "하스켈", + "us-texas-haskell-county": "해스켈", "us-texas-hays-county": "헤이스", "us-texas-hemphill-county": "헴힐", "us-texas-henderson-county": "헨더슨", @@ -2809,8 +2809,8 @@ "us-texas-irion-county": "이리온", "us-texas-jack-county": "잭", "us-texas-jackson-county": "잭슨", - "us-texas-jasper-county": "벽옥", - "us-texas-jeff-davis-county": "제프 데이비스", + "us-texas-jasper-county": "재스퍼", + "us-texas-jeff-davis-county": "제프데이비스", "us-texas-jefferson-county": "제퍼슨", "us-texas-jim-hogg-county": "짐 호그", "us-texas-jim-wells-county": "짐 웰스", @@ -2827,7 +2827,7 @@ "us-texas-kinney-county": "키니", "us-texas-kleberg-county": "클레베르그", "us-texas-knox-county": "녹스", - "us-texas-la-salle-county": "라 살", + "us-texas-la-salle-county": "라살", "us-texas-lamar-county": "라마", "us-texas-lamb-county": "양고기", "us-texas-lampasas-county": "람파사스", @@ -2852,7 +2852,7 @@ "us-texas-mclennan-county": "맥레넌", "us-texas-mcmullen-county": "맥멀렌", "us-texas-medina-county": "메디나", - "us-texas-menard-county": "메나드", + "us-texas-menard-county": "머나드", "us-texas-midland-county": "중부 방언", "us-texas-milam-county": "밀람", "us-texas-mills-county": "밀스", @@ -2910,7 +2910,7 @@ "us-texas-swisher-county": "휘두르는", "us-texas-tarrant-county": "타란트", "us-texas-taylor-county": "테일러", - "us-texas-terrell-county": "테렐", + "us-texas-terrell-county": "테럴", "us-texas-terry-county": "테리", "us-texas-throckmorton-county": "스록모튼", "us-texas-titus-county": "티투스", @@ -2998,18 +2998,18 @@ "us-virginia-appomattox-county": "아포매톡스", "us-virginia-arlington-county": "알링턴", "us-virginia-augusta-county": "오거스타", - "us-virginia-bath-county": "바스", + "us-virginia-bath-county": "배스", "us-virginia-bedford-city": "베드퍼드", "us-virginia-bedford-county": "베드퍼드", "us-virginia-bland-county": "블랜드", "us-virginia-botetourt-county": "보테투르트", - "us-virginia-bristol-city": "브리스톨", + "us-virginia-bristol-city": "브리스틀", "us-virginia-brunswick-county": "브런즈윅", "us-virginia-buchanan-county": "뷰캐넌", "us-virginia-buckingham-county": "버킹엄", "us-virginia-buena-vista-city": "부에나 비스타", "us-virginia-campbell-county": "캠벨", - "us-virginia-caroline-county": "캐롤라인", + "us-virginia-caroline-county": "캐럴라인", "us-virginia-carroll-county": "캐럴", "us-virginia-charles-city-county": "찰스 시티", "us-virginia-charlotte-county": "샬럿", @@ -3094,8 +3094,8 @@ "us-virginia-pulaski-county": "풀라스키", "us-virginia-radford-city": "래드포드", "us-virginia-rappahannock-county": "라파해녹", - "us-virginia-richmond-city": "리치몬드", - "us-virginia-richmond-county": "리치몬드", + "us-virginia-richmond-city": "리치먼드", + "us-virginia-richmond-county": "리치먼드", "us-virginia-roanoke-city": "로어노크", "us-virginia-roanoke-county": "로어노크", "us-virginia-rockbridge-county": "록브리지", @@ -3107,14 +3107,14 @@ "us-virginia-smyth-county": "스미스", "us-virginia-southampton-county": "사우샘프턴", "us-virginia-spotsylvania-county": "스팟실바니아", - "us-virginia-stafford-county": "스태포드", + "us-virginia-stafford-county": "스태퍼드", "us-virginia-staunton-city": "스톤턴", "us-virginia-suffolk-city": "서퍽", "us-virginia-surry-county": "서리", "us-virginia-sussex-county": "서식스", "us-virginia-tazewell-county": "테이즈웰", "us-virginia-virginia-beach-city": "버지니아비치", - "us-virginia-warren-county": "워렌", + "us-virginia-warren-county": "워런", "us-virginia-washington-county": "워싱턴", "us-virginia-waynesboro-city": "웨인즈버러", "us-virginia-westmoreland-county": "웨스트모어랜드", @@ -3150,7 +3150,7 @@ "us-washington-okanogan-county": "오카노간", "us-washington-pacific-county": "태평양", "us-washington-pend-oreille-county": "펜드 오레이유", - "us-washington-pierce-county": "내뚫다", + "us-washington-pierce-county": "피어스", "us-washington-san-juan-county": "산후안", "us-washington-skagit-county": "스카짓", "us-washington-skamania-county": "스카마니아", @@ -3233,7 +3233,7 @@ "us-wisconsin-columbia-county": "컬럼비아", "us-wisconsin-crawford-county": "크로퍼드", "us-wisconsin-dane-county": "덴마크 사람", - "us-wisconsin-dodge-county": "닷지", + "us-wisconsin-dodge-county": "도지", "us-wisconsin-door-county": "도어", "us-wisconsin-douglas-county": "더글러스", "us-wisconsin-dunn-county": "던", @@ -3263,16 +3263,16 @@ "us-wisconsin-milwaukee-county": "밀워키", "us-wisconsin-monroe-county": "먼로", "us-wisconsin-oconto-county": "오콘토", - "us-wisconsin-oneida-county": "오네이다", + "us-wisconsin-oneida-county": "오나이다", "us-wisconsin-outagamie-county": "우타가미", "us-wisconsin-ozaukee-county": "오자키", "us-wisconsin-pepin-county": "페핀", - "us-wisconsin-pierce-county": "내뚫다", + "us-wisconsin-pierce-county": "피어스", "us-wisconsin-polk-county": "포크", "us-wisconsin-portage-county": "운반", "us-wisconsin-price-county": "가격", "us-wisconsin-racine-county": "라신", - "us-wisconsin-richland-county": "리치랜드", + "us-wisconsin-richland-county": "리칠랜드", "us-wisconsin-rock-county": "락", "us-wisconsin-rusk-county": "러스크", "us-wisconsin-sauk-county": "사우크", @@ -3282,7 +3282,7 @@ "us-wisconsin-st-croix-county": "세인트 크로이", "us-wisconsin-taylor-county": "테일러", "us-wisconsin-trempealeau-county": "트렘펠로", - "us-wisconsin-vernon-county": "버논", + "us-wisconsin-vernon-county": "버넌", "us-wisconsin-vilas-county": "빌라스", "us-wisconsin-walworth-county": "월워스", "us-wisconsin-washburn-county": "워시번", @@ -3290,7 +3290,7 @@ "us-wisconsin-waukesha-county": "워키샤", "us-wisconsin-waupaca-county": "와우파카", "us-wisconsin-waushara-county": "와우샤라", - "us-wisconsin-winnebago-county": "위네바고", + "us-wisconsin-winnebago-county": "위너베이고", "us-wisconsin-wood-county": "목재", "us-wyoming": "와이오밍", "us-wyoming-albany-county": "올버니", @@ -3309,10 +3309,10 @@ "us-wyoming-niobrara-county": "니오브라라", "us-wyoming-park-county": "파크", "us-wyoming-platte-county": "플래트", - "us-wyoming-sheridan-county": "셰리던", + "us-wyoming-sheridan-county": "셰리든", "us-wyoming-sublette-county": "서브레트", "us-wyoming-sweetwater-county": "스위트워터", - "us-wyoming-teton-county": "테톤", + "us-wyoming-teton-county": "티턴", "us-wyoming-uinta-county": "유인타", "us-wyoming-washakie-county": "와샤키", "us-wyoming-weston-county": "웨스턴", diff --git a/apps/app/public/locales/ko/user.json b/apps/app/public/locales/ko/user.json index eb9718b680..ed20c730e0 100644 --- a/apps/app/public/locales/ko/user.json +++ b/apps/app/public/locales/ko/user.json @@ -20,7 +20,7 @@ "identity-nonbinary": "논바이너리", "identity-pansexual": "팬섹슈얼", "identity-queer": "퀴어", - "identity-questioning": "질의", + "identity-questioning": "의문", "identity-straight": "스트레이트", "identity-transgender": "트랜스젠더", "identity-woman": "여성", diff --git a/apps/app/public/locales/pl/common.json b/apps/app/public/locales/pl/common.json index 7bcda4a6ea..e3ed1d38fe 100644 --- a/apps/app/public/locales/pl/common.json +++ b/apps/app/public/locales/pl/common.json @@ -85,6 +85,11 @@ "website": "Bezpośrednia strona internetowa" }, "disclaimer": "Zrzeczenie się odpowiedzialności", + "donate": { + "hover": "Wspomóż dzisiaj aby pomóc InReach za darmo dla wszystkich", + "popup": "Pomóż zapewnić bezpłatny dostęp dla wszystkich", + "to-inreach": "Wesprzyj do wnętrza 💝" + }, "dont-have-account": "Nie masz konta?", "download-app": "Pobierz aplikację", "edit-profile": "Edytuj profil", @@ -384,6 +389,7 @@ "decline": "Odrzuć", "delete": "Usuń", "distance": "Odległość", + "donate": "Wesprzyj", "email": "E-mail", "home": "Strona główna", "hours": "Godziny", diff --git a/apps/app/public/locales/ps/common.json b/apps/app/public/locales/ps/common.json index 038b22ae42..ab05b46ffc 100644 --- a/apps/app/public/locales/ps/common.json +++ b/apps/app/public/locales/ps/common.json @@ -83,6 +83,11 @@ "website": "مستقیم ویب پا. ه" }, "disclaimer": "اعلامیه", + "donate": { + "hover": "Donate today to help keep InReach free for everyone", + "popup": "Help keep InReach free for everyone", + "to-inreach": "Donate to InReach 💝" + }, "dont-have-account": "حساب نه لری؟", "download-app": "اپلیکیشن ډاونلوډ کړئ", "edit-profile": "پېژند سمول", @@ -382,6 +387,7 @@ "decline": "Decline", "delete": "ړنګول", "distance": "فاصله", + "donate": "Donate", "email": "برېښنالیک", "home": "کور", "hours": "ساعتونه", diff --git a/apps/app/public/locales/pt/common.json b/apps/app/public/locales/pt/common.json index b164cb813a..186ed6ba6b 100644 --- a/apps/app/public/locales/pt/common.json +++ b/apps/app/public/locales/pt/common.json @@ -83,6 +83,11 @@ "website": "Site direto" }, "disclaimer": "Aviso de responsabilidade", + "donate": { + "hover": "Doe hoje para ajudar a manter o Alcance grátis para todos", + "popup": "Ajude a manter o InReach gratuito para todos", + "to-inreach": "Doe para o Alcance 💝" + }, "dont-have-account": "Não tem uma conta?", "download-app": "Baixe o aplicativo", "edit-profile": "Editar perfil", @@ -382,6 +387,7 @@ "decline": "Recusar", "delete": "Excluir", "distance": "Distância", + "donate": "Doar", "email": "E-mail", "home": "Casa", "hours": "Horas", diff --git a/apps/app/public/locales/ru/common.json b/apps/app/public/locales/ru/common.json index 9eacf1fbc5..96aa0d7afa 100644 --- a/apps/app/public/locales/ru/common.json +++ b/apps/app/public/locales/ru/common.json @@ -85,6 +85,11 @@ "website": "Прямой сайт" }, "disclaimer": "Оговорка", + "donate": { + "hover": "Пожертвовать сегодня, чтобы помочь сохранить InReach бесплатным для всех", + "popup": "Помогите оставить InReach бесплатным для всех", + "to-inreach": "Пожертвовать на InReach 💝" + }, "dont-have-account": "У вас нет учетной записи?", "download-app": "Скачайте наше приложение", "edit-profile": "Изменить профиль", @@ -384,6 +389,7 @@ "decline": "Отклонить", "delete": "Удалить", "distance": "Расстояние", + "donate": "Пожертвовать", "email": "Почта", "home": "Домашний", "hours": "Часы", diff --git a/apps/app/public/locales/sw/common.json b/apps/app/public/locales/sw/common.json index 89c1975e68..5c22f82b7d 100644 --- a/apps/app/public/locales/sw/common.json +++ b/apps/app/public/locales/sw/common.json @@ -83,6 +83,11 @@ "website": "Tovuti ya moja kwa moja" }, "disclaimer": "Kanusho", + "donate": { + "hover": "Donate today to help keep InReach free for everyone", + "popup": "Help keep InReach free for everyone", + "to-inreach": "Donate to InReach 💝" + }, "dont-have-account": "Huna akaunti?", "download-app": "Pakua programu", "edit-profile": "Hariri Profaili", @@ -382,6 +387,7 @@ "decline": "Decline", "delete": "Futa", "distance": "Umbali", + "donate": "Donate", "email": "Barua pepe", "home": "Nyumbani", "hours": "Masaa", diff --git a/apps/app/public/locales/tl/common.json b/apps/app/public/locales/tl/common.json index ec90ba8581..58977820b4 100644 --- a/apps/app/public/locales/tl/common.json +++ b/apps/app/public/locales/tl/common.json @@ -83,6 +83,11 @@ "website": "Direktang website" }, "disclaimer": "Disclaimer", + "donate": { + "hover": "Donate today to help keep InReach free for everyone", + "popup": "Help keep InReach free for everyone", + "to-inreach": "Donate to InReach 💝" + }, "dont-have-account": "Wala kang account?", "download-app": "I-download ang app", "edit-profile": "I-edit ang Profile", @@ -382,6 +387,7 @@ "decline": "Decline", "delete": "Tanggalin", "distance": "Distansya", + "donate": "Donate", "email": "Email", "home": "Tahanan", "hours": "Oras", diff --git a/apps/app/public/locales/uk/common.json b/apps/app/public/locales/uk/common.json index 0b79c6760d..b1173837ac 100644 --- a/apps/app/public/locales/uk/common.json +++ b/apps/app/public/locales/uk/common.json @@ -85,6 +85,11 @@ "website": "Прямий сайт" }, "disclaimer": "Відмова від відповідальності", + "donate": { + "hover": "Пожертвуйте сьогодні, щоб допомогти кожному зберегти InReach", + "popup": "Допоможіть зберегти InReach безкоштовно для всіх", + "to-inreach": "Пожертвувати на рахунок рахунок 💝" + }, "dont-have-account": "У вас немає облікового запису?", "download-app": "Завантажте додаток", "edit-profile": "Редагувати профіль", @@ -384,6 +389,7 @@ "decline": "Відмовитись", "delete": "Вилучити", "distance": "Відстань", + "donate": "Пожертвувати", "email": "Електронна пошта", "home": "Головна", "hours": "Годинники", diff --git a/apps/app/public/locales/zh/common.json b/apps/app/public/locales/zh/common.json index 43b5281e57..6c47ddacaf 100644 --- a/apps/app/public/locales/zh/common.json +++ b/apps/app/public/locales/zh/common.json @@ -82,6 +82,11 @@ "website": "直接网站" }, "disclaimer": "免责声明", + "donate": { + "hover": "今日捐赠以帮助所有人保持Inach免费。", + "popup": "帮助所有人保持无障碍连接", + "to-inreach": "捐赠给Inach :hear_with_ribbon:" + }, "dont-have-account": "没有账号?", "download-app": "下载该应用程序", "edit-profile": "编辑个人资料", @@ -381,6 +386,7 @@ "decline": "拒绝", "delete": "删除", "distance": "距离", + "donate": "捐助", "email": "电子邮件", "home": "主页", "hours": "小时", diff --git a/apps/app/src/pages/401.tsx b/apps/app/src/pages/401.tsx index 0671b27bb2..577c9ece99 100644 --- a/apps/app/src/pages/401.tsx +++ b/apps/app/src/pages/401.tsx @@ -1,12 +1,15 @@ import { Container, rem, Stack, Title } from '@mantine/core' import { type GetStaticProps } from 'next' +import dynamic from 'next/dynamic' import { useRouter } from 'next/router' import { useTranslation } from 'next-i18next' import { type Route } from 'nextjs-routes' import { z } from 'zod' -import { LoginBody } from '@weareinreach/ui/modals/Login' import { getServerSideTranslations } from '~app/utils/i18n' +// import { LoginBody } from '@weareinreach/ui/modals/Login' + +const LoginBody = dynamic(() => import('@weareinreach/ui/modals/Login').then((mod) => mod.LoginBody)) const RouteSchema = z.object({ pathname: z.string(), diff --git a/apps/app/src/pages/_app.tsx b/apps/app/src/pages/_app.tsx index aa2ce68a7f..43506b993b 100644 --- a/apps/app/src/pages/_app.tsx +++ b/apps/app/src/pages/_app.tsx @@ -4,6 +4,7 @@ import { ReactQueryDevtools } from '@tanstack/react-query-devtools' import { Analytics } from '@vercel/analytics/react' import { type NextPage } from 'next' import { type AppProps, type NextWebVitalsMetric } from 'next/app' +import dynamic from 'next/dynamic' import Head from 'next/head' import { useRouter } from 'next/router' import { type Session } from 'next-auth' @@ -21,6 +22,10 @@ import { Providers } from '~app/providers' import { api } from '~app/utils/api' import nextI18nConfig from '../../next-i18next.config.mjs' +// import { Donate, DonateModal } from '@weareinreach/ui/components/core/Donate' +const DonateModal = dynamic(() => + import('@weareinreach/ui/components/core/Donate').then((mod) => mod.DonateModal) +) const defaultSEO = { titleTemplate: '%s | InReach', @@ -95,6 +100,7 @@ const MyApp = (appProps: AppPropsWithGridSwitch) => { + ) diff --git a/apps/app/src/pages/account/index.tsx b/apps/app/src/pages/account/index.tsx index 7db1d0e7a9..9e975f9f5a 100644 --- a/apps/app/src/pages/account/index.tsx +++ b/apps/app/src/pages/account/index.tsx @@ -1,13 +1,18 @@ import { Center, Grid, Loader, Overlay, Stack, Title } from '@mantine/core' import { type GetServerSideProps } from 'next' +import dynamic from 'next/dynamic' import { useRouter } from 'next/router' import { useSession } from 'next-auth/react' import { useTranslation } from 'next-i18next' import { getServerSession } from '@weareinreach/auth' -import { QuickPromotionModal } from '@weareinreach/ui/modals' import { getServerSideTranslations } from '~app/utils/i18n' +// import { QuickPromotionModal } from '@weareinreach/ui/modals' +// @ts-expect-error Next Dynamic doesn't like polymorphic components +const QuickPromotionModal = dynamic(() => + import('@weareinreach/ui/modals/QuickPromotion').then((mod) => mod.QuickPromotionModal) +) const SavedLists = () => { const { t } = useTranslation('common') const { data: session, status } = useSession() @@ -22,7 +27,7 @@ const SavedLists = () => { if (status === 'unauthenticated' || session === null) { return ( - router.replace('/')} /> + router.replace('/')} /> ) } diff --git a/apps/app/src/pages/account/reviews.tsx b/apps/app/src/pages/account/reviews.tsx index 9429017f7a..91a54117b9 100644 --- a/apps/app/src/pages/account/reviews.tsx +++ b/apps/app/src/pages/account/reviews.tsx @@ -1,12 +1,18 @@ import { Center, Grid, Loader, Overlay, Stack, Title } from '@mantine/core' -import { type GetServerSideProps, InferGetServerSidePropsType } from 'next' +import { type GetServerSideProps } from 'next' +import dynamic from 'next/dynamic' import { useRouter } from 'next/router' import { useSession } from 'next-auth/react' import { useTranslation } from 'next-i18next' import { getServerSession } from '@weareinreach/auth' -import { QuickPromotionModal } from '@weareinreach/ui/modals' import { getServerSideTranslations } from '~app/utils/i18n' +// import { QuickPromotionModal } from '@weareinreach/ui/modals' + +// @ts-expect-error Next Dynamic doesn't like polymorphic components +const QuickPromotionModal = dynamic(() => + import('@weareinreach/ui/modals/QuickPromotion').then((mod) => mod.QuickPromotionModal) +) const Reviews = () => { const { t } = useTranslation('common') @@ -22,7 +28,7 @@ const Reviews = () => { if (status === 'unauthenticated' || session === null) { return ( - router.replace('/')} /> + router.replace('/')} /> ) } diff --git a/apps/app/src/pages/account/saved.tsx b/apps/app/src/pages/account/saved.tsx index 3ee9d7cf92..4ae62aa73a 100644 --- a/apps/app/src/pages/account/saved.tsx +++ b/apps/app/src/pages/account/saved.tsx @@ -1,13 +1,18 @@ import { Center, Grid, Loader, Overlay, Stack, Title } from '@mantine/core' import { type GetServerSideProps } from 'next' +import dynamic from 'next/dynamic' import { useRouter } from 'next/router' import { useSession } from 'next-auth/react' import { useTranslation } from 'next-i18next' import { getServerSession } from '@weareinreach/auth' -import { QuickPromotionModal } from '@weareinreach/ui/modals' import { getServerSideTranslations } from '~app/utils/i18n' +// import { QuickPromotionModal } from '@weareinreach/ui/modals' +// @ts-expect-error Next Dynamic doesn't like polymorphic components +const QuickPromotionModal = dynamic(() => + import('@weareinreach/ui/modals/QuickPromotion').then((mod) => mod.QuickPromotionModal) +) const SavedLists = () => { const { t } = useTranslation('common') const { data: session, status } = useSession() @@ -22,7 +27,7 @@ const SavedLists = () => { if (status === 'unauthenticated' || session === null) { return ( - router.replace('/')} /> + router.replace('/')} /> ) } diff --git a/apps/app/src/pages/admin/index.tsx b/apps/app/src/pages/admin/index.tsx index 37563e4d4c..6af7b9c642 100644 --- a/apps/app/src/pages/admin/index.tsx +++ b/apps/app/src/pages/admin/index.tsx @@ -1,4 +1,4 @@ -import { Container, Stack, Title } from '@mantine/core' +import { Stack, Title } from '@mantine/core' import { type GetServerSideProps, type NextPage } from 'next' import Head from 'next/head' import { useSession } from 'next-auth/react' diff --git a/apps/app/src/pages/admin/quicklink/email.tsx b/apps/app/src/pages/admin/quicklink/email.tsx index 6736d80548..fa4b54f313 100644 --- a/apps/app/src/pages/admin/quicklink/email.tsx +++ b/apps/app/src/pages/admin/quicklink/email.tsx @@ -32,6 +32,7 @@ import { // import { ReactTableDevtools } from '@tanstack/react-table-devtools' import compact from 'just-compact' import { type GetServerSideProps } from 'next' +import dynamic from 'next/dynamic' import { useRouter } from 'next/router' import { useSession } from 'next-auth/react' import { type Route } from 'nextjs-routes' @@ -44,9 +45,13 @@ import { Link } from '@weareinreach/ui/components/core/Link' import { MultiSelectPopover } from '@weareinreach/ui/components/data-portal/MultiSelectPopover' import { useCustomVariant } from '@weareinreach/ui/hooks/useCustomVariant' import { Icon } from '@weareinreach/ui/icon' -import { QuickPromotionModal } from '@weareinreach/ui/modals' import { api } from '~app/utils/api' import { getServerSideTranslations } from '~app/utils/i18n' +// import { QuickPromotionModal } from '@weareinreach/ui/modals' +// @ts-expect-error Next Dynamic doesn't like polymorphic components +const QuickPromotionModal = dynamic(() => + import('@weareinreach/ui/modals/QuickPromotion').then((mod) => mod.QuickPromotionModal) +) const RESULTS_PER_PAGE = 20 @@ -405,7 +410,7 @@ const QuickLink = () => { <> - + ) : !isLoading && !form.values.data?.length ? ( diff --git a/apps/app/src/pages/admin/quicklink/index.tsx b/apps/app/src/pages/admin/quicklink/index.tsx index 838f8c30b2..f812488393 100644 --- a/apps/app/src/pages/admin/quicklink/index.tsx +++ b/apps/app/src/pages/admin/quicklink/index.tsx @@ -2,6 +2,7 @@ import { Overlay, Stack, Tabs, Title } from '@mantine/core' import { type GetServerSideProps } from 'next' +import dynamic from 'next/dynamic' import { useRouter } from 'next/router' import { useSession } from 'next-auth/react' import { type Route } from 'nextjs-routes' @@ -10,8 +11,13 @@ import { useEffect, useState } from 'react' import { trpcServerClient } from '@weareinreach/api/trpc' import { checkServerPermissions } from '@weareinreach/auth' import { Icon } from '@weareinreach/ui/icon' -import { QuickPromotionModal } from '@weareinreach/ui/modals' import { getServerSideTranslations } from '~app/utils/i18n' +// import { QuickPromotionModal } from '@weareinreach/ui/modals' + +// @ts-expect-error Next Dynamic doesn't like polymorphic components +const QuickPromotionModal = dynamic(() => + import('@weareinreach/ui/modals/QuickPromotion').then((mod) => mod.QuickPromotionModal) +) const QuickLinkIndex = () => { const router = useRouter() @@ -43,7 +49,7 @@ const QuickLinkIndex = () => { {overlay && ( - + )} diff --git a/apps/app/src/pages/admin/quicklink/phone.tsx b/apps/app/src/pages/admin/quicklink/phone.tsx index 8e3a03c4e2..e13470195c 100644 --- a/apps/app/src/pages/admin/quicklink/phone.tsx +++ b/apps/app/src/pages/admin/quicklink/phone.tsx @@ -31,6 +31,7 @@ import { } from '@tanstack/react-table' import compact from 'just-compact' import { type GetServerSideProps } from 'next' +import dynamic from 'next/dynamic' import { useRouter } from 'next/router' import { useSession } from 'next-auth/react' import { type Route } from 'nextjs-routes' @@ -44,9 +45,14 @@ import { MultiSelectPopover } from '@weareinreach/ui/components/data-portal/Mult import { useCustomVariant } from '@weareinreach/ui/hooks' import { parsePhoneNumber } from '@weareinreach/ui/hooks/usePhoneNumber' import { Icon } from '@weareinreach/ui/icon' -import { QuickPromotionModal } from '@weareinreach/ui/modals' import { api } from '~app/utils/api' import { getServerSideTranslations } from '~app/utils/i18n' +// import { QuickPromotionModal } from '@weareinreach/ui/modals' + +// @ts-expect-error Next Dynamic doesn't like polymorphic components +const QuickPromotionModal = dynamic(() => + import('@weareinreach/ui/modals/QuickPromotion').then((mod) => mod.QuickPromotionModal) +) const RESULTS_PER_PAGE = 20 @@ -388,7 +394,7 @@ const QuickLink = () => { <> - + ) : isSuccess && !form.values.data?.length ? ( diff --git a/apps/app/src/pages/admin/quicklink/services.tsx b/apps/app/src/pages/admin/quicklink/services.tsx index 79a4862a3c..07ddb6bcf4 100644 --- a/apps/app/src/pages/admin/quicklink/services.tsx +++ b/apps/app/src/pages/admin/quicklink/services.tsx @@ -31,6 +31,7 @@ import { } from '@tanstack/react-table' import compact from 'just-compact' import { type GetServerSideProps } from 'next' +import dynamic from 'next/dynamic' import { useRouter } from 'next/router' import { useSession } from 'next-auth/react' import { type Route } from 'nextjs-routes' @@ -43,9 +44,14 @@ import { Link } from '@weareinreach/ui/components/core/Link' import { MultiSelectPopover } from '@weareinreach/ui/components/data-portal/MultiSelectPopover' import { useCustomVariant } from '@weareinreach/ui/hooks' import { Icon } from '@weareinreach/ui/icon' -import { QuickPromotionModal } from '@weareinreach/ui/modals' import { api } from '~app/utils/api' import { getServerSideTranslations } from '~app/utils/i18n' +// import { QuickPromotionModal } from '@weareinreach/ui/modals' + +// @ts-expect-error Next Dynamic doesn't like polymorphic components +const QuickPromotionModal = dynamic(() => + import('@weareinreach/ui/modals/QuickPromotion').then((mod) => mod.QuickPromotionModal) +) const RESULTS_PER_PAGE = 20 @@ -323,7 +329,7 @@ const QuickLink = () => { <> - + ) : !isLoading && !form.values.data?.length ? ( diff --git a/apps/app/src/pages/index.tsx b/apps/app/src/pages/index.tsx index a1531d8ff9..62cfbe415e 100644 --- a/apps/app/src/pages/index.tsx +++ b/apps/app/src/pages/index.tsx @@ -16,8 +16,9 @@ import { getCookie } from 'cookies-next' import Autoplay from 'embla-carousel-autoplay' import { type GetStaticProps } from 'next' import Head from 'next/head' +import { useRouter } from 'next/router' import { type TFunction, Trans, useTranslation } from 'next-i18next' -import { useRef, useState } from 'react' +import { useEffect, useRef, useState } from 'react' import { ms } from '@weareinreach/api/lib/milliseconds' import { trpcServerClient } from '@weareinreach/api/trpc' @@ -154,6 +155,7 @@ const CardTranslation = ({ i18nKey, t }: { i18nKey: string; t: TFunction }) => { } const Home: NextPageWithoutGrid = () => { + const router = useRouter() const { t } = useTranslation('landingPage') const theme = useMantineTheme() const variants = useCustomVariant() @@ -166,6 +168,11 @@ const Home: NextPageWithoutGrid = () => { const launchAHpopup = getCookie('inr-ahpop') + useEffect(() => { + router.prefetch('/search/[...params]') + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []) + return ( <> diff --git a/apps/app/src/pages/search/[...params]/index.tsx b/apps/app/src/pages/search/[...params]/index.tsx index b21652850d..0e39ca7a34 100644 --- a/apps/app/src/pages/search/[...params]/index.tsx +++ b/apps/app/src/pages/search/[...params]/index.tsx @@ -12,6 +12,7 @@ import { } from '@mantine/core' import { useMediaQuery } from '@mantine/hooks' import compare from 'just-compare' +import dynamic from 'next/dynamic' import Head from 'next/head' import { useRouter } from 'next/router' import { useTranslation } from 'next-i18next' @@ -28,11 +29,17 @@ import { CrisisSupport } from '@weareinreach/ui/components/sections/CrisisSuppor import { SearchResultSidebar } from '@weareinreach/ui/components/sections/SearchResultSidebar' import { useCustomVariant } from '@weareinreach/ui/hooks/useCustomVariant' import { useSearchState } from '@weareinreach/ui/hooks/useSearchState' -import { MoreFilter } from '@weareinreach/ui/modals/MoreFilter' -import { ServiceFilter } from '@weareinreach/ui/modals/ServiceFilter' import { api } from '~app/utils/api' import { getSearchResultPageCount, SEARCH_RESULT_PAGE_SIZE } from '~app/utils/constants' import { getServerSideTranslations } from '~app/utils/i18n' +// import { MoreFilter } from '@weareinreach/ui/modals/MoreFilter' +// import { ServiceFilter } from '@weareinreach/ui/modals/ServiceFilter' + +// @ts-expect-error Next Dynamic doesn't like polymorphic components +const MoreFilter = dynamic(() => import('@weareinreach/ui/modals/MoreFilter').then((mod) => mod.MoreFilter)) +const ServiceFilter = dynamic(() => + import('@weareinreach/ui/modals/ServiceFilter').then((mod) => mod.ServiceFilter) +) const PageIndexSchema = z.coerce.number().default(1) @@ -197,6 +204,7 @@ const SearchResults = () => { + {/* @ts-expect-error `component` prop not needed.. */} {t('more.filters')} diff --git a/apps/app/src/pages/search/intl/[country].tsx b/apps/app/src/pages/search/intl/[country].tsx index 73026b5529..a46bb21b6e 100644 --- a/apps/app/src/pages/search/intl/[country].tsx +++ b/apps/app/src/pages/search/intl/[country].tsx @@ -13,6 +13,7 @@ import { } from '@mantine/core' import { useMediaQuery } from '@mantine/hooks' import { type GetStaticPaths, type GetStaticPropsContext } from 'next' +import dynamic from 'next/dynamic' import Head from 'next/head' import { useRouter } from 'next/router' import { useTranslation } from 'next-i18next' @@ -25,11 +26,16 @@ import { SearchBox } from '@weareinreach/ui/components/core/SearchBox' import { CrisisSupport } from '@weareinreach/ui/components/sections/CrisisSupport' import { SearchResultSidebar } from '@weareinreach/ui/components/sections/SearchResultSidebar' import { useCustomVariant } from '@weareinreach/ui/hooks/useCustomVariant' -import { MoreFilter } from '@weareinreach/ui/modals/MoreFilter' -import { ServiceFilter } from '@weareinreach/ui/modals/ServiceFilter' import { api } from '~app/utils/api' import { getServerSideTranslations } from '~app/utils/i18n' +// import { MoreFilter } from '@weareinreach/ui/modals/MoreFilter' +// import { ServiceFilter } from '@weareinreach/ui/modals/ServiceFilter' +// @ts-expect-error Next Dynamic doesn't like polymorphic components +const MoreFilter = dynamic(() => import('@weareinreach/ui/modals/MoreFilter').then((mod) => mod.MoreFilter)) +const ServiceFilter = dynamic(() => + import('@weareinreach/ui/modals/ServiceFilter').then((mod) => mod.ServiceFilter) +) const useStyles = createStyles((theme) => ({ searchControls: { flexWrap: 'wrap', @@ -107,6 +113,7 @@ const OutsideServiceArea = () => { + {/* @ts-expect-error `component` prop not needed.. */} {t('more.filters')} diff --git a/apps/app/src/pages/suggest.tsx b/apps/app/src/pages/suggest.tsx index b102172961..56189c6f09 100644 --- a/apps/app/src/pages/suggest.tsx +++ b/apps/app/src/pages/suggest.tsx @@ -1,12 +1,18 @@ import { Grid, Overlay } from '@mantine/core' import { type GetStaticPropsContext } from 'next' +import dynamic from 'next/dynamic' import { useSession } from 'next-auth/react' import { useState } from 'react' import { trpcServerClient } from '@weareinreach/api/trpc' import { SuggestOrg } from '@weareinreach/ui/components/sections/SuggestOrg' -import { QuickPromotionModal } from '@weareinreach/ui/modals' import { getServerSideTranslations } from '~app/utils/i18n' +// import { QuickPromotionModal } from '@weareinreach/ui/modals' + +// @ts-expect-error Next Dynamic doesn't like polymorphic components +const QuickPromotionModal = dynamic(() => + import('@weareinreach/ui/modals/QuickPromotion').then((mod) => mod.QuickPromotionModal) +) const SuggestResource = () => { const { data: session, status } = useSession() @@ -21,7 +27,7 @@ const SuggestResource = () => { {overlay && ( - setOverlay(false)} /> + setOverlay(false)} /> )} diff --git a/apps/app/src/pages/support/index.tsx b/apps/app/src/pages/support/index.tsx index 8ddcfbc9c5..fe17a4e679 100644 --- a/apps/app/src/pages/support/index.tsx +++ b/apps/app/src/pages/support/index.tsx @@ -1,61 +1,72 @@ -import { Divider, Flex, Grid, Stack, Title, useMantineTheme } from '@mantine/core' -import { type GetServerSideProps } from 'next' +import { Divider, Flex, Grid, Stack, Text, Title, useMantineTheme } from '@mantine/core' +import { type GetStaticProps } from 'next' +import dynamic from 'next/dynamic' import { useTranslation } from 'next-i18next' import { AntiHateMessage } from '@weareinreach/ui/components/core/AntiHateMessage' import { Link } from '@weareinreach/ui/components/core/Link' import { useCustomVariant } from '@weareinreach/ui/hooks' import { Icon } from '@weareinreach/ui/icon' -import { GenericContentModal, PrivacyStatementModal } from '@weareinreach/ui/modals' +// import { GenericContentModal, PrivacyStatementModal } from '@weareinreach/ui/modals' import { getServerSideTranslations } from '~app/utils/i18n' -const SavedLists = () => { +// @ts-expect-error Next Dynamic doesn't like polymorphic components +const GenericContentModal = dynamic(() => + import('@weareinreach/ui/modals/GenericContent').then((mod) => mod.GenericContentModal) +) +// @ts-expect-error Next Dynamic doesn't like polymorphic components +const PrivacyStatementModal = dynamic(() => + import('@weareinreach/ui/modals/PrivacyStatement').then((mod) => mod.PrivacyStatementModal) +) + +const DonateModal = dynamic(() => + import('@weareinreach/ui/components/core/Donate').then((mod) => mod.DonateModal) +) + +const SupportItem = ({ tKey }: SupportItemProps) => { + const { t } = useTranslation('common') + const variants = useCustomVariant() + return ( + + {t(tKey)} + + + ) +} +interface SupportItemProps { + tKey: string +} + +const SupportPage = () => { const { t } = useTranslation('common') const theme = useMantineTheme() const variants = useCustomVariant() const linkVar = { variant: variants.Link.inlineInvertedUtil1 } const support = [ + + + , - - {t('footer.suggest-org')} - - + , - - {t('footer.share-feedback')} - - + , - - {t('footer.vetting-process')} - - + , - - {t('footer.privacy-statement')} - - + , - - {t('footer.anti-hate')} - + , - - {t('footer.digital-accessibility')} - - + , - - {t('footer.disclaimer')} - - + , ] @@ -77,11 +88,11 @@ const SavedLists = () => { ) } -export const getServerSideProps: GetServerSideProps = async ({ locale }) => { +export const getStaticProps: GetStaticProps = async ({ locale }) => { return { props: { ...(await getServerSideTranslations(locale, ['common', 'attribute'])), }, } } -export default SavedLists +export default SupportPage diff --git a/apps/web/package.json b/apps/web/package.json index fa38a979e0..a1c4c95af5 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -18,19 +18,12 @@ "@mantine/carousel": "6.0.21", "@mantine/core": "6.0.21", "@mantine/dates": "6.0.21", - "@mantine/dropzone": "6.0.21", "@mantine/form": "6.0.21", "@mantine/hooks": "6.0.21", "@mantine/modals": "6.0.21", "@mantine/next": "6.0.21", "@mantine/notifications": "6.0.21", "@mantine/nprogress": "6.0.21", - "@mantine/prism": "6.0.21", - "@mantine/spotlight": "6.0.21", - "@mantine/tiptap": "6.0.21", - "@tiptap/extension-link": "2.1.11", - "@tiptap/react": "2.1.11", - "@tiptap/starter-kit": "2.1.11", "@weareinreach/env": "workspace:*", "@weareinreach/ui": "workspace:*", "dayjs": "1.11.10", @@ -42,11 +35,11 @@ "react-i18next": "13.2.2" }, "devDependencies": { - "@next/bundle-analyzer": "13.5.4", - "@types/eslint": "8.44.3", + "@next/bundle-analyzer": "13.5.3", + "@types/eslint": "8.44.4", "@types/node": "18.18.4", - "@types/react": "18.2.27", - "@types/react-dom": "18.2.12", + "@types/react": "18.2.28", + "@types/react-dom": "18.2.13", "@weareinreach/config": "workspace:*", "@weareinreach/eslint-config": "0.100.0", "eslint": "8.51.0", diff --git a/lambdas/cognito-messaging/package.json b/lambdas/cognito-messaging/package.json index d4638ba3c4..a987408fa0 100644 --- a/lambdas/cognito-messaging/package.json +++ b/lambdas/cognito-messaging/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@types/aws-lambda": "8.10.124", - "@types/eslint": "8.44.3", + "@types/eslint": "8.44.4", "@types/node": "18.18.4", "@vercel/ncc": "0.38.0", "@weareinreach/config": "workspace:*", diff --git a/lambdas/cognito-user-migrate/package.json b/lambdas/cognito-user-migrate/package.json index a20a5afeb3..c21ad4e688 100644 --- a/lambdas/cognito-user-migrate/package.json +++ b/lambdas/cognito-user-migrate/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@types/aws-lambda": "8.10.124", - "@types/eslint": "8.44.3", + "@types/eslint": "8.44.4", "@types/node": "18.18.4", "@vercel/ncc": "0.38.0", "@weareinreach/config": "workspace:*", diff --git a/package.json b/package.json index c834f6ec26..66b4d36239 100644 --- a/package.json +++ b/package.json @@ -87,6 +87,7 @@ "msw@1.2.2": "1.2.1", "node-fetch@<2.6.7": "^2.6.7", "package-json@<7": "^7.0.0", + "postcss@^8": "^8.4.31", "react-dom@<18": "^18", "react@<18": "^18", "sane": ">=5.0.0", diff --git a/packages/api/package.json b/packages/api/package.json index 34eb59541c..8fa9c06192 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -43,13 +43,13 @@ "luxon": "3.4.3", "nanoid": "5.0.1", "slugify": "1.6.6", - "superjson": "1.13.3", + "superjson": "2.0.0", "tiny-invariant": "1.3.1", "zod": "3.22.4" }, "devDependencies": { "@turbo/gen": "1.10.15", - "@types/eslint": "8.44.3", + "@types/eslint": "8.44.4", "@types/google.maps": "3.54.3", "@types/luxon": "3.3.2", "@types/node": "18.18.4", diff --git a/packages/api/router/user/mutation.create.schema.ts b/packages/api/router/user/mutation.create.schema.ts index c8234e4b66..2e79b59a88 100644 --- a/packages/api/router/user/mutation.create.schema.ts +++ b/packages/api/router/user/mutation.create.schema.ts @@ -41,13 +41,20 @@ export const ZCreateSchema = z otherLawPractice: z.string().optional(), servProvider: z.string().optional(), servProviderOther: z.string().optional(), + location: z + .object({ + city: z.string(), + govDist: z.string(), + country: z.string(), + }) + .optional(), }) .transform(({ id, name, email, password, image, active, currentCity, ...data }) => { const userType = connectOneRequired({ type: data.userType }) const langPref = connectOne({ localeCode: data.language }) const currentCountry = connectOne(data.currentCountry) const currentGovDist = connectOne(data.currentGovDist) - const { lawPractice, otherLawPractice, servProvider, servProviderOther } = data + const { lawPractice, otherLawPractice, servProvider, servProviderOther, location } = data const record = { id, name, @@ -58,8 +65,8 @@ export const ZCreateSchema = z currentCity, currentCountry, currentGovDist, - ...(lawPractice || otherLawPractice || servProvider || servProviderOther - ? { signupData: { lawPractice, otherLawPractice, servProvider, servProviderOther } } + ...(lawPractice || otherLawPractice || servProvider || servProviderOther || location + ? { signupData: { lawPractice, otherLawPractice, servProvider, servProviderOther, location } } : {}), } satisfies Prisma.UserCreateArgs['data'] diff --git a/packages/auth/lib/createUser.ts b/packages/auth/lib/createUser.ts index 498750ada6..1368cbabb9 100644 --- a/packages/auth/lib/createUser.ts +++ b/packages/auth/lib/createUser.ts @@ -1,5 +1,3 @@ -/* eslint-disable node/no-process-env */ -/* eslint-disable turbo/no-undeclared-env-vars */ import { z } from 'zod' import { ClientId, cognito, generateHash } from './cognitoClient' diff --git a/packages/auth/package.json b/packages/auth/package.json index 5d3a3601db..5af9857741 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -26,14 +26,14 @@ "zod": "3.22.4" }, "devDependencies": { - "@types/eslint": "8.44.3", + "@types/eslint": "8.44.4", "@types/node": "18.18.4", - "@types/react": "18.2.27", - "@types/react-dom": "18.2.12", + "@types/react": "18.2.28", + "@types/react-dom": "18.2.13", "@weareinreach/config": "workspace:*", "@weareinreach/eslint-config": "0.100.0", "eslint": "8.51.0", - "next": "13.5.4", + "next": "13.5.3", "next-auth": "4.23.2", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/packages/db/generated/languages.ts b/packages/db/generated/languages.ts index 91564321c1..92877cb267 100644 --- a/packages/db/generated/languages.ts +++ b/packages/db/generated/languages.ts @@ -115,8 +115,8 @@ export const languageList = [ { label: 'Chechen', value: 'ce', description: 'Нохчийн мотт', common: false }, { label: 'Chichewa', value: 'ny', description: 'Chicheŵa', common: false }, { label: 'Chinese', value: 'zh', description: '中文', common: true }, - { label: 'Chinese (Simplified)', value: 'zh-CN', description: '中文', common: false }, { label: 'Chinese (Simplified)', value: 'zh-Hans', description: '中文(简体)', common: false }, + { label: 'Chinese (Simplified)', value: 'zh-CN', description: '中文', common: false }, { label: 'Chinese (Traditional)', value: 'zh-TW', description: '中文', common: false }, { label: 'Chinese (Traditional)', value: 'zh-Hant', description: '中文(繁體)', common: false }, { label: 'Chuvash', value: 'cv', description: 'Чӑваш чӗлхи', common: false }, diff --git a/packages/db/generated/serviceCategory.ts b/packages/db/generated/serviceCategory.ts index bb22e31bbf..80ee4337af 100644 --- a/packages/db/generated/serviceCategory.ts +++ b/packages/db/generated/serviceCategory.ts @@ -68,6 +68,12 @@ export const serviceCategory = [ tsKey: 'mental-health.CATEGORYNAME', tsNs: 'services', }, + { + id: 'svct_01HAD5SFNG7R86J1RTHXBFD96J', + category: 'Trans Focused Services', + tsKey: 'trans-focused-services.CATEGORYNAME', + tsNs: 'services', + }, { id: 'svct_01GW2HHEVPFRQR07PTHMWJDDKS', category: 'Translation and Interpretation', diff --git a/packages/db/package.json b/packages/db/package.json index e7759b7c30..2e24e280cf 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -52,11 +52,10 @@ "@weareinreach/env": "workspace:*", "@weareinreach/util": "workspace:*", "kysely": "0.26.3", - "p-queue": "7.4.1", "pg": "8.11.3", "prisma-kysely": "1.7.1", "sql-bricks": "3.0.1", - "superjson": "1.13.3", + "superjson": "2.0.0", "ulid": "2.3.0", "zod": "3.22.4" }, @@ -64,12 +63,12 @@ "@terraformer/wkt": "2.2.0", "@turbo/gen": "1.10.15", "@turf/helpers": "6.5.0", - "@types/eslint": "8.44.3", + "@types/eslint": "8.44.4", "@types/inquirer": "9.0.4", - "@types/inquirer-autocomplete-prompt": "3.0.0", + "@types/inquirer-autocomplete-prompt": "3.0.1", "@types/luxon": "3.3.2", "@types/node": "18.18.4", - "@types/pg": "8.10.4", + "@types/pg": "8.10.5", "@types/terraformer__wkt": "2.0.0", "@weareinreach/config": "workspace:*", "@weareinreach/eslint-config": "0.100.0", @@ -82,6 +81,7 @@ "kysely-codegen": "0.10.1", "listr2": "7.0.1", "luxon": "3.4.3", + "p-queue": "7.4.1", "prettier": "3.0.3", "pretty-bytes": "6.1.1", "pretty-ms": "8.0.0", diff --git a/packages/env/package.json b/packages/env/package.json index 4e1a659e53..c1854fb296 100644 --- a/packages/env/package.json +++ b/packages/env/package.json @@ -12,7 +12,7 @@ "dependencies": { "@t3-oss/env-nextjs": "0.7.0", "@weareinreach/util": "workspace:*", - "chromatic": "7.2.3", + "chromatic": "7.3.0", "zod": "3.22.4" }, "devDependencies": { diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index b830bf6e88..c4cfd903b5 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -15,15 +15,15 @@ "preinstall": "npx only-allow pnpm" }, "devDependencies": { - "@next/eslint-plugin-next": "13.5.4", + "@next/eslint-plugin-next": "13.5.3", "@tanstack/eslint-plugin-query": "4.36.1", - "@types/eslint": "8.44.3", + "@types/eslint": "8.44.4", "@types/eslint-config-prettier": "6.11.1", "@types/node": "18.18.4", "@typescript-eslint/eslint-plugin": "6.7.5", "@typescript-eslint/parser": "6.7.5", "eslint": "8.51.0", - "eslint-config-next": "13.5.4", + "eslint-config-next": "13.5.3", "eslint-config-prettier": "9.0.0", "eslint-formatter-github": "1.1.4", "eslint-import-resolver-typescript": "3.6.1", @@ -34,7 +34,7 @@ "eslint-plugin-react": "7.33.2", "eslint-plugin-storybook": "0.6.15", "eslint-plugin-turbo": "1.10.15", - "next": "13.5.4", + "next": "13.5.3", "resolve-pkg-maps": "1.0.0", "typescript": "5.2.2" }, diff --git a/packages/ui/components/core/Donate/index.stories.tsx b/packages/ui/components/core/Donate/index.stories.tsx new file mode 100644 index 0000000000..2710a1d5b9 --- /dev/null +++ b/packages/ui/components/core/Donate/index.stories.tsx @@ -0,0 +1,14 @@ +import { type Meta, type StoryObj } from '@storybook/react' + +import { DonateModal } from './index' + +export default { + title: 'Components/Core/Donate', + component: DonateModal, + parameters: { + layoutWrapper: 'centeredFullscreen', + }, +} satisfies Meta + +type StoryDef = StoryObj +export const Default = {} satisfies StoryDef diff --git a/packages/ui/components/core/Donate/index.tsx b/packages/ui/components/core/Donate/index.tsx new file mode 100644 index 0000000000..574f6ffa19 --- /dev/null +++ b/packages/ui/components/core/Donate/index.tsx @@ -0,0 +1,238 @@ +import { Affix, createStyles, Modal, Popover, rem, Text, useMantineTheme } from '@mantine/core' +import { useDisclosure, useTimeout } from '@mantine/hooks' +import { useRouter } from 'next/router' +import Script from 'next/script' +import { useTranslation } from 'next-i18next' +import { type ReactElement, useEffect, useState } from 'react' + +import { Button } from '~ui/components/core/Button' +import { Link } from '~ui/components/core/Link' +import { useCustomVariant } from '~ui/hooks/useCustomVariant' +import { useScreenSize } from '~ui/hooks/useScreenSize' +import { bounce } from '~ui/theme/animation' + +const useStyles = createStyles((theme) => ({ + bounce: { + animation: `${bounce(16)} 1.75s 5`, + }, + shrink: { + transition: `all 0.5s ease-in-out`, + padding: '0 !important', + borderRadius: '100% !important', + width: rem(48), + }, + modalBody: { + padding: rem(0), + [theme.fn.largerThan('xs')]: { + padding: `${rem(0)} ${rem(0)}`, + }, + [theme.fn.largerThan('sm')]: { + padding: `${rem(0)} ${rem(0)}`, + }, + }, +})) + +interface DonateModalProps { + children?: ReactElement +} +export const DonateModal = ({ children }: DonateModalProps) => { + const [opened, handler] = useDisclosure(false) + const [modalOpened, modalHandler] = useDisclosure(false) + const { t } = useTranslation() + const router = useRouter() + const variant = useCustomVariant() + const theme = useMantineTheme() + const { classes, cx } = useStyles() + const { isMobile } = useScreenSize() + const donateEmoji = '💝' + const [showEmoji, setShowEmoji] = useState(false) + const { start } = useTimeout(() => { + setShowEmoji(true) + }, 10_000) + const buttonPosition = isMobile ? { bottom: rem(100), right: rem(12) } : { bottom: rem(40), right: rem(40) } + + const buttonHandler = () => { + if (isMobile) { + if (!showEmoji || opened) { + handler.close() + } + modalHandler.open() + } else { + modalHandler.open() + } + } + useEffect(() => { + start() + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []) + + const InjectedChildren = () => { + if (!children) return null + + return ( + + {children} + + ) + } + + const showPopover = !children && (opened || !showEmoji) + const hasChildren = !!children + const isSupportPage = router.pathname === '/support' + + if (isSupportPage && !hasChildren) return null + + return ( + <> + + + {hasChildren ? ( + + ) : ( + + + + )} + + + {t(showEmoji ? 'donate.hover' : 'donate.popup')} + + + + + + + + {t('words.donate')} + + + + +