From 26a84838fa93beef1514b89f60cbb96164e42296 Mon Sep 17 00:00:00 2001 From: Claudio Fuentes Date: Fri, 25 Jul 2025 16:30:48 -0400 Subject: [PATCH 1/3] chore: update database configuration and cleanup - Updated DATABASE_URL format in .env.example files for consistency across applications. - Removed unnecessary dependencies from bun.lock to streamline the project. - Adjusted docker-compose.yml for PostgreSQL service to use the correct user and password. - Added a new docker-compose.yml for the db package to facilitate local development. --- .env.example | 2 +- apps/app/.env.example | 2 +- bun.lock | 4 ---- docker-compose.yml | 3 +-- packages/db/.env.example | 2 +- packages/db/docker-compose.yml | 19 +++++++++++++++++++ yarn.lock | 20 ++++++++++---------- 7 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 packages/db/docker-compose.yml diff --git a/.env.example b/.env.example index 3800275dd..97d912c95 100644 --- a/.env.example +++ b/.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 diff --git a/apps/app/.env.example b/apps/app/.env.example index 3a17b5d3d..828e25aaf 100644 --- a/apps/app/.env.example +++ b/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) diff --git a/bun.lock b/bun.lock index 330d00944..cede3a429 100644 --- a/bun.lock +++ b/bun.lock @@ -3,10 +3,6 @@ "workspaces": { "": { "name": "comp", - "dependencies": { - "react": "^19.1.0", - "react-dom": "^19.1.0", - }, "devDependencies": { "@azure/core-http": "^3.0.5", "@azure/core-rest-pipeline": "^1.21.0", diff --git a/docker-compose.yml b/docker-compose.yml index 5e6712e2d..6a80fb171 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 diff --git a/packages/db/.env.example b/packages/db/.env.example index 3f97dc9cf..1792de902 100644 --- a/packages/db/.env.example +++ b/packages/db/.env.example @@ -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" diff --git a/packages/db/docker-compose.yml b/packages/db/docker-compose.yml new file mode 100644 index 000000000..786340102 --- /dev/null +++ b/packages/db/docker-compose.yml @@ -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: diff --git a/yarn.lock b/yarn.lock index 2d049de68..0aad51496 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1291,7 +1291,7 @@ "@types/conventional-commits-parser" "^5.0.0" chalk "^5.3.0" -"@comp/app@^workspace:apps/app", "@comp/app@workspace:*": +"@comp/app@apps/app", "@comp/app@workspace:*": version "workspace:apps/app" resolved "workspace:apps/app" devDependencies: @@ -1402,7 +1402,7 @@ zaraz-ts "^1.2.0" zustand "^5.0.3" -"@comp/portal@^workspace:apps/portal": +"@comp/portal@apps/portal": version "workspace:apps/portal" resolved "workspace:apps/portal" devDependencies: @@ -5569,7 +5569,7 @@ uuid "^9.0.0" ws "^8.11.0" -"@trycompai/analytics@^workspace:packages/analytics", "@trycompai/analytics@workspace:*": +"@trycompai/analytics@packages/analytics", "@trycompai/analytics@workspace:*": version "workspace:packages/analytics" resolved "workspace:packages/analytics" devDependencies: @@ -5579,7 +5579,7 @@ posthog-js "^1.236.6" posthog-node "^4.14.0" -"@trycompai/db@^workspace:packages/db", "@trycompai/db@workspace:*": +"@trycompai/db@packages/db", "@trycompai/db@workspace:*": version "workspace:packages/db" resolved "workspace:packages/db" devDependencies: @@ -5592,7 +5592,7 @@ dependencies: "@prisma/client" "6.9.0" -"@trycompai/email@^workspace:packages/email", "@trycompai/email@workspace:*": +"@trycompai/email@packages/email", "@trycompai/email@workspace:*": version "workspace:packages/email" resolved "workspace:packages/email" devDependencies: @@ -5613,7 +5613,7 @@ react-email "^4.0.15" responsive-react-email "^0.0.5" -"@trycompai/integrations@^workspace:packages/integrations": +"@trycompai/integrations@packages/integrations": version "workspace:packages/integrations" resolved "workspace:packages/integrations" devDependencies: @@ -5636,7 +5636,7 @@ stoppable "^1.1.0" zod "3.25.67" -"@trycompai/kv@^workspace:packages/kv", "@trycompai/kv@workspace:*": +"@trycompai/kv@packages/kv", "@trycompai/kv@workspace:*": version "workspace:packages/kv" resolved "workspace:packages/kv" devDependencies: @@ -5646,11 +5646,11 @@ "@upstash/redis" "^1.34.2" server-only "0.0.1" -"@trycompai/tsconfig@^workspace:packages/tsconfig", "@trycompai/tsconfig@workspace:*": +"@trycompai/tsconfig@packages/tsconfig", "@trycompai/tsconfig@workspace:*": version "workspace:packages/tsconfig" resolved "workspace:packages/tsconfig" -"@trycompai/ui@^workspace:packages/ui", "@trycompai/ui@workspace:*": +"@trycompai/ui@packages/ui", "@trycompai/ui@workspace:*": version "workspace:packages/ui" resolved "workspace:packages/ui" devDependencies: @@ -5734,7 +5734,7 @@ use-debounce "^10.0.4" vaul "^0.9.6" -"@trycompai/utils@^workspace:packages/utils", "@trycompai/utils@workspace:*": +"@trycompai/utils@packages/utils", "@trycompai/utils@workspace:*": version "workspace:packages/utils" resolved "workspace:packages/utils" devDependencies: From b94765ad2f5809215b181b0a97c766283ff05df0 Mon Sep 17 00:00:00 2001 From: Claudio Fuentes Date: Fri, 25 Jul 2025 16:33:05 -0400 Subject: [PATCH 2/3] chore: update TypeScript configuration references - Changed the TypeScript configuration extension from "@comp/tsconfig/base.json" to "@trycompai/tsconfig/base.json" in tsconfig.json files. - Updated path references for "@comp/tsconfig" to "@trycompai/tsconfig" in application tsconfig.json files for consistency across the project. --- apps/app/tsconfig.json | 8 +++----- apps/portal/tsconfig.json | 8 +++----- tsconfig.json | 2 +- yarn.lock | 20 ++++++++++---------- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/apps/app/tsconfig.json b/apps/app/tsconfig.json index 7008132a5..331e74fce 100644 --- a/apps/app/tsconfig.json +++ b/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"], diff --git a/apps/portal/tsconfig.json b/apps/portal/tsconfig.json index 2ebf572bf..1b34eb702 100644 --- a/apps/portal/tsconfig.json +++ b/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"], diff --git a/tsconfig.json b/tsconfig.json index 3e773d6c5..a0209011b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@comp/tsconfig/base.json", + "extends": "@trycompai/tsconfig/base.json", "include": ["src", "."], "exclude": ["node_modules"] } diff --git a/yarn.lock b/yarn.lock index 0aad51496..2d049de68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1291,7 +1291,7 @@ "@types/conventional-commits-parser" "^5.0.0" chalk "^5.3.0" -"@comp/app@apps/app", "@comp/app@workspace:*": +"@comp/app@^workspace:apps/app", "@comp/app@workspace:*": version "workspace:apps/app" resolved "workspace:apps/app" devDependencies: @@ -1402,7 +1402,7 @@ zaraz-ts "^1.2.0" zustand "^5.0.3" -"@comp/portal@apps/portal": +"@comp/portal@^workspace:apps/portal": version "workspace:apps/portal" resolved "workspace:apps/portal" devDependencies: @@ -5569,7 +5569,7 @@ uuid "^9.0.0" ws "^8.11.0" -"@trycompai/analytics@packages/analytics", "@trycompai/analytics@workspace:*": +"@trycompai/analytics@^workspace:packages/analytics", "@trycompai/analytics@workspace:*": version "workspace:packages/analytics" resolved "workspace:packages/analytics" devDependencies: @@ -5579,7 +5579,7 @@ posthog-js "^1.236.6" posthog-node "^4.14.0" -"@trycompai/db@packages/db", "@trycompai/db@workspace:*": +"@trycompai/db@^workspace:packages/db", "@trycompai/db@workspace:*": version "workspace:packages/db" resolved "workspace:packages/db" devDependencies: @@ -5592,7 +5592,7 @@ dependencies: "@prisma/client" "6.9.0" -"@trycompai/email@packages/email", "@trycompai/email@workspace:*": +"@trycompai/email@^workspace:packages/email", "@trycompai/email@workspace:*": version "workspace:packages/email" resolved "workspace:packages/email" devDependencies: @@ -5613,7 +5613,7 @@ react-email "^4.0.15" responsive-react-email "^0.0.5" -"@trycompai/integrations@packages/integrations": +"@trycompai/integrations@^workspace:packages/integrations": version "workspace:packages/integrations" resolved "workspace:packages/integrations" devDependencies: @@ -5636,7 +5636,7 @@ stoppable "^1.1.0" zod "3.25.67" -"@trycompai/kv@packages/kv", "@trycompai/kv@workspace:*": +"@trycompai/kv@^workspace:packages/kv", "@trycompai/kv@workspace:*": version "workspace:packages/kv" resolved "workspace:packages/kv" devDependencies: @@ -5646,11 +5646,11 @@ "@upstash/redis" "^1.34.2" server-only "0.0.1" -"@trycompai/tsconfig@packages/tsconfig", "@trycompai/tsconfig@workspace:*": +"@trycompai/tsconfig@^workspace:packages/tsconfig", "@trycompai/tsconfig@workspace:*": version "workspace:packages/tsconfig" resolved "workspace:packages/tsconfig" -"@trycompai/ui@packages/ui", "@trycompai/ui@workspace:*": +"@trycompai/ui@^workspace:packages/ui", "@trycompai/ui@workspace:*": version "workspace:packages/ui" resolved "workspace:packages/ui" devDependencies: @@ -5734,7 +5734,7 @@ use-debounce "^10.0.4" vaul "^0.9.6" -"@trycompai/utils@packages/utils", "@trycompai/utils@workspace:*": +"@trycompai/utils@^workspace:packages/utils", "@trycompai/utils@workspace:*": version "workspace:packages/utils" resolved "workspace:packages/utils" devDependencies: From 1cc4fb283735f12b091f62938b36af07629535f6 Mon Sep 17 00:00:00 2001 From: Claudio Fuentes Date: Sat, 26 Jul 2025 08:27:03 -0400 Subject: [PATCH 3/3] fix: update S3 bucket name environment variable - Changed the S3 bucket name environment variable from AWS_BUCKET_NAME to APP_AWS_BUCKET_NAME for consistency with the new naming convention. --- apps/app/src/app/s3.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app/src/app/s3.ts b/apps/app/src/app/s3.ts index 7b942ba5d..0c519803a 100644 --- a/apps/app/src/app/s3.ts +++ b/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