Merging in Login into Main ER Branch by brian-montgomery · Pull Request #529 · accessiblecommunity/accessiblecommunity.github.io

brian-montgomery · 2026-04-03T13:35:40Z

This merge accomplishes several things:

Bring the escape-room-subsite-ordering branch up to date with main
Adds the Drizzle ORM.
Adds Better-Auth, configured to do Magic Link Auth.
Adds Resend and react-email for Emails.
Adds Postgres to the Development Environment in Docker.

The .env file should now include (for development):

DATABASE_URL for Drizzle.
BETTER_AUTH_SECRET and BETTER_AUTH_URL
RESEND_API_KEY

Note: I'll need to document this in the README.md file.

This contains a lot of extra from merging in with main... Here are the key commits, as opposed to looking at all the merged in code.

* Fixed `useable` and `fixable` redirects. * Refactored the navigation components.

) Bumps the npm_and_yarn group with 1 update in the /astro directory: [rollup](https://github.com/rollup/rollup). Updates `rollup` from 4.50.1 to 4.59.0 - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](rollup/rollup@v4.50.1...v4.59.0) --- updated-dependencies: - dependency-name: rollup dependency-version: 4.59.0 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps the npm_and_yarn group with 2 updates in the /astro directory: [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) and [minimatch](https://github.com/isaacs/minimatch). Updates `fast-xml-parser` from 5.3.7 to 5.4.2 - [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases) - [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md) - [Commits](NaturalIntelligence/fast-xml-parser@v5.3.7...v5.4.2) Updates `minimatch` from 9.0.6 to 9.0.9 - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v9.0.6...v9.0.9) Updates `minimatch` from 5.1.7 to 5.1.9 - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v9.0.6...v9.0.9) --- updated-dependencies: - dependency-name: fast-xml-parser dependency-version: 5.4.2 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: minimatch dependency-version: 9.0.9 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: minimatch dependency-version: 5.1.9 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

--------- Co-authored-by: rachaelbradley <rachaelbradley@users.noreply.github.com>

Bumps the npm_and_yarn group with 1 update in the /astro directory: [svgo](https://github.com/svg/svgo). Updates `svgo` from 4.0.0 to 4.0.1 - [Release notes](https://github.com/svg/svgo/releases) - [Commits](svg/svgo@v4.0.0...v4.0.1) Updates `svgo` from 3.3.2 to 3.3.3 - [Release notes](https://github.com/svg/svgo/releases) - [Commits](svg/svgo@v4.0.0...v4.0.1) --- updated-dependencies: - dependency-name: svgo dependency-version: 4.0.1 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: svgo dependency-version: 3.3.3 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps the npm_and_yarn group with 2 updates in the /astro directory: [immutable](https://github.com/immutable-js/immutable-js) and [tar](https://github.com/isaacs/node-tar). Updates `immutable` from 4.3.6 to 4.3.8 - [Release notes](https://github.com/immutable-js/immutable-js/releases) - [Changelog](https://github.com/immutable-js/immutable-js/blob/main/CHANGELOG.md) - [Commits](immutable-js/immutable-js@v4.3.6...v4.3.8) Updates `tar` from 7.5.9 to 7.5.11 - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](isaacs/node-tar@v7.5.9...v7.5.11) --- updated-dependencies: - dependency-name: immutable dependency-version: 4.3.8 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: tar dependency-version: 7.5.11 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…510) Bumps the npm_and_yarn group with 1 update in the /astro directory: [devalue](https://github.com/sveltejs/devalue). Updates `devalue` from 5.6.3 to 5.6.4 - [Release notes](https://github.com/sveltejs/devalue/releases) - [Changelog](https://github.com/sveltejs/devalue/blob/main/CHANGELOG.md) - [Commits](sveltejs/devalue@v5.6.3...v5.6.4) --- updated-dependencies: - dependency-name: devalue dependency-version: 5.6.4 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

) Bumps the npm_and_yarn group with 1 update in the /astro directory: [undici](https://github.com/nodejs/undici). Updates `undici` from 7.18.2 to 7.24.1 - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](nodejs/undici@v7.18.2...v7.24.1) --- updated-dependencies: - dependency-name: undici dependency-version: 7.24.1 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps the npm_and_yarn group with 1 update in the /astro directory: [h3](https://github.com/h3js/h3). Updates `h3` from 1.15.5 to 1.15.8 - [Release notes](https://github.com/h3js/h3/releases) - [Changelog](https://github.com/h3js/h3/blob/main/CHANGELOG.md) - [Commits](h3js/h3@v1.15.5...v1.15.8) --- updated-dependencies: - dependency-name: h3 dependency-version: 1.15.8 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps the npm_and_yarn group with 1 update in the /astro directory: [h3](https://github.com/h3js/h3). Updates `h3` from 1.15.8 to 1.15.9 - [Release notes](https://github.com/h3js/h3/releases) - [Changelog](https://github.com/h3js/h3/blob/v1.15.9/CHANGELOG.md) - [Commits](h3js/h3@v1.15.8...v1.15.9) --- updated-dependencies: - dependency-name: h3 dependency-version: 1.15.9 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…515) * Help to match form look and feel between both mutua11y forms. Match border width and also outline offset on focus. Add new checkbox group for partner organizations. * Adjust checkboxes on both mutua11y forms to take up no more than 2 columns. Adjust phrasing. * Re-arrange and adjust some form fields across both mentoring forms to allow for better alignment. * Replace "hr" element with borders * Move "years of experience" form field location.

…#524) Bumps the npm_and_yarn group with 1 update in the /astro directory: [smol-toml](https://github.com/squirrelchat/smol-toml). Updates `smol-toml` from 1.6.0 to 1.6.1 - [Release notes](https://github.com/squirrelchat/smol-toml/releases) - [Commits](squirrelchat/smol-toml@v1.6.0...v1.6.1) --- updated-dependencies: - dependency-name: smol-toml dependency-version: 1.6.1 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…content (#523)

Bumps the npm_and_yarn group with 3 updates in the /astro directory: [picomatch](https://github.com/micromatch/picomatch), [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) and [yaml](https://github.com/eemeli/yaml). Updates `picomatch` from 4.0.3 to 4.0.4 - [Release notes](https://github.com/micromatch/picomatch/releases) - [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md) - [Commits](micromatch/picomatch@4.0.3...4.0.4) Updates `picomatch` from 2.3.1 to 2.3.2 - [Release notes](https://github.com/micromatch/picomatch/releases) - [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md) - [Commits](micromatch/picomatch@4.0.3...4.0.4) Updates `fast-xml-parser` from 5.4.2 to 5.5.9 - [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases) - [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md) - [Commits](NaturalIntelligence/fast-xml-parser@v5.4.2...v5.5.9) Updates `yaml` from 2.8.1 to 2.8.3 - [Release notes](https://github.com/eemeli/yaml/releases) - [Commits](eemeli/yaml@v2.8.1...v2.8.3) --- updated-dependencies: - dependency-name: picomatch dependency-version: 4.0.4 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: picomatch dependency-version: 2.3.2 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: fast-xml-parser dependency-version: 5.5.9 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: yaml dependency-version: 2.8.3 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

--------- Co-authored-by: Brian Montgomery <brian@accessiblecommunity.org> Co-authored-by: alexisreytech <89283739+alexisreytech@users.noreply.github.com>

Also updated the podcast page. --------- Co-authored-by: Brian Montgomery <brian@accessiblecommunity.org>

…519) * Keep nav links visible on focus in dark mode. * Fix focus and focus-visible states for main site skip link in dark mode. * Move skip link styles for hover/focus in dark mode to Header component.

* Bump the npm_and_yarn group across 1 directory with 2 updates Bumps the npm_and_yarn group with 2 updates in the /astro directory: [astro](https://github.com/withastro/astro/tree/HEAD/packages/astro) and [brace-expansion](https://github.com/juliangruber/brace-expansion). Updates `astro` from 5.17.3 to 5.18.1 - [Release notes](https://github.com/withastro/astro/releases) - [Changelog](https://github.com/withastro/astro/blob/astro@5.18.1/packages/astro/CHANGELOG.md) - [Commits](https://github.com/withastro/astro/commits/astro@5.18.1/packages/astro) Updates `brace-expansion` from 2.0.2 to 5.0.5 - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](juliangruber/brace-expansion@v2.0.2...v5.0.5) --- updated-dependencies: - dependency-name: astro dependency-version: 5.18.1 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: brace-expansion dependency-version: 5.0.5 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brian Montgomery <brian@accessiblecommunity.org>

This reverts commit dfa9892. It was somehow pushed without review.

…ertical padding on smaller screens (#534) * Update "ThemedSection" component to responsively reduce vertical padding sizes for smaller screens. Achieve this by applying the pattern established by the existing "ColumnedHero" component. Remove existing optional padding class from "ThemedSection" component to unify the look across the website. * Change "verticalPaddings" property to "yPaddings"

courtneylinder · 2026-04-16T14:21:48Z

+	"refresh_token_expires_at" timestamp,
+	"scope" text,
+	"password" text,
+	"created_at" timestamp DEFAULT now() NOT NULL,


do we need created by/updated by fields?

This is the automatic schema generated by better-auth. We didn't write this one.

courtneylinder · 2026-04-16T14:22:43Z

+const entry = await getEntry("navigation", collectionName);
+
+if (entry === undefined)
+  throw new Error(`Could not find navigation entry '${collectionName}'.`);


is this just from spacing? Is it possible to add {} for clarity?

courtneylinder · 2026-04-16T14:24:59Z

+
+Inclusion is practical. It's not just a feeling; it shows up in choices and design.
+
+* Provide clear instructions and predictable schedules.


does asterik create a list in markdown? I thought it was just - but this is nifty

An asterisk (or dash) at the start of a line indicates a bullet item, yep.

shlokmestry and others added 30 commits February 11, 2026 17:11

Add accessible help for time zone selection (#460)

cbcd2b2

Add workshops page to mutua11y (#478)

de9d350

Good news blog Jan 2026 (#480)

a1bf690

Astro and Plausible updates (#483)

9bca4a7

Issue #484: Post-netlify move cleanup (#486)

450f0d8

* Fixed `useable` and `fixable` redirects. * Refactored the navigation components.

Merge branch 'main' into brian/escape-room-login

72a2df4

In progress Auth and DB integration

22e0ae4

Forcing on static pages.

3591983

Integrating better-auth with drizzle and prototype Escape Room

e2e2967

Add markdown definition list support

b42f8b4

Revived Kit Page

95d8472

Merge branch 'main' into brian/escape-room-login

3a90aa1

Merge branch 'main' into brian/escape-room-login

5a5ee3c

Update to navigation capabilities and theme coloring on Escape Rooms.

4b47236

Small fixes

a067f6a

Added two blogs by Amanda (#485)

6c20006

--------- Co-authored-by: rachaelbradley <rachaelbradley@users.noreply.github.com>

DAF Town Hall agenda March 2026 (#506)

db87965

Issue #469: Use Atkinson Hyperlegible Next Variable font. (#508)

5e0432d

Added Good News blog for February (#512)

e450548

Added 'Designing for Everyone' blog article (#513)

2a322fb

Added Autism Podcast blog (#514)

209a526

Added react-email and react renderer

10f7d5c

Implemented initial email with Resend

11273c2

dependabot bot and others added 12 commits March 23, 2026 10:04

Update content for Evaluations page. (#507)

ffead40

Add login page.

eab5841

Issue #405: Update breadcrumb divider to have empty alt text for its …

6a30a38

…content (#523)

Issue #521: Update contributors on team and podcast pages (#522)

8ceee8c

--------- Co-authored-by: Brian Montgomery <brian@accessiblecommunity.org> Co-authored-by: alexisreytech <89283739+alexisreytech@users.noreply.github.com>

Security updates

9767569

Domain update

5fcd4e4

Add 'Accessibility in Practice' blog (#527)

afd5a9b

Also updated the podcast page. --------- Co-authored-by: Brian Montgomery <brian@accessiblecommunity.org>

Merge branch 'main' into brian/escape-room-login

79871f6

brian-montgomery requested review from courtneylinder and racecn April 3, 2026 13:35

michael-n-cooper and others added 10 commits April 6, 2026 15:00

DAF Town Hall: April 2026 (#530)

8fca25a

Issue #520: Make main skip link and nav links visible in dark mode. (#…

9e0c6c9

…519) * Keep nav links visible on focus in dark mode. * Fix focus and focus-visible states for main site skip link in dark mode. * Move skip link styles for hover/focus in dark mode to Header component.

Security update for lodash-es to 4.18.x (#532)

258e5a7

Issue #430: Created Column and ThemedColumn components. (#535)

9ec0e41

Issue #426: Componentize image card (#427)

d50975c

march good news article

dfa9892

Revert previous commit (#539)

1ac7a16

This reverts commit dfa9892. It was somehow pushed without review.

March "Good News" Blog (#540)

25ffb88

courtneylinder reviewed Apr 16, 2026

View reviewed changes

Merge branch 'main' into brian/escape-room-login

755b3aa

brian-montgomery merged commit a940e46 into nathan/escape-room-subsite-ordering Apr 16, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merging in Login into Main ER Branch#529

Merging in Login into Main ER Branch#529
brian-montgomery merged 53 commits intonathan/escape-room-subsite-orderingfrom
brian/escape-room-login

brian-montgomery commented Apr 3, 2026 •

edited

Loading

Uh oh!

courtneylinder Apr 16, 2026

Uh oh!

brian-montgomery Apr 16, 2026

Uh oh!

courtneylinder Apr 16, 2026

Uh oh!

courtneylinder Apr 16, 2026

Uh oh!

brian-montgomery Apr 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants


		Inclusion is practical. It's not just a feeling; it shows up in choices and design.

		* Provide clear instructions and predictable schedules.

Conversation

brian-montgomery commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

courtneylinder Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

brian-montgomery Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

courtneylinder Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

courtneylinder Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

brian-montgomery Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

brian-montgomery commented Apr 3, 2026 •

edited

Loading