cliffkoome
diff --git a/‎backend/src/app.js‎
Lines changed: 48 additions & 1 deletion b/‎backend/src/app.js‎
Lines changed: 48 additions & 1 deletion
diff --git a/‎backend/src/routes/alerts.js‎
Lines changed: 15 additions & 1 deletion b/‎backend/src/routes/alerts.js‎
Lines changed: 15 additions & 1 deletion
diff --git a/‎frontend/index.html‎
Lines changed: 4 additions & 0 deletions b/‎frontend/index.html‎
Lines changed: 4 additions & 0 deletions
@@ -7,6 +7,8 @@ import { ussdRouter } from "./delivery/ussd.js";
 import { smsRouter } from "./routes/sms.js";
 import { voiceRouter } from "./routes/voice.js";
 import { usersRouter } from "./routes/users.js";
+import { User } from "./models/User.js";
+import { Notification } from "./models/Notification.js";
 
 export const app = express();
 
@@ -26,9 +28,54 @@ app.use("/voice", voiceRouter);
 
 app.use("/api/alerts", alertsRouter);
 app.use("/api/bulletins", bulletinsRouter);
-
 app.use("/api/users", usersRouter);
 
+// 1. Fetch all registered beneficiaries
+app.get("/api/users", async (req, res) => {
+  try {
+    const users = await User.findAll({
+      order: [["createdAt", "DESC"]],
+    });
+
+    return res.status(200).json({
+      success: true,
+      data: users,
+    });
+  } catch (error) {
+    console.error("[Admin] Error fetching users:", error);
+    return res.status(500).json({ error: "Failed to retrieve users" });
+  }
+});
+
+// 2. Fetch all alert dispatch logs
+app.get("/api/logs", async (req, res) => {
+  try {
+    const logs = await Notification.findAll({
+      order: [["updatedAt", "DESC"]],
+    });
+
+    // Map the database model keys to match the frontend table schema
+    const formattedLogs = logs.map((log) => ({
+      timestamp: log.updatedAt || log.createdAt,
+      alertKey: log.hazardType
+        ? `${log.hazardType}-${log.location}`
+        : "Manual-Alert",
+      phone: log.phoneNumber,
+      smsSent: log.smsSent,
+      callAttempts: log.callAttempts,
+      callAnswered: log.callAnswered,
+    }));
+
+    return res.status(200).json({
+      success: true,
+      data: formattedLogs,
+    });
+  } catch (error) {
+    console.error("[Admin] Error fetching logs:", error);
+    return res.status(500).json({ error: "Failed to retrieve dispatch logs" });
+  }
+});
+
 // Fallback for unmatched routes
 app.use((req, res) => {
   res.status(404).json({ error: "Not found" });
 
@@ -3,6 +3,7 @@ import { simplifyBulletin } from "../pipeline/simplify.js";
 import { translateAlert } from "../pipeline/translate.js";
 import { synthesizeSpeech } from "../delivery/tts.js";
 import { sendSms } from "../delivery/sms.js";
+import { startVoiceCall } from "../delivery/voice.js";
 
 export const alertsRouter = Router();
 
@@ -30,13 +31,26 @@ alertsRouter.post("/", async (req, res) => {
     const audioPath = `/audio/${fileName}`;
 
     let deliveryResult = null;
+    let voiceResult = null;
+
     if (phoneNumber) {
+      // Execute SMS dispatch
       deliveryResult = await sendSms({ to: phoneNumber, message: translated });
+
+      // Execute Voice dispatch internally (bypasses HTTP auth headers)
+      try {
+        voiceResult = await startVoiceCall({
+          to: phoneNumber,
+          clientRequestId: fileName,
+        });
+      } catch (voiceErr) {
+        console.error("[alerts] voice call failed:", voiceErr.message);
+      }
     }
 
     res.json({
       stages: { raw: bulletinText, simplified, translated, audioPath },
-      delivery: deliveryResult,
+      delivery: { sms: deliveryResult, voice: voiceResult },
     });
   } catch (err) {
     console.error("[alerts] pipeline error:", err);
 
@@ -4,6 +4,10 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:wght,FILL@100..700,0..1&display=swap"
+      rel="stylesheet"
+    />
     <title>frontend</title>
   </head>
   <body>