X-Git-Url: https://git.xangelo.ca/?a=blobdiff_plain;f=src%2Frender%2Fland-development.ts;h=0c1fad915890fe43330a3feb61683a9a6443a117;hb=9c0287740b282030291008cd9cf204c7f1ca8958;hp=18b64a7f5f5a0562e8ed9704fcaa7eaae4152f5f;hpb=516deaa637cb322ddbb4fb9121d56d23fef5d7a8;p=browser-rts.git

diff --git a/src/render/land-development.ts b/src/render/land-development.ts
index 18b64a7..0c1fad9 100644
--- a/src/render/land-development.ts
+++ b/src/render/land-development.ts
@@ -1,27 +1,29 @@
 import { BuildQueue } from "../repository/build-queue";
-import { City } from "../repository/city";
+import { CityWithLocation } from "../repository/city";
 import { Building } from '../repository/buildings';
 import _ from "lodash";
 
 function progressBar(current, max): string {
     const percent = Math.ceil((current/max) * 100);
     return `
-    <div class="progress-bar construction" style="background: background: rgb(0,102,0);
-    background: linear-gradient(90deg, rgba(0,102,0,1) 0%, rgba(0,102,0,1) ${percent}%, rgba(0,0,0,1) ${percent}%);">
+    <div class="progress-bar construction" style="background: background: var(--green-bg);
+    background: linear-gradient(90deg, var(--green-bg) 0%, var(--green-bg) ${percent}%, #000 ${percent}%); border-color: var(--green-border); ">
     ${percent}%
     </div>
     `;
 }
 
-export function renderLandDevelopment(city: City, buildings: Building[], buildQueues: BuildQueue[]): string {
+export function renderLandDevelopment(city: CityWithLocation, buildings: Building[], buildQueues: BuildQueue[]): string {
     const freeSpace = city.totalSpace - city.usedSpace;
     let html = `
-    <div hx-trigger="reload-construction-queue, every 600s" hx-get="/queue/construction">
+    <div hx-trigger="reload-construction-queue, every 600s" hx-get="/poll/construction">
+    <h2 data-augmented-ui="tl-clip bl-clip none">Construction</h2>
     <table>
     <tr>
-        <th>Free Land</th>
+        <th>Type</th>
         <th>Current</th>
-        <td colspan="2">${(city.totalSpace - city.usedSpace).toLocaleString()} (${Math.ceil(freeSpace/city.totalSpace * 100)}% available)</td>
+        <th>Space Available: ${(city.totalSpace - city.usedSpace).toLocaleString()} (${Math.ceil(freeSpace/city.totalSpace * 100)}% available)</th>
+        <th width="200">Cost</th>
     </tr>
     ${
         buildings.map(building => {
@@ -31,12 +33,12 @@ export function renderLandDevelopment(city: City, buildings: Building[], buildQu
                 <td>${city[building.slug]}</td>
                 <td>
                     <form hx-post="/build">
-                        <input type="number" name="amount" hx-post="/cost/construction" hx-trigger="change" hx-target="#${building.slug}-cost">
+                        <input type="number" size="6" name="amount" hx-post="/cost/construction" hx-trigger="keyup" hx-target="#${building.slug}-cost">
                         <input type="hidden" name="building_type" value="${building.slug}">
                         <button type="submit">Build</button>
                     </form>
-                    <span id="${building.slug}-cost"></span>
                 </td>
+                <td id="${building.slug}-cost"></td>
             </tr>
             `;
         }).join("\n")
@@ -48,14 +50,13 @@ export function renderLandDevelopment(city: City, buildings: Building[], buildQu
 
     const queues = `
     <hr>
-    <h2>Build Queues</h2>
+    <h2 data-augmented-ui="tl-clip bl-clip none">Build Queues</h2>
     <table>
     <tr>
     <th>Building</th>
     <th>Amount Expected</th>
     <th>Progress</th>
     </tr>
-    <tr>
     ${buildQueues.sort((a, b) => {
         return a.due - b.due;
     }).map(queue => {
@@ -73,6 +74,5 @@ export function renderLandDevelopment(city: City, buildings: Building[], buildQu
     </table>
     </div>
     `;
-
     return html + queues;
-}
\ No newline at end of file
+}