push

src/app.ts

@@ -1,5 +1,6 @@
 import express, { Application } from 'express';
 import cors from 'cors';
+import path from 'path';
 import swaggerUi from 'swagger-ui-express';
 import { swaggerSpec } from './docs/swagger';
 
@@ -66,17 +67,42 @@ app.use('/api/chat', chatRoutes);
 app.use('/api/subscriptions', subscriptionRoutes);
 app.use('/api/wallet', walletRoutes);
 
-// Simple 404 handler
+// Serve frontend static files if they exist
+const frontendPath = path.join(__dirname, '../../zurri-mock-frontend/dist');
+let frontendExists = false;
+try {
+  const fs = require('fs');
+  if (fs.existsSync(frontendPath) && fs.existsSync(path.join(frontendPath, 'index.html'))) {
+    app.use(express.static(frontendPath));
+    frontendExists = true;
+  }
+} catch (error) {
+  // Frontend not available, continue without it
+}
+
+// Serve React app for all non-API routes (SPA routing)
+// This must come after all API routes but before 404 handler
+if (frontendExists) {
+  app.get('*', (req, res, next) => {
+    // Skip if it's an API, docs, health, or root route
+    if (req.path.startsWith('/api') || req.path.startsWith('/docs') || req.path.startsWith('/health') || req.path === '/') {
+      return next();
+    }
+    // Serve React app for all other routes (dashboard, wallet, etc.)
+    res.sendFile(path.join(frontendPath, 'index.html'));
+  });
+}
+
+// 404 handler - only for API routes or if frontend doesn't exist
 app.use((req, res) => {
-  // Only return JSON for API routes, otherwise just 404
   if (req.path.startsWith('/api')) {
     res.status(404).json({ error: 'Route not found' });
-  } else {
+  } else if (!frontendExists) {
     res.status(404).send('Not found');
   }
 });
 
-// Simplified error handler
+// Simplified error handler (must be last)
 app.use((err: Error, req: express.Request, res: express.Response, next: express.NextFunction) => {
   if (process.env.NODE_ENV === 'development') {
     console.error('Error:', err.message);

src/controllers/walletController.ts

@@ -62,12 +62,10 @@ export class WalletController {
       const paymentReference = `wallet_${userId}_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
 
       // Paystack callback should point to backend endpoint, which then redirects to frontend
-      // For Hugging Face Spaces: https://nexusbert-zurri.hf.space/api/wallet/callback
-      // For local: http://localhost:7860/api/wallet/callback
+      // Use environment variable or detect hosted URL
+      const baseUrl = process.env.API_BASE_URL || process.env.BACKEND_URL || 'https://nexusbert-zurri.hf.space';
       const backendUrl = process.env.PAYSTACK_CALLBACK_URL 
-        || (process.env.HF_SPACE_ID || process.env.SPACE_ID 
-          ? `https://nexusbert-zurri.hf.space/api/wallet/callback`
-          : `${process.env.API_BASE_URL || process.env.BACKEND_URL || 'http://localhost:7860'}/api/wallet/callback`);
+        || `${baseUrl}/api/wallet/callback`;
 
       const paymentData = await getPaystackService().initializeTransaction({
         email: user.email,
@@ -289,7 +287,7 @@ export class WalletController {
 
       if (!reference) {
         // Redirect to frontend error page
-        const frontendUrl = process.env.FRONTEND_URL || 'http://localhost:3000';
+        const frontendUrl = process.env.FRONTEND_URL || 'https://nexusbert-zurri.hf.space';
         return res.redirect(`${frontendUrl}/payment/failed?error=missing_reference`);
       }
 
@@ -299,7 +297,7 @@ export class WalletController {
 
         // Check if transaction was successful
         if (verification.status !== 'success') {
-          const frontendUrl = process.env.FRONTEND_URL || 'http://localhost:3000';
+          const frontendUrl = process.env.FRONTEND_URL || 'https://nexusbert-zurri.hf.space';
           return res.redirect(
             `${frontendUrl}/payment/failed?reference=${reference}&status=${verification.status}&message=${encodeURIComponent(verification.gatewayResponse || 'Payment failed')}`
           );
@@ -308,7 +306,7 @@ export class WalletController {
         // Extract userId from metadata
         const userId = verification.metadata?.userId;
         if (!userId) {
-          const frontendUrl = process.env.FRONTEND_URL || 'http://localhost:3000';
+          const frontendUrl = process.env.FRONTEND_URL || 'https://nexusbert-zurri.hf.space';
           return res.redirect(
             `${frontendUrl}/payment/failed?error=missing_user_id&reference=${reference}`
           );
@@ -318,7 +316,7 @@ export class WalletController {
         const existingTx = await walletService.getTransactionByReference(reference);
         if (existingTx && existingTx.status === TransactionStatus.COMPLETED) {
           // Already processed, redirect to success
-          const frontendUrl = process.env.FRONTEND_URL || 'http://localhost:3000';
+          const frontendUrl = process.env.FRONTEND_URL || 'https://nexusbert-zurri.hf.space';
           const wallet = await walletService.getOrCreateWallet(userId);
           return res.redirect(
             `${frontendUrl}/payment/success?reference=${reference}&already_processed=true&balance=${Number(wallet.balance)}`
@@ -344,20 +342,20 @@ export class WalletController {
         const wallet = await walletService.getOrCreateWallet(userId);
 
         // Redirect to frontend success page with details
-        const frontendUrl = process.env.FRONTEND_URL || 'http://localhost:3000';
+        const frontendUrl = process.env.FRONTEND_URL || 'https://nexusbert-zurri.hf.space';
         return res.redirect(
           `${frontendUrl}/payment/success?reference=${reference}&points=${points}&balance=${Number(wallet.balance)}&amount=${amountInNaira}`
         );
       } catch (verifyError: any) {
         console.error('Payment verification error in callback:', verifyError);
-        const frontendUrl = process.env.FRONTEND_URL || 'http://localhost:3000';
+        const frontendUrl = process.env.FRONTEND_URL || 'https://nexusbert-zurri.hf.space';
         return res.redirect(
           `${frontendUrl}/payment/failed?reference=${reference}&error=${encodeURIComponent(verifyError.message || 'Verification failed')}`
         );
       }
     } catch (error: any) {
       console.error('Payment callback error:', error);
-      const frontendUrl = process.env.FRONTEND_URL || 'http://localhost:3000';
+      const frontendUrl = process.env.FRONTEND_URL || 'https://nexusbert-zurri.hf.space';
       return res.redirect(`${frontendUrl}/payment/failed?error=${encodeURIComponent(error.message || 'Unknown error')}`);
     }
   }