added schema detection for prod dev

Dockerfile

@@ -82,7 +82,7 @@ ENV PM2_HOME=/app/.pm2
 
 USER schichtplan
 
-EXPOSE 3000 3002
+EXPOSE 3002
 
 HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
   CMD wget --no-verbose --tries=1 --spider http://localhost:3002/api/health || exit 1

backend/src/scripts/initializeDatabase.ts

@@ -8,7 +8,30 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export async function initializeDatabase(): Promise<void> {
-  const schemaPath = path.join(__dirname, '../database/schema.sql');
+  const possiblePaths = [
+    path.join(__dirname, '../database/schema.sql'),
+    path.join(__dirname, '../../database/schema.sql'),
+    path.join(process.cwd(), 'database/schema.sql'),
+    path.join(process.cwd(), 'src/database/schema.sql'),
+    path.join(process.cwd(), 'dist/database/schema.sql')
+  ];
+
+  let schemaPath: string | null = null;
+
+  for (const p of possiblePaths) {
+    if (fs.existsSync(p)) {
+      schemaPath = p;
+      break;
+    }
+  }
+
+  if (!schemaPath) {
+    throw new Error(
+      `❌ schema.sql not found in any of the tested paths:\n${possiblePaths.join('\n')}`
+    );
+  }
+
+  console.log(`✅ Using schema at: ${schemaPath}`);
   const schema = fs.readFileSync(schemaPath, 'utf8');
   
   try {

backend/src/server.ts

@@ -1,6 +1,7 @@
 // backend/src/server.ts
 import express from 'express';
-import cors from 'cors';
+import path from 'path';
+import { fileURLToPath } from 'url';
 import { initializeDatabase } from './scripts/initializeDatabase.js';
 
 // Route imports
@@ -11,11 +12,13 @@ import setupRoutes from './routes/setup.js';
 import scheduledShifts from './routes/scheduledShifts.js';
 import schedulingRoutes from './routes/scheduling.js';
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
 const app = express();
 const PORT = 3002;
 
-// CORS und Middleware
-app.use(cors());
+// Middleware
 app.use(express.json());
 
 // API Routes
@@ -26,17 +29,6 @@ app.use('/api/shift-plans', shiftPlanRoutes);
 app.use('/api/scheduled-shifts', scheduledShifts);
 app.use('/api/scheduling', schedulingRoutes);
 
-// Error handling middleware should come after routes
-app.use((err: any, req: express.Request, res: express.Response, next: express.NextFunction) => {
-  console.error('Unhandled error:', err);
-  res.status(500).json({ error: 'Internal server error' });
-});
-
-// 404 handler for API routes
-app.use('/api/*', (req, res) => {
-  res.status(404).json({ error: 'API endpoint not found' });
-});
-
 // Health route
 app.get('/api/health', (req: any, res: any) => {
   res.json({ 
@@ -46,23 +38,18 @@ app.get('/api/health', (req: any, res: any) => {
   });
 });
 
-// Setup status route (additional endpoint for clarity)
-app.get('/api/initial-setup', async (req: any, res: any) => {
-  try {
-    const { db } = await import('./services/databaseService.js');
+// 🆕 STATIC FILE SERVING FÜR FRONTEND
+app.use(express.static(path.join(__dirname, '../../frontend-build')));
 
-    const adminExists = await db.get<{ 'COUNT(*)': number }>(
-      'SELECT COUNT(*) FROM employees WHERE role = ?',
-      ['admin']
-    );
+// 🆕 FALLBACK FÜR CLIENT-SIDE ROUTING
+app.get('*', (req, res) => {
+  res.sendFile(path.join(__dirname, '../../frontend-build/index.html'));
+});
 
-    res.json({
-      needsInitialSetup: !adminExists || adminExists['COUNT(*)'] === 0
-    });
-  } catch (error) {
-    console.error('Error checking initial setup:', error);
+// Error handling middleware
+app.use((err: any, req: express.Request, res: express.Response, next: express.NextFunction) => {
+  console.error('Unhandled error:', err);
   res.status(500).json({ error: 'Internal server error' });
-  }
 });
 
 // Initialize the application
@@ -70,25 +57,24 @@ const initializeApp = async () => {
   try {
     // Initialize database with base schema
     await initializeDatabase();
-    //console.log('✅ Database initialized successfully');
     
     // Apply any pending migrations
     const { applyMigration } = await import('./scripts/applyMigration.js');
     await applyMigration();
-    //console.log('✅ Database migrations applied');
 
     // Start server only after successful initialization
     app.listen(PORT, () => {
-      console.log('🎉 BACKEND STARTED SUCCESSFULLY!');
+      console.log('🎉 APPLICATION STARTED SUCCESSFULLY!');
       console.log(`📍 Port: ${PORT}`);
-      console.log(`📍 Health: http://localhost:${PORT}/api/health`);
+      console.log(`📍 Frontend: http://localhost:${PORT}`);
+      console.log(`📍 API: http://localhost:${PORT}/api`);
       console.log('');
-      console.log(`🔧 Setup ready at: http://localhost:${PORT}/api/setup/status`);
+      console.log(`🔧 Setup: http://localhost:${PORT}/api/setup/status`);
       console.log('📝 Create your admin account on first launch');
     });
   } catch (error) {
     console.error('❌ Error during initialization:', error);
-    process.exit(1); // Exit if initialization fails
+    process.exit(1);
   }
 };
 

ecosystem.config.cjs

@@ -2,7 +2,7 @@
 module.exports = {
   apps: [
     {
-      name: 'backend',
+      name: 'schichtplaner',
       script: './dist/server.js',
       instances: 1,
       exec_mode: 'fork',
@@ -10,21 +10,8 @@ module.exports = {
         NODE_ENV: 'production',
         PORT: 3002
       },
-      error_file: './logs/backend-err.log',
-      out_file: './logs/backend-out.log',
-      time: true
-    },
-    {
-      name: 'frontend',
-      script: 'npx',
-      args: 'serve -s frontend-build -l 3000',
-      instances: 1,
-      exec_mode: 'fork',
-      env: {
-        NODE_ENV: 'production'
-      },
-      error_file: './logs/frontend-err.log',
-      out_file: './logs/frontend-out.log',
+      error_file: './logs/app-err.log',
+      out_file: './logs/app-out.log',
       time: true
     }
   ]