diff --git a/.env.example b/.env.example index 75e42e5..5ed2d02 100644 --- a/.env.example +++ b/.env.example @@ -1,2 +1,2 @@ DATABASE_URL=postgresql://serve:yourpassword@localhost:5433/movie_select?host=/home/serve/tmp -PORT=3001 +PORT=3003 diff --git a/setup-server.sh b/setup-server.sh index 6ae737a..21df691 100755 --- a/setup-server.sh +++ b/setup-server.sh @@ -6,7 +6,7 @@ set -euo pipefail REMOTE_HOST="serve" REMOTE_APP_DIR="/home/serve/services/movie-select" REMOTE_STATIC_DIR="/var/www/virtual/serve/html/movie-select" -REMOTE_PORT=3001 +REMOTE_PORT=3003 DB_NAME="movie_select" PG_SOCKET_DIR="/home/serve/tmp" PG_PORT=5433 diff --git a/src/server/app.ts b/src/server/app.ts index 65dbf41..5163d7e 100644 --- a/src/server/app.ts +++ b/src/server/app.ts @@ -7,7 +7,7 @@ const app = new Hono(); app.use("*", cors()); -app.route("/api/rounds", roundsRouter); +app.route("/rounds", roundsRouter); app.onError((err, c) => { if (err instanceof ApiError) { diff --git a/src/server/shared/db/index.ts b/src/server/shared/db/index.ts index a8a8521..790f4d8 100644 --- a/src/server/shared/db/index.ts +++ b/src/server/shared/db/index.ts @@ -3,6 +3,15 @@ import postgres from "postgres"; import { env } from "../lib/env.ts"; import * as schema from "./schema/index.ts"; -const client = postgres(env.DATABASE_URL); +const url = new URL(env.DATABASE_URL); +const socketHost = url.searchParams.get("host"); + +const client = postgres({ + host: socketHost ?? url.hostname, + port: Number(url.port) || 5432, + database: url.pathname.slice(1), + username: url.username, + password: url.password, +}); export const db = drizzle(client, { schema }); diff --git a/vite.config.ts b/vite.config.ts index b30db88..604ecd8 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -12,7 +12,7 @@ export default defineConfig({ proxy: { "/movie-select/api": { target: "http://localhost:3001", - rewrite: (path) => path.replace(/^\/movie-select/, ""), + rewrite: (path) => path.replace(/^\/movie-select\/api/, ""), }, }, },