Merge pull request #347 from Merit-Systems/master

[Release] pre-launch

Author: rsproule

Dockerfile.railway

@@ -33,6 +33,7 @@ ARG OTEL_NODE_RESOURCE_DETECTORS
 ARG OTEL_TRACES_EXPORTER
 ARG OTEL_LOG_LEVEL
 ARG PORT
+ARG AUTH_RESEND_KEY
 
 # Set environment variables from build arguments
 ENV DATABASE_URL=$DATABASE_URL
@@ -60,6 +61,7 @@ ENV OTEL_NODE_RESOURCE_DETECTORS=$OTEL_NODE_RESOURCE_DETECTORS
 ENV OTEL_TRACES_EXPORTER=$OTEL_TRACES_EXPORTER
 ENV OTEL_LOG_LEVEL=$OTEL_LOG_LEVEL
 ENV PORT=$PORT
+ENV AUTH_RESEND_KEY=$AUTH_RESEND_KEY
 
 # Install system dependencies
 RUN apk add --no-cache \

README.md

@@ -1,4 +1,4 @@
 {
   "title": "Getting Started",
-  "pages": ["react", "next-js", "cli"]
+  "pages": ["react", "next-js", "cli", "markup-and-referrals"]
 }

echo-control/docs/getting-started/markup-and-referrals.mdx

@@ -40,9 +40,8 @@
     "@opentelemetry/sdk-logs": "0.57.2",
     "@opentelemetry/sdk-metrics": "1.26.0",
     "@opentelemetry/sdk-trace-base": "1.26.0",
-    "@prisma/client": "^6.13.0",
-    "@prisma/nextjs-monorepo-workaround-plugin": "^6.12.0",
     "@radix-ui/react-accordion": "^1.2.12",
+    "@radix-ui/react-alert-dialog": "^1.1.15",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-dialog": "^1.1.14",
     "@radix-ui/react-dropdown-menu": "^2.1.15",
@@ -90,7 +89,9 @@
     "octokit": "^5.0.3",
     "postcss": "^8.5.4",
     "posthog-js": "^1.260.3",
-    "prisma": "^6.8.2",
+    "@prisma/client": "6.16.0",
+    "@prisma/nextjs-monorepo-workaround-plugin": "6.16.0",
+    "prisma": "6.16.0",
     "react": "19.1.1",
     "react-day-picker": "^9.9.0",
     "react-dom": "19.1.1",
@@ -102,12 +103,13 @@
     "remark-gfm": "^4.0.1",
     "remark-mdx": "^3.1.0",
     "server-only": "^0.0.1",
+    "shiki": "^3.11.0",
     "sonner": "^2.0.7",
     "stripe": "^18.2.1",
     "superjson": "^2.2.2",
     "tailwind-merge": "^3.3.1",
     "tailwindcss": "^4.1.11",
-    "ts-morph": "^27.0.0",
+    "ts-morph": "^26.0.0",
     "viem": "^2.33.3",
     "x402-next": "^0.5.0",
     "zod": "^4.0.15"

echo-control/docs/getting-started/meta.json

@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE "users" ADD COLUMN     "latestFreeCreditsVersion" DECIMAL(65,30),
+ADD COLUMN     "latestPrivacyVersion" DECIMAL(65,30),
+ADD COLUMN     "latestTosVersion" DECIMAL(65,30);

echo-control/docs/getting-started/next-js.mdx

@@ -0,0 +1,5 @@
+-- CreateEnum
+CREATE TYPE "EnumPaymentSource" AS ENUM ('stripe', 'admin', 'signUpGift');
+
+-- AlterTable
+ALTER TABLE "payments" ADD COLUMN     "source" "EnumPaymentSource" NOT NULL DEFAULT 'stripe';

echo-control/package.json

@@ -35,6 +35,9 @@ model User {
   appSessions          AppSession[]
   Payout               Payout[]
   githubLink           GithubLink?
+  latestTosVersion     Decimal?
+  latestPrivacyVersion Decimal?
+  latestFreeCreditsVersion Decimal?
 
   @@map("users")
 }
@@ -200,6 +203,7 @@ model Payment {
   amount      Decimal    @db.Decimal(65, 14)
   currency    String     @default("usd")
   status      String
+  source      EnumPaymentSource @default(stripe)
   description String?
   isArchived  Boolean    @default(false)
   archivedAt  DateTime?  @db.Timestamptz(6)
@@ -273,6 +277,12 @@ enum GithubType {
   repo
 }
 
+enum EnumPaymentSource {
+  stripe
+  admin
+  signUpGift
+}
+
 model Transaction {
   id                    String               @id @default(uuid()) @db.Uuid
   transactionMetadataId String?              @db.Uuid