Merging in Login into Main ER Branch

.gitignore

@@ -22,4 +22,6 @@ astro/src/protected-materials/
 # Test files and debug content
 **/test*.astro
 **/debug*.astro
-**/*-test.*
+**/*-test.*
+# Local Netlify folder
+.netlify

astro/astro.config.mjs

@@ -1,9 +1,11 @@
 import { defineConfig, envField } from "astro/config";
+import { remarkDefinitionList, defListHastHandlers } from 'remark-definition-list';
 import styleGuide from "./style-guide/register.js";
 
 import icon from "astro-icon";
 import mdx from "@astrojs/mdx";
 import netlify from '@astrojs/netlify';
+import react from '@astrojs/react';
 import robotsTxt from "astro-robots-txt";
 import sitemap from "@astrojs/sitemap";
 
@@ -26,7 +28,7 @@ const botsToDisallow = [
 
 export default defineConfig({
   site: "https://accessiblecommunity.org",
-  output: 'server',
+  output: 'static',
   adapter: netlify(),
 
   server: {
@@ -41,6 +43,9 @@ export default defineConfig({
     "/services/globa11y/": "/globa11y/",
     "/services/mutua11y/": "/mutua11y/",
     "/services/tip-of-the-week": "/tips/",
+    // Redirect to Github projects
+    "/fixable": "https://accessiblecommunity.github.io/fixable/",
+    "/useable": "https://accessiblecommunity.github.io/useable/",
   },
 
   vite: {
@@ -51,75 +56,80 @@ export default defineConfig({
 
   env: {
     schema: {
+      BETTER_AUTH_SECRET: envField.string({ context: "server", access: "secret", optional: false }),
+      BETTER_AUTH_URL: envField.string({ context: "server", access: "public", }),
       DATABASE_URL: envField.string({ context: "server", access: "secret", optional: false }),
+      RESEND_API_KEY: envField.string({ context: "server", access: "secret", optional: false }),
+      // TODO: Remove later.
+      TEST_EMAIL: envField.string({ context: "server", access: "public", optional: false }),
     }
   },
 
-  integrations: [
-    mdx(),
-    styleGuide(),
-    icon({
-      include: {
-        // Bootstrap Icons
-        bi: [
-          // Navigation
-          'arrow-down-square', 'arrow-up-right-square', 'arrow-right-square', 'list',
-          // Contact Info
-          'envelope-at-fill', 'telephone-fill', 'geo-alt-fill',
-          // Social Media
-          'facebook', 'instagram', 'linkedin', 'rss-fill', 'tiktok', 'globe', 'mastodon', 'twitter',
-          // Descriptive
-          'gift-fill', 'pencil-fill', 'people-fill', 'person-fill',
-          // Additional icons
-          'check-circle-fill', 'exclamation-triangle-fill', 'file-text-fill', 'display-fill', 'puzzle-fill', 'tools',
-          'gift-fill', 'pencil-fill', 'people-fill', 'person-fill', 'puzzle-fill', 'stopwatch-fill', 'tools',
-        ],
-        // CoreUI Brands
-        cib: [
-          // Social Media
-          'facebook', 'instagram', 'linkedin', 'mastodon', 'twitter',
-          // Streaming
-          'apple-podcasts', 'youtube',
-          // Payment
-          "cc-paypal", "cc-stripe", "paypal", "stripe",
-        ],
-        'simple-icons': [
-          // Streaming
-          'podcastindex'
+  markdown: {
+    remarkPlugins: [ remarkDefinitionList, ],
+    remarkRehype: { handlers: defListHastHandlers },
+  },
+
+  integrations: [mdx(), react(), styleGuide(), icon({
+    include: {
+      // Bootstrap Icons
+      bi: [
+        // Navigation
+        'arrow-down-square', 'arrow-up-right-square', 'arrow-right-square', 'list',
+        // Contact Info
+        'envelope-at-fill', 'telephone-fill', 'geo-alt-fill',
+        // Social Media
+        'facebook', 'instagram', 'linkedin', 'rss-fill', 'tiktok', 'globe', 'mastodon', 'twitter',
+        'github',
+        // Descriptive
+        'gift-fill', 'pencil-fill', 'people-fill', 'person-fill',
+        // Additional icons
+        'check-circle-fill', 'exclamation-triangle-fill', 'file-text-fill', 'display-fill', 'puzzle-fill', 'tools',
+        'gift-fill', 'pencil-fill', 'people-fill', 'person-fill', 'puzzle-fill', 'stopwatch-fill', 'tools',
+      ],
+      // CoreUI Brands
+      cib: [
+        // Social Media
+        'facebook', 'instagram', 'linkedin', 'mastodon', 'twitter',
+        // Streaming
+        'apple-podcasts', 'youtube',
+        // Payment
+        "cc-paypal", "cc-stripe", "paypal", "stripe",
+      ],
+      'simple-icons': [
+        // Streaming
+        'podcastindex'
+      ],
+    }
+  }), sitemap({
+    filter: (page) =>
+      !page.endsWith('/commitment-form/') &&
+      !page.includes('/fixable/') &&
+      !page.includes('/services/escape-room/content/') &&
+      !page.endsWith('tips/archive/')
+  }), robotsTxt({
+    sitemap: true,
+    policy: [
+      // Block specified bots entirely
+      ...botsToDisallow.map((userAgent) => ({
+        userAgent,
+        disallow: ['/'],
+      })),
+      // General user-agent rules
+      {
+        userAgent: '*',
+        allow: ['/', '/materials/basic/'],
+        disallow: [
+          '/fixable/',
+          '/materials/premium/',
+          '/protected-materials/',
+          '/api/download-material',
+          '/api/digital-content',
+          '/api/verify-purchase',
+          '/services/escape-room/content/',
+          '/tips/archive/',
         ],
       }
-    }),
-    sitemap({
-      filter: (page) =>
-        !page.endsWith('/commitment-form/') &&
-        !page.includes('/fixable/') &&
-        !page.includes('/services/escape-room/content/') &&
-        !page.endsWith('tips/archive/')
-    }),
-    robotsTxt({
-      sitemap: true,
-      policy: [
-        // Block specified bots entirely
-        ...botsToDisallow.map((userAgent) => ({
-          userAgent,
-          disallow: ['/'],
-        })),
-        // General user-agent rules
-        {
-          userAgent: '*',
-          allow: ['/', '/materials/basic/'],
-          disallow: [
-            '/fixable/',
-            '/materials/premium/',
-            '/protected-materials/',
-            '/api/download-material',
-            '/api/digital-content',
-            '/api/verify-purchase',
-            '/services/escape-room/content/',
-            '/tips/archive/',
-          ],
-        },
-      ]
-    })
-  ],
-});
+    ],
+  })],
+});

astro/drizzle.config.ts

@@ -3,7 +3,7 @@ import { defineConfig } from 'drizzle-kit';
 
 export default defineConfig({
   out: './drizzle',
-  schema: './src/db/schema.ts',
+  schema: './src/db/schema',
   dialect: 'postgresql',
   dbCredentials: {
     url: process.env.DATABASE_URL!,

astro/drizzle/0000_secret_leo.sql

@@ -0,0 +1,53 @@
+CREATE TABLE "account" (
+	"id" text PRIMARY KEY NOT NULL,
+	"account_id" text NOT NULL,
+	"provider_id" text NOT NULL,
+	"user_id" text NOT NULL,
+	"access_token" text,
+	"refresh_token" text,
+	"id_token" text,
+	"access_token_expires_at" timestamp,
+	"refresh_token_expires_at" timestamp,
+	"scope" text,
+	"password" text,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "session" (
+	"id" text PRIMARY KEY NOT NULL,
+	"expires_at" timestamp NOT NULL,
+	"token" text NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp NOT NULL,
+	"ip_address" text,
+	"user_agent" text,
+	"user_id" text NOT NULL,
+	CONSTRAINT "session_token_unique" UNIQUE("token")
+);
+--> statement-breakpoint
+CREATE TABLE "user" (
+	"id" text PRIMARY KEY NOT NULL,
+	"name" text NOT NULL,
+	"email" text NOT NULL,
+	"email_verified" boolean DEFAULT false NOT NULL,
+	"image" text,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL,
+	CONSTRAINT "user_email_unique" UNIQUE("email")
+);
+--> statement-breakpoint
+CREATE TABLE "verification" (
+	"id" text PRIMARY KEY NOT NULL,
+	"identifier" text NOT NULL,
+	"value" text NOT NULL,
+	"expires_at" timestamp NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+ALTER TABLE "account" ADD CONSTRAINT "account_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "session" ADD CONSTRAINT "session_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE INDEX "account_userId_idx" ON "account" USING btree ("user_id");--> statement-breakpoint
+CREATE INDEX "session_userId_idx" ON "session" USING btree ("user_id");--> statement-breakpoint
+CREATE INDEX "verification_identifier_idx" ON "verification" USING btree ("identifier");