Compare commits
13 Commits
db30a7e178
...
fix/e2e-bu
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eab1618d04 | ||
|
|
273b600e98 | ||
|
|
024f3cb1f7 | ||
|
|
cd51f2a0c8 | ||
|
|
4d5e1502e9 | ||
|
|
56b6f67d00 | ||
|
|
370fd2d8e6 | ||
|
|
089de443a0 | ||
|
|
78e1c74fa3 | ||
|
|
d9ed1586cc | ||
|
|
5187d75d53 | ||
|
|
8d2239aebd | ||
|
|
0b523b7274 |
38
README.md
38
README.md
@@ -85,6 +85,44 @@ npm run dev
|
|||||||
docker compose up -d
|
docker compose up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Deployment
|
||||||
|
|
||||||
|
**Production URL:** [https://comparaison.local.tophermayor.com](https://comparaison.local.tophermayor.com)
|
||||||
|
|
||||||
|
| Detail | Value |
|
||||||
|
|---|---|
|
||||||
|
| Host | `ubuntu` (`192.168.50.61`) |
|
||||||
|
| Compose file | `/srv/compose/comparaison/docker-compose.yml` |
|
||||||
|
| Reverse proxy | Traefik (shared instance on `proxy-net`) |
|
||||||
|
| Database | Shared PostgreSQL (`postgres-shared` container on `proxy-net`) |
|
||||||
|
| Routing | Docker labels on the app container (Traefik router/rules) |
|
||||||
|
|
||||||
|
### Production Setup
|
||||||
|
|
||||||
|
1. **Traefik Ingress** — A shared Traefik instance handles TLS termination and routes traffic to the app container via Docker labels. The app joins the `proxy-net` network so Traefik can reach it.
|
||||||
|
|
||||||
|
2. **Shared PostgreSQL** — A standalone `postgres-shared` container provides the database. The comparaison app connects to it over `proxy-net`. No separate DB container is defined in the app's compose file.
|
||||||
|
|
||||||
|
3. **Environment** — The following are configured in the production environment:
|
||||||
|
- `DATABASE_URL` — Points to the shared Postgres instance
|
||||||
|
- `BETTER_AUTH_SECRET` — Random secret for session signing
|
||||||
|
- `OPENAI_API_KEY`, `TAVILY_API_KEY`, `PERPLEXITY_API_KEY` — LLM provider keys
|
||||||
|
- `NEXT_PUBLIC_APP_URL` — `https://comparaison.local.tophermayor.com`
|
||||||
|
|
||||||
|
### Deploying Updates
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# On ubuntu (192.168.50.61)
|
||||||
|
cd /srv/compose/comparaison
|
||||||
|
docker compose pull && docker compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
### Recent Fixes
|
||||||
|
|
||||||
|
- Added `userId` to comparison inserts so saved comparisons are properly associated with authenticated users
|
||||||
|
- Fixed OpenAI provider `getClient()` to correctly initialize the OpenAI client
|
||||||
|
- Added `BETTER_AUTH_SECRET` to production environment for proper session management
|
||||||
|
|
||||||
## Project Structure
|
## Project Structure
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -1,30 +1,24 @@
|
|||||||
version: "3.8"
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
build: .
|
build: .
|
||||||
ports:
|
container_name: comparaison
|
||||||
- "3000:3000"
|
|
||||||
environment:
|
|
||||||
- DATABASE_URL=postgresql://postgres:postgres@db:5432/comparaison
|
|
||||||
depends_on:
|
|
||||||
db:
|
|
||||||
condition: service_healthy
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
db:
|
|
||||||
image: postgres:16-alpine
|
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: postgres
|
- DATABASE_URL=postgresql://bear:changeme@postgres-shared:5432/comparaison
|
||||||
POSTGRES_PASSWORD: postgres
|
- BETTER_AUTH_SECRET=Y6oPTrn3adCnf+Bx60/4g3KjuBfLGVJJB9NFKR5bbVk=
|
||||||
POSTGRES_DB: comparaison
|
- BETTER_AUTH_URL=https://comparaison.local.tophermayor.com
|
||||||
ports:
|
- NODE_ENV=production
|
||||||
- "5432:5432"
|
networks:
|
||||||
volumes:
|
- proxy-net
|
||||||
- pgdata:/var/lib/postgresql/data
|
labels:
|
||||||
healthcheck:
|
- "traefik.enable=true"
|
||||||
test: ["CMD-SHELL", "pg_isready -U postgres"]
|
- "traefik.http.routers.comparaison.rule=Host(`comparaison.local.tophermayor.com`)"
|
||||||
interval: 5s
|
- "traefik.http.routers.comparaison.entrypoints=websecure"
|
||||||
timeout: 5s
|
- "traefik.http.routers.comparaison.tls=true"
|
||||||
retries: 5
|
- "traefik.http.routers.comparaison.tls.certresolver=cloudflare"
|
||||||
restart: unless-stopped
|
- "traefik.http.routers.comparaison.middlewares=local-only@file"
|
||||||
volumes:
|
- "traefik.http.services.comparaison.loadbalancer.server.port=3000"
|
||||||
pgdata:
|
|
||||||
|
networks:
|
||||||
|
proxy-net:
|
||||||
|
external: true
|
||||||
|
|||||||
1
drizzle/0001_fix_email_verified.sql
Normal file
1
drizzle/0001_fix_email_verified.sql
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "users" ALTER COLUMN "email_verified" SET DATA TYPE boolean USING ("email_verified" IS NOT NULL);
|
||||||
17
drizzle/0002_add_accounts_table.sql
Normal file
17
drizzle/0002_add_accounts_table.sql
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
CREATE TABLE "accounts" (
|
||||||
|
"id" text PRIMARY KEY NOT NULL,
|
||||||
|
"user_id" text NOT NULL,
|
||||||
|
"account_id" text NOT NULL,
|
||||||
|
"provider_id" text NOT NULL,
|
||||||
|
"access_token" text,
|
||||||
|
"refresh_token" text,
|
||||||
|
"access_token_expires_at" timestamp,
|
||||||
|
"refresh_token_expires_at" timestamp,
|
||||||
|
"scope" text,
|
||||||
|
"id_token" text,
|
||||||
|
"password" text,
|
||||||
|
"created_at" timestamp with time zone DEFAULT now() NOT NULL,
|
||||||
|
"updated_at" timestamp with time zone DEFAULT now() NOT NULL
|
||||||
|
);
|
||||||
|
ALTER TABLE "accounts" ADD CONSTRAINT "accounts_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;
|
||||||
|
CREATE INDEX "accounts_user_id_idx" ON "accounts" USING btree ("user_id");
|
||||||
8
drizzle/0003_add_verifications_table.sql
Normal file
8
drizzle/0003_add_verifications_table.sql
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
CREATE TABLE IF NOT EXISTS "verifications" (
|
||||||
|
"id" text PRIMARY KEY NOT NULL,
|
||||||
|
"identifier" text NOT NULL,
|
||||||
|
"value" text NOT NULL,
|
||||||
|
"expires_at" timestamp NOT NULL,
|
||||||
|
"created_at" timestamp with time zone DEFAULT now(),
|
||||||
|
"updated_at" timestamp with time zone DEFAULT now()
|
||||||
|
);
|
||||||
@@ -8,6 +8,27 @@
|
|||||||
"when": 1777066297133,
|
"when": 1777066297133,
|
||||||
"tag": "0000_gorgeous_puma",
|
"tag": "0000_gorgeous_puma",
|
||||||
"breakpoints": true
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 1,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1777066300000,
|
||||||
|
"tag": "0001_fix_email_verified",
|
||||||
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 2,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1777066400000,
|
||||||
|
"tag": "0002_add_accounts_table",
|
||||||
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 3,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1777066500000,
|
||||||
|
"tag": "0003_add_verifications_table",
|
||||||
|
"breakpoints": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -33,18 +33,26 @@ interface UserStats {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default function ProfilePage() {
|
export default function ProfilePage() {
|
||||||
|
// TODO: Replace with real auth session data
|
||||||
|
const user = { name: "Demo User", email: "demo@example.com", avatar: "" }
|
||||||
|
const stats = [
|
||||||
|
{ label: "Comparisons", value: "0", icon: BarChart3 },
|
||||||
|
{ label: "Total Views", value: "0", icon: Eye },
|
||||||
|
]
|
||||||
|
const comparisons: Comparison[] = []
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="max-w-4xl mx-auto p-4 sm:p-6 space-y-8">
|
<div className="max-w-4xl mx-auto p-4 sm:p-6 space-y-8">
|
||||||
<div className="flex items-center gap-6">
|
<div className="flex items-center gap-6">
|
||||||
<Avatar className="size-20">
|
<Avatar className="size-20">
|
||||||
<AvatarImage src={mockUser.avatar} />
|
<AvatarImage src={user.avatar} />
|
||||||
<AvatarFallback className="text-2xl bg-primary/10 text-primary font-semibold">
|
<AvatarFallback className="text-2xl bg-primary/10 text-primary font-semibold">
|
||||||
{mockUser.name.split(" ").map((n) => n[0]).join("")}
|
{user.name.split(" ").map((n) => n[0]).join("")}
|
||||||
</AvatarFallback>
|
</AvatarFallback>
|
||||||
</Avatar>
|
</Avatar>
|
||||||
<div className="space-y-1.5">
|
<div className="space-y-1.5">
|
||||||
<h1 className="text-2xl font-bold">{mockUser.name}</h1>
|
<h1 className="text-2xl font-bold">{user.name}</h1>
|
||||||
<p className="text-muted-foreground">{mockUser.email}</p>
|
<p className="text-muted-foreground">{user.email}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -75,9 +83,9 @@ export default function ProfilePage() {
|
|||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{mockComparisons.length > 0 ? (
|
{comparisons.length > 0 ? (
|
||||||
<div className="grid gap-4 sm:grid-cols-2">
|
<div className="grid gap-4 sm:grid-cols-2">
|
||||||
{mockComparisons.map((comparison) => (
|
{comparisons.map((comparison) => (
|
||||||
<Link key={comparison.id} href={`/compare/${comparison.id}`}>
|
<Link key={comparison.id} href={`/compare/${comparison.id}`}>
|
||||||
<Card className="h-full transition-all hover:border-primary hover:shadow-md">
|
<Card className="h-full transition-all hover:border-primary hover:shadow-md">
|
||||||
<CardHeader className="pb-3">
|
<CardHeader className="pb-3">
|
||||||
@@ -102,7 +110,7 @@ export default function ProfilePage() {
|
|||||||
<div className="flex items-center gap-3 text-sm text-muted-foreground">
|
<div className="flex items-center gap-3 text-sm text-muted-foreground">
|
||||||
<span className="flex items-center gap-1">
|
<span className="flex items-center gap-1">
|
||||||
<Eye className="size-3.5" />
|
<Eye className="size-3.5" />
|
||||||
{comparison.views.toLocaleString()}
|
{comparison.viewCount.toLocaleString()}
|
||||||
</span>
|
</span>
|
||||||
<span className="font-semibold text-foreground">
|
<span className="font-semibold text-foreground">
|
||||||
{comparison.overallScore}/10
|
{comparison.overallScore}/10
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ export async function createComparison(formData: FormData) {
|
|||||||
|
|
||||||
await db.insert(comparisons).values({
|
await db.insert(comparisons).values({
|
||||||
id,
|
id,
|
||||||
|
userId: "system",
|
||||||
title,
|
title,
|
||||||
query,
|
query,
|
||||||
slug,
|
slug,
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { db } from "@/lib/db";
|
|||||||
import { comparisons, comparisonItems } from "@/lib/db/schema";
|
import { comparisons, comparisonItems } from "@/lib/db/schema";
|
||||||
import { eq } from "drizzle-orm";
|
import { eq } from "drizzle-orm";
|
||||||
import { createId } from "@paralleldrive/cuid2";
|
import { createId } from "@paralleldrive/cuid2";
|
||||||
|
import { auth } from "@/lib/auth";
|
||||||
|
|
||||||
function serializeSSE(event: string, data: unknown): string {
|
function serializeSSE(event: string, data: unknown): string {
|
||||||
return `event: ${event}\ndata: ${JSON.stringify(data)}\n\n`;
|
return `event: ${event}\ndata: ${JSON.stringify(data)}\n\n`;
|
||||||
@@ -23,6 +24,11 @@ function slugify(text: string): string {
|
|||||||
// const ratelimit = new Ratelimit({ redis, limiter: slidingWindow(5, "1m") })
|
// const ratelimit = new Ratelimit({ redis, limiter: slidingWindow(5, "1m") })
|
||||||
|
|
||||||
export async function POST(request: Request) {
|
export async function POST(request: Request) {
|
||||||
|
const session = await auth.api.getSession({ headers: request.headers });
|
||||||
|
if (!session?.user) {
|
||||||
|
return Response.json({ error: "Authentication required" }, { status: 401 });
|
||||||
|
}
|
||||||
|
|
||||||
const body: { query?: string; items?: string[]; dimensions?: string[] } =
|
const body: { query?: string; items?: string[]; dimensions?: string[] } =
|
||||||
await request.json();
|
await request.json();
|
||||||
const { query, items, dimensions } = body;
|
const { query, items, dimensions } = body;
|
||||||
@@ -54,8 +60,9 @@ export async function POST(request: Request) {
|
|||||||
|
|
||||||
await db.insert(comparisons).values({
|
await db.insert(comparisons).values({
|
||||||
id,
|
id,
|
||||||
|
userId: session.user.id,
|
||||||
title,
|
title,
|
||||||
query: query || null,
|
query: query ?? title,
|
||||||
slug,
|
slug,
|
||||||
status: "researching",
|
status: "researching",
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -4,7 +4,10 @@ import { db } from "./db";
|
|||||||
import * as schema from "./db/schema";
|
import * as schema from "./db/schema";
|
||||||
|
|
||||||
export const auth = betterAuth({
|
export const auth = betterAuth({
|
||||||
database: drizzleAdapter(db, { provider: "pg", schema }),
|
database: drizzleAdapter(db, {
|
||||||
|
provider: "pg",
|
||||||
|
schema,
|
||||||
|
}),
|
||||||
emailAndPassword: { enabled: true },
|
emailAndPassword: { enabled: true },
|
||||||
session: { expiresIn: 60 * 60 * 24 * 7 },
|
session: { expiresIn: 60 * 60 * 24 * 7 },
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -20,6 +20,33 @@ export const users = pgTable("users", {
|
|||||||
updatedAt: timestamp("updated_at", { withTimezone: true }).defaultNow().notNull(),
|
updatedAt: timestamp("updated_at", { withTimezone: true }).defaultNow().notNull(),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const accounts = pgTable("accounts", {
|
||||||
|
id: text("id").primaryKey().$defaultFn(() => createId()),
|
||||||
|
userId: text("user_id")
|
||||||
|
.notNull()
|
||||||
|
.references(() => users.id, { onDelete: "cascade" }),
|
||||||
|
accountId: text("account_id").notNull(),
|
||||||
|
providerId: text("provider_id").notNull(),
|
||||||
|
accessToken: text("access_token"),
|
||||||
|
refreshToken: text("refresh_token"),
|
||||||
|
accessTokenExpiresAt: timestamp("access_token_expires_at"),
|
||||||
|
refreshTokenExpiresAt: timestamp("refresh_token_expires_at"),
|
||||||
|
scope: text("scope"),
|
||||||
|
idToken: text("id_token"),
|
||||||
|
password: text("password"),
|
||||||
|
createdAt: timestamp("created_at", { withTimezone: true }).defaultNow().notNull(),
|
||||||
|
updatedAt: timestamp("updated_at", { withTimezone: true }).defaultNow().notNull(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export const verifications = pgTable("verifications", {
|
||||||
|
id: text("id").primaryKey().$defaultFn(() => createId()),
|
||||||
|
identifier: text("identifier").notNull(),
|
||||||
|
value: text("value").notNull(),
|
||||||
|
expiresAt: timestamp("expires_at").notNull(),
|
||||||
|
createdAt: timestamp("created_at", { withTimezone: true }).defaultNow(),
|
||||||
|
updatedAt: timestamp("updated_at", { withTimezone: true }).defaultNow(),
|
||||||
|
});
|
||||||
|
|
||||||
export const comparisonStatusEnum = pgEnum("comparison_status", [
|
export const comparisonStatusEnum = pgEnum("comparison_status", [
|
||||||
"researching",
|
"researching",
|
||||||
"completed",
|
"completed",
|
||||||
@@ -33,8 +60,10 @@ export const sessions = pgTable("sessions", {
|
|||||||
.references(() => users.id, { onDelete: "cascade" }),
|
.references(() => users.id, { onDelete: "cascade" }),
|
||||||
token: text("token").notNull().unique(),
|
token: text("token").notNull().unique(),
|
||||||
expiresAt: timestamp("expires_at").notNull(),
|
expiresAt: timestamp("expires_at").notNull(),
|
||||||
createdAt: timestamp("created_at").defaultNow().notNull(),
|
ipAddress: text("ip_address"),
|
||||||
updatedAt: timestamp("updated_at").defaultNow().notNull(),
|
userAgent: text("user_agent"),
|
||||||
|
createdAt: timestamp("created_at", { withTimezone: true }).defaultNow().notNull(),
|
||||||
|
updatedAt: timestamp("updated_at", { withTimezone: true }).defaultNow().notNull(),
|
||||||
});
|
});
|
||||||
|
|
||||||
export const comparisons = pgTable(
|
export const comparisons = pgTable(
|
||||||
|
|||||||
@@ -178,7 +178,7 @@ Use the web research data above to provide factual, data-driven insights. Refere
|
|||||||
|
|
||||||
for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
|
for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
|
||||||
try {
|
try {
|
||||||
const response = await client.chat.completions.create({
|
const response = await getClient().chat.completions.create({
|
||||||
model: "gpt-4o-mini",
|
model: "gpt-4o-mini",
|
||||||
messages: [
|
messages: [
|
||||||
{ role: "system", content: SYSTEM_PROMPT },
|
{ role: "system", content: SYSTEM_PROMPT },
|
||||||
|
|||||||
Reference in New Issue
Block a user