add solar_panels and calculate energy gen/use

[browser-rts.git] / src / api.ts

diff --git a/src/api.ts b/src/api.ts
index f59ec0e3a83a173840346cd289829b236c4942c6..54f44825be11f63f8b7b5bba0b8abd377be52362 100644 (file)
--- a/src/api.ts
+++ b/src/api.ts
@@ -100,8 +100,8 @@ server.get<{}, string>('/poll/overview', async req => {
   const usage = {
     foodUsagePerTick: await cityRepo.foodUsagePerTick(city),
     foodProductionPerTick: await cityRepo.foodProductionPerTick(city),
-    energyUsagePerTick: 0,
-    energyProductionPerTick: 0
+    energyUsagePerTick: await cityRepo.energyUsagePerTick(city),
+    energyProductionPerTick: await cityRepo.energyProductionPerTick(city)
   }
 
        return renderKingomOverview({
@@ -119,8 +119,8 @@ server.get<{}, string>('/poll/construction', async req => {
   const usage = {
     foodUsagePerTick: await cityRepo.foodUsagePerTick(city),
     foodProductionPerTick: await cityRepo.foodProductionPerTick(city),
-    energyUsagePerTick: 0,
-    energyProductionPerTick: 0
+    energyUsagePerTick: await cityRepo.energyUsagePerTick(city),
+    energyProductionPerTick: await cityRepo.energyProductionPerTick(city)
   }
        return renderLandDevelopment(city, buildings, buildQueues) + topbar({...city, ...usage});
 });
@@ -134,8 +134,8 @@ server.get<{}, string>('/poll/unit-training', async req => {
   const usage = {
     foodUsagePerTick: await cityRepo.foodUsagePerTick(city),
     foodProductionPerTick: await cityRepo.foodProductionPerTick(city),
-    energyUsagePerTick: 0,
-    energyProductionPerTick: 0
+    energyUsagePerTick: await cityRepo.energyUsagePerTick(city),
+    energyProductionPerTick: await cityRepo.energyProductionPerTick(city)
   }
 
        return renderUnitTraining(city, units, unitTrainingQueues) + topbar({
@@ -161,8 +161,8 @@ server.post<{body: {sector: string}}, string>('/poll/map', async req => {
   const usage = {
     foodUsagePerTick: await cityRepo.foodUsagePerTick(city),
     foodProductionPerTick: await cityRepo.foodProductionPerTick(city),
-    energyUsagePerTick: 0,
-    energyProductionPerTick: 0
+    energyUsagePerTick: await cityRepo.energyUsagePerTick(city),
+    energyProductionPerTick: await cityRepo.energyProductionPerTick(city)
   }
 
        return renderOverworldMap(await cityRepo.findAllInSector(sector), city, sector) + topbar({
@@ -178,8 +178,8 @@ server.get<{}, string>('/poll/mailroom', async req => {
   const usage = {
     foodUsagePerTick: await cityRepo.foodUsagePerTick(city),
     foodProductionPerTick: await cityRepo.foodProductionPerTick(city),
-    energyUsagePerTick: 0,
-    energyProductionPerTick: 0
+    energyUsagePerTick: await cityRepo.energyUsagePerTick(city),
+    energyProductionPerTick: await cityRepo.energyProductionPerTick(city)
   }
 
        return renderMailroom(await mailRepo.listReceivedMessages(account.id)) + topbar({