Merge pull request #1139 from trycompai/main

[comp] Production Deploy

Author: claudfuen

.env.example

@@ -1,5 +1,5 @@
 # Database Configuration
-DATABASE_URL=postgres://postgres:postgres@db:5432/comp
+DATABASE_URL="postgresql://postgres:pass@127.0.0.1:5432/comp"
 
 # Authentication
 AUTH_SECRET=your-secret-auth-key-here-min-32-chars

apps/app/.env.example

@@ -4,7 +4,7 @@ AUTH_GOOGLE_ID=""     # Google Cloud Console -> APIs & Services -> Credentials -
 AUTH_GOOGLE_SECRET="" # Google Cloud Console -> Same location as above
 
 # Database (https://neon.tech)
-DATABASE_URL="" # Format: postgresql://user:password@host:port/database
+DATABASE_URL="" # Format: "postgresql://postgres:pass@127.0.0.1:5432/comp"
 
 # AI Services
 # OpenAI (https://platform.openai.com/api-keys)

apps/app/src/app/s3.ts

@@ -4,7 +4,7 @@ const APP_AWS_REGION = process.env.APP_AWS_REGION;
 const APP_AWS_ACCESS_KEY_ID = process.env.APP_AWS_ACCESS_KEY_ID;
 const APP_AWS_SECRET_ACCESS_KEY = process.env.APP_AWS_SECRET_ACCESS_KEY;
 
-export const BUCKET_NAME = process.env.AWS_BUCKET_NAME;
+export const BUCKET_NAME = process.env.APP_AWS_BUCKET_NAME;
 
 if (!APP_AWS_ACCESS_KEY_ID || !APP_AWS_SECRET_ACCESS_KEY || !BUCKET_NAME || !APP_AWS_REGION) {
   // Log the error in production environments

apps/app/tsconfig.json

@@ -42,8 +42,8 @@
       "@comp/integrations/*": ["../../packages/integrations/src/*"],
       "@comp/analytics": ["../../packages/analytics/src/index.ts"],
       "@comp/analytics/*": ["../../packages/analytics/src/*"],
-      "@comp/tsconfig": ["../../packages/tsconfig"],
-      "@comp/tsconfig/*": ["../../packages/tsconfig/*"],
+      "@trycompai/tsconfig": ["../../packages/tsconfig"],
+      "@trycompai/tsconfig/*": ["../../packages/tsconfig/*"],
       "@trycompai/db": ["../../packages/db/src/index.ts"],
       "@trycompai/db/*": ["../../packages/db/src/*"],
       "@trycompai/email": ["../../packages/email/index.ts"],
@@ -55,9 +55,7 @@
       "@trycompai/utils": ["../../packages/utils/src/index.ts"],
       "@trycompai/utils/*": ["../../packages/utils/src/*"],
       "@trycompai/analytics": ["../../packages/analytics/src/index.ts"],
-      "@trycompai/analytics/*": ["../../packages/analytics/src/*"],
-      "@trycompai/tsconfig": ["../../packages/tsconfig"],
-      "@trycompai/tsconfig/*": ["../../packages/tsconfig/*"]
+      "@trycompai/analytics/*": ["../../packages/analytics/src/*"]
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "trigger.config.ts"],

apps/portal/tsconfig.json

@@ -42,8 +42,8 @@
       "@comp/integrations/*": ["../../packages/integrations/src/*"],
       "@comp/analytics": ["../../packages/analytics/src/index.ts"],
       "@comp/analytics/*": ["../../packages/analytics/src/*"],
-      "@comp/tsconfig": ["../../packages/tsconfig"],
-      "@comp/tsconfig/*": ["../../packages/tsconfig/*"],
+      "@trycompai/tsconfig": ["../../packages/tsconfig"],
+      "@trycompai/tsconfig/*": ["../../packages/tsconfig/*"],
       "@trycompai/db": ["../../packages/db/src/index.ts"],
       "@trycompai/db/*": ["../../packages/db/src/*"],
       "@trycompai/email": ["../../packages/email/index.ts"],
@@ -55,9 +55,7 @@
       "@trycompai/utils": ["../../packages/utils/src/index.ts"],
       "@trycompai/utils/*": ["../../packages/utils/src/*"],
       "@trycompai/analytics": ["../../packages/analytics/src/index.ts"],
-      "@trycompai/analytics/*": ["../../packages/analytics/src/*"],
-      "@trycompai/tsconfig": ["../../packages/tsconfig"],
-      "@trycompai/tsconfig/*": ["../../packages/tsconfig/*"]
+      "@trycompai/analytics/*": ["../../packages/analytics/src/*"]
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],

bun.lock

@@ -4,13 +4,12 @@ services:
     ports:
       - '5432:5432'
     environment:
-      POSTGRES_USER: user
       POSTGRES_PASSWORD: pass
       POSTGRES_DB: comp
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -U user -d comp']
+      test: ['CMD-SHELL', 'pg_isready -U postgres -d comp']
       interval: 5s
       timeout: 5s
       retries: 5

docker-compose.yml

@@ -1,2 +1,2 @@
 # Database connection URL for local development
-DATABASE_URL="" # Format: postgresql://user:password@host:port/database
+DATABASE_URL="" # Format: "postgresql://postgres:pass@127.0.0.1:5432/comp"

packages/db/.env.example

@@ -0,0 +1,19 @@
+services:
+  postgres:
+    image: postgres:17-alpine
+    ports:
+      - '5432:5432'
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    restart: unless-stopped
+    environment:
+      POSTGRES_PASSWORD: pass
+      POSTGRES_DB: comp
+    healthcheck:
+      test: ['CMD-SHELL', 'pg_isready -U postgres -d comp']
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  postgres_data:

packages/db/docker-compose.yml

@@ -1,5 +1,5 @@
 {
-  "extends": "@comp/tsconfig/base.json",
+  "extends": "@trycompai/tsconfig/base.json",
   "include": ["src", "."],
   "exclude": ["node_modules"]
 }