Upload index.js

server/index.js

@@ -47,54 +47,36 @@ app.use(express.json());
 // Serve static files from the client build in production
 if (process.env.NODE_ENV === 'production') {
   app.use(express.static('/usr/share/nginx/html'));
-  
-  // Health check endpoint for containerized environments
-  app.get('/health', (req, res) => {
-    res.status(200).json({ 
-      status: 'OK', 
-      timestamp: new Date().toISOString(),
-      uptime: process.uptime()
-    });
+}
+
+// Health check endpoint
+app.get('/health', (req, res) => {
+  res.status(200).json({ 
+    status: 'OK', 
+    timestamp: new Date().toISOString(),
+    uptime: process.uptime()
   });
-  
-  // Serve the React app for the root route
-  app.get('/', (req, res) => {
+});
+
+app.get('/', (req, res) => {
+  if (process.env.NODE_ENV === 'production') {
+    // In production, serve the React app
     res.sendFile(path.resolve('/usr/share/nginx/html/index.html'));
-  });
-  
-  // In production, serve the React app for any non-API routes
-  app.get('*', (req, res) => {
-    if (!req.path.startsWith('/api/')) {
-      res.sendFile(path.resolve('/usr/share/nginx/html/index.html'));
-    } else {
-      res.status(404).json({ error: 'API endpoint not found' });
-    }
-  });
-} else {
-  // Development endpoints
-  app.get('/', (req, res) => {
+  } else {
     res.json({ 
       message: 'BioNexus Hub API', 
       version: '1.0.0',
       timestamp: new Date().toISOString()
     });
-  });
-  
-  // Health check endpoint for development
-  app.get('/health', (req, res) => {
-    res.status(200).json({ 
-      status: 'OK', 
-      timestamp: new Date().toISOString(),
-      uptime: process.uptime()
-    });
-  });
-}
+  }
+});
 
 app.get('/api/news', async (req, res) => {
   try {
     const news = await News.getAll();
     res.json(news);
   } catch (error) {
+    console.error('Error fetching news:', error);
     res.status(500).json({ error: 'Failed to fetch news' });
   }
 });
@@ -108,6 +90,7 @@ app.get('/api/news/:id', async (req, res) => {
     }
     res.json(newsItem);
   } catch (error) {
+    console.error('Error fetching news item:', error);
     res.status(500).json({ error: 'Failed to fetch news item' });
   }
 });
@@ -117,6 +100,7 @@ app.get('/api/datasets', async (req, res) => {
     const datasets = await Dataset.getAll();
     res.json(datasets);
   } catch (error) {
+    console.error('Error fetching datasets:', error);
     res.status(500).json({ error: 'Failed to fetch datasets' });
   }
 });
@@ -130,10 +114,22 @@ app.get('/api/datasets/:id', async (req, res) => {
     }
     res.json(dataset);
   } catch (error) {
+    console.error('Error fetching dataset:', error);
     res.status(500).json({ error: 'Failed to fetch dataset' });
   }
 });
 
+// In production, serve the React app for any non-API routes
+if (process.env.NODE_ENV === 'production') {
+  app.get('*', (req, res) => {
+    if (!req.path.startsWith('/api/') && req.path !== '/health') {
+      res.sendFile(path.resolve('/usr/share/nginx/html/index.html'));
+    } else {
+      res.status(404).json({ error: 'API endpoint not found' });
+    }
+  });
+}
+
 app.listen(PORT, '0.0.0.0', () => {
   console.log(`BioNexus Hub server running on port ${PORT}`);
 });