Feat/polar payments

.gitignore

@@ -79,6 +79,9 @@ expo-env.d.ts
 .metro-health-check*
 
 **/.claude/settings.local.json
+.claude/skills/socratic-tutor/
 
 # Astro
 .astro/
+.memelord/
+.mcp.json

.zed/settings.json

@@ -0,0 +1,22 @@
+{
+  "languages": {
+    "TSX": {
+      "formatter": [{ "language_server": { "name": "biome" } }]
+    },
+    "TypeScript": {
+      "formatter": [{ "language_server": { "name": "biome" } }]
+    },
+    "Astro": {
+      "formatter": [{ "language_server": { "name": "biome" } }]
+    },
+    "HTML": {
+      "formatter": [{ "language_server": { "name": "biome" } }]
+    },
+    "JSON": {
+      "formatter": [{ "language_server": { "name": "biome" } }]
+    }
+  },
+  "code_actions_on_format": {
+    "source.organizeImports.biome": true
+  }
+}

README.md

@@ -17,10 +17,12 @@ Bahar is an Arabic language learning application built as a monorepo using pnpm
 ## Getting Started
 
 1. Get the environment variables from Infisical
-2. Run `pnpm run dev` and `make local-db` 
+2. Run `pnpm run dev` and `make local-db`
 3. Access the web app at `http://localhost:5173`
 4. Access the API at `http://localhost:3000`
 5. Access the marketing website at `http://localhost:4321`
+6. To run drizzle studio to access the local database, run `pnpm run --filter api drizzle:studio`.
+7. If you need to test payments, make sure to set up a Cloudflare Tunnel by reading the instructions [here](./apps/api/README.md#local-development).
 
 ## Projects
 

apps/api/.example.env

@@ -1,5 +1,4 @@
-WEB_CLIENT_DOMAIN="localhost:4000"
-NEW_WEB_CLIENT_DOMAIN="localhost:4000"
+WEB_CLIENT_DOMAIN="localhost:5173"
 
 PORT=3000
 HOST="0.0.0.0"
@@ -27,3 +26,12 @@ BETTER_AUTH_SECRET=""
 
 SENTRY_DSN=""
 SENTRY_ENV=""
+
+POLAR_ACCESS_TOKEN=""
+POLAR_WEBHOOK_SECRET=""
+POLAR_PRO_PRODUCT_ID=""
+POLAR_PRO_ANNUAL_PRODUCT_ID=""
+
+CF_AI_GATEWAY_TOKEN=""
+CLOUDFLARE_ACCOUNT_ID=""
+CLOUDFLARE_AI_GATEWAY_ID=""

apps/api/README.md

@@ -76,6 +76,12 @@ pnpm install
 
 The API runs on `http://localhost:3000`.
 
+4. For testing Polar payments integration locally, use a Cloudflare Tunnel to expose the API.
+
+See [the docs](https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/do-more-with-tunnels/local-management/create-local-tunnel/) to set up Cloudflare Tunnel. Contact an admin to get the tunnel name and config file. You'll need access to Cloudflare.
+
+Once set up, run the tunnel with `cloudflared tunnel run <tunnel-name>`.
+
 ### Setting Up a New User (Fresh Local DB)
 
 When working with a fresh local database, you need to manually seed the user database migrations:
@@ -101,12 +107,10 @@ When working with a fresh local database, you need to manually seed the user dat
 4. Create a new user through the web app (sign-up flow)
 
 5. Manually convert the user to an admin in the local database:
-
    - Open Drizzle Studio: `pnpm run --filter api drizzle:studio`
    - Find the user in the `users` table and set the role to `admin`
 
 6. Seed the user database migrations:
-
    - Copy the migration SQL from `packages/drizzle-user-db-schemas/drizzle/*.sql`
    - Remove the `--> statement-breakpoint` markers and replace with newlines
    - Manually insert records into the `migrations` table in the user's database
@@ -193,16 +197,3 @@ docker run --network host -p 3000:3000 --env-file apps/api/.env bahar-api
 ## Running in Production
 
 The Docker container runs the compiled `server` binary. Migrations run automatically via Fly.io's `release_command` before deployment.
-
-## Environment Variables
-
-Required environment variables:
-
-- `DATABASE_URL` - Turso central database URL
-- `DATABASE_AUTH_TOKEN` - Turso auth token
-- `TURSO_API_TOKEN` - Turso API token for per-user database management
-- `TURSO_ORGANIZATION` - Turso organization slug
-- `BETTER_AUTH_SECRET` - Secret for Better Auth
-- `REDIS_URL` - Upstash Redis URL
-- `REDIS_TOKEN` - Upstash Redis token
-- `SENTRY_DSN` - Sentry DSN for error tracking

apps/api/drizzle/0013_damp_scarecrow.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `users` ADD `plan` text;--> statement-breakpoint
+ALTER TABLE `users` ADD `subscriptionStatus` text;

apps/api/drizzle/0014_omniscient_rumiko_fujikawa.sql

@@ -0,0 +1,17 @@
+CREATE TABLE `revlogs` (
+	`id` text PRIMARY KEY NOT NULL,
+	`user_id` text NOT NULL,
+	`difficulty` real DEFAULT 0,
+	`due` text NOT NULL,
+	`due_timestamp_ms` integer NOT NULL,
+	`review` text NOT NULL,
+	`review_timestamp_ms` integer NOT NULL,
+	`learning_steps` integer DEFAULT 0,
+	`scheduled_days` integer DEFAULT 0,
+	`stability` real DEFAULT 0,
+	`state` integer DEFAULT 0,
+	`direction` text DEFAULT 'forward' NOT NULL,
+	`source` text DEFAULT 'review' NOT NULL,
+	`created_at` integer DEFAULT (unixepoch()) NOT NULL,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
+);