Skip to content

Commit ddd7516

Browse files
authored
Merge pull request #1138 from trycompai/claudio/fix-height-issue
[dev] [claudfuen] claudio/fix-height-issue
2 parents f2cf5fb + b94765a commit ddd7516

9 files changed

Lines changed: 30 additions & 20 deletions

File tree

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Database Configuration
2-
DATABASE_URL=postgres://postgres:postgres@db:5432/comp
2+
DATABASE_URL="postgresql://postgres:pass@127.0.0.1:5432/comp"
33

44
# Authentication
55
AUTH_SECRET=your-secret-auth-key-here-min-32-chars

apps/app/.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ AUTH_GOOGLE_ID="" # Google Cloud Console -> APIs & Services -> Credentials -
44
AUTH_GOOGLE_SECRET="" # Google Cloud Console -> Same location as above
55

66
# Database (https://neon.tech)
7-
DATABASE_URL="" # Format: postgresql://user:password@host:port/database
7+
DATABASE_URL="" # Format: "postgresql://postgres:pass@127.0.0.1:5432/comp"
88

99
# AI Services
1010
# OpenAI (https://platform.openai.com/api-keys)

apps/app/tsconfig.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
"@comp/integrations/*": ["../../packages/integrations/src/*"],
4343
"@comp/analytics": ["../../packages/analytics/src/index.ts"],
4444
"@comp/analytics/*": ["../../packages/analytics/src/*"],
45-
"@comp/tsconfig": ["../../packages/tsconfig"],
46-
"@comp/tsconfig/*": ["../../packages/tsconfig/*"],
45+
"@trycompai/tsconfig": ["../../packages/tsconfig"],
46+
"@trycompai/tsconfig/*": ["../../packages/tsconfig/*"],
4747
"@trycompai/db": ["../../packages/db/src/index.ts"],
4848
"@trycompai/db/*": ["../../packages/db/src/*"],
4949
"@trycompai/email": ["../../packages/email/index.ts"],
@@ -55,9 +55,7 @@
5555
"@trycompai/utils": ["../../packages/utils/src/index.ts"],
5656
"@trycompai/utils/*": ["../../packages/utils/src/*"],
5757
"@trycompai/analytics": ["../../packages/analytics/src/index.ts"],
58-
"@trycompai/analytics/*": ["../../packages/analytics/src/*"],
59-
"@trycompai/tsconfig": ["../../packages/tsconfig"],
60-
"@trycompai/tsconfig/*": ["../../packages/tsconfig/*"]
58+
"@trycompai/analytics/*": ["../../packages/analytics/src/*"]
6159
}
6260
},
6361
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "trigger.config.ts"],

apps/portal/tsconfig.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
"@comp/integrations/*": ["../../packages/integrations/src/*"],
4343
"@comp/analytics": ["../../packages/analytics/src/index.ts"],
4444
"@comp/analytics/*": ["../../packages/analytics/src/*"],
45-
"@comp/tsconfig": ["../../packages/tsconfig"],
46-
"@comp/tsconfig/*": ["../../packages/tsconfig/*"],
45+
"@trycompai/tsconfig": ["../../packages/tsconfig"],
46+
"@trycompai/tsconfig/*": ["../../packages/tsconfig/*"],
4747
"@trycompai/db": ["../../packages/db/src/index.ts"],
4848
"@trycompai/db/*": ["../../packages/db/src/*"],
4949
"@trycompai/email": ["../../packages/email/index.ts"],
@@ -55,9 +55,7 @@
5555
"@trycompai/utils": ["../../packages/utils/src/index.ts"],
5656
"@trycompai/utils/*": ["../../packages/utils/src/*"],
5757
"@trycompai/analytics": ["../../packages/analytics/src/index.ts"],
58-
"@trycompai/analytics/*": ["../../packages/analytics/src/*"],
59-
"@trycompai/tsconfig": ["../../packages/tsconfig"],
60-
"@trycompai/tsconfig/*": ["../../packages/tsconfig/*"]
58+
"@trycompai/analytics/*": ["../../packages/analytics/src/*"]
6159
}
6260
},
6361
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],

bun.lock

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-compose.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ services:
44
ports:
55
- '5432:5432'
66
environment:
7-
POSTGRES_USER: user
87
POSTGRES_PASSWORD: pass
98
POSTGRES_DB: comp
109
volumes:
1110
- postgres_data:/var/lib/postgresql/data
1211
healthcheck:
13-
test: ['CMD-SHELL', 'pg_isready -U user -d comp']
12+
test: ['CMD-SHELL', 'pg_isready -U postgres -d comp']
1413
interval: 5s
1514
timeout: 5s
1615
retries: 5

packages/db/.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Database connection URL for local development
2-
DATABASE_URL="" # Format: postgresql://user:password@host:port/database
2+
DATABASE_URL="" # Format: "postgresql://postgres:pass@127.0.0.1:5432/comp"

packages/db/docker-compose.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
services:
2+
postgres:
3+
image: postgres:17-alpine
4+
ports:
5+
- '5432:5432'
6+
volumes:
7+
- postgres_data:/var/lib/postgresql/data
8+
restart: unless-stopped
9+
environment:
10+
POSTGRES_PASSWORD: pass
11+
POSTGRES_DB: comp
12+
healthcheck:
13+
test: ['CMD-SHELL', 'pg_isready -U postgres -d comp']
14+
interval: 5s
15+
timeout: 5s
16+
retries: 5
17+
18+
volumes:
19+
postgres_data:

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "@comp/tsconfig/base.json",
2+
"extends": "@trycompai/tsconfig/base.json",
33
"include": ["src", "."],
44
"exclude": ["node_modules"]
55
}

0 commit comments

Comments
 (0)