Compare commits

...

4 Commits

Author SHA1 Message Date
e177c3d2a6 changed frontend path 2025-10-23 14:19:29 +02:00
de23ea00ee added debugging for routing 2025-10-23 14:02:36 +02:00
d78ba474d8 removed express static fallback 2025-10-23 00:39:28 +02:00
5c7786bc19 added schema detection for prod dev 2025-10-23 00:24:23 +02:00
3 changed files with 81 additions and 38 deletions

View File

@@ -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

View File

@@ -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 {

View File

@@ -1,8 +1,9 @@
// backend/src/server.ts
import express from 'express';
import { fileURLToPath } from 'url';
import path from 'path';
import { fileURLToPath } from 'url';
import { initializeDatabase } from './scripts/initializeDatabase.js';
import fs from 'fs';
// Route imports
import authRoutes from './routes/auth.js';
@@ -21,9 +22,6 @@ const PORT = 3002;
// Middleware
app.use(express.json());
// Serviere statische Frontend-Dateien
app.use(express.static(path.join(__dirname, '../../frontend-build')));
// API Routes
app.use('/api/setup', setupRoutes);
app.use('/api/auth', authRoutes);
@@ -32,17 +30,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({
@@ -52,49 +39,82 @@ 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
const frontendBuildPath = path.join(__dirname, '../frontend-build');
console.log('📁 Frontend build path:', frontendBuildPath);
const adminExists = await db.get<{ 'COUNT(*)': number }>(
'SELECT COUNT(*) FROM employees WHERE role = ?',
['admin']
);
// Überprüfe ob das Verzeichnis existiert
if (fs.existsSync(frontendBuildPath)) {
console.log('✅ Frontend build directory exists');
const files = fs.readdirSync(frontendBuildPath);
console.log('📄 Files in frontend-build:', files);
res.json({
needsInitialSetup: !adminExists || adminExists['COUNT(*)'] === 0
});
} catch (error) {
console.error('Error checking initial setup:', error);
res.status(500).json({ error: 'Internal server error' });
// Serviere statische Dateien
app.use(express.static(frontendBuildPath));
console.log('✅ Static file serving configured');
} else {
console.log('❌ Frontend build directory NOT FOUND:', frontendBuildPath);
}
app.get('/', (req, res) => {
const indexPath = path.join(frontendBuildPath, 'index.html');
console.log('📄 Serving index.html from:', indexPath);
if (fs.existsSync(indexPath)) {
res.sendFile(indexPath);
} else {
console.error('❌ index.html not found at:', indexPath);
res.status(404).send('Frontend not found - index.html missing');
}
});
app.get('*', (req, res) => {
// Ignoriere API Routes
if (req.path.startsWith('/api/')) {
return res.status(404).json({ error: 'API endpoint not found' });
}
const indexPath = path.join(frontendBuildPath, 'index.html');
console.log('🔄 Client-side routing for:', req.path, '-> index.html');
if (fs.existsSync(indexPath)) {
res.sendFile(indexPath);
} else {
console.error('❌ index.html not found for client-side routing');
res.status(404).json({ error: 'Frontend application not found' });
}
});
// 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
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);
}
};