diff --git a/Dockerfile.dev b/Dockerfile.dev index cd5b2ea..2c59f83 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -8,11 +8,10 @@ RUN npm i --unsafe-perm COPY . ./ COPY config_dev.json ./config.json RUN npm run build -RUN npm run init-db # --- Production stage --- FROM node:24-alpine COPY --from=build /app . ENV HOST=0.0.0.0 EXPOSE 3000 -CMD ["sh", "-c", "ORIGIN=https://tatort-dev.innovation-hub-niedersachsen.de node build/index.js"] +CMD ["sh", "-c", "npm run init-db && ORIGIN=https://tatort-dev.innovation-hub-niedersachsen.de node build/index.js"] diff --git a/src/init/init_db.ts b/src/init/init_db.ts index c158151..99ad5e3 100644 --- a/src/init/init_db.ts +++ b/src/init/init_db.ts @@ -1,8 +1,9 @@ import Database from 'better-sqlite3'; import fs from 'fs'; import path from 'path'; +import { DB_FULLPATH } from '../routes'; -const fullPath = './src/lib/data/tatort.db'; +const fullPath = DB_FULLPATH; const dir = path.dirname(fullPath); if (!fs.existsSync(dir)) { diff --git a/src/lib/server/dbService.ts b/src/lib/server/dbService.ts index 21f2c4c..d50bee5 100644 --- a/src/lib/server/dbService.ts +++ b/src/lib/server/dbService.ts @@ -1,12 +1,7 @@ import Database from 'better-sqlite3'; -import fs from 'fs'; -import path from 'path'; +import { DB_FULLPATH } from '../../routes'; -const fullPath = './src/lib/data/tatort.db'; -const dir = path.dirname(fullPath); +// make sure the DB is initiated +import '../../init/init_db' -if (!fs.existsSync(dir)) { - fs.mkdirSync(dir); -} - -export const db = new Database(fullPath); +export const db = new Database(DB_FULLPATH); diff --git a/src/routes/(angemeldet)/+layout.server.ts b/src/routes/(angemeldet)/+layout.server.ts index 182068e..cdde090 100644 --- a/src/routes/(angemeldet)/+layout.server.ts +++ b/src/routes/(angemeldet)/+layout.server.ts @@ -3,30 +3,10 @@ import type { PageServerLoad } from '../anmeldung/$types'; import { ROUTE_NAMES } from '..'; -// *** [START] check for dir - -import fs from 'fs'; -const path = '/daten'; - -let path_existing: string; - -fs.access(path, fs.constants.F_OK, (err) => { - if (err) { - console.error(`❌ Directory "${path}" does NOT exist or is not accessible.`); - path_existing = "NO"; - } else { - console.log(`✅ Directory "${path}" exists and is accessible.`); - path_existing = "YES"; - } -}); - -// *** - export const load: PageServerLoad = (event: ServerLoadEvent) => { if (!event.locals.user && event.url.pathname !== ROUTE_NAMES.ANMELDUNG) throw redirect(303, ROUTE_NAMES.ANMELDUNG); return { - user: event.locals.user, - path_existing + user: event.locals.user }; }; diff --git a/src/routes/(angemeldet)/+page.svelte b/src/routes/(angemeldet)/+page.svelte index 8570c31..12431c8 100644 --- a/src/routes/(angemeldet)/+page.svelte +++ b/src/routes/(angemeldet)/+page.svelte @@ -11,7 +11,7 @@