diff --git a/Dockerfile b/Dockerfile index 510ea55..a35eadf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,8 @@ COPY package.json bun.lock ./ RUN bun install --frozen-lockfile # Install web project dependencies -COPY src/web/package.json src/web/bun.lock ./src/web/ -RUN cd src/web && bun install --frozen-lockfile +COPY web/package.json web/bun.lock ./web/ +RUN cd web && bun install --frozen-lockfile # Copy source code COPY . . diff --git a/drizzle.config.ts b/drizzle.config.ts index d82931c..d78c81c 100644 --- a/drizzle.config.ts +++ b/drizzle.config.ts @@ -8,7 +8,7 @@ BigInt.prototype.toJSON = function () { export default defineConfig({ schema: "./shared/db/schema.ts", - out: "./drizzle", + out: "./shared/db/migrations", dialect: "postgresql", dbCredentials: { url: env.DATABASE_URL, diff --git a/package.json b/package.json index 3b28fe4..b37e626 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,9 @@ "db:push:local": "drizzle-kit push", "dev": "bun --watch bot/index.ts", "db:studio": "drizzle-kit studio --host 0.0.0.0", - "studio:remote": "bash scripts/remote-studio.sh", - "dashboard:remote": "bash scripts/remote-dashboard.sh", - "remote": "bash scripts/remote.sh", + "studio:remote": "bash shared/scripts/remote-studio.sh", + "dashboard:remote": "bash shared/scripts/remote-dashboard.sh", + "remote": "bash shared/scripts/remote.sh", "test": "bun test" }, "dependencies": { diff --git a/drizzle/0000_fixed_tomas.sql b/shared/db/migrations/0000_fixed_tomas.sql similarity index 100% rename from drizzle/0000_fixed_tomas.sql rename to shared/db/migrations/0000_fixed_tomas.sql diff --git a/drizzle/0001_heavy_thundra.sql b/shared/db/migrations/0001_heavy_thundra.sql similarity index 100% rename from drizzle/0001_heavy_thundra.sql rename to shared/db/migrations/0001_heavy_thundra.sql diff --git a/drizzle/0002_fancy_forge.sql b/shared/db/migrations/0002_fancy_forge.sql similarity index 100% rename from drizzle/0002_fancy_forge.sql rename to shared/db/migrations/0002_fancy_forge.sql diff --git a/drizzle/meta/0000_snapshot.json b/shared/db/migrations/meta/0000_snapshot.json similarity index 100% rename from drizzle/meta/0000_snapshot.json rename to shared/db/migrations/meta/0000_snapshot.json diff --git a/drizzle/meta/0001_snapshot.json b/shared/db/migrations/meta/0001_snapshot.json similarity index 100% rename from drizzle/meta/0001_snapshot.json rename to shared/db/migrations/meta/0001_snapshot.json diff --git a/drizzle/meta/0002_snapshot.json b/shared/db/migrations/meta/0002_snapshot.json similarity index 100% rename from drizzle/meta/0002_snapshot.json rename to shared/db/migrations/meta/0002_snapshot.json diff --git a/drizzle/meta/_journal.json b/shared/db/migrations/meta/_journal.json similarity index 100% rename from drizzle/meta/_journal.json rename to shared/db/migrations/meta/_journal.json